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

Timestamp:

Mar 26, 2018, 9:46:13 AM (7 years ago)

Author:

bird

Message:

kmk/output: Basic memory buffered output working.

File:

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

trunk/src/kmk/w32/winchildren.c

@@ -637 +637 @@
 static void mkWinChildcareWorkerFlushUnwritten(PWINCHILD pChild, PWINCCWPIPE pPipe)
 {
-    /** @todo integrate with output.c   */
     DWORD cbUnwritten = pPipe->cbWritten - pPipe->offPendingRead;
     if (cbUnwritten)
     {
-        DWORD cbWritten = 0;
-        if (WriteFile(GetStdHandle(pPipe->iWhich == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE),
-                      &pPipe->pbBuffer[pPipe->cbWritten], cbUnwritten, &cbWritten, NULL))
-            pPipe->cbWritten += cbWritten <= cbUnwritten ? cbWritten : cbUnwritten; /* paranoia */
+#ifdef CONFIG_WITH_OUTPUT_IN_MEMORY
+        if (pChild->pMkChild)
+        {
+            output_write_bin(&pChild->pMkChild->output, pPipe->iWhich == 2, &pPipe->pbBuffer[pPipe->cbWritten], cbUnwritten);
+            pPipe->cbWritten += cbUnwritten;
+        }
+        else
+#endif
+        {
+            DWORD cbWritten = 0;
+            if (WriteFile(GetStdHandle(pPipe->iWhich == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE),
+                          &pPipe->pbBuffer[pPipe->cbWritten], cbUnwritten, &cbWritten, NULL))
+                pPipe->cbWritten += cbWritten <= cbUnwritten ? cbWritten : cbUnwritten; /* paranoia */
+        }
     }
 }
@@ -693 +702 @@
         if (offRest > offStart)
         {
-            /** @todo integrate with output.c   */
             /* Write out offStart..offRest. */
             DWORD cbToWrite = offRest - offStart;
-            DWORD cbWritten = 0;
-            if (WriteFile(GetStdHandle(pPipe->iWhich == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE),
-                          &pPipe->pbBuffer[offStart], cbToWrite, &cbWritten, NULL))
-            {
-                offStart += cbWritten <= cbToWrite ? cbWritten : cbToWrite; /* paranoia */
+#ifdef CONFIG_WITH_OUTPUT_IN_MEMORY
+            if (pChild->pMkChild)
+            {
+                output_write_bin(&pChild->pMkChild->output, pPipe->iWhich == 2, &pPipe->pbBuffer[offStart], cbToWrite);
+                offStart += cbToWrite;
                 pPipe->cbWritten = offStart;
+            }
+            else
+#endif
+            {
+                DWORD cbWritten = 0;
+                if (WriteFile(GetStdHandle(pPipe->iWhich == 1 ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE),
+                              &pPipe->pbBuffer[offStart], cbToWrite, &cbWritten, NULL))
+                {
+                    offStart += cbWritten <= cbToWrite ? cbWritten : cbToWrite; /* paranoia */
+                    pPipe->cbWritten = offStart;
+                }
             }
         }