Changeset 4f102fa for libcfa/src/concurrency

Timestamp:

Oct 11, 2022, 8:28:32 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

e5256bd

Parents:

116a2ea (diff), a55472cc (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

Files:

• io.cfa (modified) (4 diffs)
• io/types.hfa (modified) (1 diff)
• kernel/cluster.hfa (modified) (3 diffs)

libcfa/src/concurrency/io.cfa

@@ -551 +551 @@
                 enqueue(this.pending, (__outstanding_io&)pa);
 
-                wait( pa.sem );
+                wait( pa.waitctx );
 
                 return pa.ctx;
@@ -578 +578 @@
                                 pa.ctx = ctx;
 
-                                post( pa.sem );
+                                post( pa.waitctx );
                         }
 
@@ -613 +613 @@
                 }
 
-                wait( ei.sem );
+                wait( ei.waitctx );
 
                 __cfadbg_print_safe(io, "Kernel I/O : %u submitted from arbiter\n", have);
@@ -631 +631 @@
                                         __submit_only(&ctx, ei.idxs, ei.have);
 
-                                        post( ei.sem );
+                                        post( ei.waitctx );
                                 }
 

libcfa/src/concurrency/io/types.hfa

@@ -107 +107 @@
         struct __outstanding_io {
                 inline Colable;
-                single_sem sem;
+                oneshot waitctx;
         };
         static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }

libcfa/src/concurrency/kernel/cluster.hfa

@@ -21 +21 @@
 
 #include <limits.h>
+#include <inttypes.h>
 
 #include "clock.hfa"
@@ -30 +31 @@
 
 // warn normally all ints
-#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'ldms \n", old_avg, old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'ldms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
+#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'" PRId64 "ms \n", old_avg, old_avg, program()`ms )
+#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'" PRId64 "ms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
 
 // 8X linear factor is just 8 * x
@@ -41 +42 @@
 static inline __readyQ_avg_t __to_readyQ_avg(unsigned long long intsc) { if(unlikely(0 == intsc)) return 0.0; else return log2(intsc); }
 
-#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'ldms \n", old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'ldms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
+#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'" PRId64 "ms \n", old_avg, program()`ms )
+#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'" PRId64 "ms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
 verify(ret >= 0)