Changeset 516 for trunk/zoo-project

Timestamp:

Oct 27, 2014, 5:45:38 PM (10 years ago)

Author:

djay

Message:

Call exit from the child processes and make sure to remove zombies from process list.

Location:

trunk/zoo-project/zoo-kernel

Files:

• zoo_loader.c (modified) (1 diff)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/zoo_loader.c

@@ -356 +356 @@
   runRequest(&tmpMap);
 
-  /** 
-   * Required but can't be made after executing a process using POST requests.
-   */
-  if(/*strncasecmp(cgiRequestMethod,"post",4)!=0 && count(tmpMap)!=1 && */tmpMap!=NULL){
+  if(tmpMap!=NULL){
     freeMap(&tmpMap);
     free(tmpMap);

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -666 +666 @@
   
 #ifndef USE_GDB
-  (void) signal(SIGSEGV,sig_handler);
-  (void) signal(SIGTERM,sig_handler);
-  (void) signal(SIGINT,sig_handler);
-  (void) signal(SIGILL,sig_handler);
-  (void) signal(SIGFPE,sig_handler);
-  (void) signal(SIGABRT,sig_handler);
+  signal(SIGCHLD, SIG_IGN);
+  signal(SIGSEGV,sig_handler);
+  signal(SIGTERM,sig_handler);
+  signal(SIGINT,sig_handler);
+  signal(SIGILL,sig_handler);
+  signal(SIGFPE,sig_handler);
+  signal(SIGABRT,sig_handler);
 #endif
 
@@ -2716 +2717 @@
    */
 #ifndef USE_GDB
-  (void) signal(SIGSEGV,donothing);
-  (void) signal(SIGTERM,donothing);
-  (void) signal(SIGINT,donothing);
-  (void) signal(SIGILL,donothing);
-  (void) signal(SIGFPE,donothing);
-  (void) signal(SIGABRT,donothing);
+  signal(SIGSEGV,donothing);
+  signal(SIGTERM,donothing);
+  signal(SIGINT,donothing);
+  signal(SIGILL,donothing);
+  signal(SIGFPE,donothing);
+  signal(SIGABRT,donothing);
 #endif
   if(((int)getpid())!=cpid || cgiSid!=NULL){
@@ -2772 +2773 @@
 #endif
 
+  if(((int)getpid())!=cpid || cgiSid!=NULL){
+    exit(0);
+  }
+
   return 0;
 }