Changeset 2ab67b9 for src

Timestamp:

May 30, 2017, 7:49:45 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f3fc631f

Parents:

8f61052c (diff), 4a368547 (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 plg2:software/cfa/cfa-cc

Location:

src

Files:

• libcfa/concurrency/monitor (modified) (2 diffs)
• libcfa/concurrency/monitor.c (modified) (8 diffs)
• tests/sched-int-block.c (modified) (4 diffs)
• tests/sched-int-disjoint.c (modified) (1 diff)

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;
 }
 

src/tests/sched-int-block.c

@@ -10 +10 @@
 
 monitor global_data_t {
-        state_t state;
-        bool ran;
+        thread_desc * last_thread;
+        thread_desc * last_signaller;
 };
 
 void ?{} ( global_data_t * this ) {
-        this->state = BARGE;
+        this->last_thread = NULL;
+        this->last_signaller = NULL;
 }
 
@@ -28 +29 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t * mutex a, global_data_t * mutex b, unsigned i ) {
-        wait( &cond );
-        a->ran = b->ran = true;
+        wait( &cond, (uintptr_t)this_thread() );
 
         yield( ((unsigned)rand48()) % 10 );
 
-        if(a->state != SIGNAL || b->state != SIGNAL) {
-                sout | "ERROR Barging detected" | a->state | b->state | endl;
+        if(a->last_thread != a->last_signaller || b->last_thread != b->last_signaller ) {
+                sout | "ERROR Barging detected, expected" | a->last_signaller | b->last_signaller | "got" | a->last_thread | b->last_thread | endl;
                 abort();
         }
 
-        a->state = b->state = WAITED;
+        a->last_thread = b->last_thread = this_thread();
 
         yield( ((unsigned)rand48()) % 10 );
@@ -54 +54 @@
         yield( ((unsigned)rand48()) % 10 );
 
-        a->ran = b->ran = false;
-        a->state = b->state = SIGNAL;
+        a->last_thread = b->last_thread = a->last_signaller = b->last_signaller = this_thread();
 
-        signal_block( &cond );
+        if( !is_empty( &cond ) ) {
 
-        yield( ((unsigned)rand48()) % 10 );
+                thread_desc * next = front( &cond );
 
-        assert(a->ran == b->ran);
-        if(a->ran)
-        {
-                if(a->state != WAITED || b->state != WAITED) {
-                        sout | "ERROR Barging detected" | a->state | b->state | endl;
+                if( ! signal_block( &cond ) ) {
+                        sout | "ERROR expected to be able to signal" | endl;
+                        abort();
+                }
+
+                yield( ((unsigned)rand48()) % 10 );
+
+                if(a->last_thread != next || b->last_thread != next) {
+                        sout | "ERROR Barging detected, expected" | next | "got" | a->last_thread | b->last_thread | endl;
                         abort();
                 }
@@ -81 +84 @@
 //------------------------------------------------------------------------------
 void barge_op( global_data_t * mutex a ) {
-        a->state = BARGE;
+        a->last_thread = this_thread();
 }
 

src/tests/sched-int-disjoint.c

@@ -78 +78 @@
         signal( &cond, a, &data );
 
-        int pauses = (unsigned)rand48() % 10;
-        for(int i = 0; i < pauses; i++) {
-                yield();
-        }
+        yield( (unsigned)rand48() % 10 );
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us