Changeset 4462

Timestamp:

Jun 24, 2009, 8:48:35 AM (16 years ago)

Author:

Christoph Mayer

Message:

startup wrapper für gui gefixt

Files:

• sample/pingpong/main.cpp (modified) (1 diff)
• source/ariba/utility/system/StartupInterface.h (modified) (2 diffs)
• source/ariba/utility/system/StartupWrapper.cpp (modified) (2 diffs)
• source/ariba/utility/system/StartupWrapper.h (modified) (3 diffs)

sample/pingpong/main.cpp

@@ -18 +18 @@
         // this will do the main functionality and block
         PingPong ping;
-        StartupWrapper::startup(&ping, true);
+        StartupWrapper::startup(&ping);
 
         // --> we will run blocking until <enter> is hit

source/ariba/utility/system/StartupInterface.h

@@ -47 +47 @@
 namespace utility {
 
-/**
- * TODO: Mies -- to be replaced by a general Module!
- */
+class StartupWrapper;
+
 class StartupInterface
 #ifdef UNDERLAY_OMNET
@@ -63 +62 @@
         virtual void startup() = 0;
         virtual void shutdown() = 0;
+        StartupWrapper* wrapper;
 };
 

source/ariba/utility/system/StartupWrapper.cpp

@@ -47 +47 @@
 #endif
 
-SystemEventType StartupWrapperEventType("StartupWrapperEventType");
+SystemEventType StartupWrapperEventStartup("StartupWrapperEventStartup");
+SystemEventType StartupWrapperEventShutdown("StartupWrapperEventShutdown");
 
-StartupWrapper::StartupWrapper(StartupInterface* _service, bool _block)
-        : blocking( _block ), service( _service ){
+StartupWrapper::StartupWrapper(StartupInterface* _service) : service( _service ){
 }
 
@@ -126 +126 @@
 }
 
+void StartupWrapper::handleSystemEvent(const SystemEvent& event){
+
+        if( event.getType() == StartupWrapperEventStartup ){
+
+                string config = configurations.front();
+                configurations.pop();
+                Configuration::setConfigFilename( config );
+
+                //
+                // start the actual application
+                //
+
+                // TODO: im falle von omnet ist service = null, da von SpoVNetOmnetModule so ÃŒbergeben
+                // wie wird im Falle von omnet die anwendung erstellt?
+
+                service->startup();
+
+        } else if( event.getType() == StartupWrapperEventShutdown ){
+
+                service->shutdown();
+                SystemQueue::instance().cancel();
+
+        }
+
+}
+
 void StartupWrapper::startup(StartupInterface* service, bool block){
 
-        StartupWrapper* startup = new StartupWrapper(service, block);
+        StartupWrapper* startup = new StartupWrapper(service);
+        service->wrapper = startup;
 
-#ifdef UNDERLAY_OMNET
         SystemQueue::instance().scheduleEvent(
-                SystemEvent( startup, StartupWrapperEventType, NULL), 0 );
-#else
-        SystemQueue::instance().scheduleEvent(
-                SystemEvent( startup, StartupWrapperEventType, NULL), 0 );
+                SystemEvent( startup, StartupWrapperEventStartup, NULL), 0 );
 
+#ifndef UNDERLAY_OMNET
         if( block ) getchar();
 #endif
 }
 
-void StartupWrapper::handleSystemEvent(const SystemEvent& event){
+void StartupWrapper::shutdown(StartupInterface* service, bool block){
 
-        string config = configurations.front();
-        configurations.pop();
-        Configuration::setConfigFilename( config );
+        if( service == NULL || service->wrapper == NULL ) return;
 
-        //
-        // start the actual application
-        //
-
-        // TODO: im falle von omnet ist service = null, da von SpoVNetOmnetModule so ÃŒbergeben
-        // wie wird im Falle von omnet die anwendung erstellt?
-
-        service->startup();
-}
-
-void StartupWrapper::shutdown(StartupInterface* service){
 #ifdef UNDERLAY_OMNET
         //TODO: service->shutdown();
 #endif
 
-        service->shutdown();
-        SystemQueue::instance().cancel();
+        if(block){
+                SystemEvent ev (service->wrapper, StartupWrapperEventShutdown);
+                service->wrapper->handleSystemEvent(ev);
+
+        }else{
+                SystemQueue::instance().scheduleEvent(
+                                SystemEvent( service->wrapper, StartupWrapperEventShutdown, NULL), 0 );
+        }
 }
 

source/ariba/utility/system/StartupWrapper.h

@@ -72 +72 @@
         static void initConfig(string filename);
         static void startup(StartupInterface* service, bool block = true);
-        static void shutdown(StartupInterface* service);
+        static void shutdown(StartupInterface* service, bool block = true);
 
 #ifdef UNDERLAY_OMNET
@@ -80 +80 @@
 
 protected:
-        StartupWrapper(StartupInterface* _service, bool _block);
+        StartupWrapper(StartupInterface* _service);
         virtual ~StartupWrapper();
 
@@ -94 +94 @@
 #endif
 
-        volatile bool blocking;
         void waitForExit();
         StartupInterface* service;