// $Id$
//
-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
//#include "ModuleManager.ih"
// Custom includes
-#include "Scheduler/Scheduler.hh"
+#include "../Scheduler/Scheduler.hh"
+#include "../Utils/membind.hh"
#include "Module.hh"
//#include "ModuleManager.mpp"
prefix_ void senf::ppi::ModuleManager::init()
{
- ModuleRegistry::const_iterator i (moduleRegistry_.begin());
- ModuleRegistry::const_iterator const i_end (moduleRegistry_.end());
- for (; i != i_end; ++i)
- (*i)->init();
+ while (! initQueue_.empty()) {
+ initQueue_.front()->v_init();
+ initQueue_.pop_front();
+ }
+ initRunner_.disable();
}
+#ifndef DOXYGEN
+
struct senf::ppi::ModuleManager::RunGuard
{
RunGuard(ModuleManager & m) : manager(m) { manager.running_ = true; }
ModuleManager & manager;
};
+#endif
+
prefix_ void senf::ppi::ModuleManager::run()
{
init();
RunGuard guard (*this);
- Scheduler::instance().process();
+ scheduler::process();
}
////////////////////////////////////////
// private members
prefix_ senf::ppi::ModuleManager::ModuleManager()
- : running_(false), terminate_(false)
+ : running_(false), terminate_(false),
+ initRunner_ ("senf::ppi::init", membind(&ModuleManager::init, this), false,
+ scheduler::EventHook::POST)
{}
///////////////////////////////cc.e////////////////////////////////////////