Changeset 7626c5f in git

Timestamp:

Apr 8, 2011, 11:33:50 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

1da23e5a8e69792bb0f66403041e781d0ab13fa5

Parents:

f9e6d7592f3b35aaff38fe73f121615de78b162c

Message:

SIGTERM handler to close ssi links

git-svn-id: file:///usr/local/Singular/svn/trunk@14118 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• cntrlc.cc (modified) (3 diffs)
• silink.h (modified) (1 diff)
• ssiLink.cc (modified) (1 diff)

Singular/cntrlc.cc

@@ -82 +82 @@
    pipeLastLink=NULL;
    WerrorS("pipe failed");
+ }
+}
+
+void sig_term_hdl(int sig)
+{
+ while (ssiToBeClosed!=NULL)
+ {
+   slClose(ssiToBeClosed->l);
+   ssiToBeClosed=(link_list)ssiToBeClosed->next;
  }
 }
@@ -230 +239 @@
 **/
 /*---------------------------------------------------------------------*/
-void sig_ign_hdl(int sig)
+void sig_chld_hdl(int sig)
 {
  waitpid(-1,NULL,WNOHANG);  
@@ -261 +270 @@
     PrintS("cannot set signal handler for INT\n");
   }
-  si_set_signal(SIGCHLD, (si_hdl_typ)sig_ign_hdl);
+  si_set_signal(SIGCHLD, (si_hdl_typ)sig_chld_hdl);
   si_set_signal(SIGPIPE, (si_hdl_typ)sig_pipe_hdl);
+  si_set_signal(SIGTERM, (si_hdl_typ)sig_term_hdl);
 }
 

Singular/silink.h

@@ -103 +103 @@
 
 int slStatusSsiL(lists L, int timeout);
+
+typedef struct
+{
+  leftv u;
+  si_link l;
+  void * next;
+} link_struct;
+
+typedef link_struct* link_list;
+
+extern link_list ssiToBeClosed;
 #endif // SILINK_H

Singular/ssiLink.cc

@@ -67 +67 @@
 } ssiInfo;
 
-
-typedef struct
-{
-  leftv u;
-  si_link l;
-  void * next;
-} link_struct;
-
-typedef link_struct* link_list;
 
 link_list ssiToBeClosed=NULL;