Changeset 778

Timestamp:

Jan 21, 2007, 1:29:17 AM (18 years ago)

Author:

bird

Message:

Attempt at dealing with deadlocked kmk on Ctrl-C by dispatching the SIGINT/SIGBREAK on the main thread instead of the ctrl-event thread (Windows).

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• commands.c (modified) (3 diffs)
• main.c (modified) (2 diffs)

trunk/src/gmake/Makefile.kmk ¶

@@ -46 +46 @@
         BUILD_PLATFORM_ARCH=\"$(BUILD_TARGET_ARCH)\" \
         BUILD_PLATFORM_CPU=\"$(BUILD_TARGET_CPU)\"
+kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT
 
 kmk_SOURCES = \

trunk/src/gmake/commands.c ¶

@@ -442 +442 @@
   exit (10);
 #else /* not Amiga */
-#ifdef WINDOWS32
+#if defined(WINDOWS32) && !defined(CONFIG_NEW_WIN32_CTRL_EVENT)
   extern HANDLE main_thread;
 
@@ -516 +516 @@
 
   remove_intermediates (1);
-
 #ifdef SIGQUIT
   if (sig == SIGQUIT)
@@ -525 +524 @@
 
 #ifdef WINDOWS32
+#ifndef CONFIG_NEW_WIN32_CTRL_EVENT
   if (main_thread)
     CloseHandle (main_thread);
+#endif /* !CONFIG_NEW_WIN32_CTRL_EVENT */
   /* Cannot call W32_kill with a pid (it needs a handle).  The exit
      status of 130 emulates what happens in Bash.  */

trunk/src/gmake/main.c ¶

@@ -927 +927 @@
   return (sh_found);
 }
+
+/* bird: */
+#ifdef CONFIG_NEW_WIN32_CTRL_EVENT
+#include <process.h>
+static UINT g_tidMainThread = 0;
+static int g_sigPending = 0; /* lazy bird */
+
+static __declspec(naked) void dispatch_stub(void)
+{
+    __asm  {
+        pushfd
+        pushad
+        cld
+    }
+    fflush(stdout);
+    /*fprintf(stderr, "dbg: raising %s on the main thread (%d)\n", g_sigPending == SIGINT ? "SIGINT" : "SIGBREAK", _getpid());*/
+    raise(g_sigPending);
+    __asm  {
+        popad
+        popfd
+        ret
+    }
+}
+
+static BOOL WINAPI ctrl_event(DWORD CtrlType)
+{
+    int sig = (CtrlType == CTRL_C_EVENT) ? SIGINT : SIGBREAK;
+    HANDLE hThread;
+    CONTEXT Ctx;
+
+    /* open the main thread and suspend it. */
+    hThread = OpenThread(THREAD_ALL_ACCESS, FALSE, g_tidMainThread);
+    SuspendThread(hThread);
+
+    /* Get the thread context and */
+    memset(&Ctx, 0, sizeof(Ctx));
+    Ctx.ContextFlags = CONTEXT_FULL;
+    GetThreadContext(hThread, &Ctx);
+
+    /* If we've got a valid Esp, dispatch it on the main thread
+       otherwise raise the signal in the ctrl-event thread (this). */
+    if (Ctx.Esp >= 0x1000)
+    {
+        ((uintptr_t *)Ctx.Esp)[-1] = Ctx.Eip;
+        Ctx.Esp -= sizeof(uintptr_t);
+        Ctx.Eip = (uintptr_t)&dispatch_stub;
+
+        SetThreadContext(hThread, &Ctx);
+        g_sigPending = sig;
+        ResumeThread(hThread);
+        CloseHandle(hThread);
+    }
+    else
+    {
+        fprintf(stderr, "dbg: raising %s on the ctrl-event thread (%d)\n", sig == SIGINT ? "SIGINT" : "SIGBREAK", _getpid());
+        raise(sig);
+        ResumeThread(hThread);
+        CloseHandle(hThread);
+        exit(130);
+    }
+
+    Sleep(1);
+    return TRUE;
+}
+#endif /* CONFIG_NEW_WIN32_CTRL_EVENT */
+
 #endif  /* WINDOWS32 */
 
@@ -1095 +1161 @@
   FATAL_SIG (SIGXFSZ);
 #endif
+
+#ifdef CONFIG_NEW_WIN32_CTRL_EVENT
+  /* bird: dispatch signals in our own way to try avoid deadlocks. */
+  g_tidMainThread = GetCurrentThreadId ();
+  SetConsoleCtrlHandler (ctrl_event, TRUE);
+#endif /* CONFIG_NEW_WIN32_CTRL_EVENT */
 
 #undef  FATAL_SIG