monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 13:09:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

easylogging++: enforce recursive mutex

Browse source 
This fixes a hang when logging something which causes some other
logging code to be called
This commit is contained in:
moneromooo-monero 2017-01-16 19:31:43 +00:00
parent 71ac698b78
commit 5161f16f4a
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/easylogging++/easylogging++.h vendored
View file

@ -1001,7 +1001,11 @@ namespace el {
public:
Mutex(void) {
# if ELPP_OS_UNIX
pthread_mutex_init(&m_underlyingMutex, nullptr);
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&m_underlyingMutex, &attr);
pthread_mutexattr_destroy(&attr);
# elif ELPP_OS_WINDOWS
InitializeCriticalSection(&m_underlyingMutex);
# endif // ELPP_OS_UNIX