Changeset 6fafda8

Timestamp:

Jan 6, 2022, 10:53:44 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

04a8a54, 7d0ebd0

Parents:

eaf269d (diff), 7636fcc (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

Files:

• libcfa/src/concurrency/locks.hfa (modified) (4 diffs)
• tests/meta/.expect/dumpable.txt (added)
• tests/meta/dumpable.cfa (added)
• tests/unified_locking/.expect/fast.txt (deleted)
• tests/unified_locking/mutex_test.hfa (modified) (4 diffs)
• tests/zombies/fastlock.cfa (moved) (moved from tests/unified_locking/fast.cfa)

libcfa/src/concurrency/locks.hfa

@@ -177 +177 @@
 };
 
+static inline void ?{}(fast_lock & this) __attribute__((deprecated("use linear_backoff_then_block_lock instead")));
 static inline void ?{}(fast_lock & this) { this.owner = 0p; }
 
@@ -184 +185 @@
 }
 
-static inline void lock( fast_lock & this ) __attribute__((artificial));
+static inline void lock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline void lock( fast_lock & this ) {
         thread$ * thrd = active_thread();
@@ -195 +196 @@
 }
 
-static inline bool try_lock( fast_lock & this ) __attribute__((artificial));
+static inline bool try_lock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline bool try_lock ( fast_lock & this ) {
         thread$ * thrd = active_thread();
@@ -202 +203 @@
 }
 
-static inline thread$ * unlock( fast_lock & this ) __attribute__((artificial));
+static inline thread$ * unlock( fast_lock & this ) __attribute__((deprecated("use linear_backoff_then_block_lock instead"), artificial));
 static inline thread$ * unlock( fast_lock & this ) {
         /* paranoid */ verify(active_thread() == this.owner);

tests/unified_locking/mutex_test.hfa

@@ -10 +10 @@
         thread$ * id;
         uint32_t sum;
+        uint32_t cnt;
 };
 
@@ -27 +28 @@
         {
                 uint32_t tsum = mo.sum;
+                uint32_t cnt = mo.cnt;
                 mo.id = me;
                 yield(random(5));
                 value = ((uint32_t)random()) ^ ((uint32_t)me);
                 if(mo.id != me) sout | "Intruder!";
+                mo.cnt = cnt + 1;
                 mo.sum = tsum + value;
         }
@@ -54 +57 @@
         uint32_t sum = -32;
         mo.sum = -32;
+        mo.cnt = 0;
         processor p[2];
         sout | "Starting";
@@ -63 +67 @@
         }
         sout | "Done!";
+        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;