Changeset 3297 in kBuild

Timestamp:

Oct 3, 2019 6:38:20 AM (5 years ago)

Author:

bird

Message:

kmk/win: Two CONFIG_NEW_WIN_CHILDREN fixes (inverted #ifdef's), can now use all threads on systems with more than 64 (for whatever good it does).

Location:

trunk/src/kmk

Files:

• main.c (modified) (1 diff)
• w32/w32os.c (modified) (3 diffs)

trunk/src/kmk/main.c

@@ -1520 +1520 @@
     if (!cpus)
       cpus = 1;
-#  ifdef CONFIG_NEW_WIN_CHILDREN
+#  ifndef CONFIG_NEW_WIN_CHILDREN
     if (cpus > 64)
       cpus = 64; /* (wait for multiple objects limit) */

trunk/src/kmk/w32/w32os.c

@@ -41 +41 @@
 jobserver_setup (int slots)
 {
+#ifndef CONFIG_NEW_WIN_CHILDREN
   /* sub_proc.c cannot wait for more than MAXIMUM_WAIT_OBJECTS objects
    * and one of them is the job-server semaphore object.  Limit the
@@ -50 +51 @@
       DB (DB_JOBS, (_("Jobserver slots limited to %d\n"), slots));
     }
+#endif
 
   sprintf (jobserver_semaphore_name, "gmake_semaphore_%d", _getpid ());
@@ -194 +196 @@
 #else
     /* Add the completed children event as the 2nd one. */
-    handles[1] = (HANDLE)MkWinChildGetCompleteEventHandle();
+    handles[1] = (HANDLE)MkWinChildGetCompleteEventHandle ();
     if (handles[1] == NULL)
       return 0;