Changeset d5a52cc for src/libcfa/concurrency/kernel.c

Timestamp:

Nov 28, 2017, 3:04:37 PM (6 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:

4e7a4e6

Parents:

1393df07 (diff), 8a0a64d9 (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

File:

• src/libcfa/concurrency/kernel.c (modified) (2 diffs)

src/libcfa/concurrency/kernel.c

@@ -164 +164 @@
 
 void ?{}(cluster & this) {
-        ( this.ready_queue ){};
+        (this.ready_queue){};
         ( this.ready_queue_lock ){};
 
@@ -611 +611 @@
 }
 
-//-----------------------------------------------------------------------------
-// Queues
-void ?{}( __thread_queue_t & this ) {
-        this.head = NULL;
-        this.tail = &this.head;
-}
-
-void append( __thread_queue_t & this, thread_desc * t ) {
-        verify(this.tail != NULL);
-        *this.tail = t;
-        this.tail = &t->next;
-}
-
-thread_desc * pop_head( __thread_queue_t & this ) {
-        thread_desc * head = this.head;
-        if( head ) {
-                this.head = head->next;
-                if( !head->next ) {
-                        this.tail = &this.head;
-                }
-                head->next = NULL;
-        }
-        return head;
-}
-
-thread_desc * remove( __thread_queue_t & this, thread_desc ** it ) {
-        thread_desc * thrd = *it;
-        verify( thrd );
-
-        (*it) = thrd->next;
-
-        if( this.tail == &thrd->next ) {
-                this.tail = it;
-        }
-
-        thrd->next = NULL;
-
-        verify( (this.head == NULL) == (&this.head == this.tail) );
-        verify( *this.tail == NULL );
-        return thrd;
-}
-
-void ?{}( __condition_stack_t & this ) {
-        this.top = NULL;
-}
-
-void push( __condition_stack_t & this, __condition_criterion_t * t ) {
-        verify( !t->next );
-        t->next = this.top;
-        this.top = t;
-}
-
-__condition_criterion_t * pop( __condition_stack_t & this ) {
-        __condition_criterion_t * top = this.top;
-        if( top ) {
-                this.top = top->next;
-                top->next = NULL;
-        }
-        return top;
-}
-
 // Local Variables: //
 // mode: c //