Changeset 6a8df56


Ignore:
Timestamp:
Feb 28, 2018, 12:52:05 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
a16764a
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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/kernel.c

    r4b1be68 r6a8df56  
    408408        verify( !preemption_state.enabled );
    409409        lock( ready_queue_lock __cfaabi_dbg_ctx2 );
     410        //TEMP hack to find a bug
     411        if(this_processor != mainProcessor) {
     412                if(ready_queue.head == mainThread) {
     413                        unlock( ready_queue_lock );
     414                        return NULL;
     415                }
     416        }
     417
    410418        thread_desc * head = pop_head( ready_queue );
    411419        unlock( ready_queue_lock );
  • src/tests/preempt_longrun/processor.c

    r4b1be68 r6a8df56  
    1616void main(worker_t & this) {}
    1717
     18extern processor *   mainProcessor;
     19extern thread_desc * mainThread;
     20
    1821int main(int argc, char* argv[]) {
    1922        for(int i = 0; i < N; i++) {
     23                assert(this_processor == mainProcessor);
     24                assert(this_thread == mainThread);
    2025                processor p;
    2126        }
Note: See TracChangeset for help on using the changeset viewer.