Changeset f5a51db for libcfa/src/concurrency/kernel

Timestamp:

Feb 8, 2022, 11:53:13 AM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

cc7bbe6

Parents:

97c215f (diff), 1cf8a9f (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

Location:

libcfa/src/concurrency/kernel

Files:

• fwd.hfa (modified) (1 diff)
• startup.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -396 +396 @@
                                 if( !(in_kernel) ) enable_interrupts(); \
                         }
+                        #if defined(CFA_HAVE_LINUX_IO_URING_H)
+                                #define __IO_STATS__(in_kernel, ...) { \
+                                        if( !(in_kernel) ) disable_interrupts(); \
+                                        with( *__tls_stats() ) { \
+                                                __VA_ARGS__ \
+                                        } \
+                                        if( !(in_kernel) ) enable_interrupts(); \
+                                }
+                        #else
+                                #define __IO_STATS__(in_kernel, ...)
+                        #endif
                 #else
                         #define __STATS__(in_kernel, ...)
+                        #define __IO_STATS__(in_kernel, ...)
                 #endif
         }

libcfa/src/concurrency/kernel/startup.cfa

@@ -537 +537 @@
         }
 
+        this.idle_wctx.fd = 0;
+
+        // I'm assuming these two are reserved for standard input and output
+        // so I'm using them as sentinels with idle_wctx.
+        /* paranoid */ verify( this.idle_fd != 0 );
+        /* paranoid */ verify( this.idle_fd != 1 );
+
         #if !defined(__CFA_NO_STATISTICS__)
                 print_stats = 0;
@@ -590 +597 @@
 // Cluster
 static void ?{}(__cluster_proc_list & this) {
-        this.fd    = 0;
+        this.fdw   = 0p;
         this.idle  = 0;
         this.total = 0;