rms/libfaketime
1
0
Fork 0
mirror of https://github.com/wolfcw/libfaketime.git synced 2026-05-17 00:26:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #422 from fixindan/dead_lock_no_return

Browse Source 
Swapped out pthread_rwlock_xxlock(), which doesn't return if it can't…
This commit is contained in:
Wolfgang Hommel
2023-02-25 12:58:03 +01:00
committed by GitHub
parent 6fc4ae74f4 8ef74e33b6
commit 6d072025c0
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libfaketime.c
View File

@@ -3602,9 +3602,9 @@ int pthread_cond_init_232(pthread_cond_t *restrict cond, const pthread_condattr_
struct pthread_cond_monotonic *e = (struct pthread_cond_monotonic*)malloc(sizeof(struct pthread_cond_monotonic));
e->ptr = cond;
if (pthread_rwlock_wrlock(&monotonic_conds_lock) != 0) {
fprintf(stderr,"can't acquire write monotonic_conds_lock\n");
exit(-1);
if (pthread_rwlock_trywrlock(&monotonic_conds_lock) != 0) {
sched_yield();
return EAGAIN;
}
HASH_ADD_PTR(monotonic_conds, ptr, e);
pthread_rwlock_unlock(&monotonic_conds_lock);
@@ -3617,9 +3617,9 @@ int pthread_cond_destroy_232(pthread_cond_t *cond)
{
struct pthread_cond_monotonic* e;
if (pthread_rwlock_wrlock(&monotonic_conds_lock) != 0) {
fprintf(stderr,"can't acquire write monotonic_conds_lock\n");
exit(-1);
if (pthread_rwlock_trywrlock(&monotonic_conds_lock) != 0) {
sched_yield();
return EBUSY;
}
HASH_FIND_PTR(monotonic_conds, &cond, e);
if (e) {
@@ -3701,9 +3701,9 @@ int pthread_cond_timedwait_common(pthread_cond_t *cond, pthread_mutex_t *mutex,
if (abstime != NULL)
{
if (pthread_rwlock_rdlock(&monotonic_conds_lock) != 0) {
fprintf(stderr,"can't acquire read monotonic_conds_lock\n");
exit(-1);
if (pthread_rwlock_tryrdlock(&monotonic_conds_lock) != 0) {
sched_yield();
return EAGAIN;
}
HASH_FIND_PTR(monotonic_conds, &cond, e);
pthread_rwlock_unlock(&monotonic_conds_lock);