From d3afce4f3c53f6f8d0cb7a7587291c8e517eaac0 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Thu, 16 Aug 2018 14:40:13 +0200
Subject: [PATCH] Print detailed info why mutex locking failed
---
openair1/PHY/defs_common.h | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index fce7f1b885..4de7456410 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -994,9 +994,10 @@ static inline void wait_sync(char *thread_name) {
}
static inline int wakeup_thread(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
-
- if (pthread_mutex_lock(mutex) != 0) {
- LOG_E( PHY, "error locking mutex for %s\n",name);
+ int rc;
+ if ((rc = pthread_mutex_lock(mutex)) != 0) {
+ LOG_E(PHY, "wakeup_thread(): error locking mutex for %s (%d %s, %p)\n",
+ name, rc, strerror(rc), (void *)mutex);
exit_fun("nothing to add");
return(-1);
}
@@ -1013,8 +1014,10 @@ static inline int wakeup_thread(pthread_mutex_t *mutex,pthread_cond_t *cond,int
}
static inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
- if (pthread_mutex_lock(mutex) != 0) {
- LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);
+ int rc;
+ if ((rc = pthread_mutex_lock(mutex)) != 0) {
+ LOG_E(PHY, "[SCHED][eNB] wait_on_condition(): error locking mutex for %s (%d %s, %p)\n",
+ name, rc, strerror(rc), (void *)mutex);
exit_fun("nothing to add");
return(-1);
}
@@ -1034,9 +1037,10 @@ static inline int wait_on_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,
}
static inline int wait_on_busy_condition(pthread_mutex_t *mutex,pthread_cond_t *cond,int *instance_cnt,char *name) {
-
- if (pthread_mutex_lock(mutex) != 0) {
- LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);
+ int rc;
+ if ((rc = pthread_mutex_lock(mutex)) != 0) {
+ LOG_E(PHY, "[SCHED][eNB] wait_on_busy_condition(): error locking mutex for %s (%d %s, %p)\n",
+ name, rc, strerror(rc), (void *)mutex);
exit_fun("nothing to add");
return(-1);
}
@@ -1056,9 +1060,10 @@ static inline int wait_on_busy_condition(pthread_mutex_t *mutex,pthread_cond_t *
}
static inline int release_thread(pthread_mutex_t *mutex,int *instance_cnt,char *name) {
-
- if (pthread_mutex_lock(mutex) != 0) {
- LOG_E( PHY, "[SCHED][eNB] error locking mutex for %s\n",name);
+ int rc;
+ if ((rc = pthread_mutex_lock(mutex)) != 0) {
+ LOG_E(PHY, "[SCHED][eNB] release_thread(): error locking mutex for %s (%d %s, %p)\n",
+ name, rc, strerror(rc), (void *)mutex);
exit_fun("nothing to add");
return(-1);
}
--
GitLab