sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use thread-local storage for LogPrint(category...)

Browse Source 
This prevents crashes at shutdown where a global destructor
calls LogPrint(category...) after mapMultiArgs has been
deleted.
This commit is contained in:
Gavin Andresen 2013-12-10 13:19:18 +10:00
parent 962b1cf441
commit 0b238b2786
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util.cpp
View File

@ -242,17 +242,23 @@ int LogPrint(const char* category, const char* pszFormat, ...)
if (!fDebug) if (!fDebug)
return 0; return 0;
const vector<string>& categories = mapMultiArgs["-debug"]; // Give each thread quick access to -debug settings.
bool allCategories = count(categories.begin(), categories.end(), string("")); // This helps prevent issues debugging global destructors,
// where mapMultiArgs might be deleted before another
// Only look for categories, if not -debug/-debug=1 was passed, // global destructor calls LogPrint()
// as that implies every category should be logged. static boost::thread_specific_ptr<set<string> > ptrCategory;
if (!allCategories) if (ptrCategory.get() == NULL)
{ {
// Category was not found (not supplied via -debug=<category>) const vector<string>& categories = mapMultiArgs["-debug"];
if (find(categories.begin(), categories.end(), string(category)) == categories.end()) ptrCategory.reset(new set<string>(categories.begin(), categories.end()));
return 0; // thread_specific_ptr automatically deletes the set when the thread ends.
} }
const set<string>& setCategories = *ptrCategory.get();
// if not debugging everything and not debugging specific category, LogPrint does nothing.
if (setCategories.count(string("")) == 0 &&
setCategories.count(string(category)) == 0)
return 0;
} }
int ret = 0; // Returns total number of characters written int ret = 0; // Returns total number of characters written