Changes in libcfa/src/concurrency/kernel.hfa [ac2b598:e3fea42]

File:

• libcfa/src/concurrency/kernel.hfa (modified) (7 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -32 +32 @@
         __spinlock_t lock;
         int count;
-        __queue_t($thread) waiting;
+        __queue_t(thread_desc) waiting;
 };
 
@@ -44 +44 @@
 // Processor
 extern struct cluster * mainCluster;
+
+enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule, Release_Multi, Release_Multi_Schedule, Callback };
+
+typedef void (*__finish_callback_fptr_t)(void);
+
+//TODO use union, many of these fields are mutually exclusive (i.e. MULTI vs NOMULTI)
+struct FinishAction {
+        FinishOpCode action_code;
+        /*
+        // Union of possible actions
+        union {
+                // Option 1 : locks and threads
+                struct {
+                        // 1 thread or N thread
+                        union {
+                                thread_desc * thrd;
+                                struct {
+                                        thread_desc ** thrds;
+                                        unsigned short thrd_count;
+                                };
+                        };
+                        // 1 lock or N lock
+                        union {
+                                __spinlock_t * lock;
+                                struct {
+                                        __spinlock_t ** locks;
+                                        unsigned short lock_count;
+                                };
+                        };
+                };
+                // Option 2 : action pointer
+                __finish_callback_fptr_t callback;
+        };
+        /*/
+        thread_desc * thrd;
+        thread_desc ** thrds;
+        unsigned short thrd_count;
+        __spinlock_t * lock;
+        __spinlock_t ** locks;
+        unsigned short lock_count;
+        __finish_callback_fptr_t callback;
+        //*/
+};
+static inline void ?{}(FinishAction & this) {
+        this.action_code = No_Action;
+        this.thrd = 0p;
+        this.lock = 0p;
+}
+static inline void ^?{}(FinishAction &) {}
 
 // Processor
@@ -67 +116 @@
         // RunThread data
         // Action to do after a thread is ran
-        $thread * destroyer;
+        struct FinishAction finish;
 
         // Preemption data
@@ -108 +157 @@
 static inline void  ?{}(processor & this, const char name[]) { this{name, *mainCluster }; }
 
-static inline [processor *&, processor *& ] __get( processor & this ) __attribute__((const)) { return this.node.[next, prev]; }
+static inline [processor *&, processor *& ] __get( processor & this ) {
+        return this.node.[next, prev];
+}
 
 //-----------------------------------------------------------------------------
@@ -117 +168 @@
 
         // Ready queue for threads
-        __queue_t($thread) ready_queue;
+        __queue_t(thread_desc) ready_queue;
 
         // Name of the cluster
@@ -133 +184 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        __dllist_t(struct $thread) threads;
+        __dllist_t(struct thread_desc) threads;
         unsigned int nthreads;
 
@@ -151 +202 @@
 static inline void ?{} (cluster & this, const char name[])        { this{name, default_preemption()}; }
 
-static inline [cluster *&, cluster *& ] __get( cluster & this ) __attribute__((const)) { return this.node.[next, prev]; }
+static inline [cluster *&, cluster *& ] __get( cluster & this ) {
+        return this.node.[next, prev];
+}
 
 static inline struct processor * active_processor() { return TL_GET( this_processor ); } // UNSAFE