Changeset 3194 for trunk/src/kmk/w32/compat/posixfcn.c

Timestamp:

Mar 27, 2018, 4:05:17 PM (7 years ago)

Author:

bird

Message:

kmk/win: Windows kmk now defaults to --output-sync=target. Fixed output sync on windows in nested make processes that got busted by winchildren and it's no inheritance policy.

File:

• trunk/src/kmk/w32/compat/posixfcn.c (modified) (4 diffs)

trunk/src/kmk/w32/compat/posixfcn.c

@@ -154 +154 @@
 record_sync_mutex (const char *str)
 {
+#ifdef CONFIG_NEW_WIN_CHILDREN
+  HANDLE hmtx = OpenMutexA(SYNCHRONIZE, FALSE /*fInheritable*/, str);
+  if (hmtx)
+    mutex_handle = (intptr_t)hmtx;
+  else
+    {
+      mutex_handle = -1;
+      errno = ENOENT;
+    }
+#else
   char *endp;
   intptr_t hmutex = strtol (str, &endp, 16);
@@ -164 +174 @@
       errno = EINVAL;
     }
+#endif
 }
 
 /* Create a new mutex or reuse one created by our parent.  */
 intptr_t
+#ifdef CONFIG_NEW_WIN_CHILDREN
+create_mutex (char *mtxname, size_t size)
+#else
 create_mutex (void)
-{
+#endif
+{
+#ifndef CONFIG_NEW_WIN_CHILDREN
   SECURITY_ATTRIBUTES secattr;
+#endif
   intptr_t hmutex = -1;
 
@@ -176 +193 @@
      that.  */
   if (mutex_handle > 0)
-    return mutex_handle;
-
+    {
+#ifdef CONFIG_NEW_WIN_CHILDREN
+      mtxname[0] = '\0';
+#endif
+      return mutex_handle;
+    }
+
+#ifdef CONFIG_NEW_WIN_CHILDREN
+  /* We're the top-level Make. Child Make processes will open our mutex, since
+     children does not inherit any handles other than the three standard ones. */
+  snprintf(mtxname, size, "Make-output-%u-%u-%u", GetCurrentProcessId(),
+           GetCurrentThreadId(), GetTickCount());
+  hmutex = (intptr_t)CreateMutexA (NULL, FALSE /*Locked*/, mtxname);
+#else
   /* We are the top-level Make, and we want the handle to be inherited
      by our child processes.  */
@@ -185 +214 @@
 
   hmutex = (intptr_t)CreateMutex (&secattr, FALSE, NULL);
+#endif
   if (!hmutex)
     {