Changeset d48b174

Timestamp:

Jan 12, 2021, 12:57:59 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

35285fd

Parents:

58f99b3

Message:

clean-up handling of epoll so it's limited to one file

Location:

libcfa/src/concurrency

Files:

• io.cfa (modified) (4 diffs)
• io/setup.cfa (modified) (2 diffs)
• io/types.hfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -31 +31 @@
 
         extern "C" {
-                #include <sys/epoll.h>
-                #include <sys/eventfd.h>
                 #include <sys/syscall.h>
 
@@ -266 +264 @@
 
         void main( $io_ctx_thread & this ) {
-                epoll_event ev;
-                __ioctx_register( this, ev );
+                __ioctx_register( this );
 
                 __cfadbg_print_safe(io_core, "Kernel I/O : IO poller %d (%p) ready\n", this.ring->fd, &this);
@@ -303 +300 @@
                                 // we need to retry one last time in case
                                 // something completed *just now*
-                                __ioctx_prepare_block( this, ev );
+                                __ioctx_prepare_block( this );
                                 continue LOOP;
                         }
@@ -314 +311 @@
                                 // block this thread
                                 wait( this.sem );
-
-                                eventfd_t v;
-                                eventfd_read(this.ring->efd, &v);
 
                         // restore counter

libcfa/src/concurrency/io/setup.cfa

@@ -190 +190 @@
                                         __cfaabi_tls.this_stats = io_ctx->self.curr_cluster->stats;
                                 #endif
+
+                                eventfd_t v;
+                                eventfd_read(io_ctx->ring->efd, &v);
+
                                 post( io_ctx->sem );
                         }
@@ -494 +498 @@
 // I/O Context Sleep
 //=============================================================================================
-
-        void __ioctx_register($io_ctx_thread & ctx, struct epoll_event & ev) {
-                ev.events = EPOLLIN | EPOLLET | EPOLLONESHOT;
+        #define IOEVENTS EPOLLIN | EPOLLONESHOT
+
+        static inline void __ioctx_epoll_ctl($io_ctx_thread & ctx, int op, const char * error) {
+                struct epoll_event ev;
+                ev.events = IOEVENTS;
                 ev.data.u64 = (__u64)&ctx;
-                int ret = epoll_ctl(iopoll.epollfd, EPOLL_CTL_ADD, ctx.ring->efd, &ev);
+                int ret = epoll_ctl(iopoll.epollfd, op, ctx.ring->efd, &ev);
                 if (ret < 0) {
-                        abort( "KERNEL ERROR: EPOLL ADD - (%d) %s\n", (int)errno, strerror(errno) );
-                }
-        }
-
-        void __ioctx_prepare_block($io_ctx_thread & ctx, struct epoll_event & ev) {
+                        abort( "KERNEL ERROR: EPOLL %s - (%d) %s\n", error, (int)errno, strerror(errno) );
+                }
+        }
+
+        void __ioctx_register($io_ctx_thread & ctx) {
+                __ioctx_epoll_ctl(ctx, EPOLL_CTL_ADD, "ADD");
+        }
+
+        void __ioctx_prepare_block($io_ctx_thread & ctx) {
                 __cfadbg_print_safe(io_core, "Kernel I/O - epoll : Re-arming io poller %d (%p)\n", ctx.ring->fd, &ctx);
-                int ret = epoll_ctl(iopoll.epollfd, EPOLL_CTL_MOD, ctx.ring->efd, &ev);
-                if (ret < 0) {
-                        abort( "KERNEL ERROR: EPOLL REARM - (%d) %s\n", (int)errno, strerror(errno) );
-                }
+                __ioctx_epoll_ctl(ctx, EPOLL_CTL_MOD, "REARM");
         }
 

libcfa/src/concurrency/io/types.hfa

@@ -131 +131 @@
         #endif
 
-        struct epoll_event;
         struct $io_ctx_thread;
-        void __ioctx_register($io_ctx_thread & ctx, struct epoll_event & ev);
-        void __ioctx_prepare_block($io_ctx_thread & ctx, struct epoll_event & ev);
+        void __ioctx_register($io_ctx_thread & ctx);
+        void __ioctx_prepare_block($io_ctx_thread & ctx);
 #endif