Changeset 4699 for source/ariba

Timestamp:

Jul 3, 2009, 8:43:09 AM (15 years ago)

Author:

Christoph Mayer

Message:

locking für enter method neu

Location:

source/ariba/utility/system

Files:

• EnterMethod.cpp (modified) (3 diffs)
• EnterMethod.h (modified) (2 diffs)
• SystemQueue.cpp (modified) (1 diff)
• SystemQueue.h (modified) (2 diffs)

source/ariba/utility/system/EnterMethod.cpp

@@ -52 +52 @@
 void EnterMethod::enter(){
 
+        SystemQueue::instance()::enterMethod();
+
+        /*
         { boost::mutex::scoped_lock lock( waitForEnterMutex );
 
@@ -58 +61 @@
                 waitForEnter.wait( lock );
         }
+        */
 }
 
 void EnterMethod::leave(){
 
+        SystemQueue::instance()::leaveMethod();
+
+        /*
         { boost::mutex::scoped_lock lock( waitForLeaveMutex );
                 waitForLeave.notify_one();
         }
+        */
 }
 
+/*
 void EnterMethod::handleSystemEvent( const SystemEvent& event ){
 
@@ -78 +87 @@
         }
 }
-
+*/
 }} // namespace ariba, common

source/ariba/utility/system/EnterMethod.h

@@ -64 +64 @@
         
 protected:
-        void handleSystemEvent(const SystemEvent& event);
+        //void handleSystemEvent(const SystemEvent& event);
         
 private:
+        /*
         boost::condition_variable waitForEnter;
         boost::condition_variable waitForLeave;
@@ -72 +73 @@
         boost::mutex waitForEnterMutex;
         boost::mutex waitForLeaveMutex;
-
+        */
 };
 

source/ariba/utility/system/SystemQueue.cpp

@@ -111 +111 @@
 }
 
+void SystemQueue::enterMethod(){
+        // TODO: omnet case and delay scheduler
+        directScheduler.lock();
+}
+
+void SystemQueue::leaveMethod(){
+        // TODO: omnet case and delay scheduler
+        directScheduler.unlock();
+}
+
 //***************************************************************
 #ifndef UNDERLAY_OMNET

source/ariba/utility/system/SystemQueue.h

@@ -80 +80 @@
 class SystemQueue : public cSimpleModule {
 #endif
+        
         use_logging_h(SystemQueue);
+        friend class EnterMethod;
 public:
         /**
@@ -137 +139 @@
 
 protected:
+
+        /**
+         * Aqcuire the mutex
+         */
+        void enterMethod();
+
+        /**
+         * Leave the mutex
+         */
+        void leaveMethod();
 
         /**