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

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -17 +17 @@
 
 #include <stdbool.h>
-#include <stdint.h>
 
 #include "invoke.h"
@@ -33 +32 @@
         __spinlock_t lock;
         int count;
-        __queue_t($thread) waiting;
+        __queue_t(thread_desc) waiting;
 };
 
 void  ?{}(semaphore & this, int count = 1);
 void ^?{}(semaphore & this);
-bool   P (semaphore & this);
-bool   V (semaphore & this);
-bool   V (semaphore & this, unsigned count);
+void   P (semaphore & this);
+void   V (semaphore & this);
 
 
@@ -46 +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
@@ -69 +116 @@
         // RunThread data
         // Action to do after a thread is ran
-        $thread * destroyer;
+        struct FinishAction finish;
 
         // Preemption data
@@ -78 +125 @@
         bool pending_preemption;
 
-        // Idle lock (kernel semaphore)
-        __bin_sem_t idle;
+        // Idle lock
+        __bin_sem_t idleLock;
 
         // Termination
@@ -85 +132 @@
         volatile bool do_terminate;
 
-        // Termination synchronisation (user semaphore)
+        // Termination synchronisation
         semaphore terminated;
 
@@ -110 +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]; }
-
-//-----------------------------------------------------------------------------
-// I/O
-struct __io_data;
-
-#define CFA_CLUSTER_IO_POLLER_USER_THREAD 1 << 0
-// #define CFA_CLUSTER_IO_POLLER_KERNEL_SIDE 1 << 1
+static inline [processor *&, processor *& ] __get( processor & this ) {
+        return this.node.[next, prev];
+}
 
 //-----------------------------------------------------------------------------
@@ -126 +168 @@
 
         // Ready queue for threads
-        __queue_t($thread) ready_queue;
+        __queue_t(thread_desc) ready_queue;
 
         // Name of the cluster
@@ -135 +177 @@
 
         // List of processors
-        __spinlock_t idle_lock;
+        __spinlock_t proc_list_lock;
         __dllist_t(struct processor) procs;
         __dllist_t(struct processor) idles;
@@ -142 +184 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        __dllist_t(struct $thread) threads;
+        __dllist_t(struct thread_desc) threads;
         unsigned int nthreads;
 
@@ -150 +192 @@
                 cluster * prev;
         } node;
-
-        struct __io_data * io;
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                bool print_stats;
-        #endif
 };
 extern Duration default_preemption();
 
-void ?{} (cluster & this, const char name[], Duration preemption_rate, int flags);
+void ?{} (cluster & this, const char name[], Duration preemption_rate);
 void ^?{}(cluster & this);
 
-static inline void ?{} (cluster & this)                                      { this{"Anonymous Cluster", default_preemption(), 0}; }
-static inline void ?{} (cluster & this, Duration preemption_rate)            { this{"Anonymous Cluster", preemption_rate, 0}; }
-static inline void ?{} (cluster & this, const char name[])                   { this{name, default_preemption(), 0}; }
-static inline void ?{} (cluster & this, int flags)                           { this{"Anonymous Cluster", default_preemption(), flags}; }
-static inline void ?{} (cluster & this, Duration preemption_rate, int flags) { this{"Anonymous Cluster", preemption_rate, flags}; }
-static inline void ?{} (cluster & this, const char name[], int flags)        { this{name, default_preemption(), flags}; }
-
-static inline [cluster *&, cluster *& ] __get( cluster & this ) __attribute__((const)) { return this.node.[next, prev]; }
+static inline void ?{} (cluster & this)                           { this{"Anonymous Cluster", default_preemption()}; }
+static inline void ?{} (cluster & this, Duration preemption_rate) { this{"Anonymous Cluster", preemption_rate}; }
+static inline void ?{} (cluster & this, const char name[])        { this{name, default_preemption()}; }
+
+static inline [cluster *&, cluster *& ] __get( cluster & this ) {
+        return this.node.[next, prev];
+}
 
 static inline struct processor * active_processor() { return TL_GET( this_processor ); } // UNSAFE
 static inline struct cluster   * active_cluster  () { return TL_GET( this_processor )->cltr; }
-
-#if !defined(__CFA_NO_STATISTICS__)
-        static inline void print_stats_at_exit( cluster & this ) {
-                this.print_stats = true;
-        }
-#endif
 
 // Local Variables: //