Merge pull request #90 from jgfoster/james

Terminate non-current process from debugger
GemTalk · Aug 21, 2018 · 57be879 · 57be879
2 parents d24d66f + 5976fe3
commit 57be879
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 10 deletions.
diff --git a/sources/GciSession.cls b/sources/GciSession.cls
@@ -404,10 +404,10 @@ logout
 	self trigger: #'logoutPending'.
 	library ifNotNil: [
 		library logoutSession: gciSessionId.
-		library := nil.
 	].
 	self trigger: #'logout'.
 	gciSessionId := nil.
+	library := nil.
 !
 
 logoutRequested

diff --git a/sources/JadeDebugger.cls b/sources/JadeDebugger.cls
@@ -12,11 +12,14 @@ JadeDebugger comment: ''!
 
 _terminateProcess
 
+	| cachedGsProcess |
+	cachedGsProcess := gsProcess.
 	self clearUI.
-	(processList size == 1 or: [gsProcess == processList first]) ifTrue: [self view close. ^self].
-	processList := processList copyWithout: gsProcess.
+	(processList size == 1 or: [gsProcess oopType = processList first oopType]) ifTrue: [self view close. ^self].
+	processList copy do: [:each | each oopType = gsProcess oopType ifTrue: [processList remove: each]].
+	processListPresenter list: processList.
 	[
-		self _terminateProcess: gsProcess.
+		self _terminateProcess: cachedGsProcess.
 	] on: TerminateProcess do: [:ex | 
 		ex return: nil.
 	].

diff --git a/sources/Rowan UI Tests.pax b/sources/Rowan UI Tests.pax
@@ -46,7 +46,7 @@ JadeiteAbstractTestCase subclass: #JadeiteProjectBrowserTestCase
 	poolDictionaries: ''
 	classInstanceVariableNames: ''!
 JadeiteAbstractTestCase subclass: #RowanDebuggerTestCase
-	instanceVariableNames: 'debugger process'
+	instanceVariableNames: 'debugger gsProcess process'
 	classVariableNames: ''
 	poolDictionaries: ''
 	classInstanceVariableNames: ''!

diff --git a/sources/RowanDebugger.cls b/sources/RowanDebugger.cls
@@ -10,9 +10,22 @@ RowanDebugger comment: ''!
 !RowanDebugger categoriesForClass!Unclassified! !
 !RowanDebugger methodsFor!
 
-_terminateProcess: aRowanProcessService
+_processList
 
-	gciSession terminate: aRowanProcessService oopType.
+	^processList!
+
+_terminateProcess: aGsProcess
+
+	| string |
+	string := '
+| gsProcess |
+gsProcess := Object _objectForOop: ' , aGsProcess oopType value printString , '.
+gsProcess ifNotNil: [gsProcess terminate. (Delay forMilliseconds: 10) wait].
+Processor allProcesses includes: gsProcess'.
+	5 timesRepeat: [
+		(gciSession executeString: string) ifFalse: [^self].
+	].
+	self error: 'terminate process failed'.
 !
 
 basicSelectedFrame
@@ -319,6 +332,7 @@ variableDataPresenter
 
 variableListPresenter
 	^variableListPresenter! !
+!RowanDebugger categoriesFor: #_processList!public! !
 !RowanDebugger categoriesFor: #_terminateProcess:!public! !
 !RowanDebugger categoriesFor: #basicSelectedFrame!public! !
 !RowanDebugger categoriesFor: #browseFrameMethod!public! !

diff --git a/sources/RowanDebuggerTestCase.cls b/sources/RowanDebuggerTestCase.cls
@@ -1,7 +1,7 @@
 "Filed out from Dolphin Smalltalk 7"!
 
 JadeiteAbstractTestCase subclass: #RowanDebuggerTestCase
-	instanceVariableNames: 'debugger process'
+	instanceVariableNames: 'debugger gsProcess process'
 	classVariableNames: ''
 	poolDictionaries: ''
 	classInstanceVariableNames: ''!
@@ -94,10 +94,29 @@ systemBrowser
 tearDown
 
 	process ifNotNil: [process terminate. process := nil].
-	self closeDebuggers.
+	self 
+		terminateGsProcess;
+		closeDebuggers;
+		yourself.
 	RowanDebugger debuggerClass: nil.
 	RowanDebugger semaphore: nil.
 	super tearDown.
+	(Delay forMilliseconds: 50) wait.!
+
+terminateGsProcess
+
+	| string |
+	gsProcess ifNil: [^self].
+	string := '
+| gsProcess |
+gsProcess := Object _objectForOop: ' ,gsProcess printString , '.
+gsProcess ifNotNil: [gsProcess terminate. (Delay forMilliseconds: 10) wait].
+Processor allProcesses includes: gsProcess'.
+	gsProcess := nil.
+	5 timesRepeat: [
+		(debugger gciSession executeString: string) ifFalse: [^self].
+	].
+	self assert: false.
 !
 
 test1
@@ -310,11 +329,13 @@ testBug82
 	"Terminate a process other than the primary one"
 
 	| confirmProcess |
-	session executeString: '[(Delay forSeconds: 9999) wait] fork'.
+	gsProcess := session executeString: '[(Delay forSeconds: 9999) wait] fork asOop'.
 	self 
 		openDebuggerOn: 'nil halt';
+		assert: debugger _processList size equals: 2;
 		assert: debugger processListPresenter list size equals: 2;
 		assert: (debugger processListPresenter selectionByIndex: 2) notNil;
+		assert: (debugger _processList at: 2) oopType value equals: gsProcess;
 		yourself.
 	confirmProcess := [
 		[
@@ -330,6 +351,7 @@ testBug82
 	[
 		self
 			assert: debugger terminateProcess notNil;
+			assert: debugger _processList size equals: 1;
 			assert: debugger processListPresenter list size equals: 1;
 			debuggerDo: [debugger resumeProcess];
 			yourself.
@@ -404,6 +426,7 @@ testSaveMethod
 !RowanDebuggerTestCase categoriesFor: #setUp!public!running! !
 !RowanDebuggerTestCase categoriesFor: #systemBrowser!public! !
 !RowanDebuggerTestCase categoriesFor: #tearDown!public!running! !
+!RowanDebuggerTestCase categoriesFor: #terminateGsProcess!public!running! !
 !RowanDebuggerTestCase categoriesFor: #test1!public!tests! !
 !RowanDebuggerTestCase categoriesFor: #test2!public!tests! !
 !RowanDebuggerTestCase categoriesFor: #test3!public!tests! !

diff --git a/sources/RowanProcessService.cls b/sources/RowanProcessService.cls
@@ -25,12 +25,24 @@ oopType
 
 	^OopType64 fromInteger: oop!
 
+printOn: aStream
+
+	aStream
+		nextPutAll: 'GsProcess(';
+		print: oop;
+		nextPutAll: ') with ';
+		print: frames size;
+		nextPutAll: ' frames';
+		yourself.
+!
+
 stack
 
 	^frames collect: [:each | each printString]! !
 !RowanProcessService categoriesFor: #frameForLevel:!public! !
 !RowanProcessService categoriesFor: #gsProcessForSession:!public! !
 !RowanProcessService categoriesFor: #oop!public! !
 !RowanProcessService categoriesFor: #oopType!public! !
+!RowanProcessService categoriesFor: #printOn:!public! !
 !RowanProcessService categoriesFor: #stack!public! !