Changeset 10e90cb for src/libcfa/concurrency/kernel

Timestamp:

Jun 6, 2017, 2:50:57 PM (8 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:

c6d2e93

Parents:

8ca3a72 (diff), c5ac6d5 (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 (modified) (3 diffs)

src/libcfa/concurrency/kernel

@@ -28 +28 @@
 //-----------------------------------------------------------------------------
 // Locks
+bool try_lock( spinlock * );
 void lock( spinlock * );
 void unlock( spinlock * );
@@ -85 +86 @@
 
         struct FinishAction finish;
+
+        struct alarm_node_t * preemption_alarm;
+        unsigned int preemption;
+
+        unsigned short disable_preempt_count;
+
+        bool pending_preemption;
 };
 
@@ -94 +102 @@
 
 // Local Variables: //
-// mode: c //
-// tab-width: 4 //
+// mode: CFA //
+// tab-width: 6 //
 // End: //