ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix application pointer singleton lifetime

Browse Source
This commit is contained in:
Vinnie Falco
2014-02-03 22:35:42 -08:00
parent 83442825e5
commit 7fb614f7af
3 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/ripple_app/main/Application.cpp
View File

@@ -56,9 +56,38 @@ template <> char const* LogPartition::getPartitionName <TaggedCacheLog> () { ret
//
//------------------------------------------------------------------------------
// This hack lets the s_instance variable remain set during
// the call to ~Application
class ApplicationImpBase : public Application
{
public:
ApplicationImpBase ()
{
assert (s_instance == nullptr);
s_instance = this;
}
~ApplicationImpBase ()
{
s_instance = nullptr;
}
static Application* s_instance;
static Application& getInstance ()
{
bassert (s_instance != nullptr);
return *s_instance;
}
};
Application* ApplicationImpBase::s_instance;
//------------------------------------------------------------------------------
// VFALCO TODO Move the function definitions into the class declaration
class ApplicationImp
: public Application
: public ApplicationImpBase
, public RootStoppable
, public DeadlineTimer::Listener
, public LeakChecked <ApplicationImp>
@@ -127,14 +156,6 @@ public:
io_latency_probe <std::chrono::steady_clock> m_probe;
static ApplicationImp* s_instance;
static Application& getInstance ()
{
bassert (s_instance != nullptr);
return *s_instance;
}
//--------------------------------------------------------------------------
class sample_io_service_latency
@@ -298,19 +319,12 @@ public:
// VFALCO HACK
m_nodeStoreScheduler.setJobQueue (*m_jobQueue);
bassert (s_instance == nullptr);
s_instance = this;
add (m_ledgerMaster->getPropertySource ());
// VFALCO TODO remove these once the call is thread safe.
HashMaps::getInstance ().initializeNonce <size_t> ();
}
~ApplicationImp ()
{
}
//--------------------------------------------------------------------------
CollectorManager& getCollectorManager ()
@@ -1366,10 +1380,6 @@ void ApplicationImp::onAnnounceAddress ()
//------------------------------------------------------------------------------
ApplicationImp* ApplicationImp::s_instance;
//------------------------------------------------------------------------------
Application::Application ()
: PropertyStream::Source ("app")
{
@@ -1382,7 +1392,7 @@ std::unique_ptr <Application> make_Application ()
Application& getApp ()
{
return ApplicationImp::getInstance ();
return ApplicationImpBase::getInstance ();
}
// class LoandObject (5removed, use git history to recover)