Changeset 2843 for trunk/src/kmk/w32

Timestamp:

Aug 28, 2016, 5:31:02 PM (9 years ago)

Author:

bird

Message:

kmk: kSubmit is mostly done.

Location:

trunk/src/kmk/w32

Files:

• Makefile.kmk (deleted)
• Makefile.kup (added)
• include/sub_proc.h (modified) (2 diffs)
• subproc/Makefile.kup (added)
• subproc/sub_proc.c (modified) (15 diffs)

trunk/src/kmk/w32/include/sub_proc.h

@@ -39 +39 @@
 EXTERN_DECL(long process_pipe_io, (HANDLE proc, char *stdin_data,
         int stdin_data_len));
+#ifndef KMK /* unused */
 EXTERN_DECL(long process_file_io, (HANDLE proc));
+#endif
 EXTERN_DECL(void process_cleanup, (HANDLE proc));
 EXTERN_DECL(HANDLE process_wait_for_any, (VOID_DECL));
@@ -46 +48 @@
 EXTERN_DECL(BOOL process_kill, (HANDLE proc, int signal));
 EXTERN_DECL(int process_used_slots, (VOID_DECL));
+#ifdef KMK
+EXTERN_DECL(int process_kmk_register_submit, (HANDLE hEvent, intptr_t clue));
+#endif
 
 /* support routines */

trunk/src/kmk/w32/subproc/sub_proc.c

@@ -27 +27 @@
 #include <signal.h>
 #include <windows.h>
+#ifdef KMK
+# include <assert.h>
+# include "make.h"
+# include "kmkbuiltin.h"
+#endif
+
 
 #include "sub_proc.h"
@@ -34 +40 @@
 
 static char *make_command_line(char *shell_name, char *exec_path, char **argv);
+#ifndef KMK
 extern char *xmalloc (unsigned int);
-#ifdef KMK
+#else
 extern void kmk_cache_exec_image(const char *); /* imagecache.c */
 #endif
 
 typedef struct sub_process_t {
+#ifdef KMK
+        enum { kRegular = 0, kSubmit, kSubProcFreed } enmType;
+        intptr_t clue;
+#endif
         intptr_t sv_stdin[2];
         intptr_t sv_stdout[2];
@@ -64 +75 @@
 static int fake_exits_pending = 0;
 
+#ifndef KMK /* Inefficient! */
 /*
  * When a process has been waited for, adjust the wait state
@@ -88 +100 @@
         }
 }
+#endif /* !KMK */
 
 /*
@@ -112 +125 @@
         /* wait for someone to exit */
         if (!fake_exits_pending) {
+#ifdef KMK
+l_wait_again:
+#endif
                 retval = WaitForMultipleObjects(proc_index, handles, FALSE, INFINITE);
                 which = retval - WAIT_OBJECT_0;
@@ -123 +139 @@
         if (retval != WAIT_FAILED) {
                 sub_process* pproc = proc_array[which];
+#ifdef KMK
+                if (pproc->enmType == kSubmit) {
+                    /* Try get the result from kSubmit.c.  This may not succeed if the whole
+                       result hasn't arrived yet, in which we just restart the wait. */
+                    if (kSubmitSubProcGetResult(pproc->clue, &pproc->exit_code, &pproc->signal) != 0) {
+                        goto l_wait_again;
+                    }
+                }
+#endif
+#ifndef KMK /* Inefficient! */
                 process_adjust_wait_state(pproc);
+#else
+                proc_index--;
+                if ((int)which < proc_index)
+                        proc_array[which] = proc_array[proc_index];
+                proc_array[proc_index] = NULL;
+#endif
                 return pproc;
         } else
@@ -133 +165 @@
  */
 BOOL
-process_kill(HANDLE proc, int signal)
+ process_kill(HANDLE proc, int signal)
 {
         sub_process* pproc = (sub_process*) proc;
         pproc->signal = signal;
+#ifdef KMK
+        if (pproc->enmType == kRegular) {
+#endif
         return (TerminateProcess((HANDLE) pproc->pid, signal));
+#ifdef KMK
+        } else if (pproc->enmType == kSubmit) {
+                return kSubmitSubProcKill(pproc->clue, signal) == 0;
+        }
+        assert(0);
+        return FALSE;
+#endif
 }
 
@@ -149 +191 @@
 process_register(HANDLE proc)
 {
+#ifdef KMK
+        assert(((sub_process *)proc)->enmType == kRegular);
+#endif
         if (proc_index < MAXIMUM_WAIT_OBJECTS)
                 proc_array[proc_index++] = (sub_process *) proc;
 }
+
+#ifdef KMK
+/**
+ * Interface used by kmkbuiltin/kSubmit.c to register stuff going down in a
+ * worker process.
+ *
+ * @returns 0 on success, -1 if there are too many sub-processes already.
+ * @param   hEvent              The event semaphore to wait on.
+ * @param   clue                The clue to base.
+ */
+int
+process_kmk_register_submit(HANDLE hEvent, intptr_t clue)
+{
+        if (proc_index < MAXIMUM_WAIT_OBJECTS) {
+                sub_process *pSubProc = (sub_process *)xcalloc(sizeof(*pSubProc));
+                pSubProc->enmType = kSubmit;
+                pSubProc->clue    = clue;
+                pSubProc->pid     = (intptr_t)hEvent;
+
+                proc_array[proc_index++] = pSubProc;
+                return 0;
+        }
+        return -1;
+}
+#endif
 
 /*
@@ -197 +267 @@
                  */
 #ifdef KMK
-                (void) process_file_io_private(pproc, FALSE);
+                if (pproc->enmType == kRegular) {
+                    (void)process_file_io_private(pproc, FALSE);
+                }
 #else
                 (void) process_file_io(pproc);
@@ -445 +517 @@
 #ifdef KMK
         size_t exec_path_len;
+
+        assert (pproc->enmType == kRegular);
 #endif
 
@@ -783 +857 @@
         bool_t child_dead = FALSE;
         BOOL GetExitCodeResult;
+#ifdef KMK
+        assert (pproc->enmType == kRegular);
+#endif
 
         /*
@@ -918 +995 @@
 }
 
+#ifndef KMK /* unused */
 /*
  * Purpose: collects output from child process and returns results
@@ -943 +1021 @@
         return process_file_io_private(proc, TRUE);
 }
+#endif /* !KMK - unused */
 
 /* private function, avoid some kernel calls. (bird) */
@@ -1024 +1103 @@
         int i;
 
+#ifdef KMK
+        if (pproc->enmType == kRegular) {
+#endif
+
         if (pproc->using_pipes) {
                 for (i= 0; i <= 1; i++) {
@@ -1036 +1119 @@
         if ((HANDLE)pproc->pid)
                 CloseHandle((HANDLE)pproc->pid);
+#ifdef KMK
+        } else if (pproc->enmType == kSubmit) {
+            /* nothing to do. */
+        } else {
+            assert(0);
+            return;
+        }
+        pproc->enmType = kSubProcFreed;
+#endif
 
         free(pproc);