Changeset 3165 in kBuild

Timestamp:

Mar 20, 2018 3:31:34 AM (7 years ago)

Author:

bird

Message:

kmk/win: g_RWLock no longer needed.

File:

• trunk/src/kmk/w32/winchildren.c (modified) (6 diffs)

trunk/src/kmk/w32/winchildren.c

@@ -294 +294 @@
 static unsigned volatile    g_idxLastChildcareWorker = 0;
 
+#ifdef WITH_RW_LOCK
 /** RW lock for serializing kmkbuiltin_redirect and CreateProcess. */
 static SRWLOCK              g_RWLock;
+#endif
 
 
@@ -392 +394 @@
     }
 
+#ifdef WITH_RW_LOCK
     /*
      * For serializing with standard file handle manipulation (kmkbuiltin_redirect).
      */
     InitializeSRWLock(&g_RWLock);
+#endif
 
     /*
@@ -636 +640 @@
     DB(DB_JOBS, ("CreateProcessW(%ls, %ls,,, TRUE, %#x...)\n", pwszImageName, pwszCommandLine, fFlags));
     memset(&ProcInfo, 0, sizeof(ProcInfo));
+#ifdef WITH_RW_LOCK
     AcquireSRWLockShared(&g_RWLock);
+#endif
 
     fRet = CreateProcessW((WCHAR *)pwszImageName, (WCHAR *)pwszCommandLine, NULL /*pProcSecAttr*/, NULL /*pThreadSecAttr*/,
@@ -642 +648 @@
     dwErr = GetLastError();
 
+#ifdef WITH_RW_LOCK
     ReleaseSRWLockShared(&g_RWLock);
+#endif
     if (fRet)
         pChild->u.Process.hProcess = ProcInfo.hProcess;
@@ -2469 +2477 @@
 }
 
-#if 0  /* no longer needed */
+#ifdef WITH_RW_LOCK
 /** Serialization with kmkbuiltin_redirect. */
 void MkWinChildExclusiveAcquire(void)
@@ -2481 +2489 @@
     ReleaseSRWLockExclusive(&g_RWLock);
 }
-#endif
+#endif /* WITH_RW_LOCK */
 
 /**