Changes in src/libcfa/concurrency/kernel.c [e60e0dc:d6ff3ff]

File:

• src/libcfa/concurrency/kernel.c (modified) (12 diffs)

src/libcfa/concurrency/kernel.c

@@ -47 +47 @@
 KERNEL_STORAGE(cluster, systemCluster);
 KERNEL_STORAGE(system_proc_t, systemProcessor);
-KERNEL_STORAGE(event_kernel_t, event_kernel);
 KERNEL_STORAGE(thread_desc, mainThread);
 KERNEL_STORAGE(machine_context_t, mainThreadCtx);
@@ -53 +52 @@
 cluster * systemCluster;
 system_proc_t * systemProcessor;
-event_kernel_t * event_kernel;
 thread_desc * mainThread;
 
@@ -133 +131 @@
         this->cltr = cltr;
         (&this->terminated){ 0 };
-        this->do_terminate = false;
+        this->is_terminated = false;
         this->preemption_alarm = NULL;
+        this->preemption = default_preemption();
         this->pending_preemption = false;
 
@@ -143 +142 @@
         this->cltr = cltr;
         (&this->terminated){ 0 };
-        this->do_terminate = false;
+        this->is_terminated = false;
         this->preemption_alarm = NULL;
+        this->preemption = default_preemption();
         this->pending_preemption = false;
         this->kernel_thread = pthread_self();
@@ -156 +156 @@
 
 void ?{}(system_proc_t * this, cluster * cltr, processorCtx_t * runner) {
+        (&this->alarms){};
+        (&this->alarm_lock){};
+        this->pending_alarm = false;
+
         (&this->proc){ cltr, runner };
-}
-
-void ?{}(event_kernel_t * this) {
-        (&this->alarms){};
-        (&this->lock){};
 
         verify( validate( &this->alarms ) );
@@ -167 +166 @@
 
 void ^?{}(processor * this) {
-        if( ! this->do_terminate ) {
+        if( ! this->is_terminated ) {
                 LIB_DEBUG_PRINT_SAFE("Kernel : core %p signaling termination\n", this);
-                this->do_terminate = true;
+                this->is_terminated = true;
                 P( &this->terminated );
                 pthread_join( this->kernel_thread, NULL );
@@ -177 +176 @@
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
-        ( &this->ready_queue_lock ){};
-
-        this->preemption = default_preemption();
+        ( &this->lock ){};
 }
 
@@ -202 +199 @@
 
                 thread_desc * readyThread = NULL;
-                for( unsigned int spin_count = 0; ! this->do_terminate; spin_count++ )
+                for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ )
                 {
                         readyThread = nextThread( this->cltr );
@@ -346 +343 @@
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
 
-        lock( &systemProcessor->proc.cltr->ready_queue_lock DEBUG_CTX2 );
+        lock( &systemProcessor->proc.cltr->lock DEBUG_CTX2 );
         append( &systemProcessor->proc.cltr->ready_queue, thrd );
-        unlock( &systemProcessor->proc.cltr->ready_queue_lock );
+        unlock( &systemProcessor->proc.cltr->lock );
 
         verify( disable_preempt_count > 0 );
@@ -355 +352 @@
 thread_desc * nextThread(cluster * this) {
         verify( disable_preempt_count > 0 );
-        lock( &this->ready_queue_lock DEBUG_CTX2 );
+        lock( &this->lock DEBUG_CTX2 );
         thread_desc * head = pop_head( &this->ready_queue );
-        unlock( &this->ready_queue_lock );
+        unlock( &this->lock );
         verify( disable_preempt_count > 0 );
         return head;
@@ -473 +470 @@
         systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtxStorage };
 
-        // Initialize the event kernel
-        event_kernel = (event_kernel_t *)&event_kernelStorage;
-        event_kernel{};
-
         // Add the main thread to the ready queue
         // once resume is called on systemProcessor->runner the mainThread needs to be scheduled like any normal thread
@@ -511 +504 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        systemProcessor->proc.do_terminate = true;
+        systemProcessor->proc.is_terminated = true;
         suspend();