Changeset 480 in Sophya for trunk/SophyaLib/SysTools/psighand.cc

Timestamp:

Oct 20, 1999, 12:25:32 PM (26 years ago)

Author:

ansari

Message:

MAJ / PEIDA 3.8 , Reza 20/10/99

File:

• trunk/SophyaLib/SysTools/psighand.cc (modified) (6 diffs)

trunk/SophyaLib/SysTools/psighand.cc

@@ -5 +5 @@
 #include <signal.h>
 #include "psighand.h"
-#include "pexceptions.h" 
+#include "pexceptions.h"
 
-using namespace PlanckDPC;
-
-static bool sigprstate[5] = {false, false, false, false};
+static bool sigprstate[6] = {false, false, false, false, false, false};
 
 void PeidaProcessSignal(int s);
 
 /* Nouvelle-Fonction */
-void PeidaConfigureSignalhandling(bool cfpe, bool csegv, bool cquit, bool cusr1, bool cusr2) 
+void PeidaConfigureSignalhandling(bool cfpe, bool csegv, bool cint, bool cquit, bool cusr1, bool cusr2) 
 {
   struct sigaction ae, ad;
@@ -53 +51 @@
     sigprstate[1] = csegv;
     }
+
+// SIGINT
+  if (sigprstate[2] != cint) {
+    if (cquit)   { 
+      sigaction(SIGINT, &ae, NULL);
+      puts("PeidaConfigureSignalhandling(): Activating SIGINT handling (-> throw) ...");
+      }
+    else  { 
+      sigaction(SIGINT, &ad, NULL);
+      puts("PeidaConfigureSignalhandling(): Back to default SIGINT handling ...");
+      }
+    sigprstate[2] = cint; 
+    }
+  
 // SIGQUIT
-  if (sigprstate[2] != cquit) {
+  if (sigprstate[3] != cquit) {
     if (cquit)   { 
       sigaction(SIGQUIT, &ae, NULL);
@@ -63 +75 @@
       puts("PeidaConfigureSignalhandling(): Back to default SIGQUIT handling ...");
       }
-    sigprstate[2] = cquit; 
+    sigprstate[3] = cquit; 
     }
   
 // SIGUSR1
-  if (sigprstate[3] != cusr1) {
+  if (sigprstate[4] != cusr1) {
     if (cusr1)   { 
       sigaction(SIGUSR1, &ae, NULL);
@@ -76 +88 @@
       puts("PeidaConfigureSignalhandling(): Back to default SIGUSR1 handling ...");
       }
-    sigprstate[3] = cusr1;
+    sigprstate[4] = cusr1;
     }
-// SIGUSR1
-  if (sigprstate[4] != cusr2) {
+// SIGUSR2
+  if (sigprstate[5] != cusr2) {
     if (cusr2)   { 
       sigaction(SIGUSR2, &ae, NULL);
@@ -88 +100 @@
       puts("PeidaConfigureSignalhandling(): Back to default SIGUSR2 handling ...");
       }
-    sigprstate[4] = cusr2;
+    sigprstate[5] = cusr2;
     }    
 }
@@ -94 +106 @@
 void PeidaProcessSignal(int s)
 {
+string msg;
 switch(s)
   {
   case SIGFPE :
     puts("PeidaProcessSignal: ###Signal SIGFPE catched, throw catchedSIGFPE ###");
-    throw CaughtSignalExc("SIGFPE");
+    msg = "Caught SIGFPE";
+    throw ( CaughtSignalExc(msg, s) );
   case SIGSEGV :
     puts("PeidaProcessSignal: ###Signal SIGSEGV catched, throw catchedSIGSEGV ###");
-    throw CaughtSignalExc("SIGSEGV");
+    msg = "Caught SIGSEGV";
+    throw ( CaughtSignalExc(msg, s) );
   case SIGINT :
     puts("PeidaProcessSignal: ###Signal SIGINT catched, throw catchedSIGINT ###");
-    throw CaughtSignalExc("SIGINT");
+    msg = "Caught SIGINT";
+    throw ( CaughtSignalExc(msg, s) );
   case SIGQUIT :
     puts("PeidaProcessSignal: ###Signal SIGQUIT catched, throw catchedSIGQUIT ###");
-    throw CaughtSignalExc("SIGQUIT");
+    msg = "Caught SIGQUIT";
+    throw ( CaughtSignalExc(msg, s) );
   case SIGUSR1 :
     puts("PeidaProcessSignal: ###Signal SIGUSR1 catched, throw catchedSIGUSR1 ###");
-    throw CaughtSignalExc("SIGUSR1");
+    msg = "Caught SIGUSR1";
+    throw ( CaughtSignalExc(msg, s) );
   case SIGUSR2 :
     puts("PeidaProcessSignal: ###Signal SIGUSR2 catched, throw catchedSIGUSR2 ###");
-    throw CaughtSignalExc("SIGUSR2");
+    msg = "Caught SIGUSR2";
+    throw ( CaughtSignalExc(msg, s) );
   default :
     printf("PeidaProcessSignal: ###Signal %d catched, throw  inconsistentErr ### \n", s);
-    throw CaughtSignalExc("???");
+    msg = "Caught SIG???";
+    throw ( CaughtSignalExc(msg, s) );
   }
+
+// return;
 }