Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +5 -3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9077892d87 - Show all commits

8
src/thread/thread_d.hpp
View file

@ -7,7 +7,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/atomic.hpp> #include <boost/atomic.hpp>
#include <iostream> #include <sstream>
#include <vector> #include <vector>
namespace fc { namespace fc {
@ -394,8 +394,10 @@ namespace fc {
* is probably just as likely to cause crashes */ * is probably just as likely to cause crashes */
if( std::current_exception() != std::exception_ptr() ) if( std::current_exception() != std::exception_ptr() )
{ {
elog( "Thread ${name} yielded in exception handler!", ("name",thread::current().name()) ); std::stringstream stacktrace;
print_stacktrace( std::cerr ); print_stacktrace( stacktrace );
elog( "Thread ${name} yielded in exception handler!\n${trace}",
("name",thread::current().name())("trace",stacktrace.str()) );
assert( std::current_exception() != std::exception_ptr() ); assert( std::current_exception() != std::exception_ptr() );
} }