Changes in libcfa/src/concurrency/kernel.hfa [dddb3dd0:da3963a]

File:

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

libcfa/src/concurrency/kernel.hfa

@@ -28 +28 @@
 }
 
+//-----------------------------------------------------------------------------
+// Underlying Locks
 #ifdef __CFA_WITH_VERIFY__
         extern bool __cfaabi_dbg_in_kernel();
 #endif
 
-//-----------------------------------------------------------------------------
-// I/O
-struct cluster;
-struct $io_context;
-struct $io_arbiter;
-
-struct io_context_params {
-        int num_entries;
-};
-
-void  ?{}(io_context_params & this);
+struct __bin_sem_t {
+        pthread_mutex_t         lock;
+        pthread_cond_t          cond;
+        int                     val;
+};
 
 //-----------------------------------------------------------------------------
@@ -82 +78 @@
         pthread_t kernel_thread;
 
-        struct {
-                $io_context * ctx;
-                bool pending;
-                bool dirty;
-        } io;
-
         // Preemption data
         // Node which is added in the discrete event simulaiton
@@ -96 +86 @@
 
         // Idle lock (kernel semaphore)
-        int idle;
+        __bin_sem_t idle;
 
         // Termination synchronisation (user semaphore)
@@ -126 +116 @@
 
 DLISTED_MGD_IMPL_OUT(processor)
+
+//-----------------------------------------------------------------------------
+// I/O
+struct __io_data;
+
+// IO poller user-thread
+// Not using the "thread" keyword because we want to control
+// more carefully when to start/stop it
+struct $io_ctx_thread {
+        struct __io_data * ring;
+        single_sem sem;
+        volatile bool done;
+        $thread self;
+};
+
+
+struct io_context {
+        $io_ctx_thread thrd;
+};
+
+struct io_context_params {
+        int num_entries;
+        int num_ready;
+        int submit_aff;
+        bool eager_submits:1;
+        bool poller_submits:1;
+        bool poll_submit:1;
+        bool poll_complete:1;
+};
+
+void  ?{}(io_context_params & this);
+
+void  ?{}(io_context & this, struct cluster & cl);
+void  ?{}(io_context & this, struct cluster & cl, const io_context_params & params);
+void ^?{}(io_context & this);
+
+struct io_cancellation {
+        __u64 target;
+};
+
+static inline void  ?{}(io_cancellation & this) { this.target = -1u; }
+static inline void ^?{}(io_cancellation &) {}
+bool cancel(io_cancellation & this);
 
 //-----------------------------------------------------------------------------
@@ -211 +244 @@
 
         struct {
-                $io_arbiter * arbiter;
-                io_context_params params;
+                io_context * ctxs;
+                unsigned cnt;
         } io;