Workspace/WM: enhance process exit handling.

Author: trunkmaster

Applications/Workspace/WM/application.c

@@ -430,11 +430,6 @@ WApplication *wApplicationCreate(WWindow *wwin)
     int pid = wNETWMGetPidForWindow(wwin->client_win);
     if (pid > 0) {
       wAddExitHandler(wNETWMGetPidForWindow(wwin->client_win), _applicationProcessHandler, wapp);
-      CFLog(kCFLogLevelInfo,
-            CFSTR("%s: Created death handler for X11 application PID == %i"), __func__, pid);
-    } else {
-      CFLog(kCFLogLevelWarning,
-            CFSTR("%s: Failed to add death handler for X11 application. PID == %i"), __func__, pid);
     }
   }
 

Applications/Workspace/WM/dock.c

@@ -2774,6 +2774,7 @@ static void _dockHandleProcessExit(pid_t pid, unsigned char status, WDock *dock)
       }
       wDockFinishLaunch(icon);
       icon->pid = 0;
+
       if (status != 0) {
         char msg[PATH_MAX];
         char *cmd;
@@ -2789,7 +2790,7 @@ static void _dockHandleProcessExit(pid_t pid, unsigned char status, WDock *dock)
         else
           cmd = icon->command;
 
-        snprintf(msg, sizeof(msg), _("Could not execute command \"%s\"\n%s"), cmd, strerror(errno));
+        snprintf(msg, sizeof(msg), _("Could not execute command \"%s\"\n%s"), cmd, strerror(status));
         message = wstrdup(msg);
         dispatch_sync(workspace_q, ^{
           WSRunAlertPanel(_("Workspace Dock"), message, _("Got It"), NULL, NULL);
@@ -2829,6 +2830,8 @@ static pid_t _dockExecCommand(WAppIcon *btn, const char *command, WSavedState *s
     return 0;
   }
 
+  // Forked process return `errno` if exit code will be <= 0.
+  // It's intentional to make possible to process show error description later by process exit handler .
   pid = fork();
   if (pid == 0) {
     char **args;
@@ -2855,8 +2858,9 @@ static pid_t _dockExecCommand(WAppIcon *btn, const char *command, WSavedState *s
     int ret;
     ret = execvp(argv[0], args);
     if (ret < 0) {
-      CFLog(kCFLogLevelError, CFSTR("%s: return %i error #%i -- %s"), __func__, ret, errno,
-            strerror(errno));
+      // CFLog(kCFLogLevelError, CFSTR("%s: return %i error #%i -- %s"), __func__, ret, errno,
+      //       strerror(errno));
+      exit(errno);
     }
     exit(ret);
   }

Applications/Workspace/WM/event.c

@@ -132,15 +132,6 @@ static void _handleXkbStateNotify(XkbEvent *event);
 static void _handleApplicationProcess(void);
 static void _deleteExitHandler(WMagicNumber id);
 
-// typedef struct DeadProcesses {
-//   pid_t pid;
-//   unsigned char exit_status;
-// } DeadProcesses;
-
-/* stack of dead processes */
-// static DeadProcesses deadProcesses[MAX_DEAD_PROCESSES];
-// static int deadProcessPtr = 0;
-
 typedef struct ExitHandler {
   WExitHandler *callback;
   pid_t pid;
@@ -151,22 +142,34 @@ static CFMutableArrayRef appExitHandlers = NULL;
 
 WMagicNumber wAddExitHandler(pid_t pid, WExitHandler *callback, void *cdata)
 {
-  AppExitHandler *handler;
-
-  CFLog(kCFLogLevelInfo, CFSTR("%s: PID == %i"), __func__, pid);
-
-  handler = malloc(sizeof(AppExitHandler));
-  if (!handler) {
-    return 0;
-  }
-  handler->pid = pid;
-  handler->callback = callback;
-  handler->client_data = cdata;
+  AppExitHandler *handler = NULL;
 
   if (!appExitHandlers) {
     appExitHandlers = CFArrayCreateMutable(kCFAllocatorDefault, 8, NULL);
+  } else {
+    for (int i = CFArrayGetCount(appExitHandlers) - 1; i >= 0; i--) {
+      handler = (AppExitHandler *)CFArrayGetValueAtIndex(appExitHandlers, i);
+      if (handler->pid == pid) {
+        break;
+      } else {
+        handler = NULL;
+      }
+    }
+  }
+
+  if (handler == NULL) {
+    // CFLog(kCFLogLevelInfo, CFSTR("%s: PID == %i"), __func__, pid);
+
+    handler = malloc(sizeof(AppExitHandler));
+    if (!handler) {
+      return 0;
+    }
+    handler->pid = pid;
+    handler->callback = callback;
+    handler->client_data = cdata;
+
+    CFArrayAppendValue(appExitHandlers, handler);
   }
-  CFArrayAppendValue(appExitHandlers, handler);
 
   return handler;
 }
@@ -191,15 +194,16 @@ void wNotifyProcessExit(pid_t pid, int status)
 {
   AppExitHandler *tmp;
 
-  CFLog(kCFLogLevelInfo, CFSTR("%s: PID == %i, exit status == %i"), __func__, pid, status);
+  // CFLog(kCFLogLevelInfo, CFSTR("%s: PID == %i, exit status == %i"), __func__, pid,
+  //       WEXITSTATUS(status));
   if (!appExitHandlers) {
     return;
   }
-  
+
   for (int i = CFArrayGetCount(appExitHandlers) - 1; i >= 0; i--) {
     tmp = (AppExitHandler *)CFArrayGetValueAtIndex(appExitHandlers, i);
     if (tmp && tmp->pid == pid) {
-      (*tmp->callback)(tmp->pid, status, tmp->client_data);
+      (*tmp->callback)(tmp->pid, WEXITSTATUS(status), tmp->client_data);
       _deleteExitHandler(tmp);
     }
   }

Applications/Workspace/WM/startup.c

@@ -266,7 +266,7 @@ static RETSIGTYPE _childExitHandler(int foo)
   sigset_t sigs;
 
   sigfillset(&sigs);
-  /* Block signals so that NotifyDeadProcess() doesn't get fux0red */
+  /* Block signals so that wNotifyProcessExit() doesn't get fux0red */
   sigprocmask(SIG_BLOCK, &sigs, NULL);
 
   /* If 2 or more kids exit in a small time window, before this handler gets
@@ -275,8 +275,11 @@ static RETSIGTYPE _childExitHandler(int foo)
    * exited child status because we can't count on the number of SIGCHLD
    * signals to know exactly how many kids have exited. -Dan
    */
+  // CFLog(kCFLogLevelError, CFSTR("%s: error #%i -- saved_errno %i"), __func__, errno, save_errno);
+
   while ((pid = waitpid(-1, &status, WNOHANG)) > 0 || (pid < 0 && errno == EINTR)) {
-    wNotifyProcessExit(pid, WEXITSTATUS(status));
+    // CFLog(kCFLogLevelError, CFSTR("%s: PID == %i exit status == %i"), __func__, pid, WEXITSTATUS(status));
+    wNotifyProcessExit(pid, status);
   }
 
   sigprocmask(SIG_UNBLOCK, &sigs, NULL);

Applications/Workspace/WM/wmspec.c

@@ -1855,11 +1855,11 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent *event)
     }
     last_event_serial = event->serial;
 
-    fprintf(stderr,
-            "%s: _NET_WM_MOVERESIZE: %li, %li | direction: %li, button: %li, source direction: %li "
-            "serial: %lu event type: %i\n",
-            __func__, event->data.l[0], event->data.l[1], event->data.l[2], event->data.l[3],
-            event->data.l[4], event->serial, event->type);
+    // fprintf(stderr,
+    //         "%s: _NET_WM_MOVERESIZE: %li, %li | direction: %li, button: %li, source direction: %li "
+    //         "serial: %lu event type: %i\n",
+    //         __func__, event->data.l[0], event->data.l[1], event->data.l[2], event->data.l[3],
+    //         event->data.l[4], event->serial, event->type);
 
     xevent.xmotion.x_root = event->data.l[0];
     xevent.xmotion.y_root = event->data.l[1];
@@ -1875,7 +1875,7 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent *event)
                          GrabModeAsync, None, None, CurrentTime) == GrabSuccess) {
           wMouseMoveWindow(wwin, &xevent);
           XUngrabPointer(dpy, CurrentTime);
-          fprintf(stderr, "%s: _NET_WM_MOVERESIZE_MOVE finished\n", __func__);
+          // fprintf(stderr, "%s: _NET_WM_MOVERESIZE_MOVE finished\n", __func__);
         }
         break;
       case _NET_WM_MOVERESIZE_SIZE_TOPLEFT:
@@ -1891,7 +1891,7 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent *event)
                          GrabModeAsync, None, None, CurrentTime) == GrabSuccess) {
           wMouseResizeWindow(wwin, &xevent, 1);
           XUngrabPointer(dpy, CurrentTime);
-          fprintf(stderr, "%s: _NET_WM_MOVERESIZE_BOTTOMRIGHT finished\n", __func__);
+          // fprintf(stderr, "%s: _NET_WM_MOVERESIZE_BOTTOMRIGHT finished\n", __func__);
         }
         break;
     }