Changeset fece3d9 for libcfa/src/bits

Timestamp:

May 10, 2023, 2:46:05 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

8fd1b7c

Parents:

e50fce1

Message:

Added fix for cond var timeout handling race. Cleanup of locks.hfa/cfa changes is an ongoing TODO

Location:

libcfa/src/bits

Files:

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

libcfa/src/bits/weakso_locks.cfa ¶

@@ -25 +25 @@
 void unlock( blocking_lock & ) {}
 void on_notify( blocking_lock &, struct thread$ * ) {}
-size_t on_wait( blocking_lock & ) { return 0; }
+size_t on_wait( blocking_lock &, void (*pp_fn)( void * ), void * pp_datum ) { return 0; }
 void on_wakeup( blocking_lock &, size_t ) {}
 size_t wait_count( blocking_lock & ) { return 0; }

libcfa/src/bits/weakso_locks.hfa ¶

@@ -57 +57 @@
 void unlock( blocking_lock & this ) OPTIONAL_THREAD;
 void on_notify( blocking_lock & this, struct thread$ * t ) OPTIONAL_THREAD;
-size_t on_wait( blocking_lock & this ) OPTIONAL_THREAD;
+size_t on_wait( blocking_lock & this, void (*pp_fn)( void * ), void * pp_datum ) OPTIONAL_THREAD;
 void on_wakeup( blocking_lock & this, size_t ) OPTIONAL_THREAD;
 size_t wait_count( blocking_lock & this ) OPTIONAL_THREAD;
@@ -75 +75 @@
 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 size_t on_wait  ( multiple_acquisition_lock & this ) { return on_wait ( (blocking_lock &)this ); }
+static inline size_t on_wait  ( multiple_acquisition_lock & this, void (*pp_fn)( void * ), void * pp_datum ) { return on_wait ( (blocking_lock &)this, pp_fn, pp_datum ); }
 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 ); }