hg/stx-libtool: comparison DebugView.st

equal deleted inserted replaced

-:7c75379de9ec
+:34f8d67c4932
 		steppedContextAddress canAbort abortButton terminateButton
 		continueButton stepButton nextButton sendButton returnButton
 		restartButton exclusive inspecting nChainShown inspectedProcess
 		updateProcess stopButton updateButton monitorToggle stepping
 		steppedContextLineno stepForReturn actualContext inWrap
-		stackInspector steppedContext wrapperContext'
+		stackInspector steppedContext wrapperContext verboseBacktrace'
 	classVariableNames:'CachedDebugger CachedExclusive OpenDebuggers MoreDebuggingDetail
 		DebuggingDebugger'
 	poolDictionaries:''
 	category:'Interface-Debugger'
 !
 super initialize.
 font := font on:device.
+verboseBacktrace := false.
 busy := false.
 exclusive := false.
 inspecting := false.
 exitAction := nil.
 bigStep := false.
 contextInspector := ContextInspectorView
 origin:(0.5 @ 0.0) corner:(1.0 @ 1.0)
 in:hpanel.
 contextInspector label:'context'.
-"Modified: 22.10.1996 / 15:50:01 / cg"
+"Modified: 10.1.1997 / 21:05:52 / cg"
 !
 initializeMiddleButtonMenu
 |labels selectors m|
 exclusive ifTrue:[
 labels := resources array:#(
 'show more'
+'show verbose backtrace'
 '-'
 'remove breakpoint'
 'remove all trace & breakpoints'
 '-'
 'copy walkback text'
 '='
 'exit smalltalk (no confirmation)'
 ).
 selectors := #(
 showMore
+showVerboseBacktrace
 nil
 removeBreakpoint
 removeAllBreakpoints
 nil
 copyWalkbackText
 exit
 )
 ] ifFalse:[
 labels := resources array:#(
 'show more'
+'show verbose backtrace'
 '-'
 'skip'
 'step out'
 '-'
 "
 'exit smalltalk (no confirmation)'
 ).
 selectors := #(
 showMore
+showVerboseBacktrace
 nil
 skip
 skipForReturn
 nil
 "
 exit
 ).
 ].
 m := PopUpMenu
-labels:labels
+labels:(resources array:labels)
 selectors:selectors
 receiver:self
 for:contextView.
+verboseBacktrace ifTrue:[
+m labelAt:#showVerboseBacktrace put:(resources string:'show dense backtrace').
+m selectorAt:#showVerboseBacktrace put:#showDenseBacktrace
+].
 contextView middleButtonMenu:m.
 inspecting ifTrue:[
 m notNil ifTrue:[
 browseClassHierarchy browseFullClassProtocol
 implementors senders inspectContext skip doStepOut).
 ].
 ]
-"Modified: 14.10.1996 / 13:21:26 / cg"
+"Modified: 10.1.1997 / 21:35:36 / cg"
 !
 realize
 super realize.
 "/    exclusive ifTrue:[
 terminateButton turnOff.
 "Modified: 10.1.1997 / 17:42:10 / cg"
 !
+redisplayBacktrace
+|oldSelection con|
+contextArray notNil ifTrue:[
+oldSelection := contextView selection.
+con := contextArray at:1.
+contextArray at:1 put:nil.
+self setContext:con.
+contextView setSelection:oldSelection.
+]
+"Modified: 25.5.1996 / 12:26:55 / cg"
+"Created: 10.1.1997 / 21:36:46 / cg"
+!
 removeAllBreakpoints
 "remove all trace & breakpoints - if any"
 MessageTracer unwrapAllMethods
 !
 	^ self showError:'** select a context first **'
 ].
 SystemBrowser browseAllCallsOn:selectedContext selector.
 !
+showDenseBacktrace
+verboseBacktrace := false.
+contextView middleButtonMenu labelAt:#showDenseBacktrace put:(resources string:'show verbose backtrace').
+contextView middleButtonMenu selectorAt:#showDenseBacktrace put:#showVerboseBacktrace.
+self redisplayBacktrace.
+"Created: 10.1.1997 / 21:33:55 / cg"
+"Modified: 10.1.1997 / 21:37:21 / cg"
+!
 showMore
 "double number of contexts shown"
-|oldSelection con|
 contextArray notNil ifTrue:[
-oldSelection := contextView selection.
 nChainShown := nChainShown * 2.
-con := contextArray at:1.
+self redisplayBacktrace.
-contextArray at:1 put:nil.
-self setContext:con.
-contextView setSelection:oldSelection.
 ]
-"Modified: 25.5.1996 / 12:26:55 / cg"
+"Modified: 10.1.1997 / 21:37:04 / cg"
+!
+showVerboseBacktrace
+verboseBacktrace := true.
+contextView middleButtonMenu labelAt:#showVerboseBacktrace put:(resources string:'dense stack backtrace').
+contextView middleButtonMenu selectorAt:#showVerboseBacktrace put:#showDenseBacktrace.
+self redisplayBacktrace.
+"Modified: 10.1.1997 / 21:37:13 / cg"
 !
 skip
 "skip for cursor line in selected method"
 !
 setContext:aContext releaseInspectors:releaseInspectors
 "show calling chain from aContext in the walk-back listview"
-|con text method caller caller2 m count|
+|con text method caller caller2 m count showIt|
 (contextArray notNil and:[aContext == (contextArray at:1)]) ifTrue:[
-	"no change"
+"no change"
-	^ false
+^ false
 ].
 m := contextView middleButtonMenu.
 m notNil ifTrue:[
-	m disable:#showMore.
+m disable:#showMore.
 ].
 aContext isNil ifTrue:[
-	text := Array with:'** no context **'.
+text := Array with:'** no context **'.
-	contextArray := nil.
+contextArray := nil.
 ] ifFalse:[
-	text := OrderedCollection new:nChainShown.
+text := OrderedCollection new:nChainShown.
-	contextArray := OrderedCollection new:nChainShown.
+contextArray := OrderedCollection new:nChainShown.
-	con := aContext.
+con := aContext.
-	"
+"
-	 get them all
+get them all
-	"
+"
-	count := 0.
+count := 0.
-	[con notNil and:[count <= nChainShown]] whileTrue:[
+[con notNil and:[count <= nChainShown]] whileTrue:[
-	    contextArray add:con. count := count + 1.
+(self showingContext:con) ifTrue:[
-	    (MoreDebuggingDetail == true) ifTrue:[
+contextArray add:con. count := count + 1.
-		text add:(((ObjectMemory addressOf:con) printStringRadix:16) , ' ' , con printString).
-	    ] ifFalse:[
+(MoreDebuggingDetail == true) ifTrue:[
-		text add:con printString.
+text add:(((ObjectMemory addressOf:con) printStringRadix:16) , ' ' , con printString).
-	    ].
+] ifFalse:[
+text add:con printString.
-	    method := con method.
+].
-	    (method notNil and:[method isWrapped]) ifTrue:[
+].
-		"
-		 kludge: if its a wrapped method, then hide the wrap-call
+method := con method.
-		"
+(method notNil and:[method isWrapped]) ifTrue:[
-		caller := con sender.
+"
-		(caller notNil and:[caller receiver == method originalMethod]) ifTrue:[
+kludge: if its a wrapped method, then hide the wrap-call
-		    caller2 := caller sender.
+"
-		    (caller2 notNil and:[caller2 method == method]) ifTrue:[
+caller := con sender.
-			con := caller2
+(caller notNil and:[caller receiver == method originalMethod]) ifTrue:[
-		    ]
+caller2 := caller sender.
-		].
+(caller2 notNil and:[caller2 method == method]) ifTrue:[
-		caller := caller2 := nil
+con := caller2
-	    ].
+]
-	    con := con sender
+].
-	].
+caller := caller2 := nil
+].
-	"
+con := con sender
-	 did we reach the end ?
+].
-	"
-	(con isNil or:[con sender isNil]) ifTrue:[
+"
-	    "
+did we reach the end ?
-	     the very last one is the startup context
+"
-	     (in main) - it has nil as receiver and nil as selector
+(con isNil or:[con sender isNil]) ifTrue:[
-	    "
+"
-	    contextArray last selector isNil ifTrue:[
+the very last one is the startup context
-		contextArray removeLast.
+(in main) - it has nil as receiver and nil as selector
-		text removeLast
+"
-	    ]
+contextArray last selector isNil ifTrue:[
-	] ifFalse:[
+contextArray removeLast.
-	    m notNil ifTrue:[
+text removeLast
-		m enable:#showMore.
+]
-		text add:(resources string:'*** more walkback follows - click here to see them ***')
+] ifFalse:[
-	    ].
+m notNil ifTrue:[
-	].
+m enable:#showMore.
+text add:(resources string:'*** more walkback follows - click here to see them ***')
+].
+].
 ].
 contextView setList:text.
 releaseInspectors ifTrue:[
-	receiverInspector release.
+receiverInspector release.
-	contextInspector release.
+contextInspector release.
 ].
 m notNil ifTrue:[
-	m disable:#removeBreakpoint.
+m disable:#removeBreakpoint.
-	m disable:#implementors.
+m disable:#implementors.
-	m disable:#senders.
+m disable:#senders.
-	m disable:#browseClass.
+m disable:#browseClass.
 ].
 ^ true
 "Created: 14.12.1995 / 19:10:31 / cg"
+"Modified: 10.1.1997 / 21:01:57 / cg"
 !
 setContextSkippingInterruptContexts:aContext
 "show calling chain from aContext in the walk-back listview.
 Ignore any non-interresting interrupt-context."
 "Modified: 24.11.1995 / 22:07:30 / cg"
 !
 showTerminated
 self showError:'** the process has terminated **'
+!
+showingContext:aContext
+"return false, if this context is to be skipped"
+|sel rec|
+verboseBacktrace ifTrue:[^ true].
+rec := aContext receiver.
+sel := aContext selector.
+(rec isMemberOf:Block) ifTrue:[
+sel == #valueNowOrOnUnwindDo: ifTrue:[^ false].
+sel == #valueOnUnwindDo: ifTrue:[^ false].
+sel == #value ifTrue:[^ false].
+sel == #value: ifTrue:[^ false].
+sel == #value:value: ifTrue:[^ false].
+sel == #value:value:value: ifTrue:[^ false].
+sel == #value:value:value:value: ifTrue:[^ false].
+sel == #value:value:value:value:Value: ifTrue:[^ false].
+sel == #value:value:value:value:value:value: ifTrue:[^ false].
+].
+"/    aContext isBlockContext ifTrue:[
+"/        sel == #value ifTrue:[^ false].
+"/        sel == #value: ifTrue:[^ false].
+"/        sel == #value:value: ifTrue:[^ false].
+"/        sel == #value:value:value: ifTrue:[^ false].
+"/        sel == #value:value:value:value: ifTrue:[^ false].
+"/        sel == #value:value:value:value:Value: ifTrue:[^ false].
+"/        sel == #value:value:value:value:value:value: ifTrue:[^ false].
+"/    ].
+((rec isMemberOf:Signal)
+or:[(rec isMemberOf:QuerySignal)
+or:[rec isMemberOf:SignalSet]]
+) ifTrue:[
+sel == #handle:do: ifTrue:[^ false].
+].
+^ true.
+"Created: 10.1.1997 / 21:01:39 / cg"
+"Modified: 10.1.1997 / 21:11:32 / cg"
 !
 stepping
 ^ stepping
 !
 "
 special: look if this context was created by
 valueWithReceiver kind of method invocation;
 if so, grab the method from the sender and show it
 "
-((sender := con sender) notNil
+((sender := homeContext sender) notNil
 and:[(sender selector startsWith:'valueWithReceiver:')
 and:[sender receiver isMethod]]) ifTrue:[
 method := sender receiver.
 self sensor shiftDown ifTrue:[
 code := method decompiledSource
 ] ifFalse:[
 m disableAll:#(browse browseClass browseClassHierarchy browseFullClassProtocol).
 ].
 ]
-"Modified: 1.11.1996 / 16:35:59 / cg"
+"Modified: 10.1.1997 / 21:29:48 / cg"
 ! !
 !DebugView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.122 1997-01-10 18:05:11 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.123 1997-01-10 20:50:11 cg Exp $'
 ! !

changeset 936	34f8d67c4932
parent 935	7c75379de9ec
child 937	e1520a0db57e