Changeset cfff639 for libcfa/src/concurrency/io.cfa

Timestamp:

Apr 24, 2021, 7:45:02 PM (4 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:

fb0be05

Parents:

89eff25 (diff), 254ad1b (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.cfa (modified) (4 diffs)

libcfa/src/concurrency/io.cfa

@@ -244 +244 @@
                         // Allocation was successful
                         __STATS__( true, io.alloc.fast += 1; )
-                        enable_interrupts( __cfaabi_dbg_ctx );
+                        enable_interrupts();
 
                         __cfadbg_print_safe(io, "Kernel I/O : fast allocation successful from ring %d\n", ctx->fd);
@@ -256 +256 @@
                 // Fast path failed, fallback on arbitration
                 __STATS__( true, io.alloc.slow += 1; )
-                enable_interrupts( __cfaabi_dbg_ctx );
+                enable_interrupts();
 
                 $io_arbiter * ioarb = proc->cltr->io.arbiter;
@@ -314 +314 @@
                         // Mark the instance as no longer in-use, re-enable interrupts and return
                         __STATS__( true, io.submit.fast += 1; )
-                        enable_interrupts( __cfaabi_dbg_ctx );
+                        enable_interrupts();
 
                         __cfadbg_print_safe(io, "Kernel I/O : submitted on fast path\n");
@@ -322 +322 @@
                 // Fast path failed, fallback on arbitration
                 __STATS__( true, io.submit.slow += 1; )
-                enable_interrupts( __cfaabi_dbg_ctx );
+                enable_interrupts();
 
                 __cfadbg_print_safe(io, "Kernel I/O : falling back on arbiter for submission\n");