Changeset 93d2219 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Oct 28, 2022, 3:12:16 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

fa2e183

Parents:

e874605 (diff), 22a0e87 (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) (12 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -16 +16 @@
 #define __cforall_thread__
 #define _GNU_SOURCE
+
+// #define __CFA_DEBUG_PRINT_RUNTIME_CORE__
 
 // C Includes
@@ -222 +224 @@
                 ( this.runner ){};
                 init( this, "Main Processor", *mainCluster, 0p );
-                kernel_thread = pthread_self();
+                kernel_thread = __cfaabi_pthread_self();
 
                 runner{ &this };
@@ -283 +285 @@
 }
 
+extern "C"{
+        void pthread_delete_kernel_threads_();
+}
+
+
 static void __kernel_shutdown(void) {
         if(!cfa_main_returned) return;
+
+        //delete kernel threads for pthread_concurrency
+        pthread_delete_kernel_threads_();
+
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -327 +338 @@
 
                 /* paranoid */ verify( this.do_terminate == true );
-                __cfaabi_dbg_print_safe("Kernel : destroyed main processor context %p\n", &runner);
+                __cfadbg_print_safe(runtime_core, "Kernel : destroyed main processor context %p\n", &runner);
         }
 
@@ -388 +399 @@
         (proc->runner){ proc, &info };
 
-        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
+        __cfadbg_print_safe(runtime_core, "Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
 
         //Set global state
@@ -520 +531 @@
         random_state = __global_random_mask ? __global_random_prime : __global_random_prime ^ rdtscl();
         #if defined( __CFA_WITH_VERIFY__ )
+                executing = 0p;
                 canary = 0x0D15EA5E0D15EA5Ep;
         #endif
@@ -652 +664 @@
         io.params = io_params;
 
+        managed.procs = 0p;
+        managed.cnt = 0;
+
         doregister(this);
 
@@ -667 +682 @@
 
 void ^?{}(cluster & this) libcfa_public {
+        set_concurrency( this, 0 );
+
         destroy(this.io.arbiter);
 
@@ -777 +794 @@
         pthread_attr_t attr;
 
-        check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
+        check( __cfaabi_pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
         size_t stacksize = max( PTHREAD_STACK_MIN, DEFAULT_STACK_SIZE );
@@ -804 +821 @@
         #endif
 
-        check( pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
-        check( pthread_create( pthread, &attr, start, arg ), "pthread_create" );
+        check( __cfaabi_pthread_attr_setstack( &attr, stack, stacksize ), "pthread_attr_setstack" );
+        check( __cfaabi_pthread_create( pthread, &attr, start, arg ), "pthread_create" );
         return stack;
 }
 
 void __destroy_pthread( pthread_t pthread, void * stack, void ** retval ) {
-        int err = pthread_join( pthread, retval );
+        int err = __cfaabi_pthread_join( pthread, retval );
         if( err != 0 ) abort("KERNEL ERROR: joining pthread %p caused error %s\n", (void*)pthread, strerror(err));
 
@@ -816 +833 @@
                 pthread_attr_t attr;
 
-                check( pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
+                check( __cfaabi_pthread_attr_init( &attr ), "pthread_attr_init" ); // initialize attribute
 
                 size_t stacksize;
                 // default stack size, normally defined by shell limit
-                check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
+                check( __cfaabi_pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
                 assert( stacksize >= PTHREAD_STACK_MIN );
                 stacksize += __page_size;
@@ -838 +855 @@
 }
 
+unsigned set_concurrency( cluster & this, unsigned new ) libcfa_public {
+        unsigned old = this.managed.cnt;
+
+        __cfadbg_print_safe(runtime_core, "Kernel : resizing cluster from %u to %u\n", old, (unsigned)new);
+
+        // Delete all the old unneeded procs
+        if(old > new) for(i; (unsigned)new ~ old) {
+                __cfadbg_print_safe(runtime_core, "Kernel : destroying %u\n", i);
+                delete( this.managed.procs[i] );
+        }
+
+        // Allocate new array (uses realloc and memcpies the data)
+        this.managed.procs = alloc( new, this.managed.procs`realloc );
+        this.managed.cnt = new;
+
+        // Create the desired new procs
+        if(old < new) for(i; old ~ new) {
+                __cfadbg_print_safe(runtime_core, "Kernel : constructing %u\n", i);
+                (*(this.managed.procs[i] = alloc())){ this };
+        }
+
+        // return the old count
+        return old;
+}
+
 #if defined(__CFA_WITH_VERIFY__)
 static bool verify_fwd_bck_rng(void) {