summaryrefslogtreecommitdiff
path: root/node/Topology.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/Topology.hpp')
-rw-r--r--node/Topology.hpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/node/Topology.hpp b/node/Topology.hpp
index 104ad344..b917738e 100644
--- a/node/Topology.hpp
+++ b/node/Topology.hpp
@@ -55,7 +55,7 @@ class RuntimeEnvironment;
/**
* Database of network topology
*/
-class Topology : protected Thread
+class Topology
{
public:
/**
@@ -74,7 +74,7 @@ public:
Topology(const RuntimeEnvironment *renv,const char *dbpath)
throw(std::runtime_error);
- virtual ~Topology();
+ ~Topology();
/**
* Set up supernodes for this network
@@ -276,8 +276,10 @@ public:
std::vector< SharedPtr<Peer> > &_v;
};
-protected:
- virtual void main()
+ /**
+ * Thread main method; do not call elsewhere
+ */
+ void threadMain()
throw();
private:
@@ -297,6 +299,7 @@ private:
};
const RuntimeEnvironment *const _r;
+ Thread<Topology> _thread;
std::map< Address,SharedPtr<Peer> > _activePeers;
Mutex _activePeers_m;