Changes in libcfa/src/concurrency/locks.cfa [454f478:ac5816d]

File:

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

libcfa/src/concurrency/locks.cfa

@@ -7 +7 @@
 //-----------------------------------------------------------------------------
 // info_thread
-forall(L & | is_blocking_lock(L)) {
+forall(dtype L | is_blocking_lock(L)) {
         struct info_thread {
                 // used to put info_thread on a dl queue (aka sequence)
@@ -195 +195 @@
 //-----------------------------------------------------------------------------
 // alarm node wrapper
-forall(L & | is_blocking_lock(L)) {
+forall(dtype L | is_blocking_lock(L)) {
         struct alarm_node_wrap {
                 alarm_node_t alarm_node;
@@ -239 +239 @@
 //-----------------------------------------------------------------------------
 // condition variable
-forall(L & | is_blocking_lock(L)) {
+forall(dtype L | is_blocking_lock(L)) {
 
         void ?{}( condition_variable(L) & this ){
@@ -356 +356 @@
         bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time         ) with(this) { WAIT_TIME( info, &l , time ) }
 }
-
-//-----------------------------------------------------------------------------
-// Semaphore
-void  ?{}( semaphore & this, int count = 1 ) {
-        (this.lock){};
-        this.count = count;
-        (this.waiting){};
-}
-void ^?{}(semaphore & this) {}
-
-bool P(semaphore & this) with( this ){
-        lock( lock __cfaabi_dbg_ctx2 );
-        count -= 1;
-        if ( count < 0 ) {
-                // queue current task
-                append( waiting, active_thread() );
-
-                // atomically release spin lock and block
-                unlock( lock );
-                park();
-                return true;
-        }
-        else {
-            unlock( lock );
-            return false;
-        }
-}
-
-bool V(semaphore & this) with( this ) {
-        $thread * thrd = 0p;
-        lock( lock __cfaabi_dbg_ctx2 );
-        count += 1;
-        if ( count <= 0 ) {
-                // remove task at head of waiting list
-                thrd = pop_head( waiting );
-        }
-
-        unlock( lock );
-
-        // make new owner
-        unpark( thrd );
-
-        return thrd != 0p;
-}
-
-bool V(semaphore & this, unsigned diff) with( this ) {
-        $thread * thrd = 0p;
-        lock( lock __cfaabi_dbg_ctx2 );
-        int release = max(-count, (int)diff);
-        count += diff;
-        for(release) {
-                unpark( pop_head( waiting ) );
-        }
-
-        unlock( lock );
-
-        return thrd != 0p;
-}