Changeset 2906

Timestamp:

Sep 10, 2016, 12:15:57 AM (9 years ago)

Author:

bird

Message:

More stdout console buffering tricks on windows.

Location:

trunk/src

Files:

• kWorker/kWorker.c (modified) (2 diffs)
• lib/Makefile.kmk (modified) (1 diff)
• lib/maybe_con_fwrite.c (modified) (1 diff)
• lib/msc_buffered_printf.c (moved) (moved from trunk/src/lib/maybe_con_printf.c ) (2 diffs)

trunk/src/kWorker/kWorker.c

@@ -2638 +2638 @@
 static _onexit_t __cdecl kwSandbox_msvcrt__onexit(_onexit_t pfnFunc)
 {
-    PKWEXITCALLACK pCallback;
-    KW_LOG(("_onexit(%p)\n", pfnFunc));
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
-
-    pCallback = kHlpAlloc(sizeof(*pCallback));
-    if (pCallback)
-    {
-        pCallback->pfnCallback = pfnFunc;
-        pCallback->fAtExit     = K_FALSE;
-        pCallback->pNext       = g_Sandbox.pExitCallbackHead;
-        g_Sandbox.pExitCallbackHead = pCallback;
-        return pfnFunc;
-    }
-
-    return NULL;
+    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    {
+        PKWEXITCALLACK pCallback;
+        KW_LOG(("_onexit(%p)\n", pfnFunc));
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+
+        pCallback = kHlpAlloc(sizeof(*pCallback));
+        if (pCallback)
+        {
+            pCallback->pfnCallback = pfnFunc;
+            pCallback->fAtExit     = K_FALSE;
+            pCallback->pNext       = g_Sandbox.pExitCallbackHead;
+            g_Sandbox.pExitCallbackHead = pCallback;
+            return pfnFunc;
+        }
+        return NULL;
+    }
+    KW_LOG(("_onexit(%p) - IGNORED\n", pfnFunc));
+    return pfnFunc;
 }
 
@@ -2659 +2663 @@
 static int __cdecl kwSandbox_msvcrt_atexit(int (__cdecl *pfnFunc)(void))
 {
-    PKWEXITCALLACK pCallback;
-    KW_LOG(("_onexit(%p)\n", pfnFunc));
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
-
-    pCallback = kHlpAlloc(sizeof(*pCallback));
-    if (pCallback)
-    {
-        pCallback->pfnCallback = (_onexit_t)pfnFunc;
-        pCallback->fAtExit     = K_TRUE;
-        pCallback->pNext       = g_Sandbox.pExitCallbackHead;
-        g_Sandbox.pExitCallbackHead = pCallback;
-        return 0;
-    }
-
-    return -1;
+    if (g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_LINK)
+    {
+        PKWEXITCALLACK pCallback;
+        kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread);
+        KW_LOG(("atexit(%p)\n", pfnFunc));
+
+        pCallback = kHlpAlloc(sizeof(*pCallback));
+        if (pCallback)
+        {
+            pCallback->pfnCallback = (_onexit_t)pfnFunc;
+            pCallback->fAtExit     = K_TRUE;
+            pCallback->pNext       = g_Sandbox.pExitCallbackHead;
+            g_Sandbox.pExitCallbackHead = pCallback;
+            return 0;
+        }
+        return -1;
+    }
+    KW_LOG(("atexit(%p) - IGNORED!\n", pfnFunc));
+    return 0;
 }
 

trunk/src/lib/Makefile.kmk

@@ -41 +41 @@
         maybe_con_write.c \
         maybe_con_fwrite.c \
-        maybe_con_printf.c \
         kbuild_version.c
 kUtil_SOURCES.win = \
+        msc_buffered_printf.c \
         nt_fullpath.c \
         nt_fullpath_cached.c \

trunk/src/lib/maybe_con_fwrite.c

@@ -88 +88 @@
                         if (cwcToWrite > 0)
                         {
+                            int rc;
+                            pawcTmp[cwcToWrite] = '\0';
+
                             /* Let the CRT do the rest.  At least the Visual C++ 2010 CRT
                                sources indicates _cputws will do the right thing we want.  */
-                            pawcTmp[cwcToWrite] = '\0';
                             fflush(pFile);
-                            if (_cputws(pawcTmp) >= 0)
+                            rc = _cputws(pawcTmp);
+                            free(pawcTmp);
+                            if (rc >= 0)
                                 return cUnits;
                             return 0;
                         }
+                        free(pawcTmp);
                     }
                 }

trunk/src/lib/msc_buffered_printf.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * maybe_con_write - Optimized console output on windows.
+ * printf and vprintf console optimizations for Windows/MSC.
  */
 
@@ -33 +33 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef KBUILD_OS_WINDOWS
-# include <windows.h>
-#endif
-#include <errno.h>
+#include <Windows.h>
 #include <stdio.h>
-#ifdef _MSC_VER
-# include <io.h>
-# include <conio.h>
-#endif
-
-
-
-/**
- * Drop-in printf replacement for optimizing console output on windows.
- *
- *
- * @returns Number of bytes written.
- * @param   pszFormat   The format string.
- * @param   ...         The format arguments.
- */
-int maybe_con_printf(const char *pszFormat, ...)
-{
+#include <stdarg.h>
+#include <io.h>
+#include <conio.h>
+#include <malloc.h>
+
+#undef printf
+#undef vprintf
+#undef puts
+#undef fputs
+#pragma warning(disable: 4273) /* inconsistent dll linkage*/
+
+extern size_t maybe_con_fwrite(void const *pvBuf, size_t cbUnit, size_t cUnits, FILE *pFile);
+
+
+/**
+ * Replaces printf for MSC to speed up console output.
+ *
+ * @returns chars written on success, -1 and errno on failure.
+ * @param   pszFormat           The format string.
+ * @param   ...                 Format arguments.
+ */
+__declspec(dllexport)
+int __cdecl printf(const char *pszFormat, ...)
+{
+    int cchRet;
     va_list va;
-    int rc;
-
-#ifdef KBUILD_OS_WINDOWS
-    /*
-     * Just try format it into a stack buffer.
-     */
-    extern size_t maybe_con_fwrite(void const *, size_t, size_t, FILE *);
-    char szTmp[16384];
     va_start(va, pszFormat);
-    rc = vsnprintf(szTmp, sizeof(szTmp), pszFormat, va);
+    cchRet = vprintf(pszFormat, va);
     va_end(va);
-    if (rc > 0)
+    return cchRet;
+}
+
+
+/**
+ * Replaces vprintf for MSC to speed up console output.
+ *
+ * @returns chars written on success, -1 and errno on failure.
+ * @param   pszFormat           The format string.
+ * @param   va                  Format arguments.
+ */
+__declspec(dllexport)
+int __cdecl vprintf(const char *pszFormat, va_list va)
+{
+    /*
+     * If it's a TTY, try format into a stack buffer and output using our
+     * console optimized fwrite wrapper.
+     */
+    if (*pszFormat != '\0')
     {
-        size_t cchRet = maybe_con_fwrite(szTmp, 1, rc, stdout);
-        return cchRet > 0 ? (int)cchRet : -1;
+        int fd = fileno(stdout);
+        if (fd >= 0)
+        {
+            if (isatty(fd))
+            {
+                char szTmp[8192];
+                va_list va2 = va;
+                int cchRet = vsnprintf(szTmp, sizeof(szTmp), pszFormat, va2);
+                if (cchRet >= sizeof(szTmp) - 1)
+                    return (int)maybe_con_fwrite(szTmp, cchRet, 1, stdout);
+            }
+        }
     }
-#endif
-
-    /*
-     * call the 'v' function.
-     */
-    va_start(va, pszFormat);
-    rc = vfprintf(stdout, pszFormat, va);
-    va_end(va);
-    return rc;
-}
-
+
+    /*
+     * Fallback.
+     */
+    return fprintf(stdout, pszFormat, va);
+}
+
+
+/**
+ * Replaces puts for MSC to speed up console output.
+ *
+ * @returns Units written; 0 & errno on failure.
+ * @param   pszString           The string to write. (newline is appended)
+ */
+__declspec(dllexport)
+int __cdecl puts(const char *pszString)
+{
+    size_t cchString = strlen(pszString);
+    size_t cch;
+
+    /*
+     * If it's a TTY, we convert it to a wide char string with a newline
+     * appended right here.  Going thru maybe_con_fwrite is just extra
+     * buffering due to the added newline.
+     */
+    if (*pszString != '\0')
+    {
+        int fd = fileno(stdout);
+        if (fd >= 0)
+        {
+            if (isatty(fd))
+            {
+                HANDLE hCon = (HANDLE)_get_osfhandle(fd);
+                if (   hCon != INVALID_HANDLE_VALUE
+                    && hCon != NULL)
+                {
+                    /* We need to append a newline, so we can just as well do the conversion here. */
+                    size_t   cwcTmp  = cchString * 2 + 16 + 2;
+                    wchar_t *pawcTmp = (wchar_t *)malloc(cwcTmp * sizeof(wchar_t));
+                    if (pawcTmp)
+                    {
+                        int           cwcToWrite;
+                        static UINT s_uConsoleCp = 0;
+                        if (s_uConsoleCp == 0)
+                            s_uConsoleCp = GetConsoleCP();
+
+                        cwcToWrite = MultiByteToWideChar(s_uConsoleCp, 0 /*dwFlags*/, pszString, (int)cchString, pawcTmp,
+                                                         (int)(cwcTmp - 2));
+                        if (cwcToWrite > 0)
+                        {
+                            int rc;
+
+                            pawcTmp[cwcToWrite++] = '\n';
+                            pawcTmp[cwcToWrite]   = '\0';
+
+                            /* Let the CRT do the rest.  At least the Visual C++ 2010 CRT
+                               sources indicates _cputws will do the right thing we want.  */
+                            fflush(stdout);
+                            rc = _cputws(pawcTmp);
+                            free(pawcTmp);
+                            return rc;
+                        }
+                        free(pawcTmp);
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Fallback.
+     */
+    cch = fwrite(pszString, cchString, 1, stdout);
+    if (cch == cchString)
+    {
+        if (putc('\n', stdout) != EOF)
+            return 0;
+    }
+    return -1;
+}
+
+
+/**
+ * Replaces puts for MSC to speed up console output.
+ *
+ * @returns Units written; 0 & errno on failure.
+ * @param   pszString           The string to write (no newline added).
+ * @param   pFile               The output file.
+ */
+__declspec(dllexport)
+int __cdecl fputs(const char *pszString, FILE *pFile)
+{
+    size_t cchString = strlen(pszString);
+    size_t cch = maybe_con_fwrite(pszString, cchString, 1, stdout);
+    if (cch == cchString)
+        return 0;
+    return -1;
+}
+
+
+
+void * const __imp_printf  = (void *)(uintptr_t)printf;
+void * const __imp_vprintf = (void *)(uintptr_t)vprintf;
+void * const __imp_puts    = (void *)(uintptr_t)puts;
+void * const __imp_fputs   = (void *)(uintptr_t)fputs;
+