Common: Use a scoped lock in the Logger to avoid deadlock on thread cancel.
Signed-off-by: Tom Tsou <tom.tsou@ettus.com>
diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp
index 04a7ae4..2a53698 100644
--- a/CommonLibs/Logger.cpp
+++ b/CommonLibs/Logger.cpp
@@ -206,7 +206,7 @@
if (gLogToConsole||gLogToFile) {
int mlen = mStream.str().size();
int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n');
- gLogToLock.lock();
+ ScopedLock lock(gLogToLock);
if (gLogToConsole) {
// The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers,
// so just use std::cout.
@@ -218,7 +218,6 @@
if (neednl) {fputc('\n',gLogToFile);}
fflush(gLogToFile);
}
- gLogToLock.unlock();
}
}