Changeset 3664 in kBuild for trunk

Timestamp:

Feb 21, 2025 11:33:59 AM (2 months ago)

Author:

bird

Message:

kmk/output.c: More debugging code for the mysterious 'kmk: write error: stdout' problem...

File:

• trunk/src/kmk/output.c (modified) (11 diffs)

trunk/src/kmk/output.c

@@ -61 +61 @@
 
 #if defined(KMK) && defined(KBUILD_OS_WINDOWS) && 1
+# define DEBUG_STDOUT_CLOSE_ISSUE
 /* fflush wrapper w/ error checking + reporting for stdout.
    This is to debug the mysterious 'kmk: write error: stdout' errors. */
 int g_fStdOutError = 0;
 
+static void my_stdout_error (const char *pszOperation, const char *pszMessage)
+{
+  DWORD const     dwErr   = GetLastError ();
+  int const       iErrNo  = errno;
+  int const       fdFile  = fileno(stdout);
+  HANDLE    const hNative = (HANDLE)_get_osfhandle (_fileno (stdout));
+  DWORD const     dwType  = GetFileType (hNative);
+  fprintf (stderr, "kmk: %s: %s! (lasterr=%u errno=%d fileno=%d native=%p type=%#x)\n",
+           pszOperation, pszMessage, dwErr, iErrNo, fdFile, hNative, dwType);
+}
+
 static int my_fflush (FILE *pFile)
 {
@@ -72 +84 @@
         {
           int rcRet = fflush (pFile);
-          g_fStdOutError = ferror(g_fStdOutError);
+          g_fStdOutError = ferror (pFile);
           if (rcRet != EOF && !g_fStdOutError)
             { /* likely */ }
           else if (rcRet == EOF)
-            fprintf (stderr, "kmk: fflush(stdout): flush failed! errno=%d\n", errno);
+            my_stdout_error ("fflush(stdout)", "flush failed!");
           else
-            fprintf (stderr, "kmk: fflush(stdout): error pending after successful flush! errno=%d\n", errno);
+            my_stdout_error ("fflush(stdout)", "error pending after successful flush!");
 
           return rcRet;
@@ -84 +96 @@
       else
         {
-          fprintf (stderr, "kmk: fflush(stdout): error pending on entry! errno=%d\n", errno);
+          my_stdout_error ("fflush(stdout)", "error pending on entry!");
           g_fStdOutError = 1;
         }
@@ -93 +105 @@
 
 # undef  fflush
-# undef  fflush(a_pFile) my_fflush(a_pFile)
+# define fflush(a_pFile) my_fflush(a_pFile)
 
 #endif
@@ -275 +287 @@
       /* Exit the critical section.  */
 # if defined (KBUILD_OS_WINDOWS) || defined (KBUILD_OS_OS2) || defined (KBUILD_OS_DOS)
-      _setmode (fileno (stdout), prev_mode_out);
-      _setmode (fileno (stderr), prev_mode_err);
+      if (prev_mode_out != -1)
+        _setmode (fileno (stdout), prev_mode_out);
+      if (prev_mode_err != -1)
+        _setmode (fileno (stderr), prev_mode_err);
 # endif
       if (sem)
@@ -571 +585 @@
       while (len > 0)
         {
-          const char *nl = memchr ( src, '\n', len);
+          const char *nl = memchr (src, '\n', len);
           size_t line_len = nl ? nl - src : len;
           output_write_bin (out, is_err, src, line_len);
@@ -980 +994 @@
 }
 
-#endif /* CONFIG_WITH_OUTPUT_IN_MEMORY */
+#endif /* !CONFIG_WITH_OUTPUT_IN_MEMORY */
 
 /* Synchronize the output of jobs in -j mode to keep the results of
@@ -1161 +1175 @@
 {
   int prev_fail = ferror (stdout);
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+  if (prev_fail)
+    my_stdout_error ("close_stdout", "error pending on entry!");
+  errno = 0; SetLastError (0);
+#endif
   int fclose_fail = fclose (stdout);
 
   if (prev_fail || fclose_fail)
     {
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+      if (fclose_fail)
+        my_stdout_error ("close_stdout", "fclose failed!");
+#endif
       if (fclose_fail)
         perror_with_name (_("write error: stdout"), "");
@@ -1178 +1201 @@
 output_init (struct output *out)
 {
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+  if (STREAM_OK (stdout) && ferror (stdout))
+    my_stdout_error (out ? "output_init(out)" : "output_init(NULL)", "error pending entry!");
+#endif
+
   if (out)
     {
@@ -1220 +1248 @@
   set_append_mode (fileno (stderr));
 
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+  if (ferror (stdout))
+    my_stdout_error ("output_init", "error pending on exit!");
+#endif
 #ifdef HAVE_ATEXIT
   if (STREAM_OK (stdout))
@@ -1263 +1295 @@
   if (output_context && output_context->syncout)
     if (combined_output < 0)
-      combined_output = sync_init ();
+      {
+        combined_output = 0;
+        combined_output = sync_init ();
+      }
 #else
 #ifndef NO_OUTPUT_SYNC