Changeset 3536

Timestamp:

Dec 21, 2021, 12:32:59 AM (4 years ago)

Author:

bird

Message:

grep: Windows console output optimizations.

Location:

trunk/src/grep

Files:

• Makefile.kmk (modified) (1 diff)
• config.win.h (modified) (1 diff)
• src/grep.c (modified) (5 diffs)

trunk/src/grep/Makefile.kmk

@@ -144 +144 @@
        lib/strerror.c \
        \
+        ../lib/maybe_con_fwrite.c \
+        ../lib/is_console.c \
         ../lib/nt/ntstat.c \
         ../lib/nt/ntdir.c \

trunk/src/grep/config.win.h

@@ -2587 +2587 @@
 /* Override initialize_main to do wildcard expansion. */
 #define initialize_main w32_initialize_main
+void w32_initialize_main(int *pcArgs, char ***ppapszArgs);
 
 #endif /* !INCLUDED_CONFIG_WIN_H */

trunk/src/grep/src/grep.c

@@ -57 +57 @@
 #include "xbinary-io.h"
 #include "xstrtol.h"
+
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+# include "console.h"
+#endif
 
 enum { SEP_CHAR_SELECTED = ':' };
@@ -439 +443 @@
 static int stdout_errno;
 
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+# include <assert.h>
+static void fwrite_errno (void const *, size_t, size_t);
+#endif
+
 static void
 putchar_errno (int c)
 {
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+  char ch = (char)c;
+  fwrite_errno (&ch, 1, 1);
+#else
   if (putchar (c) < 0)
     stdout_errno = errno;
+#endif
 }
 
@@ -449 +463 @@
 fputs_errno (char const *s)
 {
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+  fwrite_errno (s, 1, strlen (s));
+#else
   if (fputs (s, stdout) < 0)
     stdout_errno = errno;
+#endif
 }
 
@@ -458 +476 @@
   va_list ap;
   va_start (ap, format);
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+  char szBuf[1024]; /* Only really used for a PRIuMAX number and maybe a newline.  */
+  int cch = vsnprintf (szBuf, sizeof (szBuf), format, ap);
+  assert (cch < sizeof(szBuf));
+  fwrite_errno (szBuf, 1, cch);
+#else
   if (vfprintf (stdout, format, ap) < 0)
     stdout_errno = errno;
+#endif
   va_end (ap);
 }
@@ -466 +491 @@
 fwrite_errno (void const *ptr, size_t size, size_t nmemb)
 {
+#if defined(KMK_GREP) && defined(KBUILD_OS_WINDOWS)
+  /*
+   * This trick reduces the runtime of 'grep -r GNU .' in the grep source dir
+   * from just above 11 seconds to just below 1.2 seconds.
+   * Note! s_is_console is for keeping output to file speedy.
+   */
+  static int s_is_console = -1;
+  if (s_is_console != -1)
+    { /* likely*/ }
+  else
+    s_is_console = is_console (fileno (stdout));
+  if (  s_is_console
+      ? maybe_con_fwrite (ptr, size, nmemb, stdout) != nmemb
+      : fwrite (ptr, size, nmemb, stdout) != nmemb)
+#else
   if (fwrite (ptr, size, nmemb, stdout) != nmemb)
+#endif
     stdout_errno = errno;
 }