Changes in src/libcfa/concurrency/monitor.c [be3d020:44264c5]

File:

• src/libcfa/concurrency/monitor.c (modified) (8 diffs)

src/libcfa/concurrency/monitor.c

@@ -137 +137 @@
 }
 
-void ?{}(__condition_node_t * this, thread_desc * waiting_thread, unsigned short count, uintptr_t user_info ) {
-        this->waiting_thread = waiting_thread;
-        this->count = count;
-        this->next = NULL;
-        this->user_info = user_info;
-}
-
-void ?{}(__condition_criterion_t * this ) {
-        this->ready  = false;
-        this->target = NULL;
-        this->owner  = NULL;
-        this->next   = NULL;
-}
-
-void ?{}(__condition_criterion_t * this, monitor_desc * target, __condition_node_t * owner ) {
-        this->ready  = false;
-        this->target = target;
-        this->owner  = owner;
-        this->next   = NULL;
+void debug_break() __attribute__(( noinline ))
+{
+        
 }
 
 //-----------------------------------------------------------------------------
 // Internal scheduling
-void wait( condition * this, uintptr_t user_info = 0 ) {
+void wait( condition * this ) {
         LIB_DEBUG_PRINT_SAFE("Waiting\n");
 
@@ -176 +160 @@
         LIB_DEBUG_PRINT_SAFE("count %i\n", count);
 
-        __condition_node_t waiter = { this_thread(), count, user_info };
+        __condition_node_t waiter;
+        waiter.waiting_thread = this_thread();
+        waiter.count = count;
+        waiter.next = NULL;
 
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                (&criteria[i]){ this->monitors[i], &waiter };
+                criteria[i].ready  = false;
+                criteria[i].target = this->monitors[i];
+                criteria[i].owner  = &waiter;
+                criteria[i].next   = NULL;
                 LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
         }
@@ -212 +202 @@
         ScheduleInternal( locks, count, threads, thread_count );
 
+        debug_break();
         //WE WOKE UP
 
@@ -221 +212 @@
 }
 
-bool signal( condition * this ) {
-        if( is_empty( this ) ) {
+void signal( condition * this ) {
+        if( !this->blocked.head ) {
                 LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
-                return false;
+                return;
         }
 
@@ -266 +257 @@
         //Release
         unlock_all( this->monitors, count );
-
-        return true;
-}
-
-bool signal_block( condition * this ) {
+}
+
+void signal_block( condition * this ) {
         if( !this->blocked.head ) {
                 LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
-                return false;
+                return;
         }
 
@@ -287 +276 @@
 
         //create creteria
-        __condition_node_t waiter = { this_thread(), count, 0 };
+        __condition_node_t waiter;
+        waiter.waiting_thread = this_thread();
+        waiter.count = count;
+        waiter.next = NULL;
 
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                (&criteria[i]){ this->monitors[i], &waiter };
                 LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
+                criteria[i].ready  = false;
+                criteria[i].owner  = &waiter;
+                criteria[i].next   = NULL;
+                criteria[i].target = this->monitors[i];
                 push( &criteria[i].target->signal_stack, &criteria[i] );
         }
@@ -308 +303 @@
 
         LIB_DEBUG_PRINT_SAFE( "Waiting on signal block\n" );
+        debug_break();
 
         //Everything is ready to go to sleep
         ScheduleInternal( locks, count, &signallee, 1 );
 
+        debug_break();
         LIB_DEBUG_PRINT_SAFE( "Back from signal block\n" );
 
@@ -318 +315 @@
         restore_recursion( this->monitors, recursions, count );
         unlock_all( locks, count );
-
-        return true;
-}
-
-uintptr_t front( condition * this ) {
-        LIB_DEBUG_DO(
-                if( is_empty(this) ) {
-                        abortf( "Attempt to access user data on an empty condition.\n"
-                    "Possible cause is not checking if the condition is empty before reading stored data." );
-                }
-        );
-        return this->blocked.head->user_info;
 }