From e1e577ec222163022ef732e4f62a2213b09d0689 Mon Sep 17 00:00:00 2001
From: "hyunghwan.chung" <hyunghwan.chung@c9d47f8d-4fed-4a2f-8cad-691f5fbe3904>
Date: Wed, 18 Sep 2019 08:24:05 +0000
Subject: [PATCH] touched up user-defined signal handling

---
 moo/kernel/System.moo |  6 +++---
 moo/kernel/X11.moo    | 50 +++++++++++++++++++++----------------------
 moo/lib/exec.c        |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/moo/kernel/System.moo b/moo/kernel/System.moo
index b524dc0..8968b4a 100644
--- a/moo/kernel/System.moo
+++ b/moo/kernel/System.moo
@@ -31,7 +31,7 @@ class System(Apex)
 
 	method(#class) _initialize
 	{
-		self.shr := Set new.
+		self.shr := OrderedCollection new.
 		self.asyncsg := SemaphoreGroup new.
 	}
 
@@ -52,7 +52,7 @@ class System(Apex)
 
 	method(#class) installSignalHandler: block
 	{
-		self.shr add: block.
+		self.shr addLast: block.
 	}
 
 	method(#class) uninstallSignalHandler: block
@@ -168,7 +168,7 @@ class System(Apex)
 
 					ifnot (self.shr isEmpty)
 					{
-						self.shr do: [ :handler | handler value: signo ]
+						self.shr do: [ :handler | handler value: signo ].
 					}
 					else
 					{
diff --git a/moo/kernel/X11.moo b/moo/kernel/X11.moo
index 451a025..8640c34 100644
--- a/moo/kernel/X11.moo
+++ b/moo/kernel/X11.moo
@@ -277,9 +277,9 @@ widget windowHandle dump.
 	{
 		if (self.gcHandle notNil)
 		{
-			self.widget displayServer _destroy_gc (self).
-			self.gcHandle := nil
-		}
+			self.widget displayServer _destroy_gc(self).
+			self.gcHandle := nil.
+		}.
 	}
 
 	method apply
@@ -466,14 +466,17 @@ class X11.Composite(X11.Widget)
 	method remove: widget
 	{
 		| link |
-		if (widget parent ~~ self)
+		if (widget parent notNil) // TODO: DEBUG. check if this widget is being disposed multiple times. I see this method called with 'widget parent' of nil.
 		{
-			selfns.Exception signal: "Cannot remove an unknown widget"
-		}.
+			if (widget parent ~~ self)
+			{
+				selfns.Exception signal: "Cannot remove an unknown widget"
+			}.
 
-		link := self.children findIdenticalLink: widget.
-		self.children removeLink: link.
-		widget parent: nil.
+			link := self.children findIdenticalLink: widget.
+			self.children removeLink: link.
+			widget parent: nil.
+		}.
 	}
 
 	method childrenCount
@@ -499,7 +502,10 @@ class X11.Composite(X11.Widget)
 			child dispose.
 			self remove: child.
 		].
-		super dispose
+'Composite dispose DONE XXXXXXXXXXXXXX' dump.
+'SUPER SUPER SUPER dispose' dump.
+		super dispose.
+'SUPER SUPER SUPER dispose DONE' dump.
 	}
 
 	method onPaintEvent: event
@@ -655,24 +661,20 @@ extend X11
 	{
 		if (self.event_loop_sem isNil)
 		{
-			
 			self.event_loop_sem := Semaphore new.
 			self.event_loop_sem signalOnInput: (self _get_fd).
 			self.event_loop_proc := [
-
 				[
-					| llevtbuf llevent ongoing |
+					| llevtbuf llevent |
 
 					self.event_loop_exit_req := false.
 					llevtbuf := X11.LLEvent new.
-					ongoing := true.
 					while (self.shell_container childrenCount > 0)
 					{
 'Waiting for X11 event...' dump.
 						if  (self.event_loop_exit_req) { break }.
 						self.event_loop_sem wait.
 						if  (self.event_loop_exit_req) { break }.
-						ifnot (ongoing) { break }.
 
 						while ((llevent := self _get_llevent(llevtbuf)) notNil)
 						{
@@ -680,7 +682,6 @@ extend X11
 							{
 								//System logNl: ('Error while getting a event from server ' & self.cid asString).
 								self.event_loop_exit_req := true.
-								ongoing := false.
 								break.
 							}
 							else
@@ -690,9 +691,7 @@ extend X11
 						}.
 					}.
 				] ensure: [
-
 'CLOSING X11 EVENT LOOP' dump.
-
 					//self.event_loop_sem signal. // in case the process is suspended in self.event_loop_sem wait.
 					self.event_loop_sem unsignal.
 			// TODO: LOOK HERE FOR RACE CONDITION with exitEventLoop.
@@ -701,10 +700,16 @@ extend X11
 
 					[ self dispose ] on: Exception do: [:ex | ("WARNING: dispose failure...." & ex messageText) dump ].
 				]
-			] fork.
+			] newProcess.
+
+			self.event_loop_proc resume.
 		}
 	}
 
+/////////////////////////////////////////
+// TOOD: exitEventLoop to terminate the whole process by force or
+//       requestToExit to signal process after having set a flag?
+//       what is better?
 	method exitEventLoop
 	{
 		if (self.event_loop_sem notNil)
@@ -716,16 +721,12 @@ extend X11
 		}
 	}
 
-	method signal_event_loop_semaphore
-	{
-		self.event_loop_sem signal.
-	}
-
 	method requestToExit 
 	{
 		self.event_loop_exit_req := true.
 		self.event_loop_sem signal.
 	}
+/////////////////////////////////////////
 
 	method __dispatch_llevent: llevent
 	{
@@ -810,7 +811,6 @@ class MyObject(Object)
 	method initialize
 	{
 		self.on_sig := [:sig | 
-'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx' dump.
 			self.disp1 requestToExit.
 			self.disp2 requestToExit.
 		].
diff --git a/moo/lib/exec.c b/moo/lib/exec.c
index 56d54e9..2babeea 100644
--- a/moo/lib/exec.c
+++ b/moo/lib/exec.c
@@ -613,7 +613,7 @@ static void dump_process_info (moo_t* moo, moo_bitmask_t log_mask)
 	{
 		moo_ooi_t io_handle;
 
-		MOO_LOG0 (moo, log_mask, "> IO Semaphores:");
+		MOO_LOG0 (moo, log_mask, "> IO semaphores:");
 		for (io_handle = 0; io_handle < moo->sem_io_map_capa; io_handle++)
 		{
 			moo_ooi_t index;