Changeset 3666

Timestamp:

Feb 21, 2025, 3:31:23 PM (5 weeks ago)

Author:

bird

Message:

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

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (1 diff)
• output.c (modified) (3 diffs)
• output.h (modified) (1 diff)
• w32/winchildren.c (modified) (7 diffs)

trunk/src/kmk/Makefile.kmk ¶

@@ -243 +243 @@
 kmk_DEFS.win       := CONFIG_WITH_OUTPUT_IN_MEMORY
 kmk_DEFS.win.x86   := CONFIG_NEW_WIN32_CTRL_EVENT
-kmk_DEFS.win.amd64 := CONFIG_NEW_WIN32_CTRL_EVENT
+kmk_DEFS.win.amd64 := CONFIG_NEW_WIN32_CTRL_EVENT DEBUG_STDOUT_CLOSE_ISSUE
 kmk_DEFS.debug     := CONFIG_WITH_MAKE_STATS
 ifdef CONFIG_WITH_MAKE_STATS

trunk/src/kmk/output.c ¶

@@ -60 +60 @@
 #endif
 
-#if defined(KMK) && defined(KBUILD_OS_WINDOWS) && 1
-# define DEBUG_STDOUT_CLOSE_ISSUE
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
 /* fflush wrapper w/ error checking + reporting for stdout.
    This is to debug the mysterious 'kmk: write error: stdout' errors. */
@@ -68 +67 @@
 static void my_stdout_error (const char *pszOperation, const char *pszMessage)
 {
+# ifdef KBUILD_OS_WINDOWS
   DWORD const     dwErr   = GetLastError ();
+# endif
   int const       iErrNo  = errno;
-  int const       fdFile  = fileno(stdout);
+  int const       fdFile  = fileno (stdout);
+# ifdef KBUILD_OS_WINDOWS
   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);
+  fprintf (stderr, "kmk[%u]: %s: %s! (lasterr=%u errno=%d fileno=%d native=%p type=%#x)\n",
+           makelevel, pszOperation, pszMessage, dwErr, iErrNo, fdFile, hNative, dwType);
+# else
+  fprintf (stderr, "kmk[%u]: %s: %s! (lasterr=%u errno=%d fileno=%d)\n",
+           makelevel, pszOperation, pszMessage, dwErr, iErrNo, fdFile);
+# endif
 }
 
@@ -107 +113 @@
 # define fflush(a_pFile) my_fflush(a_pFile)
 
-#endif
+/* Preserves errno and win32 last error. */
+void my_check_stdout (const char *pszWhere)
+{
+  if (!g_fStdOutError)
+    {
+# ifdef KBUILD_OS_WINDOWS
+      DWORD const dwErrSaved  = GetLastError();
+# endif
+      int const   iErrNoSaved = errno;
+
+      if (ferror (stdout))
+        {
+          my_stdout_error (pszWhere, "error pending!");
+          g_fStdOutError = 1;
+        }
+
+      errno = iErrNoSaved;
+# ifdef KBUILD_OS_WINDOWS
+      SetLastError(dwErrSaved);
+# endif
+    }
+}
+
+#endif /* DEBUG_STDOUT_CLOSE_ISSUE */
 
 

trunk/src/kmk/output.h ¶

@@ -104 +104 @@
 #endif
 
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+void my_check_stdout (const char *pszWhere);
+#endif
+
 #endif /* INLCUDED_MAKE_OUTPUT_H */
 

trunk/src/kmk/w32/winchildren.c ¶

@@ -1287 +1287 @@
     extern int          process_priority;
 #endif
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+    my_check_stdout("mkWinChildcareWorkerCreateProcess/entry");
+#endif
 
     /*
@@ -1450 +1453 @@
     CloseHandle(ProcInfo.hThread);
     kmk_cache_exec_image_w(pwszImageName);
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+    my_check_stdout("mkWinChildcareWorkerCreateProcess/tail");
+#endif
     return 0;
 }
@@ -3589 +3595 @@
 {
     PWINCHILD pChild;
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+    my_check_stdout ("MkWinChildWait/entry");
+#endif
 
     *pPid         = 0;
@@ -3601 +3610 @@
     {
         DWORD dwStatus = WaitForSingleObject(g_hEvtWaitChildren, INFINITE);
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+        my_check_stdout ("MkWinChildWait/wakeup");
+#endif
         if (dwStatus == WAIT_FAILED)
             return (int)GetLastError();
@@ -3641 +3653 @@
     dir_cache_invalid_after_job();
 #endif
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+    my_check_stdout ("MkWinChildWait/tail");
+#endif
     return 0;
 }
@@ -3678 +3693 @@
     WCHAR                  *pwszPathIgnored;
     int                     rc;
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+    my_check_stdout("MkWinChildReExecMake/entry");
+#endif
 
     /*
@@ -3744 +3762 @@
 
         CloseHandle(ProcInfo.hProcess);
+#ifdef DEBUG_STDOUT_CLOSE_ISSUE
+        my_check_stdout("MkWinChildReExecMake/exit");
+#endif
         for (;;)
             exit(dwExitCode);