Changeset 436c0de for src/libcfa/concurrency/kernel.c

Timestamp:

Jun 18, 2017, 9:22:22 AM (9 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:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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

Conflicts:

src/InitTweak/GenInit.cc

File:

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

src/libcfa/concurrency/kernel.c

@@ -311 +311 @@
         // appropriate stack.
         proc_cor_storage.__cor.state = Active;
-      main( &proc_cor_storage );
-      proc_cor_storage.__cor.state = Halted;
+        main( &proc_cor_storage );
+        proc_cor_storage.__cor.state = Halted;
 
         // Main routine of the core returned, the core is now fully terminated
@@ -333 +333 @@
         if( !thrd ) return;
 
-        assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
+        verifyf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
         lock( &systemProcessor->proc.cltr->lock );
@@ -577 +577 @@
 
 void append( __thread_queue_t * this, thread_desc * t ) {
-        assert(this->tail != NULL);
+        verify(this->tail != NULL);
         *this->tail = t;
         this->tail = &t->next;
@@ -599 +599 @@
 
 void push( __condition_stack_t * this, __condition_criterion_t * t ) {
-        assert( !t->next );
+        verify( !t->next );
         t->next = this->top;
         this->top = t;