Changeset 2903 in kBuild

Timestamp:

Sep 9, 2016 5:38:50 PM (9 years ago)

Author:

bird

Message:

kmk: faster messages.

Location:

trunk/src/lib

Files:

• Makefile.kmk (modified) (1 diff)
• maybe_con_printf.c (copied) (copied from trunk/src/lib/maybe_con_fwrite.c ) (1 diff)

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 = \

trunk/src/lib/maybe_con_printf.c

@@ -46 +46 @@
 
 /**
- * Drop-in fwrite replacement for optimizing console output on windows.
+ * Drop-in printf replacement for optimizing console output on windows.
  *
  *
- * @returns Units written; 0 & errno on failure.
- * @param   pvBuf               What to write.
- * @param   cbUnit              How much to write in each unit.
- * @param   cUnits              How many units to write.
- * @param   pFile               The file to write to.
+ * @returns Number of bytes written.
+ * @param   pszFormat   The format string.
+ * @param   ...         The format arguments.
  */
-size_t maybe_con_fwrite(void const *pvBuf, size_t cbUnit, size_t cUnits, FILE *pFile)
+int maybe_con_printf(const char *pszFormat, ...)
 {
+    va_list va;
+    int rc;
+
 #ifdef KBUILD_OS_WINDOWS
     /*
-     * If it's a TTY, do our own conversion to wide char and
-     * call WriteConsoleW directly.
+     * Just try format it into a stack buffer.
      */
-    if (   cbUnit > 0
-        && cUnits > 0
-        && (pFile == stdout || pFile == stderr))
+    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);
+    va_end(va);
+    if (rc > 0)
     {
-        int fd = fileno(pFile);
-        if (fd >= 0)
-        {
-            if (isatty(fd))
-            {
-                HANDLE hCon = (HANDLE)_get_osfhandle(fd);
-                if (   hCon != INVALID_HANDLE_VALUE
-                    && hCon != NULL)
-                {
-                    size_t   cbToWrite = cbUnit * cUnits;
-                    size_t   cwcTmp    = cbToWrite * 2 + 16;
-                    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*/, pvBuf, (int)cbToWrite, pawcTmp, (int)(cwcTmp - 1));
-                        if (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)
-                                return cUnits;
-                            return 0;
-                        }
-                    }
-                }
-            }
-        }
+        size_t cchRet = maybe_con_fwrite(szTmp, 1, rc, stdout);
+        return cchRet > 0 ? (int)cchRet : -1;
     }
 #endif
 
     /*
-     * Semi regular write handling.
+     * call the 'v' function.
      */
-    return fwrite(pvBuf, cbUnit, cUnits, pFile);
+    va_start(va, pszFormat);
+    rc = vfprintf(stdout, pszFormat, va);
+    va_end(va);
+    return rc;
 }
+