--- a/src/DIF/RMT/RMTQueue.h
+++ b/src/DIF/RMT/RMTQueue.h
@@ -1,5 +1,5 @@
//
-// Copyright © 2014 PRISTINE Consortium (http://ict-pristine.eu)
+// Copyright © 2014 - 2015 PRISTINE Consortium (http://ict-pristine.eu)
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
@@ -33,7 +33,7 @@
friend class RMTModuleAllocator;
public:
- RMTQueue();
+
virtual ~RMTQueue();
/**
@@ -90,55 +90,47 @@
* @param value new threshold
*/
void setThreshLength(int value);
+//
+// /**
+// * Returns the queue ID. Its content is determined by RA's QueueIdGen policy.
+// *
+// * @return queue ID
+// */
+// const char* getQueueId() const;
+//
+// /**
+// * Sets the queue ID.
+// *
+// * @param queueId new queue ID
+// */
+// void setQueueId(const char* queueId);
/**
- * Returns the queue ID. Its content is determined by RA's QueueIdGen policy.
+ * Returns a pointer to the first PDU in the queue.
*
- * @return queue ID
+ * @return PDU
*/
- const char* getQueueId() const;
+ const cPacket* getFirstPDU() const;
/**
- * Sets the queue ID.
+ * Returns a pointer to the last PDU in the queue.
*
- * @param queueId new queue ID
+ * @return PDU
*/
- void setQueueId(const char* queueId);
+ const cPacket* getLastPDU() const;
/**
- * Returns the payload length of the first PDU in the queue.
- *
- * @return queue ID
+ * Iterators.
*/
- unsigned int getFirstPDUPayloadLength();
+ typedef std::deque<cPacket*>::iterator iterator;
+ typedef std::deque<cPacket*>::const_iterator const_iterator;
+ iterator begin() { return queue.begin(); }
+ iterator end() { return queue.end(); }
/**
- * Returns the payload length of the last PDU in the queue.
- *
- * @return queue ID
+ * Sends out the first PDU in the queue.
*/
- unsigned int getLastPDUPayloadLength();
-
- /**
- * Returns the qos-id of the first PDU in the queue.
- *
- * @return queue ID
- */
- unsigned short getFirstPDUQoSID();
-
- /**
- * Returns the qos-id of the last PDU in the queue.
- *
- * @return queue ID
- */
- unsigned short getLastPDUQoSID();
-
- /**
- * Instructs the module to send out the first message in the queue.
- * The time needed to send out a message is defined by a NED parameter
- * (either "TxQueuingTime" or "RxQueuingTime").
- */
- void startTransmitting();
+ void releasePDU();
/**
* Marks the last PDU in a queue with a congestion bit.
@@ -152,18 +144,16 @@
protected:
virtual void initialize();
+ virtual void finish();
virtual void handleMessage(cMessage* msg);
private:
std::deque<cPacket*> queue;
queueType type;
- const char* queueId;
-
int maxQLength;
int thresholdQLength;
- double queuingTime;
simtime_t qTime;
cGate* rmtAccessGate;
@@ -173,18 +163,18 @@
void setType(queueType type);
void enqueuePDU(cPacket* pdu);
- void releasePDU();
cPacket* dropLast();
cGate* getOutputGate() const;
cGate* getInputGate() const;
- cGate* getRmtAccessGate() const;
- void setRmtAccessGate(cGate* gate);
+ cGate* getRMTAccessGate() const;
+ void setRMTAccessGate(cGate* gate);
void redrawGUI();
simsignal_t sigRMTPDURcvd;
simsignal_t sigRMTPDUSent;
+ simsignal_t sigStatRMTQueueLength;
};
typedef RMTQueue::queueType RMTQueueType;