Changeset 3159 for trunk/src/kmk/job.c

Timestamp:

Mar 19, 2018, 2:37:13 PM (7 years ago)

Author:

bird

Message:

kmk/win: Some fixes & docs.

File:

• trunk/src/kmk/job.c (modified) (5 diffs)

trunk/src/kmk/job.c

@@ -42 +42 @@
 int no_default_sh_exe = 1;
 int batch_mode_shell = 1;
+# ifndef CONFIG_NEW_WIN32_CTRL_EVENT
 HANDLE main_thread;
+# endif
 
 #elif defined (_AMIGA)
@@ -813 +815 @@
 #endif /* _AMIGA */
 #ifdef WINDOWS32
+          {
 # ifndef CONFIG_NEW_WIN_CHILDREN
-          {
             HANDLE hPID;
             HANDLE hcTID, hcPID;
@@ -822 +824 @@
             coredump = 0;
 
+#  ifndef CONFIG_NEW_WIN32_CTRL_EVENT
             /* Record the thread ID of the main process, so that we
                could suspend it in the signal handler.  */
@@ -839 +842 @@
                   DB (DB_VERBOSE, ("Main thread handle = %p\n", main_thread));
               }
+#  endif
 
             /* wait for anything to finish */
@@ -875 +879 @@
 
             pid = (pid_t) hPID;
+# else  /* CONFIG_NEW_WIN_CHILDREN */
+#  ifndef CONFIG_NEW_WIN32_CTRL_EVENT
+            /* Ctrl-C handler needs to suspend the main thread handle to
+               prevent mayhem when concurrently calling reap_children.  */
+            if (   !main_thread
+                && !DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
+                                     GetCurrentProcess (), &main_thread, 0,
+                                     FALSE, DUPLICATE_SAME_ACCESS))
+              fprintf (stderr, "Failed to duplicate main thread handle: %u\n",
+                       GetLastError ());
+#  endif
+
+            assert (!any_remote);
+            pid = 0;
+            coredump = exit_sig = exit_code = 0;
+            {
+              int rc = MkWinChildWait(block, &pid, &exit_code, &exit_sig, &coredump, &c);
+              if (rc != 0)
+                    ON (fatal, NILF, _("MkWinChildWait: %u"), rc);
+            }
+            if (pid == 0)
+              {
+                /* No more children, stop. */
+                reap_more = 0;
+                break;
+              }
+
+            /* If we have started jobs in this second, remove one.  */
+            if (job_counter)
+              --job_counter;
+# endif /* CONFIG_NEW_WIN_CHILDREN */
           }
-# else  /* CONFIG_NEW_WIN_CHILDREN */
-          assert (!any_remote);
-          pid = 0;
-          coredump = exit_sig = exit_code = 0;
-          {
-            int rc = MkWinChildWait(block, &pid, &exit_code, &exit_sig, &coredump, &c);
-            if (rc != 0)
-                  ON (fatal, NILF, _("MkWinChildWait: %u"), rc);
-          }
-          if (pid == 0)
-            {
-              /* No more children, stop. */
-              reap_more = 0;
-              break;
-            }
-
-          /* If we have started jobs in this second, remove one.  */
-          if (job_counter)
-            --job_counter;
-# endif /* CONFIG_NEW_WIN_CHILDREN */
 #endif /* WINDOWS32 */
         }