Changeset 3353 for trunk/src/kmk/main.c

Timestamp:

Jun 5, 2020, 2:57:13 AM (5 years ago)

Author:

bird

Message:

kmk/winchildren: Use windows job objects to terminate all orphaned children when the topmost kmk process terminates. There are a couple of command line options to disable/tweak this behaviour.

File:

• trunk/src/kmk/main.c (modified) (6 diffs)

trunk/src/kmk/main.c

@@ -416 +416 @@
 
 int make_expensive_statistics = 0;
+#endif
+
+#if defined (WINDOWS32) && defined (CONFIG_NEW_WIN_CHILDREN)
+/* --job-object[=mode]. */
+char *win_job_object_mode = NULL;
+
+/* --job-object-name=name */
+char *win_job_object_name = NULL;
 #endif
 
@@ -552 +560 @@
   --statistics                Gather extra statistics for $(make-stats ).\n"),
 #endif
+#if defined (WINDOWS32) && defined (CONFIG_NEW_WIN_CHILDREN)
+    N_("\
+  --job-object=mode           Windows job object mode:\n\
+                                root-kill   = Root make instance only, kill all\n\
+                                              process when root exits. (def)\n\
+                                root-nokill = Root make instance only.\n\
+                                              No killing.\n\
+                                each-kill   = Each make instances, kill all\n\
+                                              children when an instance exits.\n\
+                                each-nokill = Each make instances, no killing.\n\
+                                none        = No job objects.\n"),
+    N_("\
+  --job-object-name=name      Name of windows job object to open or create.\n\
+                              The default name is 'kmk-job-obj-<date>Z<pid>'.\n"),
+#endif
     NULL
   };
@@ -577 +600 @@
     { 'p', flag, &print_data_base_flag, 1, 1, 0, 0, 0, "print-data-base" },
 #ifdef CONFIG_PRETTY_COMMAND_PRINTING
-    { CHAR_MAX+10, flag, (char *) &pretty_command_printing, 1, 1, 1, 0, 0,
+    { CHAR_MAX+50, flag, (char *) &pretty_command_printing, 1, 1, 1, 0, 0,
        "pretty-command-printing" },
 #endif
 #ifdef CONFIG_WITH_PRINT_STATS_SWITCH
-    { CHAR_MAX+11, flag, (char *) &print_stats_flag, 1, 1, 1, 0, 0,
+    { CHAR_MAX+51, flag, (char *) &print_stats_flag, 1, 1, 1, 0, 0,
        "print-stats" },
 #endif
 #ifdef CONFIG_WITH_PRINT_TIME_SWITCH
-    { CHAR_MAX+12, positive_int, (char *) &print_time_min, 1, 1, 0,
+    { CHAR_MAX+52, positive_int, (char *) &print_time_min, 1, 1, 0,
       (char *) &no_val_print_time_min, (char *) &default_print_time_min,
       "print-time" },
 #endif
 #ifdef KMK
-    { CHAR_MAX+14, positive_int, (char *) &process_priority, 1, 1, 0,
+    { CHAR_MAX+54, positive_int, (char *) &process_priority, 1, 1, 0,
       (char *) &process_priority, (char *) &process_priority, "priority" },
-    { CHAR_MAX+15, positive_int, (char *) &process_affinity, 1, 1, 0,
+    { CHAR_MAX+55, positive_int, (char *) &process_affinity, 1, 1, 0,
       (char *) &process_affinity, (char *) &process_affinity, "affinity" },
-    { CHAR_MAX+17, flag, (char *) &process_priority, 1, 1, 0, 0, 0, "nice" },
+    { CHAR_MAX+56, flag, (char *) &process_priority, 1, 1, 0, 0, 0, "nice" },
 #endif
     { 'q', flag, &question_flag, 1, 1, 1, 0, 0, "question" },
@@ -604 +627 @@
       "no-keep-going" },
 #if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
-    { CHAR_MAX+16, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
+    { CHAR_MAX+57, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
        "statistics" },
 #endif
@@ -639 +662 @@
     { CHAR_MAX+6, strlist, &eval_strings, 1, 0, 0, 0, 0, "eval" },
     { CHAR_MAX+7, string, &sync_mutex, 1, 1, 0, 0, 0, "sync-mutex" },
+#if defined (WINDOWS32) && defined (CONFIG_NEW_WIN_CHILDREN)
+    { CHAR_MAX+58, string, &win_job_object_mode, 1, 1, 1, 0, 0, "job-object" },
+    { CHAR_MAX+59, string, &win_job_object_name,  1, 1, 1, 0, 0,
+      "job-object-name" },
+#endif
     { 0, 0, 0, 0, 0, 0, 0, 0, 0 }
   };
@@ -3728 +3756 @@
   decode_debug_flags ();
   decode_output_sync_flags ();
+
+#if defined (WINDOWS32) && defined (CONFIG_NEW_WIN_CHILDREN)
+  /* validate the job object mode value . */
+  if (win_job_object_mode == NULL)
+    win_job_object_mode = xstrdup("root-kill");
+  else if (   strcmp (win_job_object_mode, "none") != 0
+           && strcmp (win_job_object_mode, "root-kill") != 0
+           && strcmp (win_job_object_mode, "root-nokill") != 0
+           && strcmp (win_job_object_mode, "each-kill") != 0
+           && strcmp (win_job_object_mode, "each-nokill") != 0)
+    OS (fatal, NILF, _("unknown job object mode '%s'"), win_job_object_mode);
+#endif
 }