Changeset 3041 for source/ariba/utility/system

Timestamp:

Apr 23, 2009, 9:18:12 AM (16 years ago)

Author:

Christoph Mayer

Message:

-mehrere Fixes, Tickets #25 (bind listeners earlier), #21 (better pingpong), #40 (systemqueue misbehavior)

Location:

source/ariba/utility/system

Files:

• StartupWrapper.cpp (modified) (2 diffs)
• StartupWrapper.h (modified) (1 diff)

source/ariba/utility/system/StartupWrapper.cpp

@@ -124 +124 @@
 void StartupWrapper::startup(StartupInterface* service, bool block){
 
-        StartupWrapper* spovnet = new StartupWrapper(service, block);
+        StartupWrapper* startup = new StartupWrapper(service, block);
 
 #ifdef UNDERLAY_OMNET
         SystemQueue::instance().scheduleEvent(
-                SystemEvent( spovnet, StartupWrapperEventType, NULL), 0 );
+                SystemEvent( startup, StartupWrapperEventType, NULL), 0 );
 #else
-        spovnet->handleSystemEvent(
-                SystemEvent( spovnet, StartupWrapperEventType, NULL));
+        SystemQueue::instance().scheduleEvent(
+                SystemEvent( startup, StartupWrapperEventType, NULL), 0 );
+
+        if( block ) getchar();
 #endif
 }
@@ -149 +151 @@
 
         service->startup();
-        waitForExit();
-
-#ifndef UNDERLAY_OMNET
-        service->shutdown();
-        delete event.getListener();
-#endif
 }
 
-void StartupWrapper::waitForExit(){
-#ifndef UNDERLAY_OMNET
-        if( blocking ) getchar();
-#endif
-}
-
-void StartupWrapper::shutdown(){
+void StartupWrapper::shutdown(StartupInterface* service){
 #ifdef UNDERLAY_OMNET
         //TODO: service->shutdown();
 #endif
 
+        service->shutdown();
         SystemQueue::instance().cancel();
 }

source/ariba/utility/system/StartupWrapper.h

@@ -72 +72 @@
         static void initConfig(string filename);
         static void startup(StartupInterface* service, bool block = true);
-        static void shutdown();
+        static void shutdown(StartupInterface* service);
 
 #ifdef UNDERLAY_OMNET