Changeset 2907

Timestamp:

Sep 10, 2016, 12:33:26 AM (9 years ago)

Author:

bird

Message:

do fprintf too.

Location:

trunk/src

Files:

• kmk/Makefile.kmk (modified) (1 diff)
• lib/msc_buffered_printf.c (modified) (4 diffs)

trunk/src/kmk/Makefile.kmk

@@ -58 +58 @@
  TEMPLATE_BIN-KMK_INCS += glob
 endif
-TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
+TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
 ifeq ($(KBUILD_TARGET),win)

trunk/src/lib/msc_buffered_printf.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * printf and vprintf console optimizations for Windows/MSC.
+ * printf, vprintf, fprintf, puts, fputs console optimizations for Windows/MSC.
  */
 
@@ -42 +42 @@
 #undef printf
 #undef vprintf
+#undef fprintf
 #undef puts
 #undef fputs
@@ -101 +102 @@
      * Fallback.
      */
-    return fprintf(stdout, pszFormat, va);
+    return vfprintf(stdout, pszFormat, va);
+}
+
+
+/**
+ * Replaces fprintf for MSC to speed up console output.
+ *
+ * @returns chars written on success, -1 and errno on failure.
+ * @param   pFile               The output file/stream.
+ * @param   pszFormat           The format string.
+ * @param   va                  Format arguments.
+ */
+__declspec(dllexport)
+int __cdecl fprintf(FILE *pFile, const char *pszFormat, ...)
+{
+    va_list va;
+    int cchRet;
+
+    /*
+     * If it's a TTY, try format into a stack buffer and output using our
+     * console optimized fwrite wrapper.
+     */
+    if (*pszFormat != '\0')
+    {
+        int fd = fileno(pFile);
+        if (fd >= 0)
+        {
+            if (isatty(fd))
+            {
+                char szTmp[8192];
+                va_start(va, pszFormat);
+                cchRet = vsnprintf(szTmp, sizeof(szTmp), pszFormat, va);
+                va_end(va);
+                if (cchRet >= sizeof(szTmp) - 1)
+                    return (int)maybe_con_fwrite(szTmp, cchRet, 1, pFile);
+            }
+        }
+    }
+
+    /*
+     * Fallback.
+     */
+    va_start(va, pszFormat);
+    cchRet = vfprintf(pFile, pszFormat, va);
+    va_end(va);
+    return cchRet;
 }
 
@@ -200 +246 @@
 void * const __imp_printf  = (void *)(uintptr_t)printf;
 void * const __imp_vprintf = (void *)(uintptr_t)vprintf;
+void * const __imp_fprintf = (void *)(uintptr_t)fprintf;
 void * const __imp_puts    = (void *)(uintptr_t)puts;
 void * const __imp_fputs   = (void *)(uintptr_t)fputs;