Changeset 2879 for trunk/src/kmk/kmkbuiltin/kSubmit.c

Timestamp:

Sep 5, 2016, 10:14:21 PM (9 years ago)

Author:

bird

Message:

fixes

File:

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

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -791 +791 @@
  * @param   pWorker             The worker instance.
  * @param   dwErr               The error code.
- */
-static int kSubmitWinReadFailed(PWORKERINSTANCE pWorker, DWORD dwErr)
+ * @param   pszWhere            Where it failed.
+ */
+static int kSubmitWinReadFailed(PWORKERINSTANCE pWorker, DWORD dwErr, const char *pszWhere)
 {
     DWORD dwExitCode;
 
     if (pWorker->cbResultRead == 0)
-        errx(1, "ReadFile failed: %u", dwErr);
+        errx(1, "%s/ReadFile failed: %u", pszWhere, dwErr);
     else
-        errx(1, "ReadFile failed: %u (read %u bytes)", dwErr, pWorker->cbResultRead);
+        errx(1, "%s/ReadFile failed: %u (read %u bytes)", pszWhere, dwErr, pWorker->cbResultRead);
     assert(dwErr != 0);
 
@@ -824 +825 @@
  * @param   pWorker             The worker instance.
  */
-static int kSubmitReadMoreResultWin(PWORKERINSTANCE pWorker)
+static int kSubmitReadMoreResultWin(PWORKERINSTANCE pWorker, const char *pszWhere)
 {
     /*
@@ -847 +848 @@
             if (dwErr == ERROR_IO_PENDING)
                 return -1;
-            return kSubmitWinReadFailed(pWorker, dwErr);
+            return kSubmitWinReadFailed(pWorker, dwErr, pszWhere);
         }
 
@@ -886 +887 @@
      */
 l_again:
-    rc = kSubmitReadMoreResultWin(pWorker);
+    rc = kSubmitReadMoreResultWin(pWorker, "kSubmitMarkActive");
     if (rc == -1)
     {
@@ -952 +953 @@
         while (pWorker->cbResultRead < sizeof(pWorker->Result))
         {
-            int rc = kSubmitReadMoreResultWin(pWorker);
+            int rc = kSubmitReadMoreResultWin(pWorker, "kSubmitSubProcGetResult/more");
             if (rc == -1)
                 return -1;
@@ -962 +963 @@
     {
         DWORD dwErr = GetLastError();
-        kSubmitWinReadFailed(pWorker, dwErr);
+        kSubmitWinReadFailed(pWorker, dwErr, "kSubmitSubProcGetResult/result");
     }