Ticket #1447: 0001-Notify-shell-when-activity-process-terminates.patch

src/sugar/activity/activityfactory.py

@@ -277 +277 @@
             stderr=log_file.fileno())
 
         gobject.child_watch_add(child.pid,
-                                _child_watch_cb,
-                                (environment_dir, log_file))
+                                _child_watch_cb_stub,
+                                (self, environment_dir, log_file))
 
     def _no_reply_handler(self, *args):
         pass
@@ -317 +317 @@
     def _find_object_error_handler(self, err):
         logging.error('Datastore find failed %s', err)
         self._launch_activity()
+    
+    def _no_reply_handler(*args):
+        pass
+    
+    def _notify_activity_ended_error_handler(err):
+        logging.error('Notify activity ended failed %s', err)
+    
+    def _child_watch_cb(self, pid, condition, user_data):
+        environment_dir, log_file = user_data
+        if environment_dir is not None:
+            subprocess.call(['/bin/rm', '-rf', environment_dir])
+        try:
+            log_file.write('Activity died: pid %s condition %s data %s\n' %
+                (pid, condition, user_data))
+        finally:
+            log_file.close()
+
+        # try to reap zombies in case SIGCHLD has not been set to SIG_IGN
+        try:
+            os.waitpid(pid, 0)
+        except OSError:
+            # SIGCHLD = SIG_IGN, no zombies
+            pass
+
+        self._shell.NotifyActivityEnded(
+            self._handle.activity_id, reply_handler=self._no_reply_handler,
+            error_handler=self._notify_activity_ended_error_handler)
+
+
+def _child_watch_cb_stub(pid, condition, user_data):
+    # This stub function invokes the actual callback via gobject.idle_add
+    # to work around GIL related segfaults.  See #1123 and #1147.
+    handler, environment_dir, log_file = user_data
+    gobject.idle_add(handler._child_watch_cb, pid, condition,
+                     (environment_dir, log_file))
 
 
 def create(bundle, activity_handle=None):
@@ -338 +373 @@
     return ActivityCreationHandler(bundle, activity_handle)
 
 
-def _child_watch_cb(pid, condition, user_data):
-    # FIXME we use standalone method here instead of ActivityCreationHandler's
-    # member to have workaround code, see #1123
-    environment_dir, log_file = user_data
-    if environment_dir is not None:
-        subprocess.call(['/bin/rm', '-rf', environment_dir])
-    try:
-        log_file.write('Activity died: pid %s condition %s data %s\n' %
-            (pid, condition, user_data))
-    finally:
-        log_file.close()
-
-    # try to reap zombies in case SIGCHLD has not been set to SIG_IGN
-    try:
-        os.waitpid(pid, 0)
-    except OSError:
-        # SIGCHLD = SIG_IGN, no zombies
-        pass