Changeset 349b2cb for src

Timestamp:

Mar 22, 2017, 11:28:47 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

9c14ae9

Parents:

597db97 (diff), a53e10a (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src

Files:

• Concurrency/Keywords.cc (modified) (1 diff)
• libcfa/concurrency/invoke.c (modified) (3 diffs)
• libcfa/concurrency/invoke.h (modified) (3 diffs)
• libcfa/concurrency/kernel (modified) (1 diff)
• libcfa/concurrency/monitor (modified) (1 diff)
• libcfa/concurrency/monitor.c (modified) (3 diffs)
• libcfa/concurrency/thread (modified) (3 diffs)
• libcfa/concurrency/thread.c (modified) (5 diffs)
• tests/monitor.c (modified) (1 diff)
• tests/multi-monitor.c (modified) (1 diff)
• tests/thread.c (modified) (1 diff)

src/Concurrency/Keywords.cc

@@ -331 +331 @@
                         ),
                         new ListInit(
-                                map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
+                                map_range < std::list<Initializer*> > ( args, [this](DeclarationWithType * var ){
+                                        Type * type = var->get_type()->clone();
+                                        type->set_mutex( false );
                                         return new SingleInit( new UntypedExpr(
                                                 new NameExpr( "get_monitor" ),
-                                                {  new VariableExpr( var ) }
+                                                {  new CastExpr( new VariableExpr( var ), type ) }
                                         ) );
                                 })

src/libcfa/concurrency/invoke.c

@@ -29 +29 @@
 
 extern void __suspend_internal(void);
-extern void __thread_signal_termination(struct thread_desc*);
+extern void __leave_monitor_desc( struct monitor_desc * this );
 
 void CtxInvokeCoroutine(
@@ -65 +65 @@
       struct thread_desc* thrd = get_thread( this );
       struct coroutine_desc* cor = &thrd->cor;
+      struct monitor_desc* mon = &thrd->mon;
       cor->state = Active;
 
@@ -70 +71 @@
       main( this );
 
-      __thread_signal_termination(thrd);
+      __leave_monitor_desc( mon );
 
       //Final suspend, should never return

src/libcfa/concurrency/invoke.h

@@ -38 +38 @@
       };
 
-      struct signal_once {
-            volatile bool condition;
-            struct spinlock lock;
-            struct simple_thread_list blocked;
-      };
-
       #ifdef __CFORALL__
       extern "Cforall" {
@@ -52 +46 @@
             void ?{}(spinlock * this);
             void ^?{}(spinlock * this);
-
-            void ?{}(signal_once * this);
-            void ^?{}(signal_once * this);
       }
       #endif
@@ -79 +70 @@
       };
 
+      struct monitor_desc {
+            struct spinlock lock;
+            struct thread_desc * owner;
+            struct simple_thread_list entry_queue;
+            unsigned int recursion;
+      };
+
       struct thread_desc {
-            struct coroutine_desc cor;            // coroutine body used to store context
-            struct signal_once terminated;      // indicate if execuation state is not halted
+            struct coroutine_desc cor;          // coroutine body used to store context
+            struct monitor_desc mon;            // monitor body used for mutual exclusion
             struct thread_desc * next;          // instrusive link field for threads
       };

src/libcfa/concurrency/kernel

@@ -30 +30 @@
 void lock( spinlock * );
 void unlock( spinlock * );
+
+struct signal_once {
+        volatile bool condition;
+        struct spinlock lock;
+        struct simple_thread_list blocked;
+};
+
+void ?{}(signal_once * this);
+void ^?{}(signal_once * this);
 
 void wait( signal_once * );

src/libcfa/concurrency/monitor

@@ -21 +21 @@
 #include "invoke.h"
 #include "stdlib"
-
-struct monitor_desc {
-        spinlock lock;
-        thread_desc * owner;
-        simple_thread_list entry_queue;
-        unsigned int recursion;
-};
 
 static inline void ?{}(monitor_desc * this) {

src/libcfa/concurrency/monitor.c

@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor_desc * this) {
-        lock( &this->lock );
-        thread_desc * thrd = this_thread();
+extern "C" {
+        void __enter_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
+                thread_desc * thrd = this_thread();
 
-        if( !this->owner ) {
-                //No one has the monitor, just take it
-                this->owner = thrd;
-                this->recursion = 1;
-        }
-        else if( this->owner == thrd) {
-                //We already have the monitor, just not how many times we took it
-                assert( this->recursion > 0 );
-                this->recursion += 1;
-        }
-        else {
-                //Some one else has the monitor, wait in line for it
-                append( &this->entry_queue, thrd );
-                ScheduleInternal( &this->lock );
+                if( !this->owner ) {
+                        //No one has the monitor, just take it
+                        this->owner = thrd;
+                        this->recursion = 1;
+                }
+                else if( this->owner == thrd) {
+                        //We already have the monitor, just not how many times we took it
+                        assert( this->recursion > 0 );
+                        this->recursion += 1;
+                }
+                else {
+                        //Some one else has the monitor, wait in line for it
+                        append( &this->entry_queue, thrd );
+                        ScheduleInternal( &this->lock );
 
-                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
-                return; 
+                        //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                        return; 
+                }
+
+                unlock( &this->lock );
         }
 
-        unlock( &this->lock );
-}
+        void __leave_monitor_desc(monitor_desc * this) {
+                lock( &this->lock );
 
-void leave(monitor_desc * this) {
-        lock( &this->lock );
+                thread_desc * thrd = this_thread();
+                assert( thrd == this->owner );
 
-        thread_desc * thrd = this_thread();
-        assert( thrd == this->owner );
+                //Leaving a recursion level, decrement the counter
+                this->recursion -= 1;
 
-        //Leaving a recursion level, decrement the counter
-        this->recursion -= 1;
+                //If we left the last level of recursion it means we are changing who owns the monitor
+                thread_desc * new_owner = 0;
+                if( this->recursion == 0) {
+                        //Get the next thread in the list
+                        new_owner = this->owner = pop_head( &this->entry_queue );
 
-        //If we left the last level of recursion it means we are changing who owns the monitor
-        thread_desc * new_owner = 0;
-        if( this->recursion == 0) {
-                //Get the next thread in the list
-                new_owner = this->owner = pop_head( &this->entry_queue );
+                        //We are passing the monitor to someone else, which means recursion level is not 0
+                        this->recursion = new_owner ? 1 : 0;
+                }       
 
-                //We are passing the monitor to someone else, which means recursion level is not 0
-                this->recursion = new_owner ? 1 : 0;
-        }       
+                unlock( &this->lock );
 
-        unlock( &this->lock );
-
-        //If we have a new owner, we need to wake-up the thread
-        if( new_owner ) {
-                ScheduleThread( new_owner );
+                //If we have a new owner, we need to wake-up the thread
+                if( new_owner ) {
+                        ScheduleThread( new_owner );
+                }
         }
 }
@@ -74 +76 @@
 void enter(monitor_desc ** monitors, int count) {
         for(int i = 0; i < count; i++) {
-                enter( monitors[i] );
+                __enter_monitor_desc( monitors[i] );
         }
 }
@@ -80 +82 @@
 void leave(monitor_desc ** monitors, int count) {
         for(int i = count - 1; i >= 0; i--) {
-                leave( monitors[i] );
+                __leave_monitor_desc( monitors[i] );
         }
 }

src/libcfa/concurrency/thread

@@ -22 +22 @@
 
 #include "coroutine"
+#include "monitor"
 
 //-----------------------------------------------------------------------------
@@ -28 +29 @@
 // Anything that is resumed is a coroutine.
 trait is_thread(dtype T) {
-      void ^?{}(T* this);
+      void ^?{}(T* mutex this);
       void main(T* this);
       thread_desc* get_thread(T* this);
@@ -40 +41 @@
 }
 
-static inline coroutine_desc* get_coroutine(thread_desc* this) {
+forall( dtype T | is_thread(T) )
+static inline monitor_desc* get_monitor(T * this) {
+        return &get_thread(this)->mon;
+}
+
+static inline coroutine_desc* get_coroutine(thread_desc * this) {
         return &this->cor;
+}
+
+static inline monitor_desc* get_monitor(thread_desc * this) {
+        return &this->mon;
 }
 

src/libcfa/concurrency/thread.c

@@ -35 +35 @@
 void start( T* this );
 
-forall( dtype T | is_thread(T) )
-void stop( T* this );
-
 //-----------------------------------------------------------------------------
 // Thread ctors and dtors
@@ -44 +41 @@
         (&this->cor){};
         this->cor.name = "Anonymous Coroutine";
-        (&this->terminated){};
+        this->mon.owner = this;
+        this->mon.recursion = 1;
         this->next = NULL;
 }
@@ -66 +64 @@
 forall( dtype T | sized(T) | is_thread(T) )
 void ^?{}( scoped(T)* this ) {
-        stop(&this->handle);
         ^(&this->handle){};
 }
@@ -86 +83 @@
 
         ScheduleThread(thrd_h);
-}
-
-forall( dtype T | is_thread(T) )
-void stop( T* this ) {
-        wait( & get_thread(this)->terminated ); 
 }
 
@@ -116 +108 @@
 }
 
-// C Helper to signal the termination of a thread_desc
-// Used in invoke.c
-extern "C" {
-        void __thread_signal_termination( thread_desc * this ) {
-                this->cor.state = Halted;
-                LIB_DEBUG_PRINTF("Thread end : %p\n", this);
-                signal( &this->terminated );    
-        }
-}
-
 // Local Variables: //
 // mode: c //

src/tests/monitor.c

@@ -36 +36 @@
 
 void ?{}( MyThread * this ) {}
+void ^?{}( MyThread * mutex this ) {}
 
 void main( MyThread* this ) {
-        for(int i = 0; i < 1000000; i++) {
+        for(int i = 0; i < 1_000_000; i++) {
                 increment( &global );
         }

src/tests/multi-monitor.c

@@ -31 +31 @@
 }
 
+void ^?{}( MyThread * mutex this ) {}
+
 void main( MyThread* this ) {
         for(int i = 0; i < 1000000; i++) {

src/tests/thread.c

@@ -12 +12 @@
 void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
 void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
+
+void ^?{}( First  * mutex this ) {}
+void ^?{}( Second * mutex this ) {}
 
 void main(First* this) {