Changeset 1801 in kBuild for trunk/src/kmk

Timestamp:

Sep 21, 2008 2:29:24 PM (16 years ago)

Author:

bird

Message:

incdep: make thread count relative to the job slots.

File:

• trunk/src/kmk/incdep.c (modified) (3 diffs)

trunk/src/kmk/incdep.c

@@ -130 +130 @@
 /* The handles to the worker threads. */
 #ifdef HAVE_PTHREAD
-static pthread_t incdep_threads[1];
+static pthread_t incdep_threads[4];
 #elif defined (WINDOWS32)
-static HANDLE incdep_threads[1];
+static HANDLE incdep_threads[4];
 #elif defined (__OS2__)
-static TID incdep_threads[1];
-#endif
+static TID incdep_threads[4];
+#endif
+static unsigned incdep_num_threads = 1;
 
 /* flag indicating whether the worker threads should terminate or not. */
@@ -431 +432 @@
 
   incdep_terminate = 0;
-  for (i = 0; i < sizeof (incdep_threads) / sizeof (incdep_threads[0]); i++)
+  incdep_num_threads = sizeof (incdep_threads) / sizeof (incdep_threads[0]);
+  if (incdep_num_threads + 1 > job_slots)
+    incdep_num_threads = job_slots <= 1 ? 1 : job_slots - 1;
+  for (i = 0; i < incdep_num_threads; i++)
     {
 #ifdef HAVE_PTHREAD
@@ -489 +493 @@
   /* wait for the threads to quit */
 
-  for (i = 0; i < sizeof (incdep_threads) / sizeof (incdep_threads[0]); i++)
+  for (i = 0; i < incdep_num_threads; i++)
     {
       /* later? */
     }
+  incdep_num_threads = 0;
 
   /* destroy the lock and condition variables / event objects. */