Changeset 41ca6fa for libcfa/src/concurrency/kernel

Timestamp:

Mar 12, 2021, 11:14:36 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5f39135, b0d5c0c

Parents:

2d019af (diff), df65c0c (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/startup.cfa (modified) (5 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -73 +73 @@
 static void __kernel_first_resume( processor * this );
 static void __kernel_last_resume ( processor * this );
-static void init(processor & this, const char name[], cluster & _cltr);
+static void init(processor & this, const char name[], cluster & _cltr, void (*fnc) (void *), void * arg);
 static void deinit(processor & this);
 static void doregister( struct cluster & cltr );
@@ -198 +198 @@
                 ( this.terminated ){};
                 ( this.runner ){};
-                init( this, "Main Processor", *mainCluster );
+                init( this, "Main Processor", *mainCluster, 0p, 0p );
                 kernel_thread = pthread_self();
 
@@ -452 +452 @@
 }
 
-static void init(processor & this, const char name[], cluster & _cltr) with( this ) {
+static void init(processor & this, const char name[], cluster & _cltr, void (*fnc) (void *), void * arg) with( this ) {
         this.name = name;
         this.cltr = &_cltr;
@@ -464 +464 @@
         this.io.dirty   = false;
 
+        this.init.fnc = fnc;
+        this.init.arg = arg;
+
         this.idle = eventfd(0, 0);
         if (idle < 0) {
@@ -513 +516 @@
 }
 
-void ?{}(processor & this, const char name[], cluster & _cltr) {
+void ?{}(processor & this, const char name[], cluster & _cltr, void (*fnc) (void *), void * arg) {
         ( this.terminated ){};
         ( this.runner ){};
 
         disable_interrupts();
-                init( this, name, _cltr );
+                init( this, name, _cltr, fnc, arg );
         enable_interrupts( __cfaabi_dbg_ctx );