Changeset 12763 for source/ariba/utility/system/SystemQueue.h

Timestamp:

Mar 13, 2014, 7:30:17 PM (11 years ago)

Author:

hock@…

Message:

priority queue (but not tested)

--> FIXME in SystemEvent.h (has to be fixed first!)

File:

• source/ariba/utility/system/SystemQueue.h (modified) (3 diffs)

source/ariba/utility/system/SystemQueue.h

@@ -40 +40 @@
 #define SYSTEMQUEUE_H_
 
-// #include <vector>
-#include <list>
-#include <cassert>
 #include "SystemEvent.h"
 #include "SystemEventListener.h"
 #include "ariba/utility/logging/Logging.h"
+
+#include <cassert>
+#include <list>
+#include <vector>
+#include <queue>          // std::priority_queue
+#include <functional>     // std::greater
+
 #include <boost/date_time.hpp>
 #include <boost/cstdint.hpp>
@@ -169 +173 @@
 
 typedef list<SystemEvent> EventQueue;
+typedef std::priority_queue<SystemEvent, 
+                            std::vector<SystemEvent>, 
+                            std::greater<SystemEvent> > PriorityEventQueue;
+// typedef std::priority_queue<SystemEvent> PriorityEventQueue;
+// TODO is vector the best underlay?
+                            
 
         //********************************************************
@@ -205 +215 @@
         private:
         EventQueue immediateEventsQ;
-        EventQueue timedEventsQ;
-        
-        ptime now;
-        ptime next_deadline;
-
+        PriorityEventQueue timedEventsQ;
+        
         boost::condition_variable system_queue_idle;
         boost::mutex queue_mutex;