Changeset 3619 in kBuild for trunk

Timestamp:

Oct 21, 2024 8:46:49 PM (6 months ago)

Author:

bird

Message:

kmk/incdep.c: better accounting for debugging race/whatever

File:

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

trunk/src/kmk/incdep.c

@@ -97 +97 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
+struct incdep_worker_data
+{
+    int worker_tid;                         /* -1 for main, index for the others. */
+    unsigned int done_count;                /* workers increment this */
+    unsigned int flushed_count;             /* main thread: flushed done count. */
+    unsigned int todo_count;                /* main thread: queued on todo */
+};
+
 struct incdep_variable_in_set
 {
@@ -195 +203 @@
 
 /* the list of files that needs reading. */
-static struct incdep * volatile incdep_head_todo;
-static struct incdep * volatile incdep_tail_todo;
+static struct incdep * volatile incdep_head_todo  = NULL;
+static struct incdep * volatile incdep_tail_todo  = NULL;
+static unsigned int volatile    incdep_count_todo = 0;
 
 /* the number of files that are currently being read. */
-static int volatile incdep_num_reading;
+static int volatile incdep_num_reading = 0;
 
 /* the list of files that have been read. */
-static struct incdep * volatile incdep_head_done;
-static struct incdep * volatile incdep_tail_done;
+static struct incdep * volatile incdep_head_done  = NULL;
+static struct incdep * volatile incdep_tail_done  = NULL;
+static unsigned int volatile    incdep_count_done = 0;
 
 
@@ -233 +243 @@
 static malloc_zone_t *incdep_zone;
 #endif
+
+/* Worker specific data, the extra entry is for the main thread.
+   TODO: Move all parallel arrays in here to avoid unnecessary cacheline
+         sharing between worker threads. */
+static struct incdep_worker_data incdep_worker_data[INCDEP_MAX_THREADS + 1];
 
 
@@ -396 +411 @@
 #elif defined (__OS2__)
   _fmutex_request (&incdep_mtx, 0);
+#elif !defined(CONFIG_WITHOUT_THREADS)
+# error Misconfig?
 #endif
 }
@@ -585 +602 @@
 incdep_worker (int thrd)
 {
+  struct incdep_worker_data *thrd_data = &incdep_worker_data[thrd];
+  thrd_data->worker_tid = thrd;
+
   incdep_lock ();
 
@@ -591 +611 @@
       /* get job from the todo list. */
 
+      struct incdep *tmp;
       struct incdep *cur = incdep_head_todo;
       if (!cur)
@@ -598 +619 @@
         }
       if (cur->next)
-        incdep_head_todo = cur->next;
+        {
+          assert (incdep_count_todo > 1);
+          assert (cur != incdep_tail_todo);
+          incdep_head_todo = cur->next;
+        }
       else
-        incdep_head_todo = incdep_tail_todo = NULL;
+        {
+          assert (incdep_count_todo == 1);
+          assert (cur == incdep_tail_todo);
+          incdep_head_todo = incdep_tail_todo = NULL;
+        }
+      incdep_count_todo--;
       incdep_num_reading++;
 
@@ -620 +650 @@
       incdep_num_reading--;
       cur->next = NULL;
-      if (incdep_tail_done)
-        incdep_tail_done->next = cur;
+      tmp = incdep_tail_done;
+      if (tmp)
+        {
+          tmp->next = cur;
+          assert (incdep_count_done > 0);
+        }
       else
-        incdep_head_done = cur;
+        {
+          assert (!incdep_head_done);
+          assert (incdep_count_done == 0);
+          incdep_head_done = cur;
+        }
       incdep_tail_done = cur;
+      incdep_count_done++;
+
+      thrd_data->done_count++;
 
       incdep_signal_done ();
@@ -866 +907 @@
 {
   unsigned i;
+  unsigned total_done = 0;
 
   if (!incdep_initialized)
@@ -892 +934 @@
       strcache2_term (&incdep_dep_strcaches[i]);
       strcache2_term (&incdep_var_strcaches[i]);
+
+      /* accounting */
+      total_done += incdep_worker_data[i].done_count;
     }
   incdep_num_threads = 0;
+
+  /* sanity check */
+  if (total_done != incdep_worker_data[INCDEP_MAX_THREADS].flushed_count)
+    fprintf (stderr, "kmk/incdep: warning: total_done=%#x does not equal flushed_count=%#x!\n",
+             total_done, incdep_worker_data[INCDEP_MAX_THREADS].flushed_count);
+  if (total_done != incdep_worker_data[INCDEP_MAX_THREADS].todo_count)
+    fprintf (stderr, "kmk/incdep: warning: total_done=%#x does not equal todo_count=%#x!\n",
+             total_done, incdep_worker_data[INCDEP_MAX_THREADS].todo_count);
 
   /* destroy the lock and condition variables / event objects. */
@@ -2090 +2143 @@
 incdep_flush_it (floc *f)
 {
+  struct incdep_worker_data *thrd_data = &incdep_worker_data[INCDEP_MAX_THREADS];
+
   incdep_lock ();
   for (;;)
     {
-      struct incdep *cur = incdep_head_done;
+      struct incdep *cur   = incdep_head_done;
+      unsigned int   count = incdep_count_done;
 
       /* if the done list is empty, grab a todo list entry. */
-      if (!cur && incdep_head_todo)
+      if (!cur)
         {
           cur = incdep_head_todo;
-          if (cur->next)
-            incdep_head_todo = cur->next;
-          else
-            incdep_head_todo = incdep_tail_todo = NULL;
-          incdep_unlock ();
-
-          incdep_read_file (cur, f);
-          eval_include_dep_file (cur, f);
-          incdep_freeit (cur);
-
-          incdep_lock ();
-          continue;
+          if (cur)
+            {
+              if (cur->next)
+                {
+                  assert (incdep_count_todo > 1);
+                  assert (cur != incdep_tail_todo);
+                  incdep_head_todo = cur->next;
+                }
+              else
+                {
+                  assert (incdep_count_todo == 1);
+                  assert (cur == incdep_tail_todo);
+                  incdep_head_todo = incdep_tail_todo = NULL;
+                }
+              incdep_count_todo--;
+              thrd_data->todo_count--;
+              incdep_unlock ();
+
+              incdep_read_file (cur, f);
+              eval_include_dep_file (cur, f);
+              incdep_freeit (cur);
+
+              incdep_lock ();
+              continue;
+            }
         }
 
@@ -2126 +2195 @@
       /* we grab the entire done list and work thru it. */
       incdep_head_done = incdep_tail_done = NULL;
+      incdep_count_done = 0;
+
       incdep_unlock ();
 
@@ -2131 +2202 @@
         {
           struct incdep *next = cur->next;
+          assert (count > 0);
 #ifdef PARSE_IN_WORKER
           incdep_flush_recorded_instructions (cur);
@@ -2137 +2209 @@
 #endif
           incdep_freeit (cur);
+          thrd_data->flushed_count++;
+          count--;
           cur = next;
         }
+      assert (count == 0);
 
       incdep_lock ();
@@ -2151 +2226 @@
 eval_include_dep (const char *names, floc *f, enum incdep_op op)
 {
+  struct incdep_worker_data *thrd_data = &incdep_worker_data[INCDEP_MAX_THREADS];
   struct incdep *head = 0;
   struct incdep *tail = 0;
   struct incdep *cur;
+  unsigned int count = 0;
   const char *names_iterator = names;
   const char *name;
@@ -2200 +2277 @@
          head = cur;
        tail = cur;
+       count++;
     }
 
@@ -2222 +2300 @@
   else
     {
+      struct incdep *tmp;
+
       /* initialize the worker threads and related stuff the first time around. */
 
@@ -2231 +2311 @@
       incdep_lock ();
 
-      if (incdep_tail_todo)
-        incdep_tail_todo->next = head;
+      tmp = incdep_tail_todo;
+      if (tmp)
+        {
+          assert (incdep_count_todo > 0);
+          assert (incdep_head_todo != NULL);
+          tmp->next = head;
+        }
       else
-        incdep_head_todo = head;
+        {
+          assert (incdep_count_todo == 0);
+          assert (incdep_head_todo == NULL);
+          incdep_head_todo = head;
+        }
       incdep_tail_todo = tail;
+      incdep_count_todo += count;
+      thrd_data->todo_count += count;
 
       incdep_signal_todo ();