ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-02 00:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

New SharedSingleton, resolves destruction of objects with static storage duration.

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-12 04:35:13 -07:00
parent 41eb8a1e29
commit 55447b05ac
17 changed files with 150 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/beast_sqdb/source/session.cpp
View File

@@ -60,12 +60,10 @@
namespace sqdb
{
class session::Sqlite3 : public SharedSingleton <Sqlite3>
class session::Sqlite3
{
public:
friend class SharedSingleton <Sqlite3>;
Sqlite3() : SharedSingleton <Sqlite3> (SingletonLifetime::persistAfterCreation)
Sqlite3()
{
int threadSafe = sqlite3_threadsafe();
@@ -84,30 +82,25 @@ public:
{
sqlite3_shutdown();
}
static Sqlite3* createInstance()
{
return new Sqlite3;
}
};
//------------------------------------------------------------------------------
session::session()
: prepare(this)
, m_instance(Sqlite3::getInstance())
, m_bInTransaction(false)
, m_connection(nullptr)
: prepare (this)
, m_instance (SharedSingleton <Sqlite3>::getInstance ())
, m_bInTransaction (false)
, m_connection (nullptr)
{
}
session::session(const session& deferredClone)
: prepare(this)
, m_instance(Sqlite3::getInstance())
, m_bInTransaction(false)
, m_connection(nullptr)
, m_fileName(deferredClone.m_fileName)
, m_connectString(deferredClone.m_connectString)
: prepare (this)
, m_instance (SharedSingleton <Sqlite3>::getInstance ())
, m_bInTransaction (false)
, m_connection (nullptr)
, m_fileName (deferredClone.m_fileName)
, m_connectString (deferredClone.m_connectString)
{
// shouldn't be needed since deferredClone did it
//Sqlite::initialize();