Changeset 22b7579 for libcfa/src/bits

Timestamp:

Mar 31, 2021, 1:48:15 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c7c178b

Parents:

f621e43f

Message:

Changed is_blocking_lock trait to use on_wakeup.
Fixed fast_lock to work with conditions.

Location:

libcfa/src/bits

Files:

• weakso_locks.cfa (modified) (1 diff)
• weakso_locks.hfa (modified) (2 diffs)

libcfa/src/bits/weakso_locks.cfa

@@ -18 +18 @@
 #include "bits/weakso_locks.hfa"
 
-void  ?{}( blocking_lock & this, bool multi_acquisition, bool strict_owner ) {}
-void ^?{}( blocking_lock & this ) {}
+void  ?{}( blocking_lock &, bool, bool ) {}
+void ^?{}( blocking_lock & ) {}
 
-void lock( blocking_lock & this ) {}
-bool try_lock( blocking_lock & this ) { return false; }
-void unlock( blocking_lock & this ) {}
-void on_notify( blocking_lock & this, struct $thread * t ) {}
-void on_wait( blocking_lock & this ) {}
-size_t wait_count( blocking_lock & this ) { return 0; }
-void set_recursion_count( blocking_lock & this, size_t recursion ) {}
-size_t get_recursion_count( blocking_lock & this ) { return 0; }
+void lock( blocking_lock & ) {}
+bool try_lock( blocking_lock & ) { return false; }
+void unlock( blocking_lock & ) {}
+void on_notify( blocking_lock &, struct $thread * ) {}
+size_t on_wait( blocking_lock & ) {}
+void on_wakeup( blocking_lock &, size_t ) {}
+size_t wait_count( blocking_lock & ) { return 0; }

libcfa/src/bits/weakso_locks.hfa

@@ -56 +56 @@
 void unlock( blocking_lock & this ) OPTIONAL_THREAD;
 void on_notify( blocking_lock & this, struct $thread * t ) OPTIONAL_THREAD;
-void on_wait( blocking_lock & this ) OPTIONAL_THREAD;
+size_t on_wait( blocking_lock & this ) OPTIONAL_THREAD;
+void on_wakeup( blocking_lock & this, size_t ) OPTIONAL_THREAD;
 size_t wait_count( blocking_lock & this ) OPTIONAL_THREAD;
-void set_recursion_count( blocking_lock & this, size_t recursion ) OPTIONAL_THREAD;
-size_t get_recursion_count( blocking_lock & this ) OPTIONAL_THREAD;
 
 //----------
@@ -72 +71 @@
 static inline bool   try_lock ( multiple_acquisition_lock & this ) { return try_lock( (blocking_lock &)this ); }
 static inline void   unlock   ( multiple_acquisition_lock & this ) { unlock  ( (blocking_lock &)this ); }
-static inline void   on_wait  ( multiple_acquisition_lock & this ) { on_wait ( (blocking_lock &)this ); }
+static inline size_t on_wait  ( multiple_acquisition_lock & this ) { return on_wait ( (blocking_lock &)this ); }
+static inline void   on_wakeup( multiple_acquisition_lock & this, size_t v ) { on_wakeup ( (blocking_lock &)this, v ); }
 static inline void   on_notify( multiple_acquisition_lock & this, struct $thread * t ){ on_notify( (blocking_lock &)this, t ); }
-static inline void   set_recursion_count( multiple_acquisition_lock & this, size_t recursion ){ set_recursion_count( (blocking_lock &)this, recursion ); }
-static inline size_t get_recursion_count( multiple_acquisition_lock & this ){ return get_recursion_count( (blocking_lock &)this ); }