Changeset 154672d for libcfa/src/concurrency/io

Timestamp:

Sep 7, 2023, 10:05:33 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

0f8b1a7

Parents:

79b05224 (diff), 416b443 (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) (3 diffs)

libcfa/src/concurrency/io/types.hfa

@@ -24 +24 @@
 
 #include "bits/locks.hfa"
-#include "bits/queue.hfa"
 #include "iofwd.hfa"
 #include "kernel/fwd.hfa"
 
 #if defined(CFA_HAVE_LINUX_IO_URING_H)
-        #include "bits/sequence.hfa"
         #include "monitor.hfa"
 
@@ -120 +118 @@
         struct __outstanding_io {
                 // intrusive link fields
-                inline Colable;
+                inline dlink(__outstanding_io);
 
                 // primitive on which to block until the io is processed
                 oneshot waitctx;
         };
-        static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }
+    P9_EMBEDDED( __outstanding_io, dlink(__outstanding_io) )
 
         // queue of operations that are outstanding
@@ -134 +132 @@
 
                 // the actual queue
-                Queue(__outstanding_io) queue;
+                dlist(__outstanding_io) queue;
 
                 // volatile used to avoid the need for taking the lock if it's empty