Changeset 41846

Timestamp:

Oct 17, 2021, 1:30:25 PM (5 years ago)

Author:

eugene

Message:

add thread state and entry to enble debugging

File:

• branches/eam_branches/ppStack.20211015/src/ppStackThread.c (modified) (8 diffs)

branches/eam_branches/ppStack.20211015/src/ppStackThread.c

@@ -19 +19 @@
     thread->firstScan = 0;
     thread->lastScan = 0;
+    thread->entry = -1; // this gets assigned after allocation
+    thread->status = PPSTACK_THREAD_NEW;
     return thread;
 }
@@ -124 +126 @@
             readouts->data[j] = ro;
         }
-        threads->data[i] = ppStackThreadAlloc(readouts);
+        ppStackThread *thread = ppStackThreadAlloc(readouts);
+        thread->entry = i;
+        threads->data[i] = thread;
         psFree(readouts);               // Drop reference
     }
@@ -157 +161 @@
     while (true) {
         // check for any groups which can read data
+        // NOTE: threads->n is set (in ppStackThreadDataSetup) to be 1 more than the argument to -threads
         for (int j = 0; j < threads->n; j++) {
             ppStackThread *thread = threads->data[j];
+            // fprintf (stderr, "grab thread %d, scan: %d - %d : busy: %d read: %d status: %d\n", thread->entry, thread->firstScan, thread->lastScan, thread->busy, thread->read, thread->status);
             if (thread->read) {
                 continue;
@@ -166 +172 @@
             thread->lastScan = stack->lastScan + rows;
             stack->lastScan = thread->lastScan;
+            thread->status = PPSTACK_THREAD_READ;
 
             psArray *readouts = thread->readouts;
@@ -172 +179 @@
 
             psTrace("ppStack", 2, "Reading data for chunk %d into group %d....\n", numChunk, j);
+            // fprintf (stderr, "Reading data for chunk %d into group %d (thread %d, scan: %d - %d)....\n", numChunk, j, thread->entry, thread->firstScan, thread->lastScan);
             for (int i = 0; i < readouts->n; i++) {
                 pmReadout *ro = readouts->data[i]; // Input readout
@@ -177 +185 @@
                     continue;
                 }
+
+                // fprintf (stderr, "read data for readout %d\n", i);
 
                 // override the recorded last scan
@@ -232 +242 @@
 
             thread->read = thread->busy = true;
+            thread->status = PPSTACK_THREAD_RUN;
             return thread;
         }
@@ -239 +250 @@
         for (int j = 0; j < threads->n; j++) {
             ppStackThread *thread = threads->data[j];
+            // fprintf (stderr, "test thread %d, scan: %d - %d : busy: %d, read: %d, status: %d\n", thread->entry, thread->firstScan, thread->lastScan, thread->busy, thread->read, thread->status);
+
             if (thread->busy) {
                 continue;
             }
+            thread->status = PPSTACK_THREAD_NEW;
             thread->read = false;
             wait = false;