Changes in / [86601a5:5a96b36]

File:

• tests/unified_locking/mutex_test.hfa (modified) (4 diffs)

tests/unified_locking/mutex_test.hfa

@@ -22 +22 @@
 }
 
-uint32_t cs(uint32_t & entries) {
+uint32_t cs() {
         thread$ * me = active_thread();
         uint32_t value;
         lock(mo.l);
         {
-                entries++;
                 uint32_t tsum = mo.sum;
                 uint32_t cnt = mo.cnt;
@@ -43 +42 @@
 thread LockCheck {
         uint32_t sum;
-        uint32_t entries;
 };
 
 void main(LockCheck & this) {
         this.sum = 0;
-        this.entries = 0;
         for(num_times) {
                 trash();
-                this.sum += cs( this.entries );
+                this.sum += cs();
                 trash();
                 yield(random(10));
@@ -61 +58 @@
         mo.sum = -32;
         mo.cnt = 0;
-        uint32_t real_entries = 0;
         processor p[2];
         sout | "Starting";
@@ -67 +63 @@
                 LockCheck checkers[13];
                 for(i;13) {
-                        LockCheck & curr = join(checkers[i]);
-                        sum += curr.sum;
-                        real_entries += curr.entries;
+                        sum += join(checkers[i]).sum;
                 }
         }
         sout | "Done!";
-        if(real_entries != (13 * num_times)) sout | "Invalid real cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
-        if(mo.cnt != (13 * num_times)) sout | "Invalid concurrent cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
+        if(mo.cnt != (13 * num_times)) sout | "Invalid cs count!" | mo.cnt | "vs "| (13 * num_times) | "(13 *" | num_times | ')';
         if(sum == mo.sum) sout | "Match!";
         else sout | "No Match!" | sum | "vs" | mo.sum;