Changeset 3172 for trunk/src/kmk/kmkbuiltin/append.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/kmkbuiltin/append.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/append.c

@@ -45 +45 @@
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
+#endif
+#if !defined(kmk_builtin_append) && defined(KBUILD_OS_WINDOWS) && defined(CONFIG_NEW_WIN_CHILDREN)
+# include "../w32/winchildren.h"
 #endif
 #include "err.h"
@@ -169 +172 @@
  * Appends text to a textfile, creating the textfile if necessary.
  */
-int kmk_builtin_append(int argc, char **argv, char **envp)
+#ifndef kmk_builtin_append
+int kmk_builtin_append(int argc, char **argv, char **envp, struct child *pChild, pid_t *pPidSpawned)
+#else
+int main(int argc, char **argv, char **envp)
+#endif
 {
+#if defined(KBUILD_OS_WINDOWS) || defined(KBUILD_OS_OS2)
+    static const char s_szNewLine[] = "\r\n";
+#else
+    static const char s_szNewLine[] = "\n";
+#endif
+    KMKBUILTINAPPENDBUF OutBuf = { NULL, 0, 0, 0 };
     const char *pszFilename;
     int rc = 88;
@@ -184 +197 @@
     int fLookForInserts = 0;
 #endif
-#if defined(KBUILD_OS_WINDOWS) || defined(KBUILD_OS_OS2)
-    static const char s_szNewLine[] = "\r\n";
-#else
-    static const char s_szNewLine[] = "\n";
-#endif
-    KMKBUILTINAPPENDBUF OutBuf = { NULL, 0, 0, 0 };
 
     g_progname = argv[0];
@@ -409 +416 @@
      * Write the buffer (unless we ran out of heap already).
      */
+#if !defined(kmk_builtin_append) && defined(KBUILD_OS_WINDOWS) && defined(CONFIG_NEW_WIN_CHILDREN)
+    if (!OutBuf.fOutOfMemory)
+    {
+        rc = MkWinChildCreateAppend(pszFilename, &OutBuf.pszBuf, OutBuf.offBuf, fTruncate, pChild, pPidSpawned);
+        if (rc != 0)
+            rc = errx(rc, "MkWinChildCreateAppend failed: %u", rc);
+        if (OutBuf.pszBuf)
+            free(OutBuf.pszBuf);
+    }
+    else
+#endif
     if (!OutBuf.fOutOfMemory)
     {