From 94f4ddcd4ba8346f5f24d80e9c57d9a0d889d4ed Mon Sep 17 00:00:00 2001
From: jygaulier <gaulier@alchemy.fr>
Date: Thu, 5 Jul 2012 17:10:35 +0200
Subject: [PATCH] fix bug causing programs executed inside a forked task (ex.
 running imagemagick) to always return status -1

---
 lib/classes/task/Scheduler.class.php | 34 ++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/lib/classes/task/Scheduler.class.php b/lib/classes/task/Scheduler.class.php
index 9c62b55050..8df09ae8be 100755
--- a/lib/classes/task/Scheduler.class.php
+++ b/lib/classes/task/Scheduler.class.php
@@ -108,10 +108,6 @@ class task_Scheduler
 
         $this->log(sprintf("running scheduler with method %s", $this->method));
 
-        if ($this->method == self::METHOD_FORK) {
-            pcntl_signal(SIGCHLD, SIG_IGN);
-        }
-
         $conn = appbox::get_instance(\bootstrap::getCore())->get_connection();
 
         $taskPoll = array(); // the poll of tasks
@@ -230,7 +226,8 @@ class task_Scheduler
                             $task->getID(), '--runner=scheduler'
                         ),
                         "killat"       => null,
-                        "sigterm_sent" => false
+                        "sigterm_sent" => false,
+                        "pid"          => false
                     );
                     if ($this->method == self::METHOD_PROC_OPEN) {
                         $taskPoll[$tkey]['process'] = NULL;
@@ -293,7 +290,17 @@ class task_Scheduler
                                 @proc_close($taskPoll[$tkey]["process"]);
 
                                 $taskPoll[$tkey]["process"] = null;
+                            } elseif ($this->method == self::METHOD_FORK) {
+                                $pid = $taskPoll[$tkey]['pid'];
+                                if ($pid) {
+                                    $status = NULL;
+                                    if (pcntl_waitpid($pid, $status, WNOHANG) === $pid) {
+                                        // pid has quit
+                                        $taskPoll[$tkey]['pid'] = false;
+                                    }
+                                }
                             }
+
                             if ($schedstatus == 'started') {
                                 $taskPoll[$tkey]["task"]->setState(task_abstract::STATE_TOSTART);
                             }
@@ -332,13 +339,14 @@ class task_Scheduler
                                     sleep(2); // let the process lock and write it's pid
                                 }
 
-                                if (is_resource($taskPoll[$tkey]["process"]) && $taskPoll[$tkey]['task']->getPID() !== null) {
+                                if (is_resource($taskPoll[$tkey]["process"]) && ($pid = $taskPoll[$tkey]['task']->getPID()) !== null) {
+                                    $taskPoll[$tkey]['pid'] = $pid;
                                     $this->log(
                                         sprintf(
                                             "Task %s '%s' started (pid=%s)"
                                             , $taskPoll[$tkey]['task']->getID()
                                             , $taskPoll[$tkey]["cmd"] . ' ' . implode(' ', $taskPoll[$tkey]["args"])
-                                            , $taskPoll[$tkey]['task']->getPID()
+                                            , $pid
                                         )
                                     );
                                     $runningtask ++;
@@ -380,6 +388,9 @@ class task_Scheduler
 
                                 $this->log(sprintf("exec('%s %s')", $taskPoll[$tkey]["cmd"], implode(' ', $taskPoll[$tkey]["args"])));
                                 pcntl_exec($taskPoll[$tkey]["cmd"], $taskPoll[$tkey]["args"]);
+                            } else {
+                                // parent (scheduler)
+                                $taskPoll[$tkey]['pid'] = $pid;
                             }
                         }
                         break;
@@ -517,6 +528,15 @@ class task_Scheduler
 
                                 $taskPoll[$tkey]["process"] = null;
                             }
+                        } elseif ($this->method == self::METHOD_FORK) {
+                            $pid = $taskPoll[$tkey]['pid'];
+                            if ($pid) {
+                                $status = NULL;
+                                if (pcntl_waitpid($pid, $status, WNOHANG) === $pid) {
+                                    // pid has quit
+                                    $taskPoll[$tkey]['pid'] = false;
+                                }
+                            }
                         }
                         break;
                 }