Changeset d27b6be for libcfa/src/concurrency

Timestamp:

Mar 22, 2021, 4:07:21 PM (3 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:

304de00

Parents:

d971c8d

Message:

• Fixed TryLock? in blocking_lock implementation that did not return whether or not try_lock succeeded.
• Fix cfathread try_lock interface.

Location:

libcfa/src/concurrency

Files:

• clib/cfathread.cfa (modified) (1 diff)
• locks.hfa (modified) (2 diffs)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -245 +245 @@
         int cfathread_mutex_init(cfathread_mutex_t *restrict mut, const cfathread_mutexattr_t *restrict) __attribute__((nonnull (1))) { *mut = new(); return 0; }
         int cfathread_mutex_destroy(cfathread_mutex_t *mut) __attribute__((nonnull (1))) { delete( *mut ); return 0; }
-        int cfathread_mutex_lock   (cfathread_mutex_t *mut) __attribute__((nonnull (1))) { lock    ( (*mut)->impl ); return 0; }
-        int cfathread_mutex_trylock(cfathread_mutex_t *mut) __attribute__((nonnull (1))) { try_lock( (*mut)->impl ); return 0; }
-        int cfathread_mutex_unlock (cfathread_mutex_t *mut) __attribute__((nonnull (1))) { unlock  ( (*mut)->impl ); return 0; }
+        int cfathread_mutex_lock   (cfathread_mutex_t *mut) __attribute__((nonnull (1))) { lock( (*mut)->impl ); return 0; }
+        int cfathread_mutex_unlock (cfathread_mutex_t *mut) __attribute__((nonnull (1))) { unlock( (*mut)->impl ); return 0; }
+        int cfathread_mutex_trylock(cfathread_mutex_t *mut) __attribute__((nonnull (1))) {
+                bool ret = try_lock( (*mut)->impl );
+                if( ret ) return 0;
+                else return EBUSY;
+        }
 
         //--------------------

libcfa/src/concurrency/locks.hfa

@@ -32 +32 @@
 static inline void ^?{}( single_acquisition_lock & this ) {}
 static inline void   lock      ( single_acquisition_lock & this ) { lock    ( (blocking_lock &)this ); }
-static inline void   try_lock  ( single_acquisition_lock & this ) { try_lock( (blocking_lock &)this ); }
+static inline bool   try_lock  ( single_acquisition_lock & this ) { return try_lock( (blocking_lock &)this ); }
 static inline void   unlock    ( single_acquisition_lock & this ) { unlock  ( (blocking_lock &)this ); }
 static inline void   on_wait   ( single_acquisition_lock & this ) { on_wait ( (blocking_lock &)this ); }
@@ -47 +47 @@
 static inline void ^?{}( owner_lock & this ) {}
 static inline void   lock     ( owner_lock & this ) { lock    ( (blocking_lock &)this ); }
-static inline void   try_lock ( owner_lock & this ) { try_lock( (blocking_lock &)this ); }
+static inline bool   try_lock ( owner_lock & this ) { return try_lock( (blocking_lock &)this ); }
 static inline void   unlock   ( owner_lock & this ) { unlock  ( (blocking_lock &)this ); }
 static inline void   on_wait  ( owner_lock & this ) { on_wait ( (blocking_lock &)this ); }