Changeset be3d020

Timestamp:

May 29, 2017, 11:26:03 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ccd349d

Parents:

8c700c1

Message:

• signal/signal_block now returns true if the queue was not empty
• wait now supports passing in a user define value

Location:

src/libcfa/concurrency

Files:

• monitor (modified) (2 diffs)
• monitor.c (modified) (8 diffs)

src/libcfa/concurrency/monitor

@@ -59 +59 @@
         unsigned short count;                           //Number of criterions in the criteria
         __condition_node_t * next;                      //Intrusive linked list Next field
+        uintptr_t user_info;                            //Custom user info accessible before signalling
 };
 
@@ -85 +86 @@
 }
 
-void wait( condition * this );
-void signal( condition * this );
-void signal_block( condition * this );
+void wait( condition * this, uintptr_t user_info = 0 );
+bool signal( condition * this );
+bool signal_block( condition * this );
+static inline bool is_empty( condition * this ) { return !this->blocked.head; }
+uintptr_t front( condition * this );
+
 #endif //MONITOR_H

src/libcfa/concurrency/monitor.c

@@ -137 +137 @@
 }
 
-void debug_break() __attribute__(( noinline ))
-{
-        
+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;
 }
 
 //-----------------------------------------------------------------------------
 // Internal scheduling
-void wait( condition * this ) {
+void wait( condition * this, uintptr_t user_info = 0 ) {
         LIB_DEBUG_PRINT_SAFE("Waiting\n");
 
@@ -160 +176 @@
         LIB_DEBUG_PRINT_SAFE("count %i\n", count);
 
-        __condition_node_t waiter;
-        waiter.waiting_thread = this_thread();
-        waiter.count = count;
-        waiter.next = NULL;
+        __condition_node_t waiter = { this_thread(), count, user_info };
 
         __condition_criterion_t criteria[count];
         for(int i = 0; i < count; i++) {
-                criteria[i].ready  = false;
-                criteria[i].target = this->monitors[i];
-                criteria[i].owner  = &waiter;
-                criteria[i].next   = NULL;
+                (&criteria[i]){ this->monitors[i], &waiter };
                 LIB_DEBUG_PRINT_SAFE( "Criterion %p\n", &criteria[i] );
         }
@@ -202 +212 @@
         ScheduleInternal( locks, count, threads, thread_count );
 
-        debug_break();
         //WE WOKE UP
 
@@ -212 +221 @@
 }
 
-void signal( condition * this ) {
-        if( !this->blocked.head ) {
+bool signal( condition * this ) {
+        if( is_empty( this ) ) {
                 LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
-                return;
+                return false;
         }
 
@@ -257 +266 @@
         //Release
         unlock_all( this->monitors, count );
-}
-
-void signal_block( condition * this ) {
+
+        return true;
+}
+
+bool signal_block( condition * this ) {
         if( !this->blocked.head ) {
                 LIB_DEBUG_PRINT_SAFE("Nothing to signal\n");
-                return;
+                return false;
         }
 
@@ -276 +287 @@
 
         //create creteria
-        __condition_node_t waiter;
-        waiter.waiting_thread = this_thread();
-        waiter.count = count;
-        waiter.next = NULL;
+        __condition_node_t waiter = { this_thread(), count, 0 };
 
         __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] );
         }
@@ -303 +308 @@
 
         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" );
 
@@ -315 +318 @@
         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;
 }