X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FModule.cci;h=b138400e2920eb4de126124cacf919b63c4e7d51;hb=refs%2Fheads%2Fmaster;hp=b54093fcf1ad7e7a2c7360810be3c24f40dbfc13;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/PPI/Module.cci b/senf/PPI/Module.cci
index b54093f..b138400 100644
--- a/senf/PPI/Module.cci
+++ b/senf/PPI/Module.cci
@@ -2,23 +2,28 @@
 //
 // 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
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Module inline non-template implementation */
@@ -27,18 +32,17 @@
 #include "Route.hh"
 #include "Connectors.hh"
 #include "EventManager.hh"
-#include "ModuleManager.hh"
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
 #include <algorithm>
 
 #define prefix_ inline
-///////////////////////////////cci.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::module::Module
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // private members
 
 prefix_ void senf::ppi::module::Module::v_init()
@@ -56,44 +60,20 @@ prefix_ senf::ppi::ModuleManager & senf::ppi::module::Module::moduleManager()
     return ModuleManager::instance();
 }
 
-prefix_ void senf::ppi::module::Module::registerConnector(connector::Connector & connector)
-{
-    if (std::find(connectorRegistry_.begin(), connectorRegistry_.end(), &connector)
-        == connectorRegistry_.end()) {
-        connectorRegistry_.push_back(&connector);
-        connector.setModule(*this);
-    }
-}
-
-prefix_ void senf::ppi::module::Module::unregisterConnector(connector::Connector & connector)
-{
-    ConnectorRegistry::iterator i (std::find(connectorRegistry_.begin(), connectorRegistry_.end(),
-                                             &connector));
-    if (i != connectorRegistry_.end())
-        connectorRegistry_.erase(i);
-
-    routes_.erase_if(boost::bind(&RouteBase::hasConnector, _1, boost::cref(connector)));
-}
-
 prefix_ void senf::ppi::module::Module::unregisterEvent(EventDescriptor & event)
 {
     routes_.erase_if(boost::bind(&RouteBase::hasEvent, _1, boost::cref(event)));
 }
 
-prefix_ senf::ppi::RouteBase &
-senf::ppi::module::Module::addRoute(std::auto_ptr<RouteBase> route)
-{
-    routes_.push_back(route.release());
-    return routes_.back();
-}
-
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // public members
 
 prefix_ senf::ppi::module::Module::~Module()
 {
-    SENF_ASSERT(connectorRegistry_.empty());
-    SENF_ASSERT(routes_.empty());
+    SENF_ASSERT(connectorRegistry_.empty(),
+                "Internal failure: connectors still registered in Module destructor ??");
+    SENF_ASSERT(routes_.empty(),
+                "internal failure: routes still registered in Module destructor ??");
 
     moduleManager().unregisterModule(*this);
 }
@@ -110,7 +90,7 @@ prefix_ senf::ClockService::clock_type senf::ppi::module::Module::now()
     return eventManager().now();
 }
 
-////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // protected members
 
 prefix_ senf::ppi::module::Module::Module()
@@ -118,18 +98,13 @@ prefix_ senf::ppi::module::Module::Module()
     moduleManager().registerModule(*this);
 }
 
-prefix_ void senf::ppi::module::Module::noroute(connector::Connector & connector)
-{
-    registerConnector(connector);
-    connector.setModule(*this);
-}
-
 prefix_ void senf::ppi::module::Module::destroy()
 {
-    eventManager().destroyModule(*this);
+    if (EventManager::alive())
+        eventManager().destroyModule(*this);
 }
 
-///////////////////////////////cci.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_