Brussel meeting ready version

Marcel Marek Marcel Marek 2014-11-20

<< < 1 2 3 (Page 3 of 3)
copied src/DIF/RA/RMTPolicies/LongestQFirst.h -> src/DIF/RMT/policies/scheduler/LongestQFirst.h
copied src/DIF/RMT/RMTSchedulingBase.cc -> src/DIF/RMT/policies/scheduler/IntRMTSchedulingPolicy.ned
copied src/DIF/RMT/RMTSchedulingBase.h -> src/DIF/RMT/policies/scheduler/RMTSchedulingBase.h
src/DIF/RA/RMTPolicies/LongestQFirst.h to src/DIF/RMT/policies/scheduler/LongestQFirst.h
--- a/src/DIF/RA/RMTPolicies/LongestQFirst.h
+++ b/src/DIF/RMT/policies/scheduler/LongestQFirst.h
@@ -13,17 +13,17 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-#ifndef LONGESTQFIRST_H_
-#define LONGESTQFIRST_H_
+#ifndef __RINA_LONGESTQFIRST_H_
+#define __RINA_LONGESTQFIRST_H_
+
+#include <omnetpp.h>
 
 #include "RMTSchedulingBase.h"
 
 class LongestQFirst : public RMTSchedulingBase
 {
   public:
-    LongestQFirst();
-    virtual ~LongestQFirst();
     virtual void run(RMTQueueManager* queues);
 };
 
-#endif /* LONGESTQFIRST_H_ */
+#endif
src/DIF/RMT/RMTSchedulingBase.cc to src/DIF/RMT/policies/scheduler/IntRMTSchedulingPolicy.ned
--- a/src/DIF/RMT/RMTSchedulingBase.cc
+++ b/src/DIF/RMT/policies/scheduler/IntRMTSchedulingPolicy.ned
@@ -13,15 +13,11 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-#include <RMTSchedulingBase.h>
+package rina.DIF.RMT.policies.scheduler;
 
-RMTSchedulingBase::RMTSchedulingBase()
+moduleinterface IntRMTSchedulingPolicy
 {
-    name = "base";
+    parameters:
+        @display("i=block/socket");
+        string policyName;
 }
-
-RMTSchedulingBase::~RMTSchedulingBase()
-{
-}
-
-
src/DIF/RMT/RMTSchedulingBase.h to src/DIF/RMT/policies/scheduler/RMTSchedulingBase.h
--- a/src/DIF/RMT/RMTSchedulingBase.h
+++ b/src/DIF/RMT/policies/scheduler/RMTSchedulingBase.h
@@ -21,15 +21,16 @@
 #include "RMTQueueManager.h"
 #include "RMTQueue.h"
 
-class RMTSchedulingBase
+class RMTSchedulingBase : public cSimpleModule
 {
   public:
     RMTSchedulingBase();
     virtual ~RMTSchedulingBase();
-    std::string getName() { return name; };
-    virtual void run(RMTQueueManager* queues) = 0;
+    virtual void run(RMTQueueManager* queues);
+
   protected:
-    std::string name;
+    virtual void initialize();
+    virtual void handleMessage(cMessage *msg);
 };
 
 #endif /* RMTSCHEDULINGBASE_H_ */
<< < 1 2 3 (Page 3 of 3)