PPI: Delayed connect and disconnect

[senf.git] / PPI / Module.hh

diff --git a/PPI/Module.hh b/PPI/Module.hh
index df06938..1062fb0 100644 (file)
--- a/PPI/Module.hh
+++ b/PPI/Module.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -33,6 +33,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include "../Scheduler/ClockService.hh"
 #include "predecl.hh"
+#include "ModuleManager.hh"
 
 //#include "Module.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -106,8 +107,8 @@ namespace module {
         public:
             // Define connectors. Any number and type of connectors may be defined. Connectors
             // must be public since they need to be accessed to connect modules with each other.
-            senf::ppi::connector::PassiveInput input;
-            senf::ppi::connector::ActiveOutput output;
+            senf::ppi::connector::PassiveInput<> input;
+            senf::ppi::connector::ActiveOutput<> output;
 
             SomeModule(senf::FileHandle h) 
               : handle ( h ), 
@@ -167,7 +168,7 @@ namespace module {
         \see \ref ppi_modules
      */
     class Module
-        : boost::noncopyable
+        : ModuleManager::Initializable, boost::noncopyable
     {
     public:
         virtual ~Module();
@@ -232,7 +233,7 @@ namespace module {
                                              event to a connector defines the event as the
                                              conceptual 'source' of the data. This means, the event
                                              controls how packets are sent (Example: Routing from an
-                                             IOEVent to an output defines, that output data will be
+                                             IOEvent to an output defines, that output data will be
                                              generated whenever the event is signaled).
 
                                              This event routing allows to automatically
@@ -289,7 +290,7 @@ namespace module {
 
     private:
 #endif
-        virtual void init();            ///< Called just before the network is run
+        virtual void v_init();
 
 #ifndef DOXYGEN
     public: