Index: libcfa/src/concurrency/clib/cfathread.cfa =================================================================== --- libcfa/src/concurrency/clib/cfathread.cfa (revision 1324fdeb242f419454dc5d092c6a456182ce072d) +++ libcfa/src/concurrency/clib/cfathread.cfa (revision 8dc8f685ba350a26b62441941e152a41b4645d48) @@ -450,5 +450,5 @@ // Condition struct cfathread_condition { - condition_variable(exp_backoff_then_block_lock) impl; + cond_lock(exp_backoff_then_block_lock) impl; }; int cfathread_cond_init(cfathread_cond_t *restrict cond, const cfathread_condattr_t *restrict) __attribute__((nonnull (1))) { *cond = new(); return 0; } Index: libcfa/src/concurrency/locks.cfa =================================================================== --- libcfa/src/concurrency/locks.cfa (revision 1324fdeb242f419454dc5d092c6a456182ce072d) +++ libcfa/src/concurrency/locks.cfa (revision 8dc8f685ba350a26b62441941e152a41b4645d48) @@ -246,9 +246,9 @@ struct alarm_node_wrap { alarm_node_t alarm_node; - condition_variable(L) * cond; + cond_lock(L) * cond; info_thread(L) * info_thd; }; - void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) { + void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, cond_lock(L) * c, info_thread(L) * i ) { this.alarm_node{ callback, alarm, period }; this.cond = c; @@ -259,5 +259,5 @@ static void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) { - // This condition_variable member is called from the kernel, and therefore, cannot block, but it can spin. + // This cond_lock member is called from the kernel, and therefore, cannot block, but it can spin. lock( cond->lock __cfaabi_dbg_ctx2 ); @@ -323,5 +323,5 @@ //----------------------------------------------------------------------------- // condition variable - void ?{}( condition_variable(L) & this ){ + void ?{}( cond_lock(L) & this ){ this.lock{}; this.blocked_threads{}; @@ -329,7 +329,7 @@ } - void ^?{}( condition_variable(L) & this ){ } - - static void process_popped( condition_variable(L) & this, info_thread(L) & popped ) with( this ) { + void ^?{}( cond_lock(L) & this ){ } + + static void process_popped( cond_lock(L) & this, info_thread(L) & popped ) with( this ) { if (&popped != 0p) { popped.signalled = true; @@ -345,5 +345,5 @@ } - bool notify_one( condition_variable(L) & this ) with( this ) { + bool notify_one( cond_lock(L) & this ) with( this ) { lock( lock __cfaabi_dbg_ctx2 ); bool ret = ! isEmpty( blocked_threads ); @@ -353,5 +353,5 @@ } - bool notify_all( condition_variable(L) & this ) with(this) { + bool notify_all( cond_lock(L) & this ) with(this) { lock( lock __cfaabi_dbg_ctx2 ); bool ret = ! isEmpty( blocked_threads ); @@ -363,9 +363,9 @@ } - uintptr_t front( condition_variable(L) & this ) with(this) { + uintptr_t front( cond_lock(L) & this ) with(this) { return isEmpty( blocked_threads ) ? NULL : first( blocked_threads ).info; } - bool empty( condition_variable(L) & this ) with(this) { + bool empty( cond_lock(L) & this ) with(this) { lock( lock __cfaabi_dbg_ctx2 ); bool ret = isEmpty( blocked_threads ); @@ -374,7 +374,7 @@ } - int counter( condition_variable(L) & this ) with(this) { return count; } - - static void enqueue_thread( condition_variable(L) & this, info_thread(L) * i ) with(this) { + int counter( cond_lock(L) & this ) with(this) { return count; } + + static void enqueue_thread( cond_lock(L) & this, info_thread(L) * i ) with(this) { // add info_thread to waiting queue insert_last( blocked_threads, *i ); @@ -393,5 +393,5 @@ // helper for wait()'s' with no timeout - static void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) { + static void queue_info_thread( cond_lock(L) & this, info_thread(L) & i ) with(this) { lock( lock __cfaabi_dbg_ctx2 ); enqueue_thread( this, &i ); @@ -412,5 +412,5 @@ // helper for wait()'s' with a timeout - static void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) { + static void queue_info_thread_timeout( cond_lock(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) { lock( lock __cfaabi_dbg_ctx2 ); enqueue_thread( this, &info ); @@ -434,13 +434,13 @@ return i.signalled; - void wait( condition_variable(L) & this ) with(this) { WAIT( 0, 0p ) } - void wait( condition_variable(L) & this, uintptr_t info ) with(this) { WAIT( info, 0p ) } - void wait( condition_variable(L) & this, L & l ) with(this) { WAIT( 0, &l ) } - void wait( condition_variable(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) } - - bool wait( condition_variable(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , duration ) } - bool wait( condition_variable(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , duration ) } - bool wait( condition_variable(L) & this, L & l, Duration duration ) with(this) { WAIT_TIME( 0 , &l , duration ) } - bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) } + void wait( cond_lock(L) & this ) with(this) { WAIT( 0, 0p ) } + void wait( cond_lock(L) & this, uintptr_t info ) with(this) { WAIT( info, 0p ) } + void wait( cond_lock(L) & this, L & l ) with(this) { WAIT( 0, &l ) } + void wait( cond_lock(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) } + + bool wait( cond_lock(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , duration ) } + bool wait( cond_lock(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , duration ) } + bool wait( cond_lock(L) & this, L & l, Duration duration ) with(this) { WAIT_TIME( 0 , &l , duration ) } + bool wait( cond_lock(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) } //----------------------------------------------------------------------------- Index: libcfa/src/concurrency/locks.hfa =================================================================== --- libcfa/src/concurrency/locks.hfa (revision 1324fdeb242f419454dc5d092c6a456182ce072d) +++ libcfa/src/concurrency/locks.hfa (revision 8dc8f685ba350a26b62441941e152a41b4645d48) @@ -11,6 +11,6 @@ // Created On : Thu Jan 21 19:46:50 2021 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Apr 25 07:14:16 2025 -// Update Count : 22 +// Last Modified On : Thu Aug 21 22:36:44 2025 +// Update Count : 23 // @@ -797,5 +797,5 @@ //----------------------------------------------------------------------------- - // condition_variable + // cond_lock // The multi-tool condition variable @@ -805,5 +805,5 @@ // - has shadow queue // - can be signalled outside of critical sections with no locks held - struct condition_variable { + struct cond_lock { // Spin lock used for mutual exclusion __spinlock_t lock; @@ -816,24 +816,24 @@ }; - void ?{}( condition_variable( L ) & this ); - void ^?{}( condition_variable( L ) & this ); - - bool notify_one( condition_variable( L ) & this ); - bool notify_all( condition_variable( L ) & this ); - - uintptr_t front( condition_variable( L ) & this ); - - bool empty ( condition_variable( L ) & this ); - int counter( condition_variable( L ) & this ); - - void wait( condition_variable( L ) & this ); - void wait( condition_variable( L ) & this, uintptr_t info ); - bool wait( condition_variable( L ) & this, Duration duration ); - bool wait( condition_variable( L ) & this, uintptr_t info, Duration duration ); - - void wait( condition_variable( L ) & this, L & l ); - void wait( condition_variable( L ) & this, L & l, uintptr_t info ); - bool wait( condition_variable( L ) & this, L & l, Duration duration ); - bool wait( condition_variable( L ) & this, L & l, uintptr_t info, Duration duration ); + void ?{}( cond_lock( L ) & this ); + void ^?{}( cond_lock( L ) & this ); + + bool notify_one( cond_lock( L ) & this ); + bool notify_all( cond_lock( L ) & this ); + + uintptr_t front( cond_lock( L ) & this ); + + bool empty ( cond_lock( L ) & this ); + int counter( cond_lock( L ) & this ); + + void wait( cond_lock( L ) & this ); + void wait( cond_lock( L ) & this, uintptr_t info ); + bool wait( cond_lock( L ) & this, Duration duration ); + bool wait( cond_lock( L ) & this, uintptr_t info, Duration duration ); + + void wait( cond_lock( L ) & this, L & l ); + void wait( cond_lock( L ) & this, L & l, uintptr_t info ); + bool wait( cond_lock( L ) & this, L & l, Duration duration ); + bool wait( cond_lock( L ) & this, L & l, uintptr_t info, Duration duration ); //----------------------------------------------------------------------------- Index: libcfa/src/concurrency/mutex.cfa =================================================================== --- libcfa/src/concurrency/mutex.cfa (revision 1324fdeb242f419454dc5d092c6a456182ce072d) +++ libcfa/src/concurrency/mutex.cfa (revision 8dc8f685ba350a26b62441941e152a41b4645d48) @@ -12,6 +12,6 @@ // Created On : Fri May 25 01:37:11 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Feb 19 17:01:36 2023 -// Update Count : 3 +// Last Modified On : Thu Aug 21 22:35:44 2025 +// Update Count : 4 // @@ -131,13 +131,13 @@ //----------------------------------------------------------------------------- // Conditions -void ?{}(condition_variable & this) { +void ?{}(cond_lock & this) { this.blocked_threads{}; } -void ^?{}(condition_variable & this) { +void ^?{}(cond_lock & this) { // default } -void notify_one(condition_variable & this) with(this) { +void notify_one(cond_lock & this) with(this) { lock( lock __cfaabi_dbg_ctx2 ); unpark( @@ -147,5 +147,5 @@ } -void notify_all(condition_variable & this) with(this) { +void notify_all(cond_lock & this) with(this) { lock( lock __cfaabi_dbg_ctx2 ); while(this.blocked_threads) { @@ -157,5 +157,5 @@ } -void wait(condition_variable & this) { +void wait(cond_lock & this) { lock( this.lock __cfaabi_dbg_ctx2 ); append( this.blocked_threads, active_thread() ); @@ -165,5 +165,5 @@ forall(L & | is_lock(L)) -void wait(condition_variable & this, L & l) { +void wait(cond_lock & this, L & l) { lock( this.lock __cfaabi_dbg_ctx2 ); append( this.blocked_threads, active_thread() ); Index: libcfa/src/concurrency/mutex.hfa =================================================================== --- libcfa/src/concurrency/mutex.hfa (revision 1324fdeb242f419454dc5d092c6a456182ce072d) +++ libcfa/src/concurrency/mutex.hfa (revision 8dc8f685ba350a26b62441941e152a41b4645d48) @@ -12,6 +12,6 @@ // Created On : Fri May 25 01:24:09 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Feb 2 11:46:08 2023 -// Update Count : 2 +// Last Modified On : Thu Aug 21 22:35:23 2025 +// Update Count : 3 // @@ -79,5 +79,5 @@ // Condition variables -struct condition_variable { +struct cond_lock { // Spin lock used for mutual exclusion __spinlock_t lock; @@ -87,14 +87,14 @@ }; -void ?{}(condition_variable & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); -void ^?{}(condition_variable & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void ?{}(cond_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void ^?{}(cond_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); -void notify_one(condition_variable & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); -void notify_all(condition_variable & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void notify_one(cond_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void notify_all(cond_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); -void wait(condition_variable & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void wait(cond_lock & this) __attribute__((deprecated("use concurrency/locks.hfa instead"))); forall(L & | is_lock(L)) -void wait(condition_variable & this, L & l) __attribute__((deprecated("use concurrency/locks.hfa instead"))); +void wait(cond_lock & this, L & l) __attribute__((deprecated("use concurrency/locks.hfa instead"))); //-----------------------------------------------------------------------------