Changeset e5628db for libcfa

Timestamp:

May 12, 2022, 3:10:58 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

8060b2b, f835806

Parents:

f75e25b (diff), 491bb81 (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

Files:

• concurrency/io.cfa (modified) (1 diff)
• concurrency/ready_subqueue.hfa (modified) (2 diffs)
• parseargs.cfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -244 +244 @@
 
                                         remote = true;
-                                        __STATS__( false, io.calls.helped++; )
+                                        __STATS__( true, io.calls.helped++; )
                                 }
                                 proc->io.target = MAX;

libcfa/src/concurrency/ready_subqueue.hfa

@@ -83 +83 @@
         /* paranoid */ verify( node->link.ts   != 0  );
         /* paranoid */ verify( this.anchor.ts  != 0  );
+        /* paranoid */ verify( (this.anchor.ts  == MAX) == is_empty );
         return [node, this.anchor.ts];
 }
@@ -93 +94 @@
 // Return the timestamp
 static inline unsigned long long ts(__intrusive_lane_t & this) {
-        // Cannot verify here since it may not be locked
+        // Cannot verify 'emptiness' here since it may not be locked
         /* paranoid */ verify(this.anchor.ts != 0);
         return this.anchor.ts;

libcfa/src/parseargs.cfa

@@ -208 +208 @@
         }
 
+        if(strcmp(arg, "Y") == 0) {
+                value = true;
+                return true;
+        }
+
+        if(strcmp(arg, "y") == 0) {
+                value = true;
+                return true;
+        }
+
         if(strcmp(arg, "no") == 0) {
+                value = false;
+                return true;
+        }
+
+        if(strcmp(arg, "N") == 0) {
+                value = false;
+                return true;
+        }
+
+        if(strcmp(arg, "n") == 0) {
                 value = false;
                 return true;