PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 23:34:14 +00:00
Code Issues Releases Activity

don't use std::promise *

Browse Source
This commit is contained in:
Jeff Becker 2016-08-29 15:34:59 -04:00
parent 10ffdb2766
commit ce97fa87e7
No known key found for this signature in database
GPG Key ID: AB950234D6EA286B
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NetDb.cpp
View File

@ -23,7 +23,7 @@ namespace data
{ {
NetDb netdb; NetDb netdb;
NetDb::NetDb (): m_Ready(new std::promise<void>()), m_IsRunning (false), m_Thread (nullptr), m_Reseeder (nullptr), m_Storage("netDb", "r", "routerInfo-", "dat"), m_HiddenMode(false) NetDb::NetDb (): m_IsRunning (false), m_Thread (nullptr), m_Reseeder (nullptr), m_Storage("netDb", "r", "routerInfo-", "dat"), m_HiddenMode(false)
{ {
} }
@ -34,7 +34,7 @@ namespace data
} }
void NetDb::Start () void NetDb::Start ()
{ {
m_Storage.SetPlace(i2p::fs::GetDataDir()); m_Storage.SetPlace(i2p::fs::GetDataDir());
m_Storage.Init(i2p::data::GetBase64SubstitutionTable(), 64); m_Storage.Init(i2p::data::GetBase64SubstitutionTable(), 64);
InitProfilesStorage (); InitProfilesStorage ();
@ -45,7 +45,7 @@ namespace data
m_IsRunning = true; m_IsRunning = true;
m_Thread = new std::thread (std::bind (&NetDb::Run, this)); m_Thread = new std::thread (std::bind (&NetDb::Run, this));
m_Ready->set_value(); m_Ready.set_value();
} }
void NetDb::Stop () void NetDb::Stop ()
@ -72,9 +72,7 @@ namespace data
void NetDb::WaitForReady() void NetDb::WaitForReady()
{ {
m_Ready->get_future().wait(); m_Ready.get_future().get();
delete m_Ready;
m_Ready = nullptr;
} }
void NetDb::Run () void NetDb::Run ()

2
NetDb.h
View File

@ -112,7 +112,7 @@ namespace data
std::shared_ptr<const RouterInfo> GetRandomRouter (Filter filter) const; std::shared_ptr<const RouterInfo> GetRandomRouter (Filter filter) const;
private: private:
std::promise<void> * m_Ready; std::promise<void> m_Ready;
mutable std::mutex m_LeaseSetsMutex; mutable std::mutex m_LeaseSetsMutex;
std::map<IdentHash, std::shared_ptr<LeaseSet> > m_LeaseSets; std::map<IdentHash, std::shared_ptr<LeaseSet> > m_LeaseSets;