Changeset 3172 for trunk/src/kmk/w32/winchildren.c

Timestamp:

Mar 21, 2018, 3:21:23 PM (7 years ago)

Author:

bird

Message:

kmk/win: Make outsource the writing part of kmk_builtin_append to a worker thread to try avoid blocking the main kmk thread.

File:

• trunk/src/kmk/w32/winchildren.c (modified) (9 diffs)

trunk/src/kmk/w32/winchildren.c

@@ -110 +110 @@
     /** kmkbuiltin command. */
     WINCHILDTYPE_BUILT_IN,
+    /** kmkbuiltin_append result write out. */
+    WINCHILDTYPE_APPEND,
     /** kSubmit job. */
     WINCHILDTYPE_SUBMIT,
@@ -188 +190 @@
             char          **papszEnv;
         } BuiltIn;
+
+        /** Data for WINCHILDTYPE_APPEND.   */
+        struct
+        {
+            /** The filename. */
+            char           *pszFilename;
+            /** How much to append. */
+            size_t          cbAppend;
+            /** What to append. */
+            char           *pszAppend;
+            /** Whether to truncate the file. */
+            int             fTruncate;
+        } Append;
 
         /** Data for WINCHILDTYPE_SUBMIT.   */
@@ -1672 +1687 @@
 
 /**
+ * Childcare worker: handle append write-out.
+ *
+ * @param   pWorker             The worker.
+ * @param   pChild              The kSubmit child.
+ */
+static void mkWinChildcareWorkerThreadHandleAppend(PWINCHILDCAREWORKER pWorker, PWINCHILD pChild)
+{
+    int fd = open(pChild->u.Append.pszFilename,
+                  pChild->u.Append.fTruncate
+                  ? O_WRONLY | O_TRUNC  | O_CREAT | _O_NOINHERIT | _O_BINARY
+                  : O_WRONLY | O_APPEND | O_CREAT | _O_NOINHERIT | _O_BINARY,
+                  0666);
+    if (fd >= 0)
+    {
+        ssize_t cbWritten = write(fd, pChild->u.Append.pszAppend, pChild->u.Append.cbAppend);
+        if (cbWritten == (ssize_t)pChild->u.Append.cbAppend)
+        {
+            if (close(fd) >= 0)
+            {
+                pChild->iExitCode = 0;
+                return;
+            }
+            fprintf(stderr, "kmk_builtin_append: close failed on '%s': %u (%s)\n",
+                    pChild->u.Append.pszFilename, errno, strerror(errno));
+        }
+        else
+            fprintf(stderr, "kmk_builtin_append: error writing %lu bytes to on '%s': %u (%s)\n",
+                    pChild->u.Append.cbAppend, pChild->u.Append.pszFilename, errno, strerror(errno));
+        close(fd);
+    }
+    else
+        fprintf(stderr, "kmk_builtin_append: error opening '%s': %u (%s)\n",
+                pChild->u.Append.pszFilename, errno, strerror(errno));
+    pChild->iExitCode = 1;
+}
+
+/**
  * Childcare worker: handle kSubmit job.
  *
@@ -1784 +1836 @@
                     case WINCHILDTYPE_BUILT_IN:
                         mkWinChildcareWorkerThreadHandleBuiltIn(pWorker, pChild);
+                        break;
+                    case WINCHILDTYPE_APPEND:
+                        mkWinChildcareWorkerThreadHandleAppend(pWorker, pChild);
                         break;
                     case WINCHILDTYPE_SUBMIT:
@@ -2004 +2059 @@
             break;
 
+        case WINCHILDTYPE_APPEND:
+            if (pChild->u.Append.pszFilename)
+            {
+                free(pChild->u.Append.pszFilename);
+                pChild->u.Append.pszFilename = NULL;
+            }
+            if (pChild->u.Append.pszAppend)
+            {
+                free(pChild->u.Append.pszAppend);
+                pChild->u.Append.pszAppend = NULL;
+            }
+            break;
+
         case WINCHILDTYPE_SUBMIT:
             if (pChild->u.Submit.pvSubmitWorker)
@@ -2283 +2351 @@
 
 /**
+ * Interface used by append.c for do the slow file system part.
+ *
+ * This will append the given buffer to the specified file and free the buffer.
+ *
+ * @returns 0 on success, windows status code on failure.
+ *
+ * @param   pszFilename     The name of the file to append to.
+ * @param   ppszAppend      What to append.  The pointer pointed to is set to
+ *                          NULL once we've taken ownership of the buffer and
+ *                          promise to free it.
+ * @param   cbAppend        How much to append.
+ * @param   fTruncate       Whether to truncate the file before appending to it.
+ * @param   pMkChild        The make child structure.
+ * @param   pPid            Where to return the pid.
+ */
+int MkWinChildCreateAppend(const char *pszFilename, char **ppszAppend, size_t cbAppend, int fTruncate,
+                           struct child *pMkChild, pid_t *pPid)
+{
+    size_t    cbFilename = strlen(pszFilename) + 1;
+    PWINCHILD pChild     = mkWinChildNew(WINCHILDTYPE_APPEND);
+    pChild->pMkChild            = pMkChild;
+    pChild->u.Append.fTruncate  = fTruncate;
+    pChild->u.Append.pszAppend  = *ppszAppend;
+    pChild->u.Append.cbAppend   = cbAppend;
+    pChild->u.Append.pszFilename = (char *)memcpy(xmalloc(cbFilename), pszFilename, cbFilename);
+    *ppszAppend = NULL;
+    return mkWinChildPushToCareWorker(pChild, pPid);
+}
+
+/**
  * Interface used by kSubmit.c for registering stuff to wait on.
  *
@@ -2337 +2435 @@
                     pChild->iSignal = iSignal;
                     break;
-
 #ifdef KMK
-
                 case WINCHILDTYPE_SUBMIT:
                 {
@@ -2356 +2452 @@
 
 #endif /* KMK */
-
                 default:
                     assert(0);
@@ -2418 +2513 @@
 #ifdef KMK
         case WINCHILDTYPE_BUILT_IN:
-            break;
+        case WINCHILDTYPE_APPEND:
         case WINCHILDTYPE_SUBMIT:
-            break;
         case WINCHILDTYPE_REDIRECT:
             break;