Changeset 2846

Timestamp:

Aug 30, 2016, 2:48:33 PM (9 years ago)

Author:

bird

Message:

fixes

Location:

trunk/src

Files:

• Makefile.kmk (modified) (1 diff)
• kWorker/kWorker.c (modified) (2 diffs)
• kmk/job.c (modified) (1 diff)
• kmk/kmkbuiltin.h (modified) (1 diff)
• kmk/kmkbuiltin/kSubmit.c (modified) (7 diffs)
• kmk/w32/subproc/sub_proc.c (modified) (2 diffs)

trunk/src/Makefile.kmk

@@ -34 +34 @@
 include $(PATH_SUB_CURRENT)/kObjCache/Makefile.kmk
 include $(PATH_SUB_CURRENT)/misc/Makefile.kmk
+ifeq ($(KBUILD_TARGET),win)
+ include $(PATH_SUB_CURRENT)/kLibTweaker/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/kWorker/Makefile.kmk
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/kWorker/kWorker.c

@@ -3815 +3815 @@
                     if (cbActually > cbToRead)
                         cbActually = cbToRead;
+                    else if (cbActually < cbToRead)
+                        ((KU8 *)pvBuffer)[cbActually] = '\0'; // hack hack hack
 
                     kHlpMemCopy(pvBuffer, &pFsObj->pbCached[pHandle->offFile], cbActually);
@@ -5243 +5245 @@
     HANDLE  hPipe = INVALID_HANDLE_VALUE;
 
+
     /*
      * Parse arguments.

trunk/src/kmk/job.c

@@ -467 +467 @@
 #else
   if (exit_sig == 0)
+# if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+    error (NILF, ignored ? _("[%s] Error %d (%#x) (ignored)") :
+           _("*** [%s] Error %d (%#x)"),
+           target_name, exit_code, exit_code);
+# else
     error (NILF, ignored ? _("[%s] Error %d (ignored)") :
            _("*** [%s] Error %d"),
            target_name, exit_code);
+# endif
   else
     error (NILF, "*** [%s] %s%s",

trunk/src/kmk/kmkbuiltin.h

@@ -65 +65 @@
 extern int kSubmitSubProcGetResult(intptr_t pvUser, int *prcExit, int *piSigNo);
 extern int kSubmitSubProcKill(intptr_t pvUser, int iSignal);
+extern void kSubmitSubProcCleanup(intptr_t pvUser);
 #endif
 extern int kmk_builtin_kDepIDB(int argc, char **argv, char **envp);

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -188 +188 @@
     else
     {
-        assert(pList->pHead == pWorker);
-        pList->pHead = pPrev;
+        assert(pList->pTail == pWorker);
+        pList->pTail = pPrev;
     }
 
@@ -199 +199 @@
     else
     {
-        assert(pList->pTail == pWorker);
-        pList->pTail = pNext;
-    }
+        assert(pList->pHead == pWorker);
+        pList->pHead = pNext;
+    }
+
+    assert(!pList->pHead || pList->pHead->pPrev == NULL);
+    assert(!pList->pTail || pList->pTail->pNext == NULL);
 
     assert(pList->cEntries > 0);
@@ -235 +238 @@
         assert(pList->pHead == NULL);
         pList->pHead = pWorker;
-        pList->pTail = pWorker;
-    }
+    }
+    pList->pTail = pWorker;
+
+    assert(pList->pHead->pPrev == NULL);
+    assert(pList->pTail->pNext == NULL);
 
     pList->cEntries++;
@@ -954 +960 @@
         case STATUS_ILLEGAL_INSTRUCTION:        *piSigNo = SIGILL; break;
     }
+
     return 0;
 }
@@ -961 +968 @@
 {
     return -1;
+}
+
+
+/**
+ * Called by process_cleanup when it's done with the worker.
+ *
+ * @param   pvUser              The worker instance.
+ */
+void kSubmitSubProcCleanup(intptr_t pvUser)
+{
+    PWORKERINSTANCE pWorker = (PWORKERINSTANCE)pvUser;
+    kSubmitListUnlink(&g_BusyList, pWorker);
+    kSubmitListAppend(&g_IdleList, pWorker);
 }
 
@@ -1515 +1535 @@
 #ifdef KBUILD_OS_WINDOWS
             /* Quote the argv elements, but first we need unquoted pszExecute. */
-            char *pszFreeExec = NULL;
+            int const cArgs = argc - iArg;
+            int iArg2;
+            char **papszArgsOrg = (char **)xmalloc(sizeof(argv[0]) * cArgs);
             if (!pszExecutable)
-                pszExecutable = pszFreeExec = xstrdup(argv[0]);
-            quote_argv(argc, argv, fWatcomBrainDamage, 1 /*fFreeOrLeak*/);
+                pszExecutable = argv[iArg];
+            memcpy(papszArgsOrg, &argv[iArg], sizeof(argv[0]) * cArgs);
+            quote_argv(cArgs, &argv[iArg], fWatcomBrainDamage, 0 /*fFreeOrLeak*/);
 #endif
 
@@ -1530 +1553 @@
 
 #ifdef KBUILD_OS_WINDOWS
-            free(pszFreeExec);
+            for (iArg2 = 0; iArg2 < cArgs; iArg2++)
+                if (argv[iArg2 + iArg] != papszArgsOrg[iArg2])
+                {
+                    free(argv[iArg2 + iArg]);
+                    argv[iArg2 + iArg] = papszArgsOrg[iArg2];
+                }
+            free(papszArgsOrg);
 #endif
         }

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

@@ -218 +218 @@
 
                 proc_array[proc_index++] = pSubProc;
-                *pPid = (HANDLE)pSubProc;
+                *pPid = (intptr_t)pSubProc;
                 return 0;
         }
@@ -1123 +1123 @@
 #ifdef KMK
         } else if (pproc->enmType == kSubmit) {
-            /* nothing to do. */
+            kSubmitSubProcCleanup(pproc->clue);
         } else {
             assert(0);