dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLI debugging, got rid of nasty old Thread class and replaced with newer cleaner portable idiom.

Browse source
This commit is contained in:
Adam Ierymenko 2013-08-05 16:06:16 -04:00
parent 3368330b77
commit a7c4cbe53a
17 changed files with 141 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

10
node/Topology.cpp
View file

@ -38,7 +38,6 @@ namespace ZeroTier {
Topology::Topology(const RuntimeEnvironment *renv,const char *dbpath)
throw(std::runtime_error) :
Thread(),
_r(renv),
_amSupernode(false)
{
@ -55,7 +54,7 @@ Topology::Topology(const RuntimeEnvironment *renv,const char *dbpath)
Utils::lockDownFile(dbpath,false); // node.db caches secrets
start();
_thread = Thread<Topology>::start(this);
}
Topology::~Topology()
@ -68,10 +67,7 @@ Topology::~Topology()
_peerDeepVerifyJobs.back().type = _PeerDeepVerifyJob::EXIT_THREAD;
}
_peerDeepVerifyJobs_c.signal();
while (running())
Thread::sleep(10); // wait for thread to terminate without join()
Thread<Topology>::join(_thread);
KISSDB_close(&_dbm);
}
@ -223,7 +219,7 @@ void Topology::clean()
_peerDeepVerifyJobs_c.signal();
}
void Topology::main()
void Topology::threadMain()
throw()
{
for(;;) {