Changeset 7f6a7c9 for libcfa/src/concurrency/io/call.cfa.in

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years 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/call.cfa.in (modified) (2 diffs)

libcfa/src/concurrency/io/call.cfa.in

@@ -75 +75 @@
         ;
 
-        extern struct $io_context * cfa_io_allocate(struct io_uring_sqe * out_sqes[], __u32 out_idxs[], __u32 want)  __attribute__((nonnull (1,2)));
-        extern void cfa_io_submit( struct $io_context * in_ctx, __u32 in_idxs[], __u32 have, bool lazy ) __attribute__((nonnull (1,2)));
+        extern struct io_context$ * cfa_io_allocate(struct io_uring_sqe * out_sqes[], __u32 out_idxs[], __u32 want)  __attribute__((nonnull (1,2)));
+        extern void cfa_io_submit( struct io_context$ * in_ctx, __u32 in_idxs[], __u32 have, bool lazy ) __attribute__((nonnull (1,2)));
 #endif
 
@@ -200 +200 @@
                 __u32 idx;
                 struct io_uring_sqe * sqe;
-                struct $io_context * ctx = cfa_io_allocate( &sqe, &idx, 1 );
-
+                struct io_context$ * ctx = cfa_io_allocate( &sqe, &idx, 1 );
+
+                memset(sqe, 0, sizeof(*sqe));
                 sqe->opcode = IORING_OP_{op};
+                sqe->flags = sflags;
                 sqe->user_data = (uintptr_t)&future;
-                sqe->flags = sflags;
-                sqe->ioprio = 0;
-                sqe->fd = 0;
-                sqe->off = 0;
-                sqe->addr = 0;
-                sqe->len = 0;
-                sqe->fsync_flags = 0;
-                sqe->__pad2[0] = 0;
-                sqe->__pad2[1] = 0;
-                sqe->__pad2[2] = 0;{body}
+                {body}
 
                 asm volatile("": : :"memory");