Changeset 12524

Timestamp:

Oct 11, 2013, 5:10:15 PM (11 years ago)

Author:

hock@…

Message:

moved SystemQueue::instance() into cpp:
fixes some weird issues in some corner cases.
(e.g. strange compiler settings in application which links to libariba..)

Location:

source/ariba/utility/system

Files:

• SystemQueue.cpp (modified) (2 diffs)
• SystemQueue.h (modified) (3 diffs)

source/ariba/utility/system/SystemQueue.cpp

@@ -53 +53 @@
 }
 
+
+SystemQueue& SystemQueue::instance()
+{
+        static SystemQueue _inst;
+//      std::cout << "SystemQueue::instance: " << &_inst << std::endl;
+        return _inst;
+}
+
+
 void SystemQueue::scheduleEvent( const SystemEvent& event, uint32_t delay ) {
 #ifndef UNDERLAY_OMNET
@@ -92 +101 @@
 
 void SystemQueue::run() {
-#ifndef UNDERLAY_OMNET
         systemQueueRunning = true;
         directScheduler.run();
         delayScheduler.run();
-#endif
 }
 

source/ariba/utility/system/SystemQueue.h

@@ -78 +78 @@
  */
 
-#ifndef UNDERLAY_OMNET
-class SystemQueue : private boost::noncopyable {
-#else
-class SystemQueue : public cSimpleModule {
-#endif
-        
+class SystemQueue : private boost::noncopyable
+{
         use_logging_h(SystemQueue);
         friend class EnterMethod;
@@ -90 +86 @@
          * Get the SystemQueue singleton instance.
          */
-        static SystemQueue& instance() {
-                static SystemQueue _inst;
-                return _inst;
-        }
-
-#ifdef UNDERLAY_OMNET
-        /**
-         * Prevent deletion of this module
-         * by implementing the virtual method
-         * and doing nothing in it
-         */
-        virtual void deleteModule(){}
-#endif
+        static SystemQueue& instance();
 
         /**
@@ -177 +161 @@
          */
         ~SystemQueue();
-
-#ifdef UNDERLAY_OMNET
-        virtual void handleMessage( cMessage* msg );
-#endif
-