Changeset 2432e8e for libcfa/src/concurrency/io.cfa

Timestamp:

Mar 2, 2022, 2:07:45 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

ced2e855

Parents:

028404f

Message:

Fixed deadlock on io slowpath due to spin lock recursion.

File:

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

libcfa/src/concurrency/io.cfa

@@ -287 +287 @@
         //=============================================================================================
         // submission
-        static inline void __submit( struct $io_context * ctx, __u32 idxs[], __u32 have, bool lazy) {
+        static inline void __submit_only( struct $io_context * ctx, __u32 idxs[], __u32 have) {
                 // We can proceed to the fast path
                 // Get the right objects
@@ -306 +306 @@
                 ctx->proc->io.pending = true;
                 ctx->proc->io.dirty   = true;
+        }
+
+        static inline void __submit( struct $io_context * ctx, __u32 idxs[], __u32 have, bool lazy) {
+                __sub_ring_t & sq = ctx->sq;
+                __submit_only(ctx, idxs, have);
+
                 if(sq.to_submit > 30) {
                         __tls_stats()->io.flush.full++;
@@ -501 +507 @@
                                         __external_io & ei = (__external_io&)drop( ctx.ext_sq.queue );
 
-                                        __submit(&ctx, ei.idxs, ei.have, ei.lazy);
+                                        __submit_only(&ctx, ei.idxs, ei.have);
 
                                         post( ei.sem );