Changeset 2055098 for src/libcfa/concurrency/kernel

Timestamp:

May 1, 2017, 1:40:13 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:

5544465, ed8a0d2

Parents:

12d3187 (diff), 13e2c54 (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) (1 diff)

src/libcfa/concurrency/kernel

@@ -55 +55 @@
 //-----------------------------------------------------------------------------
 // Processor
-enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule };
+enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule, Release_Multi, Release_Multi_Schedule };
+
+//TODO use union, many of these fields are mutually exclusive (i.e. MULTI vs NOMULTI)
 struct FinishAction {
         FinishOpCode action_code;
         thread_desc * thrd;
         spinlock * lock;
+        spinlock ** locks;
+        unsigned short lock_count;
+        thread_desc ** thrds;
+        unsigned short thrd_count;
 };
 static inline void ?{}(FinishAction * this) {