Changeset 6a8df56

Timestamp:

Feb 28, 2018, 12:52:05 PM (7 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:

a16764a6

Parents:

4b1be68 (diff), 807d8c3 (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

Location:

src

Files:

• libcfa/concurrency/kernel.c (modified) (1 diff)
• tests/preempt_longrun/processor.c (modified) (1 diff)

src/libcfa/concurrency/kernel.c

@@ -408 +408 @@
         verify( !preemption_state.enabled );
         lock( ready_queue_lock __cfaabi_dbg_ctx2 );
+        //TEMP hack to find a bug
+        if(this_processor != mainProcessor) {
+                if(ready_queue.head == mainThread) {
+                        unlock( ready_queue_lock );
+                        return NULL;
+                }
+        }
+
         thread_desc * head = pop_head( ready_queue );
         unlock( ready_queue_lock );

src/tests/preempt_longrun/processor.c

@@ -16 +16 @@
 void main(worker_t & this) {}
 
+extern processor *   mainProcessor;
+extern thread_desc * mainThread;
+
 int main(int argc, char* argv[]) {
         for(int i = 0; i < N; i++) {
+                assert(this_processor == mainProcessor);
+                assert(this_thread == mainThread);
                 processor p;
         }