Changeset 872 for LATMOS-Accounts

Timestamp:

12/25/11 15:57:03 (13 years ago)

Author:

nanardon

Message:

• avoid race condition in signals management

File:

• LATMOS-Accounts/bin/la-sync-manager (modified) (1 diff)

LATMOS-Accounts/bin/la-sync-manager

@@ -79 +79 @@
     my $pid = fork;
     if ($pid == 0) {
+        local $SIG{HUP} = 'IGNORE';
         $SIG{INT} = 'DEFAULT';
         my $res = $syncm->process_module($module, $baserev);
         exit($res ? 0 : 1);
     }
-    my $retpid;
-    while(($retpid = waitpid(-1, 0)) <= 0) {}
-    local $SIG{HUP} = 'IGNORE';
-    if ($retpid) {
-        my $res = $? << 8;
-        if ($res) {
-            la_log LA_ERR, "Sync process exit with $res";
-            return;
+    my $done = 0;
+    my $res = 0;
+    local $SIG{CHLD} = sub {
+        my $retpid = waitpid($pid, 0);
+        if ($retpid < 0) {
+            # no such process ??
+        } elsif ($retpid) {
+            $res = $? << 8;
+            if ($res) {
+                la_log LA_ERR, "Sync process exit with $res";
+            }
         }
+        $done = 1;
+    };
+    while (!$done) {
+        sleep(1);
     }
-    return 1;
+    return !$res;
 }