Changeset fd061ed3 for src/libcfa

Timestamp:

Feb 28, 2017, 1:49:12 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

14f6bb39

Parents:

31868da (diff), cc7f4b1 (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:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• concurrency/invoke.h (modified) (2 diffs)
• concurrency/monitor (modified) (1 diff)
• concurrency/monitor.c (modified) (3 diffs)
• iostream (modified) (2 diffs)
• iostream.c (modified) (2 diffs)
• stdlib (modified) (2 diffs)
• stdlib.c (modified) (2 diffs)

src/libcfa/concurrency/invoke.h ¶

@@ -60 +60 @@
 
       struct coStack_t {
-            unsigned int size;          // size of stack
-            void *storage;                      // pointer to stack
-            void *limit;                        // stack grows towards stack limit
-            void *base;                         // base of stack
-            void *context;                      // address of cfa_context_t
-            void *top;                          // address of top of storage
+            unsigned int size;                // size of stack
+            void *storage;                            // pointer to stack
+            void *limit;                              // stack grows towards stack limit
+            void *base;                               // base of stack
+            void *context;                            // address of cfa_context_t
+            void *top;                                // address of top of storage
             bool userStack;     
       };
@@ -73 +73 @@
       struct coroutine {
             struct coStack_t stack;
-            const char *name;                   // textual name for coroutine/task, initialized by uC++ generated code
-            int errno_;                         // copy of global UNIX variable errno
-            enum coroutine_state state; // current execution status for coroutine
-            struct coroutine *starter;  // first coroutine to resume this one
-            struct coroutine *last;             // last coroutine to resume this one
+            const char *name;                         // textual name for coroutine/task, initialized by uC++ generated code
+            int errno_;                               // copy of global UNIX variable errno
+            enum coroutine_state state;       // current execution status for coroutine
+            struct coroutine *starter;        // first coroutine to resume this one
+            struct coroutine *last;                   // last coroutine to resume this one
       };
 
       struct thread {
-            struct coroutine c;           // coroutine body used to store context
-            struct signal_once terminated;// indicate if execuation state is not halted
-            struct thread * next;         // instrusive link field for threads
+            struct coroutine c;                 // coroutine body used to store context
+            struct signal_once terminated;      // indicate if execuation state is not halted
+            struct thread * next;               // instrusive link field for threads
       };
 

src/libcfa/concurrency/monitor ¶

@@ -21 +21 @@
 #include "invoke.h"
 
-struct monitor {
+struct __monitor_t {
         spinlock lock;
-        thread * holder;
+        thread * owner;
         simple_thread_list entry_queue;
+        unsigned int recursion;
 };
 
-void enter(monitor *);
-void leave(monitor *);
+static inline void ?{}(__monitor_t * this) {
+        this->owner = 0;
+        this->recursion = 0;
+}
 
-struct monitor_guard {
-        monitor * m;
+void enter(__monitor_t *);
+void leave(__monitor_t *);
+
+struct monitor_guard_t {
+        __monitor_t * m;
 };
 
-static inline void ?{}( monitor_guard * this, monitor * m ) {
+static inline void ?{}( monitor_guard_t * this, __monitor_t * m ) {
         this->m = m;
         enter( this->m );
 }
 
-static inline void ^?{}( monitor_guard * this ) {
+static inline void ^?{}( monitor_guard_t * this ) {
         leave( this->m );
 }

src/libcfa/concurrency/monitor.c ¶

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// monitor.c --
+// __monitor_t.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(monitor * this) {
+void enter(__monitor_t * this) {
         lock( &this->lock );
         thread * thrd = this_thread();
 
-        if( this->holder ) {
+        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 );
-                return;
-        }
-        else {
-                this->holder = thrd;
+
+                //ScheduleInternal will unlock spinlock, no need to unlock ourselves
+                return; 
         }
 
@@ -35 +45 @@
 }
 
-void leave(monitor * this) {
+void leave(__monitor_t * this) {
         lock( &this->lock );
 
         thread * thrd = this_thread();
-        assert( thrd == this->holder );
+        assert( thrd == this->owner );
 
-        this->holder = pop_head( &this->entry_queue );
+        //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 * 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;
+        }       
 
         unlock( &this->lock );
 
-        if( this->holder ) ScheduleThread( this->holder );
+        //If we have a new owner, we need to wake-up the thread
+        if( new_owner ) {
+                ScheduleThread( new_owner );
+        }
 }

src/libcfa/iostream ¶

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:01:09 2016
-// Update Count     : 93
+// Last Modified On : Fri Feb 24 21:09:09 2017
+// Update Count     : 94
 //
 
@@ -45 +45 @@
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, signed char );
+forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned char );
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, short int );

src/libcfa/iostream.c ¶

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 18:01:39 2016
-// Update Count     : 306
+// Last Modified On : Fri Feb 24 21:09:59 2017
+// Update Count     : 307
 //
 
@@ -26 +26 @@
 ostype * ?|?( ostype *os, char c ) {
         prtfmt( os, "%c", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, signed char c ) {
+        prtfmt( os, "%hhd", c );
+        sepOff( os );
+        return os;
+} // ?|?
+
+forall( dtype ostype | ostream( ostype ) )
+ostype * ?|?( ostype *os, unsigned char c ) {
+        prtfmt( os, "%hhu", c );
         sepOff( os );
         return os;

src/libcfa/stdlib ¶

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:47 2017
-// Update Count     : 100
+// Last Modified On : Fri Feb 24 21:07:16 2017
+// Update Count     : 101
 //
 
@@ -95 +95 @@
 //---------------------------------------
 
-char abs( char );
+unsigned char abs( signed char );
 extern "C" { int abs( int ); }                                                  // use default C routine for int
-long int abs( long int );
-long long int abs( long long int );
+unsigned long int abs( long int );
+unsigned long long int abs( long long int );
 float abs( float );
 double abs( double );

src/libcfa/stdlib.c ¶

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 23 14:11:29 2017
-// Update Count     : 170
+// Last Modified On : Fri Feb 24 21:08:11 2017
+// Update Count     : 171
 //
 
@@ -240 +240 @@
 //---------------------------------------
 
-char abs( char v ) { return abs( (int)v ); }
-long int abs( long int v ) { return labs( v ); }
-long long int abs( long long int v ) { return llabs( v ); }
+unsigned char abs( signed char v ) { return abs( (int)v ); }
+unsigned long int abs( long int v ) { return labs( v ); }
+unsigned long long int abs( long long int v ) { return llabs( v ); }
 float abs( float x ) { return fabsf( x ); }
 double abs( double x ) { return fabs( x ); }