This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/15561 Change subject: Use new libosmocore logging lock API ...................................................................... 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 --- M CommonLibs/Logger.cpp M CommonLibs/debug.c M CommonLibs/debug.h M Transceiver52M/osmo-trx.cpp 4 files changed, 5 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/61/15561/1 diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp index 5db7f87..89e13e5 100644 --- a/CommonLibs/Logger.cpp +++ b/CommonLibs/Logger.cpp @@ -48,9 +48,11 @@ int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n'); const char *fmt = neednl ? "%s\n" : "%s"; - log_mutex_lock_canceldisable(&old_state); + /* print related function called inside a C++ destructor, use pthread_setcancelstate() APIs. + See osmo-trx commit 86be40b4eb762d5c12e8e3f7388ca9f254e77b36 for more information */ + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_state); LOGPSRC(mCategory, mPriority, filename, line, fmt, mStream.str().c_str()); - log_mutex_unlock_canceldisable(old_state); + pthread_setcancelstate(old_state, NULL); } ostringstream& Log::get() 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 @@ .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); -} diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 760ab32..ad12bb8 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -15,21 +15,10 @@ DLMS, }; - -bool log_mutex_init(); -void log_mutex_lock(); -void log_mutex_unlock(); -void log_mutex_lock_canceldisable(int *st); -void log_mutex_unlock_canceldisable(int st); - #define CLOGC(category, level, fmt, args...) do { \ - log_mutex_lock(); \ LOGP(category, level, "[tid=%lu] " fmt, pthread_self(), ##args); \ - log_mutex_unlock(); \ } while(0) #define CLOGCHAN(chan, category, level, fmt, args...) do { \ - log_mutex_lock(); \ LOGP(category, level, "[tid=%lu][chan=%lu] " fmt, pthread_self(), chan, ##args); \ - log_mutex_unlock(); \ } while(0) diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index ab0b631..0612a94 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -571,14 +571,11 @@ #endif #endif - if (!log_mutex_init()) { - fprintf(stderr, "Failed to initialize log mutex!\n"); - exit(2); - } convolve_init(); convert_init(); osmo_init_logging2(tall_trx_ctx, &log_info); + log_enable_multithread(); osmo_stats_init(tall_trx_ctx); vty_init(&g_vty_info); ctrl_vty_init(tall_trx_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I519d0f30bce871005ca26b90177ea4aa4839360a Gerrit-Change-Number: 15561 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190917/8a541a85/attachment.htm>