Changeset 63be3387 for libcfa/src/concurrency/kernel.hfa

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel.hfa (modified) (6 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -64 +64 @@
         // 1 - means the proc should wake-up immediately
         // FD - means the proc is going asleep and should be woken by writing to the FD.
+        //      The FD value should always be the evfd field just below.
         volatile int sem;
 
@@ -69 +70 @@
         int evfd;
 
-        // buffer into which the proc will read from evfd
-        // unused if not using io_uring for idle sleep
-        void * rdbuf;
-
-        // future use to track the read of the eventfd
-        // unused if not using io_uring for idle sleep
-        io_future_t * ftr;
-
+        // Used for debugging, should be removed eventually.
         volatile unsigned long long wake__time;
         volatile unsigned long long sleep_time;
@@ -160 +154 @@
 // P9_EMBEDDED( processor, dlink(processor) )
 static inline tytagref( dlink(processor), dlink(processor) ) ?`inner( processor & this ) {
-    dlink(processor) & b = this.link;
-    tytagref( dlink(processor), dlink(processor) ) result = { b };
-    return result;
+        dlink(processor) & b = this.link;
+        tytagref( dlink(processor), dlink(processor) ) result = { b };
+        return result;
 }
 
@@ -256 +250 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        __dllist_t(struct thread$) threads;
+        dlist(struct thread$, struct __thread_user_link) threads;
         unsigned int nthreads;
 
@@ -269 +263 @@
                 io_context_params params;
         } io;
+
+        struct {
+                struct processor ** procs;
+                unsigned cnt;
+        } managed;
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -298 +297 @@
 static inline struct cluster   * active_cluster  () { return publicTLS_get( this_processor )->cltr; }
 
+// set the number of internal processors
+// these processors are in addition to any explicitly declared processors
+unsigned set_concurrency( cluster & this, unsigned new_count );
+
 #if !defined(__CFA_NO_STATISTICS__)
         void print_stats_now( cluster & this, int flags );