Changes in src/libcfa/concurrency/kernel.c [c2b9f21:0cf5b79]

File:

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

src/libcfa/concurrency/kernel.c

@@ -14 +14 @@
 //
 
+#include "libhdr.h"
+
 //C Includes
 #include <stddef.h>
@@ -148 +150 @@
 
         this.runner = &runner;
-        __cfaabi_dbg_print_safe("Kernel : constructing main processor context %p\n", &runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : constructing main processor context %p\n", &runner);
         runner{ &this };
 }
@@ -154 +156 @@
 void ^?{}(processor & this) {
         if( ! this.do_terminate ) {
-                __cfaabi_dbg_print_safe("Kernel : core %p signaling termination\n", &this);
+                LIB_DEBUG_PRINT_SAFE("Kernel : core %p signaling termination\n", &this);
                 this.do_terminate = true;
                 P( this.terminated );
@@ -179 +181 @@
         processor * this = runner.proc;
 
-        __cfaabi_dbg_print_safe("Kernel : core %p starting\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p starting\n", this);
 
         {
@@ -185 +187 @@
                 preemption_scope scope = { this };
 
-                __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);
+                LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
 
                 thread_desc * readyThread = NULL;
@@ -211 +213 @@
                 }
 
-                __cfaabi_dbg_print_safe("Kernel : core %p stopping\n", this);
+                LIB_DEBUG_PRINT_SAFE("Kernel : core %p stopping\n", this);
         }
 
         V( this->terminated );
 
-        __cfaabi_dbg_print_safe("Kernel : core %p terminated\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p terminated\n", this);
 }
 
@@ -290 +292 @@
         processorCtx_t proc_cor_storage = { proc, &info };
 
-        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", proc_cor_storage.__cor.stack.base);
+        LIB_DEBUG_PRINT_SAFE("Coroutine : created stack %p\n", proc_cor_storage.__cor.stack.base);
 
         //Set global state
@@ -297 +299 @@
 
         //We now have a proper context from which to schedule threads
-        __cfaabi_dbg_print_safe("Kernel : core %p created (%p, %p)\n", proc, proc->runner, &ctx);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p created (%p, %p)\n", proc, proc->runner, &ctx);
 
         // SKULLDUGGERY: Since the coroutine doesn't have its own stack, we can't
@@ -308 +310 @@
 
         // Main routine of the core returned, the core is now fully terminated
-        __cfaabi_dbg_print_safe("Kernel : core %p main ended (%p)\n", proc, proc->runner);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p main ended (%p)\n", proc, proc->runner);
 
         return NULL;
@@ -314 +316 @@
 
 void start(processor * this) {
-        __cfaabi_dbg_print_safe("Kernel : Starting core %p\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : Starting core %p\n", this);
 
         pthread_create( &this->kernel_thread, NULL, CtxInvokeProcessor, (void*)this );
 
-        __cfaabi_dbg_print_safe("Kernel : core %p started\n", this);
+        LIB_DEBUG_PRINT_SAFE("Kernel : core %p started\n", this);
 }
 
@@ -332 +334 @@
         verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
 
-        lock(   this_processor->cltr->ready_queue_lock __cfaabi_dbg_ctx2 );
+        lock(   this_processor->cltr->ready_queue_lock DEBUG_CTX2 );
         append( this_processor->cltr->ready_queue, thrd );
         unlock( this_processor->cltr->ready_queue_lock );
@@ -341 +343 @@
 thread_desc * nextThread(cluster * this) {
         verify( disable_preempt_count > 0 );
-        lock( this->ready_queue_lock __cfaabi_dbg_ctx2 );
+        lock( this->ready_queue_lock DEBUG_CTX2 );
         thread_desc * head = pop_head( this->ready_queue );
         unlock( this->ready_queue_lock );
@@ -353 +355 @@
         suspend();
         verify( disable_preempt_count > 0 );
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -365 +367 @@
         verify( disable_preempt_count > 0 );
 
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -379 +381 @@
         verify( disable_preempt_count > 0 );
 
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -393 +395 @@
         verify( disable_preempt_count > 0 );
 
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -406 +408 @@
         verify( disable_preempt_count > 0 );
 
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -421 +423 @@
         verify( disable_preempt_count > 0 );
 
-        enable_interrupts( __cfaabi_dbg_ctx );
+        enable_interrupts( DEBUG_CTX );
 }
 
@@ -439 +441 @@
 // Kernel boot procedures
 void kernel_startup(void) {
-        __cfaabi_dbg_print_safe("Kernel : Starting\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Starting\n");
 
         // Start by initializing the main thread
@@ -448 +450 @@
         (*mainThread){ &info };
 
-        __cfaabi_dbg_print_safe("Kernel : Main thread ready\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Main thread ready\n");
 
         // Initialize the main cluster
@@ -454 +456 @@
         (*mainCluster){};
 
-        __cfaabi_dbg_print_safe("Kernel : main cluster ready\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : main cluster ready\n");
 
         // Initialize the main processor and the main processor ctx
@@ -481 +483 @@
 
         // THE SYSTEM IS NOW COMPLETELY RUNNING
-        __cfaabi_dbg_print_safe("Kernel : Started\n--------------------------------------------------\n\n");
-
-        enable_interrupts( __cfaabi_dbg_ctx );
+        LIB_DEBUG_PRINT_SAFE("Kernel : Started\n--------------------------------------------------\n\n");
+
+        enable_interrupts( DEBUG_CTX );
 }
 
 void kernel_shutdown(void) {
-        __cfaabi_dbg_print_safe("\n--------------------------------------------------\nKernel : Shutting down\n");
+        LIB_DEBUG_PRINT_SAFE("\n--------------------------------------------------\nKernel : Shutting down\n");
 
         disable_interrupts();
@@ -511 +513 @@
         ^(mainThread){};
 
-        __cfaabi_dbg_print_safe("Kernel : Shutdown complete\n");
+        LIB_DEBUG_PRINT_SAFE("Kernel : Shutdown complete\n");
 }
 
@@ -521 +523 @@
         // abort cannot be recursively entered by the same or different processors because all signal handlers return when
         // the globalAbort flag is true.
-        lock( kernel_abort_lock __cfaabi_dbg_ctx2 );
+        lock( kernel_abort_lock DEBUG_CTX2 );
 
         // first task to abort ?
@@ -546 +548 @@
 
         int len = snprintf( abort_text, abort_text_size, "Error occurred while executing task %.256s (%p)", thrd->self_cor.name, thrd );
-        __cfaabi_dbg_bits_write( abort_text, len );
+        __lib_debug_write( abort_text, len );
 
         if ( thrd != this_coroutine ) {
                 len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", this_coroutine->name, this_coroutine );
-                __cfaabi_dbg_bits_write( abort_text, len );
+                __lib_debug_write( abort_text, len );
         }
         else {
-                __cfaabi_dbg_bits_write( ".\n", 2 );
+                __lib_debug_write( ".\n", 2 );
         }
 }
 
 extern "C" {
-        void __cfaabi_dbg_bits_acquire() {
-                lock( kernel_debug_lock __cfaabi_dbg_ctx2 );
-        }
-
-        void __cfaabi_dbg_bits_release() {
+        void __lib_debug_acquire() {
+                lock( kernel_debug_lock DEBUG_CTX2 );
+        }
+
+        void __lib_debug_release() {
                 unlock( kernel_debug_lock );
         }
@@ -580 +582 @@
 
 void P(semaphore & this) {
-        lock( this.lock __cfaabi_dbg_ctx2 );
+        lock( this.lock DEBUG_CTX2 );
         this.count -= 1;
         if ( this.count < 0 ) {
@@ -596 +598 @@
 void V(semaphore & this) {
         thread_desc * thrd = NULL;
-        lock( this.lock __cfaabi_dbg_ctx2 );
+        lock( this.lock DEBUG_CTX2 );
         this.count += 1;
         if ( this.count <= 0 ) {