Changeset 3578

Timestamp:

May 15, 2009, 1:59:19 PM (15 years ago)

Author:

Christoph Mayer

Message:

-paar fixes von pp branch zurück gemergt, one-shot Timer Fehler, Node Logausgabe wenn kein Bootstrap
-make dist hook damit alle .svn dateien gelöscht werden

Files:

• (root) (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• source/ariba/Node.cpp (modified) (1 diff)
• source/ariba/Node.h (modified) (1 diff)
• source/ariba/utility/system/Timer.cpp (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
+SUBDIRS    = docu source sample
 EXTRA_DIST = etc/* INSTALL LICENSE README bootstrap
-SUBDIRS    = docu source sample
+
+# hook to remove all .svn files before rolling the tarball
+dist-hook:
+        find $(distdir) -name '.[a-zA-Z0-9]*' | xargs rm -rf

source/ariba/Node.cpp

@@ -63 +63 @@
         const communication::EndpointDescriptor* ep =
                         ariba_mod.getBootstrapNode(vnetname);
-        if( ep == NULL ) return;
-
+        if( ep == NULL ) {
+                std::cout << "no bootstrap node defined" << std::endl;  
+                return;
+        }
         ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
         base_overlay->start( *ariba_mod.base_comm, nodeId );

source/ariba/Node.h

@@ -49 +49 @@
 
 #include <vector>
+#include <iostream>
 #include "Module.h"
 #include "Identifiers.h"

source/ariba/utility/system/Timer.cpp

@@ -102 +102 @@
         }
 
-        obj->running = false;
+        if(! obj->oneshot )
+                obj->running = false;
 }
 #endif // UNDERLAY_OMNET
 
 void Timer::handleSystemEvent( const SystemEvent& event ) {
-        if( running )
+        if( running ){
+                if( oneshot ) running = false;
                 eventFunction();
+        }
 
 #ifdef UNDERLAY_OMNET