Changes in libcfa/src/concurrency/locks.cfa [6a8882c:be73f30]

File:

• libcfa/src/concurrency/locks.cfa (modified) (14 diffs)

libcfa/src/concurrency/locks.cfa

@@ -15 +15 @@
                 this.t = t;
                 this.lock = 0p;
-                this.listed = false;
         }
 
@@ -22 +21 @@
                 this.info = info;
                 this.lock = 0p;
-                this.listed = false;
         }
 
@@ -51 +49 @@
 }
 
-void ?{}( single_acquisition_lock & this ) {
+void ?{}( mutex_lock & this ) {
         ((blocking_lock &)this){ false, false };
 }
 
-void ^?{}( single_acquisition_lock & this ) {
+void ^?{}( mutex_lock & this ) {
         // default
 }
@@ -67 +65 @@
 }
 
-void ?{}( multiple_acquisition_lock & this ) {
+void ?{}( recursive_mutex_lock & this ) {
         ((blocking_lock &)this){ true, false };
 }
 
-void ^?{}( multiple_acquisition_lock & this ) {
+void ^?{}( recursive_mutex_lock & this ) {
         // default
 }
 
 void lock( blocking_lock & this ) with( this ) {
+        $thread * thrd = active_thread();
         lock( lock __cfaabi_dbg_ctx2 );
-        if ( owner == active_thread() && !multi_acquisition) {
+        if ( owner == thrd && !multi_acquisition) {
                 fprintf(stderr, "A single acquisition lock holder attempted to reacquire the lock resulting in a deadlock."); // Possibly throw instead
-        exit(EXIT_FAILURE);
-        } else if ( owner != 0p && owner != active_thread() ) {
-                append( blocked_threads, active_thread() );
+                exit(EXIT_FAILURE);
+        } else if ( owner != 0p && owner != thrd ) {
+                append( blocked_threads, thrd );
                 wait_count++;
                 unlock( lock );
-                park( );
-        } else if ( owner == active_thread() && multi_acquisition ) {
+                park( __cfaabi_dbg_ctx );
+        } else if ( owner == thrd && multi_acquisition ) {
                 recursion_count++;
                 unlock( lock );
         } else {
-                owner = active_thread();
+                owner = thrd;
                 recursion_count = 1;
                 unlock( lock );
@@ -96 +95 @@
 
 bool try_lock( blocking_lock & this ) with( this ) {
+        $thread * thrd = active_thread();
         bool ret = false;
         lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ) {
-                owner = active_thread();
-                recursion_count = 1;
+                owner = thrd;
+                if ( multi_acquisition ) recursion_count = 1;
                 ret = true;
-        } else if ( owner == active_thread() && multi_acquisition ) {
+        } else if ( owner == thrd && multi_acquisition ) {
                 recursion_count++;
                 ret = true;
@@ -113 +113 @@
         lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ){ // no owner implies lock isn't held
-                fprintf( stderr, "There was an attempt to release a lock that isn't held" ); 
+                fprintf( stderr, "There was an attempt to release a lock that isn't held" );
                 return;
         } else if ( strict_owner && owner != active_thread() ) {
-                fprintf( stderr, "A thread other than the owner attempted to release an owner lock" ); 
+                fprintf( stderr, "A thread other than the owner attempted to release an owner lock" );
                 return;
         }
@@ -123 +123 @@
                 $thread * thrd = pop_head( blocked_threads );
                 owner = thrd;
-                recursion_count = ( thrd ? 1 : 0 );
+                recursion_count = ( thrd && multi_acquisition ? 1 : 0 );
                 wait_count--;
-                unpark( thrd );
+                unpark( thrd __cfaabi_dbg_ctx2 );
         }
         unlock( lock );
@@ -151 +151 @@
         } else {
                 owner = t;
-                recursion_count = 1;
-                #if !defined( __CFA_NO_STATISTICS__ )
-                        //kernelTLS.this_stats = t->curr_cluster->stats;
-                #endif
-                unpark( t );
+                if ( multi_acquisition ) recursion_count = 1;
+                unpark( t __cfaabi_dbg_ctx2 );
                 unlock( lock );
         }
@@ -163 +160 @@
     lock( lock __cfaabi_dbg_ctx2 );
         if ( owner == 0p ){ // no owner implies lock isn't held
-                fprintf( stderr, "A lock that is not held was passed to a synchronization lock" ); 
+                fprintf( stderr, "A lock that is not held was passed to a synchronization lock" );
         } else if ( strict_owner && owner != active_thread() ) {
-                fprintf( stderr, "A thread other than the owner of a lock passed it to a synchronization lock" ); 
+                fprintf( stderr, "A thread other than the owner of a lock passed it to a synchronization lock" );
         } else {
                 $thread * thrd = pop_head( blocked_threads );
                 owner = thrd;
-                recursion_count = ( thrd ? 1 : 0 );
+                recursion_count = ( thrd && multi_acquisition ? 1 : 0 );
                 wait_count--;
-                unpark( thrd );
+                unpark( thrd __cfaabi_dbg_ctx2 );
         }
         unlock( lock );
@@ -180 +177 @@
 ///////////////////////////////////////////////////////////////////
 
-// This is temporary until an inheritance bug is fixed
-
-void lock( single_acquisition_lock & this ){
+// In an ideal world this may not be necessary
+// Is it possible for nominal inheritance to inherit traits??
+// If that occurs we would avoid all this extra code
+
+void lock( mutex_lock & this ){
         lock( (blocking_lock &)this );
 }
 
-void unlock( single_acquisition_lock & this ){
+void unlock( mutex_lock & this ){
         unlock( (blocking_lock &)this );
 }
 
-void add_( single_acquisition_lock & this, struct $thread * t ){
+void add_( mutex_lock & this, struct $thread * t ){
         add_( (blocking_lock &)this, t );
 }
 
-void remove_( single_acquisition_lock & this ){
+void remove_( mutex_lock & this ){
         remove_( (blocking_lock &)this );
 }
 
-void set_recursion_count( single_acquisition_lock & this, size_t recursion ){
+void set_recursion_count( mutex_lock & this, size_t recursion ){
         set_recursion_count( (blocking_lock &)this, recursion );
 }
 
-size_t get_recursion_count( single_acquisition_lock & this ){
-        return get_recursion_count( (blocking_lock &)this );
-}
-
-void lock( owner_lock & this ){
+size_t get_recursion_count( mutex_lock & this ){
+        get_recursion_count( (blocking_lock &)this );
+}
+
+void lock( recursive_mutex_lock & this ){
         lock( (blocking_lock &)this );
 }
 
-void unlock( owner_lock & this ){
+void unlock( recursive_mutex_lock & this ){
         unlock( (blocking_lock &)this );
 }
 
-void add_( owner_lock & this, struct $thread * t ){
+void add_( recursive_mutex_lock & this, struct $thread * t ){
         add_( (blocking_lock &)this, t );
 }
 
-void remove_( owner_lock & this ){
+void remove_( recursive_mutex_lock & this ){
         remove_( (blocking_lock &)this );
 }
 
-void set_recursion_count( owner_lock & this, size_t recursion ){
+void set_recursion_count( recursive_mutex_lock & this, size_t recursion ){
         set_recursion_count( (blocking_lock &)this, recursion );
 }
 
-size_t get_recursion_count( owner_lock & this ){
-        return get_recursion_count( (blocking_lock &)this );
-}
-
-void lock( multiple_acquisition_lock & this ){
-        lock( (blocking_lock &)this );
-}
-
-void unlock( multiple_acquisition_lock & this ){
-        unlock( (blocking_lock &)this );
-}
-
-void add_( multiple_acquisition_lock & this, struct $thread * t ){
-        add_( (blocking_lock &)this, t );
-}
-
-void remove_( multiple_acquisition_lock & this ){
-        remove_( (blocking_lock &)this );
-}
-
-void set_recursion_count( multiple_acquisition_lock & this, size_t recursion ){
-        set_recursion_count( (blocking_lock &)this, recursion );
-}
-
-size_t get_recursion_count( multiple_acquisition_lock & this ){
-        return get_recursion_count( (blocking_lock &)this );
-}
-
-///////////////////////////////////////////////////////////////////
-//// condition variable
+size_t get_recursion_count( recursive_mutex_lock & this ){
+        get_recursion_count( (blocking_lock &)this );
+}
+
+///////////////////////////////////////////////////////////////////
+//// Synchronization Locks
 ///////////////////////////////////////////////////////////////////
 
 forall(dtype L | is_blocking_lock(L)) {
-
-        void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) {
-        // This condition_variable member is called from the kernel, and therefore, cannot block, but it can spin.
-            lock( cond->lock __cfaabi_dbg_ctx2 );
-            if ( (*i)->listed ) {                       // is thread on queue
-                info_thread(L) * copy = *i;
-                        remove( cond->blocked_threads, i );              //remove this thread O(1)
-                        cond->count--;
-                        if( !copy->lock ) {
-                                #if !defined( __CFA_NO_STATISTICS__ )
-                                        //kernelTLS.this_stats = copy->t->curr_cluster->stats;
-                                #endif
-                                unpark( copy->t );
-                } else {
-                        add_(*copy->lock, copy->t);                     // call lock's add_
-                }
-            }
-            unlock( cond->lock );
-        }
-
-        void alarm_node_wrap_cast( alarm_node_t & a ) {
-                timeout_handler( (alarm_node_wrap(L) &)a );
-        }
-
-        void ?{}( condition_variable(L) & this ){
+        void ?{}( synchronization_lock(L) & this, bool reacquire_after_signal ){
                 this.lock{};
                 this.blocked_threads{};
                 this.count = 0;
+                this.reacquire_after_signal = reacquire_after_signal;
+        }
+
+        void ^?{}( synchronization_lock(L) & this ){
+                // default
+        }
+
+        void ?{}( condition_variable(L) & this ){
+                ((synchronization_lock(L) &)this){ true };
         }
 
@@ -293 +253 @@
         }
 
-        void ?{}( alarm_node_wrap(L) & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback ) {
-                this.alarm_node{ thrd, alarm, period, callback };
-        }
-
-        void ^?{}( alarm_node_wrap(L) & this ) {
-                // default
-        }
-
-        bool notify_one( condition_variable(L) & this ) with( this ) {
+        void ?{}( thread_queue(L) & this ){
+                ((synchronization_lock(L) &)this){ false };
+        }
+
+        void ^?{}( thread_queue(L) & this ){
+                // default
+        }
+
+        bool notify_one( synchronization_lock(L) & this ) with( this ) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 bool ret = !!blocked_threads;
                 info_thread(L) * popped = pop_head( blocked_threads );
                 if(popped != 0p) {
-                        popped->listed = false;
-                        count--;
-                        if (popped->lock) {
+                        if( reacquire_after_signal ){
                                 add_(*popped->lock, popped->t);
                         } else {
-                                unpark(popped->t);
+                                unpark(
+                                        popped->t __cfaabi_dbg_ctx2
+                                );
                         }
                 }
@@ -318 +278 @@
         }
 
-        bool notify_all( condition_variable(L) & this ) with(this) {
+        bool notify_all( synchronization_lock(L) & this ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 bool ret = blocked_threads ? true : false;
@@ -324 +284 @@
                         info_thread(L) * popped = pop_head( blocked_threads );
                         if(popped != 0p){
-                                popped->listed = false;
-                                count--;
-                                if (popped->lock) {
+                                if( reacquire_after_signal ){
                                         add_(*popped->lock, popped->t);
                                 } else {
-                                        unpark(popped->t);
+                                        unpark(
+                                                popped->t __cfaabi_dbg_ctx2
+                                        );
                                 }
                         }
@@ -337 +297 @@
         }
 
-        uintptr_t front( condition_variable(L) & this ) with(this) {
-                if(!blocked_threads) return NULL;
-                return peek(blocked_threads)->info;
-        }
-
-        bool empty( condition_variable(L) & this ) with(this) {
+        uintptr_t front( synchronization_lock(L) & this ) with(this) {
+                return (*peek(blocked_threads)).info;
+        }
+
+        bool empty( synchronization_lock(L) & this ) with(this) {
                 return blocked_threads ? false : true;
         }
 
-        int counter( condition_variable(L) & this ) with(this) {
+        int counter( synchronization_lock(L) & this ) with(this) {
                 return count;
         }
 
-        // helper for wait()'s' without a timeout
-        void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) {
+        void queue_info_thread( synchronization_lock(L) & this, info_thread(L) & i ) with(this) {
+                lock( lock __cfaabi_dbg_ctx2 );
+                append( blocked_threads, &i );
+                count++;
+                unlock( lock );
+                park( __cfaabi_dbg_ctx );
+        }
+
+
+        void wait( synchronization_lock(L) & this ) with(this) {
+                info_thread( L ) i = { active_thread() };
+                queue_info_thread( this, i );
+        }
+
+        void wait( synchronization_lock(L) & this, uintptr_t info ) with(this) {
+                info_thread( L ) i = { active_thread(), info };
+                queue_info_thread( this, i );
+        }
+        // I still need to implement the time delay wait routines
+        bool wait( synchronization_lock(L) & this, Duration duration ) with(this) {
+                timeval tv = { time(0) };
+                Time t = { tv };
+                return wait( this, t + duration );
+        }
+
+        bool wait( synchronization_lock(L) & this, uintptr_t info, Duration duration ) with(this) {
+                // TODO: ADD INFO
+                return wait( this, duration );
+        }
+
+        bool wait( synchronization_lock(L) & this, Time time ) with(this) {
+                return false; //default
+        }
+
+        bool wait( synchronization_lock(L) & this, uintptr_t info, Time time ) with(this) {
+                // TODO: ADD INFO
+                return wait( this, time );
+        }
+
+        void queue_info_thread_unlock( synchronization_lock(L) & this, L & l, info_thread(L) & i ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 append( this.blocked_threads, &i );
                 count++;
-                i.listed = true;
-                size_t recursion_count;
-                if (i.lock) {
-                        recursion_count = get_recursion_count(*i.lock);
-                        remove_( *i.lock );
-                }
-                
-                unlock( lock );
-                park( ); // blocks here
-
-                if (i.lock) set_recursion_count(*i.lock, recursion_count); // resets recursion count here after waking
-        }
-
-        // helper for wait()'s' with a timeout
-        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Time t ) with(this) {
-                lock( lock __cfaabi_dbg_ctx2 );
-
-                info_thread(L) * queue_ptr = &info;
-
-                alarm_node_wrap(L) node_wrap = { info.t, t, 0`s, alarm_node_wrap_cast };
-                node_wrap.cond = &this;
-                node_wrap.i = &queue_ptr;
-
-                register_self( &node_wrap.alarm_node );
-
-                append( blocked_threads, queue_ptr );
-                info.listed = true;
-                count++;
-
-                size_t recursion_count;
-                if (info.lock) {
-                        recursion_count = get_recursion_count(*info.lock);
-                        remove_( *info.lock );
-                }
-
-                unlock( lock );
-                park();
-
-                if (info.lock) set_recursion_count(*info.lock, recursion_count);
-        }
-
-        void wait( condition_variable(L) & this ) with(this) {
-                info_thread( L ) i = { active_thread() };
-                queue_info_thread( this, i );
-        }
-
-        void wait( condition_variable(L) & this, uintptr_t info ) with(this) {
-                info_thread( L ) i = { active_thread(), info };
-                queue_info_thread( this, i );
-        }
-        
-        void wait( condition_variable(L) & this, Duration duration ) with(this) {
-                info_thread( L ) i = { active_thread() };
-                queue_info_thread_timeout(this, i, __kernel_get_time() + duration );
-        }
-
-        void wait( condition_variable(L) & this, uintptr_t info, Duration duration ) with(this) { 
-                info_thread( L ) i = { active_thread(), info };
-                queue_info_thread_timeout(this, i, __kernel_get_time() + duration );
-        }
-
-        void wait( condition_variable(L) & this, Time time ) with(this) {
-                info_thread( L ) i = { active_thread() };
-                queue_info_thread_timeout(this, i, time);
-        }
-
-        void wait( condition_variable(L) & this, uintptr_t info, Time time ) with(this) {
-                info_thread( L ) i = { active_thread(), info };
-                queue_info_thread_timeout(this, i, time);
-        }
-
-        void wait( condition_variable(L) & this, L & l ) with(this) {
+                i.lock = &l;
+                size_t recursion_count = get_recursion_count(l);
+                remove_( l );
+                unlock( lock );
+                park( __cfaabi_dbg_ctx ); // blocks here
+
+                set_recursion_count(l, recursion_count); // resets recursion count here after waking
+        }
+
+        void wait( synchronization_lock(L) & this, L & l ) with(this) {
                 info_thread(L) i = { active_thread() };
-                i.lock = &l;
-                queue_info_thread( this, i );
-        }
-
-        void wait( condition_variable(L) & this, L & l, uintptr_t info ) with(this) {
+                queue_info_thread_unlock( this, l, i );
+        }
+
+        void wait( synchronization_lock(L) & this, L & l, uintptr_t info ) with(this) {
                 info_thread(L) i = { active_thread(), info };
-                i.lock = &l;
-                queue_info_thread( this, i );
-        }
-        
-        void wait( condition_variable(L) & this, L & l, Duration duration ) with(this) {
-                info_thread(L) i = { active_thread() };
-                i.lock = &l;
-                queue_info_thread_timeout(this, i, __kernel_get_time() + duration );
-        }
-        
-        void wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) {
-                info_thread(L) i = { active_thread(), info };
-                i.lock = &l;
-                queue_info_thread_timeout(this, i, __kernel_get_time() + duration );
-        }
-        
-        void wait( condition_variable(L) & this, L & l, Time time ) with(this) {
-                info_thread(L) i = { active_thread() };
-                i.lock = &l;
-                queue_info_thread_timeout(this, i, time );
-        }
-        
-        void wait( condition_variable(L) & this, L & l, uintptr_t info, Time time ) with(this) {
-                info_thread(L) i = { active_thread(), info };
-                i.lock = &l;
-                queue_info_thread_timeout(this, i, time );
-        }
-}
-
-// thread T1 {};
-// thread T2 {};
-
-// multiple_acquisition_lock m;
-// condition_variable( multiple_acquisition_lock ) c;
-
-// void main( T1 & this ) {
-//      printf("T1 start\n");
-//      lock(m);
-//      printf("%d\n", counter(c));
-//      if(empty(c)) {
-//              printf("T1 wait\n");
-//              wait(c,m,12);
-//      }else{
-//              printf("%d\n", front(c));
-//              notify_one(c);
-//      }
-//      unlock(m);
-//      printf("curr thd in main %p \n", active_thread());
-//      printf("T1 waits for 2s\n");
-//      lock(m);
-//      wait( c, m, 2`s );
-//      unlock(m);
-//      printf("T1 wakes\n");
-//      printf("T1 done\n");
-// }
-
-// void main( T2 & this ) {
-//      printf("T2 start\n");
-//      lock(m);
-//      printf("%d\n", counter(c));
-//      if(empty(c)) {
-//              printf("T2 wait\n");
-//              wait(c,m,12);
-//      }else{
-//              printf("%d\n", front(c));
-//              notify_one(c);
-//      }
-//      unlock(m);
-//      printf("T2 done\n");
-// }
-
-// int main() {
-//      printf("start\n");
-//      processor p[2];
-//      {
-//              T1 t1;
-//              T2 t2;
-//      }
-//      printf("done\n");
-// }
+                queue_info_thread_unlock( this, l, i );
+        }
+
+        bool wait( synchronization_lock(L) & this, L & l, Duration duration ) with(this) {
+                timeval tv = { time(0) };
+                Time t = { tv };
+                return wait( this, l, t + duration );
+        }
+
+        bool wait( synchronization_lock(L) & this, L & l, uintptr_t info, Duration duration ) with(this) {
+                // TODO: ADD INFO
+                return wait( this, l, duration );
+        }
+
+        bool wait( synchronization_lock(L) & this, L & l, Time time ) with(this) {
+                return false; //default
+        }
+
+        bool wait( synchronization_lock(L) & this, L & l, uintptr_t info, Time time ) with(this) {
+                // TODO: ADD INFO
+                return wait( this, l, time );
+        }
+}
+
+///////////////////////////////////////////////////////////////////
+//// condition lock alternative approach
+///////////////////////////////////////////////////////////////////
+
+// the solution below is less efficient but does not require the lock to have a specific add/remove routine
+
+///////////////////////////////////////////////////////////////////
+//// is_simple_lock
+///////////////////////////////////////////////////////////////////
+
+forall(dtype L | is_simple_lock(L)) {
+        void ?{}( condition_lock(L) & this ){
+                // default
+        }
+
+        void ^?{}( condition_lock(L) & this ){
+                // default
+        }
+
+        bool notify_one( condition_lock(L) & this ) with(this) {
+                return notify_one( c_var );
+        }
+
+        bool notify_all( condition_lock(L) & this ) with(this) {
+                return notify_all( c_var );
+        }
+
+        void wait( condition_lock(L) & this, L & l ) with(this) {
+                lock( m_lock );
+                size_t recursion = get_recursion_count( l );
+                unlock( l );
+                wait( c_var, m_lock );
+                lock( l );
+                set_recursion_count( l , recursion );
+                unlock( m_lock );
+        }
+}