X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FModuleManager.cc;h=c31145a26785613ce2d9a8c00187da6535a9ab6e;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=66190d45368becc1d35e4097a6489962f2cfd61a;hpb=f13780e9e4da7df981d6f6542fbdc714beb34765;p=senf.git

diff --git a/senf/PPI/ModuleManager.cc b/senf/PPI/ModuleManager.cc
index 66190d4..c31145a 100644
--- a/senf/PPI/ModuleManager.cc
+++ b/senf/PPI/ModuleManager.cc
@@ -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 ModuleManager non-inline non-template implementation */
@@ -27,16 +32,16 @@
 //#include "ModuleManager.ih"
 
 // Custom includes
-#include <senf/Scheduler/Scheduler.hh>
 #include <senf/Utils/membind.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include <senf/Utils/Console/Sysdir.hh>
 #include "Module.hh"
-#include <senf/Utils/Console/Console.hh>
 
 //#include "ModuleManager.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::ppi::ModuleManager
 
 prefix_ void senf::ppi::ModuleManager::init()
@@ -66,32 +71,33 @@ prefix_ void senf::ppi::ModuleManager::run()
     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),
                    scheduler::EventHook::PRE, false)
 {
-    senf::console::sysdir().add("ppi", consoleDir_);
+    console::sysdir().add("ppi", consoleDir_);
 
     consoleDir_
-        .add("dump", senf::console::factory::Command(
+        .add("dump", console::factory::Command(
                  senf::membind(&ModuleManager::dumpModules, this))
              .doc("Dump complete PPI structure\n"
                   "The dump will contain one paragraph for each module. The first line gives module\n"
                   "information, additional lines list all connectors and their peers (if connected).\n"
                   "\n"
-                  "This information can be processed by 'PPI/drawmodules.py' and 'dot' (from the\n"
+                  "This information can be processed by 'tools/drawmodules.py' and 'dot' (from the\n"
                   "graphviz package) to generate a graphic representation of the module structure:\n"
                   "\n"
                   "    $ echo /sys/ppi/dump | nc -q1 <host> <port> \\\n"
-                  "          | python PPI/drawmodules.py | dot -Tpng /dev/fd/0 >modules.png\n")
+                  "          | python tools/drawmodules.py | dot -Tpng /dev/fd/0 >modules.png\n")
             );
 }
 
 prefix_ void senf::ppi::ModuleManager::dumpModules(std::ostream & os)
+    const
 {
     for (ModuleRegistry::const_iterator i (moduleRegistry_.begin()), i_end (moduleRegistry_.end());
          i != i_end; ++i) {
@@ -99,15 +105,19 @@ prefix_ void senf::ppi::ModuleManager::dumpModules(std::ostream & os)
         for (module::Module::ConnectorRegistry::iterator j ((*i)->connectorRegistry_.begin()),
                  j_end ((*i)->connectorRegistry_.end()); j != j_end; ++j) {
             os << "  " << *j << " " << prettyName(typeid(**j));
-            if ((**j).connected())
+            if ((**j).connected()) {
                 os << " " << & (*j)->peer();
+                connector::PassiveConnector * pc (dynamic_cast<connector::PassiveConnector *>(*j));
+                if (pc && pc->throttled())
+                    os << " throttled";
+            }
             os << "\n";
         }
         os << "\n";
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "ModuleManager.mpp"