Changeset 6a490b2 for libcfa/src/concurrency/kernel.hfa

Timestamp:

May 11, 2020, 1:53:29 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

504a7dc

Parents:

b7d6a36 (diff), a7b486b (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' into relaxed_ready

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -17 +17 @@
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "invoke.h"
@@ -32 +33 @@
         __spinlock_t lock;
         int count;
-        __queue_t(thread_desc) waiting;
+        __queue_t($thread) waiting;
 };
 
 void  ?{}(semaphore & this, int count = 1);
 void ^?{}(semaphore & this);
-void   P (semaphore & this);
-void   V (semaphore & this);
+bool   P (semaphore & this);
+bool   V (semaphore & this);
+bool   V (semaphore & this, unsigned count);
 
 
@@ -44 +46 @@
 // 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
@@ -117 +70 @@
         // RunThread data
         // Action to do after a thread is ran
-        struct FinishAction finish;
+        $thread * destroyer;
 
         // Preemption data
@@ -126 +79 @@
         bool pending_preemption;
 
-        // Idle lock
-        __bin_sem_t idleLock;
+        // Idle lock (kernel semaphore)
+        __bin_sem_t idle;
 
         // Termination
@@ -133 +86 @@
         volatile bool do_terminate;
 
-        // Termination synchronisation
+        // Termination synchronisation (user semaphore)
         semaphore terminated;
 
@@ -158 +111 @@
 static inline void  ?{}(processor & this, const char name[]) { this{name, *mainCluster }; }
 
-static inline [processor *&, processor *& ] __get( processor & this ) {
-        return this.node.[next, prev];
-}
+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
 
 
@@ -333 +291 @@
         // List of threads
         __spinlock_t thread_list_lock;
-        __dllist_t(struct thread_desc) threads;
+        __dllist_t(struct $thread) threads;
         unsigned int nthreads;
 
@@ -341 +299 @@
                 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);
+void ?{} (cluster & this, const char name[], Duration preemption_rate, int flags);
 void ^?{}(cluster & this);
 
-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 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 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: //