Changeset 7f6a7c9 for libcfa/src/concurrency/io/setup.cfa

Timestamp:

Sep 21, 2022, 11:02:15 AM (20 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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 pthread-emulation

File:

• libcfa/src/concurrency/io/setup.cfa (modified) (13 diffs)

libcfa/src/concurrency/io/setup.cfa

@@ -28 +28 @@
         void ?{}(io_context_params & this) libcfa_public {}
 
-        void  ?{}($io_context & this, struct cluster & cl) {}
-        void ^?{}($io_context & this) {}
+        void  ?{}(io_context$ & this, struct cluster & cl) {}
+        void ^?{}(io_context$ & this) {}
 
         void __cfa_io_start( processor * proc ) {}
@@ -37 +37 @@
         void __cfa_io_stop ( processor * proc ) {}
 
-        $io_arbiter * create(void) { return 0p; }
-        void destroy($io_arbiter *) {}
+        io_arbiter$ * create(void) { return 0p; }
+        void destroy(io_arbiter$ *) {}
 
 #else
@@ -105 +105 @@
 
 
-        static void __io_uring_setup ( $io_context & this, const io_context_params & params_in, int procfd );
-        static void __io_uring_teardown( $io_context & this );
-        static void __epoll_register($io_context & ctx);
-        static void __epoll_unregister($io_context & ctx);
-        void __ioarbiter_register( $io_arbiter & mutex, $io_context & ctx );
-        void __ioarbiter_unregister( $io_arbiter & mutex, $io_context & ctx );
-
-        void ?{}($io_context & this, processor * proc, struct cluster & cl) {
+        static void __io_uring_setup ( io_context$ & this, const io_context_params & params_in, int procfd );
+        static void __io_uring_teardown( io_context$ & this );
+        static void __epoll_register(io_context$ & ctx);
+        static void __epoll_unregister(io_context$ & ctx);
+        void __ioarbiter_register( io_arbiter$ & mutex, io_context$ & ctx );
+        void __ioarbiter_unregister( io_arbiter$ & mutex, io_context$ & ctx );
+
+        void ?{}(io_context$ & this, processor * proc, struct cluster & cl) {
                 /* paranoid */ verify( cl.io.arbiter );
                 this.proc = proc;
@@ -122 +122 @@
         }
 
-        void ^?{}($io_context & this) {
+        void ^?{}(io_context$ & this) {
                 __cfadbg_print_safe(io_core, "Kernel I/O : tearing down io_context %u\n", this.fd);
 
@@ -129 +129 @@
         }
 
-        static void __io_uring_setup( $io_context & this, const io_context_params & params_in, int procfd ) {
+        static void __io_uring_setup( io_context$ & this, const io_context_params & params_in, int procfd ) {
                 // Step 1 : call to setup
                 struct io_uring_params params;
@@ -228 +228 @@
 
                 #if !defined(CFA_WITH_IO_URING_IDLE)
+                {
                         // Step 4 : eventfd
                         __cfadbg_print_safe(io_core, "Kernel I/O : registering %d for completion with ring %d\n", procfd, fd);
@@ -237 +238 @@
 
                         __cfadbg_print_safe(io_core, "Kernel I/O : registered %d for completion with ring %d\n", procfd, fd);
-                #endif
-
+                }
+                #endif
+
+                // TODO: implement a proper version of this.
+                // I have not found a better maximum that works in general but users should be able to configure it
+                // the same way they configure other I/O options
                 // #if defined(CFA_HAVE_IORING_REGISTER_IOWQ_MAX_WORKERS)
+                // {
                 //      // Step 5 : max worker count
                 //      __cfadbg_print_safe(io_core, "Kernel I/O : lmiting max workers for ring %d\n", fd);
@@ -252 +258 @@
 
                 //      __cfadbg_print_safe(io_core, "Kernel I/O : lmited max workers for ring %d\n", fd);
+                // }
                 // #endif
 
@@ -270 +277 @@
         }
 
-        static void __io_uring_teardown( $io_context & this ) {
+        static void __io_uring_teardown( io_context$ & this ) {
                 // Shutdown the io rings
                 struct __sub_ring_t & sq = this.sq;
@@ -313 +320 @@
 // I/O Context Sleep
 //=============================================================================================
-        // static inline void __epoll_ctl($io_context & ctx, int op, const char * error) {
+        // static inline void __epoll_ctl(io_context$ & ctx, int op, const char * error) {
         //      struct epoll_event ev;
         //      ev.events = EPOLLIN | EPOLLONESHOT;
@@ -323 +330 @@
         // }
 
-        // static void __epoll_register($io_context & ctx) {
+        // static void __epoll_register(io_context$ & ctx) {
         //      __epoll_ctl(ctx, EPOLL_CTL_ADD, "ADD");
         // }
 
-        // static void __epoll_unregister($io_context & ctx) {
+        // static void __epoll_unregister(io_context$ & ctx) {
         //      // Read the current epoch so we know when to stop
         //      size_t curr = __atomic_load_n(&iopoll.epoch, __ATOMIC_SEQ_CST);
@@ -346 +353 @@
         // }
 
-        // void __ioctx_prepare_block($io_context & ctx) {
+        // void __ioctx_prepare_block(io_context$ & ctx) {
         //      __cfadbg_print_safe(io_core, "Kernel I/O - epoll : Re-arming io poller %d (%p)\n", ctx.fd, &ctx);
         //      __epoll_ctl(ctx, EPOLL_CTL_MOD, "REARM");
@@ -355 +362 @@
 // I/O Context Misc Setup
 //=============================================================================================
-        void ?{}( $io_arbiter & this ) {
+        void ?{}( io_arbiter$ & this ) {
                 this.pending.empty = true;
         }
 
-        void ^?{}( $io_arbiter & mutex this ) {}
-
-        $io_arbiter * create(void) {
+        void ^?{}( io_arbiter$ & mutex this ) {}
+
+        io_arbiter$ * create(void) {
                 return new();
         }
-        void destroy($io_arbiter * arbiter) {
+        void destroy(io_arbiter$ * arbiter) {
                 delete(arbiter);
         }