Changeset 633a642 for src/libcfa/concurrency/preemption.c

Timestamp:

Jan 30, 2018, 4:52:54 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

1449d83, 5ff188f

Parents:

320eb73a (diff), 7416d46a (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 plg2:software/cfa/cfa-cc

File:

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

src/libcfa/concurrency/preemption.c

@@ -60 +60 @@
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
 
-void ?{}(event_kernel_t & this) {
-        (this.alarms){};
-        (this.lock){};
+void ?{}(event_kernel_t & this) with( this ) {
+        alarms{};
+        lock{};
 }
 
@@ -149 +149 @@
         // If counter reaches 0, execute any pending CtxSwitch
         void enable_interrupts( __cfaabi_dbg_ctx_param ) {
-                processor * proc   = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
+                processor   * proc = this_processor;      // Cache the processor now since interrupts can start happening after the atomic add
                 thread_desc * thrd = this_thread;         // Cache the thread now since interrupts can start happening after the atomic add