Browse Source

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
changes/61/15561/3
Pau Espin 3 years ago
parent
commit
b7e992703c
  1. 6
      CommonLibs/Logger.cpp
  2. 46
      CommonLibs/debug.c
  3. 11
      CommonLibs/debug.h
  4. 5
      Transceiver52M/osmo-trx.cpp

6
CommonLibs/Logger.cpp

@ -48,9 +48,11 @@ Log::~Log()
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()

46
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);
}

11
CommonLibs/debug.h

@ -15,21 +15,10 @@ enum {
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)

5
Transceiver52M/osmo-trx.cpp

@ -576,14 +576,11 @@ int main(int argc, char *argv[])
printf("Built without atomic operation support. Using Mutex, it may affect performance!\n");
#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);

Loading…
Cancel
Save