VDBThreadGroupPresenter.st
changeset 44 41cc5a7840fe
parent 40 d766d4c854a2
child 49 2ec7f7ed9242
--- a/VDBThreadGroupPresenter.st	Thu Jun 08 14:16:29 2017 +0100
+++ b/VDBThreadGroupPresenter.st	Thu Jun 08 13:43:34 2017 +0100
@@ -23,31 +23,38 @@
 !
 
 label
-    | pidOrEmpty state |
+    | executableOrThreadGrouppId pidOrEmpty state |
+
+    threadGroup executable notNil ifTrue:[ 
+        executableOrThreadGrouppId := threadGroup executable contractTo: 30 
+    ] ifFalse:[ 
+        executableOrThreadGrouppId := 'thread group ', threadGroup id.
+    ].
 
     (threadGroup type = 'process' and:[ threadGroup pid notNil ]) ifTrue:[
         pidOrEmpty := 'pid ', threadGroup pid printString , ', '.
     ].
+    threadGroup isStopped ifTrue:[ 
+        state := 'stopped'
+    ] ifFalse:[ 
     threadGroup isRunning ifTrue:[ 
         state := 'running'
     ] ifFalse:[ 
-        threadGroup isStopped ifTrue:[ 
-            state := 'stopped'
-        ] ifFalse:[ 
-            threadGroup isDead ifTrue:[ 
-                state := 'terminated'
-            ] ifFalse:[
-                state := 'not run'
-            ]
-        ].
-    ].
+    threadGroup isFinished ifTrue:[ 
+        state := 'finished'
+    ] ifFalse:[ 
+    threadGroup isTerminated ifTrue:[ 
+        state := 'terminated'
+    ] ifFalse:[ 
+        state := 'not run'
+    ]]]].
 
-    ^ 'thread group %1 [%2%3]' bindWith: threadGroup id 
-                                   with: pidOrEmpty ? ''
-                                   with: state
+    ^ '%1 [%2%3]' bindWith: executableOrThreadGrouppId 
+                      with: pidOrEmpty ? ''
+                      with: state
 
     "Created: / 22-09-2014 / 00:14:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 02-03-2015 / 06:58:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-06-2017 / 07:47:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 threadGroup