ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-05 03:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use boost::thread_specific_ptr instead of thread_local:

Browse Source 
`thread_local` causes deployment problems with CentOS 7
This commit is contained in:
seelabs
2016-07-07 08:34:18 -04:00
parent d790c3b671
commit dd2feb8d1f
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ripple/core/impl/ThreadEntry.cpp
View File

@@ -22,19 +22,25 @@
#include <ripple/basics/Log.h>
#include <boost/coroutine/exceptions.hpp>
#include <boost/thread/tss.hpp>
#include <exception>
#include <iostream>
namespace ripple {
#ifndef NO_LOG_UNHANDLED_EXCEPTIONS
namespace detail {
thread_local
std::string threadName;
static boost::thread_specific_ptr<std::string> threadName;
namespace detail {
void setThreadName(std::string name)
{
threadName = std::move(name);
try
{
threadName.reset(new std::string{std::move(name)});
}
catch(...)
{
}
}
}
@@ -42,27 +48,28 @@ void terminateHandler()
{
if (std::current_exception())
{
std::string const name = threadName.get() ? *threadName.get() : "Unknown";
try
{
throw;
}
catch (const std::exception& e)
{
std::cerr << detail::threadName << ": " << e.what () << '\n';
std::cerr << name << ": " << e.what () << '\n';
JLOG(debugLog().fatal())
<< detail::threadName << ": " << e.what () << '\n';
<< name << ": " << e.what () << '\n';
}
catch (boost::coroutines::detail::forced_unwind const&)
{
std::cerr << detail::threadName << ": forced_unwind\n";
std::cerr << name << ": forced_unwind\n";
JLOG(debugLog().fatal())
<< detail::threadName << ": forced_unwind\n";
<< name << ": forced_unwind\n";
}
catch (...)
{
std::cerr << detail::threadName << ": unknown exception\n";
std::cerr << name << ": unknown exception\n";
JLOG (debugLog ().fatal ())
<< detail::threadName << ": unknown exception\n";
<< name << ": unknown exception\n";
}
}
}