Changeset eafb094 for src/libcfa

Timestamp:

Feb 13, 2017, 5:20:06 PM (8 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:

294647b, d3a804f5

Parents:

ee897e4b

Message:

Removed global spinlock

Location:

src/libcfa/concurrency

Files:

• kernel (modified) (1 diff)
• kernel.c (modified) (3 diffs)

src/libcfa/concurrency/kernel

@@ -28 +28 @@
 //-----------------------------------------------------------------------------
 // Locks
-// void lock( simple_lock * );
-// void lock( simple_lock *, spinlock * );
-// void unlock( simple_lock * );
-
 void lock( spinlock * );
 void unlock( spinlock * );

src/libcfa/concurrency/kernel.c

@@ -36 +36 @@
 #include "invoke.h"
 
-static volatile int lock;
-
-void spin_lock( volatile int *lock ) {
-        for ( unsigned int i = 1;; i += 1 ) {
-          if ( *lock == 0 && __sync_lock_test_and_set_4( lock, 1 ) == 0 ) break;
-        }
-}
-
-void spin_unlock( volatile int *lock ) {
-        __sync_lock_release_4( lock );
-}
-
 //-----------------------------------------------------------------------------
 // Kernel storage
@@ -176 +164 @@
 void ?{}(cluster * this) {
         ( &this->ready_queue ){};
-        lock = 0;
+        ( &this->lock ){};
 }
 
@@ -413 +401 @@
 //-----------------------------------------------------------------------------
 // Locks
-// void ?{}( simple_lock * this ) {
-//      ( &this->blocked ){};
-// }
-
-// void ^?{}( simple_lock * this ) {
-
-// }
-
-// void lock( simple_lock * this ) {
-//      {
-//              spin_lock( &lock );
-//              append( &this->blocked, this_thread() );
-//              spin_unlock( &lock );
-//      }
-//      ScheduleInternal();
-// }
-
-// void lock( simple_lock * this, spinlock * to_release ) {
-//      {
-//              spin_lock( &lock );
-//              append( &this->blocked, this_thread() );
-//              spin_unlock( &lock );
-//      }
-//      ScheduleInternal( to_release );
-//      lock( to_release );
-// }
-
-// void unlock( simple_lock * this ) {
-//      thread * it;
-//      while( it = pop_head( &this->blocked) ) {
-//              ScheduleThread( it );
-//      }
-// }
-
 void ?{}( spinlock * this ) {
         this->lock = 0;