remove network from activation phase

This commit is contained in:
2018-11-08 13:46:17 +01:00
parent bb81391d00
commit f290ec6197
19 changed files with 138 additions and 66 deletions

View File

@@ -18,9 +18,9 @@ Sprocket* Sprocket::init(SprocketConfig cfg){
Sprocket* Sprocket::activate() {
return activate(&scheduler);
}
Sprocket* Sprocket::activate(Scheduler* scheduler, Network* network) {
Sprocket* Sprocket::activate(Scheduler* scheduler) {
// setup plugins
activatePlugins(scheduler, network);
activatePlugins(scheduler);
return this;
}
@@ -30,7 +30,7 @@ Sprocket* Sprocket::join(Network& net){
//net.onReceive(bind(&Sprocket::dispatch,this, _1, _2));
net.connect();
network = net;
return activate(&scheduler, &net);
return activate(&scheduler);
}
Sprocket* Sprocket::addTask(Task& tsk){
@@ -57,8 +57,8 @@ void Sprocket::addPlugin(Plugin* p){
plugins.push_back(p);
}
void Sprocket::activatePlugins(Scheduler* scheduler, Network* network){
void Sprocket::activatePlugins(Scheduler* scheduler){
for(Plugin* p : plugins){
p->activate(scheduler, network);
p->activate(scheduler);
}
}
}