Changeset 402658b1 for libcfa/src/concurrency/io/types.hfa

Timestamp:

Jan 13, 2021, 10:23:07 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

9153e53

Parents:

bace538 (diff), a00bc5b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/concurrency/io/types.hfa (modified) (4 diffs)

libcfa/src/concurrency/io/types.hfa

@@ -65 +65 @@
 
                 // A buffer of sqes (not the actual ring)
-                struct io_uring_sqe * sqes;
+                volatile struct io_uring_sqe * sqes;
 
                 // The location and size of the mmaped area
@@ -85 +85 @@
 
                 // the kernel ring
-                struct io_uring_cqe * cqes;
+                volatile struct io_uring_cqe * cqes;
 
                 // The location and size of the mmaped area
@@ -97 +97 @@
                 __u32 ring_flags;
                 int fd;
+                int efd;
                 bool eager_submits:1;
                 bool poller_submits:1;
@@ -130 +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);
+        void __sqe_clean( volatile struct io_uring_sqe * sqe );
 #endif