Просмотр исходного кода

moved initialization of signal handlint to module Console

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7559 8c9fc860-2736-0410-a75d-ab315db34111
eth.guenter 7 лет назад
Родитель
Сommit
8436205b09

+ 1 - 10
source/Generic.Darwin.I386.Unix.Mod

@@ -929,15 +929,6 @@ VAR
 		END;
 	END InstallHandler;
 
-
-	PROCEDURE InitSignalHandler;
-	VAR i: LONGINT;
-	BEGIN
-		FOR i := 1 TO 15 DO
-			IF ~(i IN {SIGINT, SIGKILL}) THEN InstallHandler(i) END;
-			InstallHandler( SIGUSR1 );
-		END;
-	END InitSignalHandler;
 	
 	PROCEDURE HandleSignal*( sig: LONGINT );
 	BEGIN
@@ -1126,7 +1117,7 @@ VAR
 		getSysinfo;
 
 		CreateSignalStack;
-		InitSignalHandler;
+		InstallHandler( SIGUSR1 );
 	END Init;
 
 	(* load X11 related libaries only on demand *)

+ 0 - 10
source/Generic.Linux.I386.Unix.Mod

@@ -957,15 +957,6 @@ VAR
 		RETURN  xstat( 3, path, buf );
 	END stat;
 
-
-
-	PROCEDURE InitSignalHandler;
-	VAR i: LONGINT;
-	BEGIN
-		FOR i := 1 TO 15 DO
-			IF ~(i IN {SIGINT, SIGKILL}) THEN InstallHandler(i) END;
-		END;
-	END InitSignalHandler;
 	
 	PROCEDURE HandleSignal*( sig: LONGINT );
 	BEGIN
@@ -1151,7 +1142,6 @@ VAR
 		getSysinfo;
 
 		CreateSignalStack;
-		InitSignalHandler;
 	END Init;
 
 	(* load X11 related libaries only on demand *)

+ 1 - 10
source/Generic.Solaris.I386.Unix.Mod

@@ -609,15 +609,6 @@ VAR
 		END
 	END InstallHandler;
 
-
-	PROCEDURE InitSignalHandler;
-	VAR i: LONGINT;
-	BEGIN
-		FOR i := 1 TO 15 DO
-			IF ~(i IN {SIGINT, SIGKILL}) THEN InstallHandler( i ) END;
-		END;
-		InstallHandler( SIGUSR1 );
-	END InitSignalHandler;
 	
 	PROCEDURE HandleSignal*( sig: LONGINT );
 	BEGIN
@@ -1108,7 +1099,7 @@ VAR
 
 		getSysinfo;
 		
-		InitSignalHandler;
+		InstallHandler( SIGUSR1 )
 	END Init;
 	
 	

+ 10 - 3
source/Unix.BootConsole.Mod

@@ -1,6 +1,6 @@
 MODULE BootConsole;	(** AUTHOR "G.F."; PURPOSE "Boot console"; *)
 
-IMPORT S := SYSTEM, Trace, Glue, Unix, Modules, Objects, Commands, Heaps;
+IMPORT S := SYSTEM, Trace, Glue, Unix, Modules, Objects, Commands;
 
 TYPE
 	Module = Modules.Module;
@@ -177,12 +177,19 @@ VAR
 		END
 	END StartSystem;
 
-
+	PROCEDURE InitSignalHandling;
+	VAR i: LONGINT;
+	BEGIN
+		FOR i := 1 TO 15 DO
+			IF i # 9 THEN Unix.HandleSignal( i ) END;
+		END;
+	END InitSignalHandling;
+	
 BEGIN
 	Glue.Initialize;
 	InitializeCoreModules;
+	InitSignalHandling;
 	StartSystem;
-	Unix.HandleSignal( 2 );	
 	Objects.GCLoop
 END BootConsole.