diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-17 20:26:53 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-10-09 19:15:49 +0200 |
commit | b7e992703c285fa8ea1f22b970d4aa1f202720eb (patch) | |
tree | a2897d9ffb05ea82b665dbfdbfb85590a560e225 /CommonLibs/debug.c | |
parent | 928141b7d682a80b12875ef5d288646755dba44e (diff) |
Use new libosmocore logging lock API
Since libosmocore Id7711893b34263baacac6caf4d489467053131bb, a new API
log_enable_multithread() is available which takes care of protecting
logging infrastructure from us (and actually does it correctly since we
cannot protect internal libosmocore structures from osmo-trx).
Let's drop all mutex related code from osmo-trx logging infra and simply
rely on libosmocore's.
Related: OS#4088
Change-Id: I519d0f30bce871005ca26b90177ea4aa4839360a
Diffstat (limited to 'CommonLibs/debug.c')
-rw-r--r-- | CommonLibs/debug.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index 48d4981..09dab2b 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -59,49 +59,3 @@ const struct log_info log_info = { .cat = default_categories, .num_cat = ARRAY_SIZE(default_categories), }; - -pthread_mutex_t log_mutex; - -bool log_mutex_init() { - int rc; - pthread_mutexattr_t attr; - - if ((rc = pthread_mutexattr_init(&attr))) { - fprintf(stderr, "pthread_mutexattr_init() failed: %d\n", rc); - return false; - } - if ((rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE))) { - fprintf(stderr, "pthread_mutexattr_settype() failed: %d\n", rc); - return false; - } - if ((rc = pthread_mutex_init(&log_mutex, &attr))) { - fprintf(stderr, "pthread_mutex_init() failed: %d\n", rc); - return false; - } - if ((rc = pthread_mutexattr_destroy(&attr))) { - fprintf(stderr, "pthread_mutexattr_destroy() failed: %d\n", rc); - return false; - } - return true; - /* FIXME: do we need to call pthread_mutex_destroy() during process exit? */ -} - -/* If called inside a C++ destructor, use log_mutex_(un)lock_canceldisable() APIs instead. - See osmo-trx commit 86be40b4eb762d5c12e8e3f7388ca9f254e77b36 for more information */ -void log_mutex_lock() { - OSMO_ASSERT(!pthread_mutex_lock(&log_mutex)); -} - -void log_mutex_unlock() { - OSMO_ASSERT(!pthread_mutex_unlock(&log_mutex)); -} - -void log_mutex_lock_canceldisable(int *st) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, st); - log_mutex_lock(); -} - -void log_mutex_unlock_canceldisable(int st) { - log_mutex_unlock(); - pthread_setcancelstate(st, NULL); -} |