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

fix major bugs

Browse source
This commit is contained in:
Daniel Larimer 2012-09-09 11:12:15 -04:00
parent 79c2c530e9
commit 297b073c94
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/shared_ptr.hpp
View file

@ -52,11 +52,11 @@ namespace fc {
shared_ptr& operator=(const shared_ptr& p ) { shared_ptr& operator=(const shared_ptr& p ) {
shared_ptr tmp(p); shared_ptr tmp(p);
fc::swap(tmp,*this); fc::swap(tmp._ptr,_ptr);
return *this; return *this;
} }
shared_ptr& operator=(shared_ptr&& p ) { shared_ptr& operator=(shared_ptr&& p ) {
fc::swap(*this,p); fc::swap(_ptr,p._ptr);
return *this; return *this;
} }
T& operator* ()const { return *_ptr; } T& operator* ()const { return *_ptr; }

4
src/filesystem.cpp
View file

@ -41,10 +41,10 @@ namespace fc {
} }
path::operator boost::filesystem::path& () { path::operator boost::filesystem::path& () {
return static_cast<boost::filesystem::path&>(*this); return *_p;
} }
path::operator const boost::filesystem::path& ()const { path::operator const boost::filesystem::path& ()const {
return static_cast<const boost::filesystem::path&>(*this); return *_p;
} }
fc::string path::string()const { fc::string path::string()const {

28
src/thread.cpp
View file

@ -7,11 +7,21 @@ namespace fc {
static boost::mutex m; return m; static boost::mutex m; return m;
} }
thread*& current_thread() {
#ifdef _MSC_VER
static __declspec(thread) thread* t = NULL;
#else
static __thread thread* t = NULL;
#endif
return t;
}
thread::thread( const char* name ) { thread::thread( const char* name ) {
promise<void>::ptr p(new promise<void>()); promise<void>::ptr p(new promise<void>());
boost::thread* t = new boost::thread( [this,p]() { boost::thread* t = new boost::thread( [this,p]() {
try { try {
this->my = new thread_d(*this); this->my = new thread_d(*this);
current_thread() = this;
p->set_value(); p->set_value();
exec(); exec();
} catch ( ... ) { } catch ( ... ) {
@ -41,22 +51,8 @@ namespace fc {
} }
thread& thread::current() { thread& thread::current() {
// Apple does not support __thread by default, but some custom gcc builds if( !current_thread() ) current_thread() = new thread((thread_d*)0);
// for Mac OS X support it. Backup use boost::thread_specific_ptr return *current_thread();
#if defined(__APPLE__) && (__GNUC__ <= 4 && __GNUC_MINOR__ < 4)
#warning using boost::thread_specific_ptr instead of __thread, use gcc 4.5 or newer for better performance.
static boost::thread_specific_ptr<thread> t;
if( !t.get() ) t.reset( new thread((thread_d*)0) );
return *t.get();
#else
#ifdef _MSC_VER
static __declspec(thread) thread* t = NULL;
#else
static __thread thread* t = NULL;
#endif
if( !t ) t = new thread((thread_d*)0);
return *t;
#endif
} }
const string& thread::name()const { return my->name; } const string& thread::name()const { return my->name; }
void thread::set_name( const fc::string& n ) { my->name = n; } void thread::set_name( const fc::string& n ) { my->name = n; }