Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue

Patch up CircularQueue
This commit is contained in:
Scott Lahteine 2016-08-02 19:42:38 -07:00 committed by GitHub
commit e040e00ae9

View file

@ -29,7 +29,7 @@
* @brief Circular Queue class * @brief Circular Queue class
* @details Implementation of the classic ring buffer data structure * @details Implementation of the classic ring buffer data structure
*/ */
template<typename T, int N> template<typename T, uint8_t N>
class CircularQueue { class CircularQueue {
private: private:
@ -41,8 +41,8 @@ class CircularQueue {
struct buffer_t { struct buffer_t {
uint8_t head; uint8_t head;
uint8_t tail; uint8_t tail;
uint8_t count;
uint8_t size; uint8_t size;
uint8_t length;
T queue[N]; T queue[N];
} buffer; } buffer;
@ -50,47 +50,46 @@ class CircularQueue {
/** /**
* @brief Class constructor * @brief Class constructor
* @details This class requires two template parameters, T defines the type * @details This class requires two template parameters, T defines the type
* of the items this queue will handle and N defines the maximum number of * of item this queue will handle and N defines the maximum number of
* items that can be stored on the queue. * items that can be stored on the queue.
*/ */
CircularQueue<T, N>() { CircularQueue<T, N>() {
this->buffer.length = N; this->buffer.size = N;
this->buffer.size = this->buffer.head = this->buffer.tail = 0; this->buffer.count = this->buffer.head = this->buffer.tail = 0;
} }
/** /**
* @brief Removes and returns a item from the queue * @brief Removes and returns a item from the queue
* @details Removes the oldest item on the queue which is pointed by the * @details Removes the oldest item on the queue, pointed to by the
* buffer_t head variable, this item is then returned to the caller. * buffer_t head field. The item is returned to the caller.
* @return type T item * @return type T item
*/ */
T dequeue() { T dequeue() {
if (this->isEmpty()) return T(); if (this->isEmpty()) return T();
T const item = this->buffer.queue[this->buffer.head++]; uint8_t index = this->buffer.head;
--this->buffer.size;
if (this->buffer.head == this->buffer.length) --this->buffer.count;
if (++this->buffer.head == this->buffer.size)
this->buffer.head = 0; this->buffer.head = 0;
return item; return this->buffer.queue[index];
} }
/** /**
* @brief Adds an item to the queue * @brief Adds an item to the queue
* @details Adds a item to the queue on the location pointed by the buffer_t * @details Adds an item to the queue on the location pointed by the buffer_t
* tail vairable, will return false if there is no queue space available. * tail variable. Returns false if no queue space is available.
*
* @param item Item to be added to the queue * @param item Item to be added to the queue
* @return true if the operation was successfull * @return true if the operation was successful
*/ */
bool enqueue(T const &item) { bool enqueue(T const &item) {
if (this->isFull()) return false; if (this->isFull()) return false;
this->buffer.queue[this->buffer.tail++] = item; this->buffer.queue[this->buffer.tail] = item;
++this->buffer.size;
if (this->buffer.tail == this->buffer.length) ++this->buffer.count;
if (++this->buffer.tail == this->buffer.size)
this->buffer.tail = 0; this->buffer.tail = 0;
return true; return true;
@ -102,7 +101,7 @@ class CircularQueue {
* @return true if queue is empty * @return true if queue is empty
*/ */
bool isEmpty() { bool isEmpty() {
return this->buffer.size == 0; return this->buffer.count == 0;
} }
/** /**
@ -111,35 +110,35 @@ class CircularQueue {
* @return true if queue is full * @return true if queue is full
*/ */
bool isFull() { bool isFull() {
return this->buffer.size == this->buffer.length; return this->buffer.count == this->buffer.size;
} }
/** /**
* @brief Gets the queue size * @brief Gets the queue size
* @details Returns the maximum number of items a queue can have. * @details Returns the maximum number of items a queue can have.
* @return the queue lenght * @return the queue size
*/ */
uint8_t length() { uint8_t size() {
return this->buffer.length; return this->buffer.size;
} }
/** /**
* @brief Gets the next item from the queue without removing it * @brief Gets the next item from the queue without removing it
* @details Returns the next item on the queue but the item is not removed * @details Returns the next item in the queue without removing it
* from the queue nor the pointers updated. * or updating the pointers.
* @return the queue size * @return first item in the queue
*/ */
uint8_t peek() { T peek() {
return this->buffer.queue[this->buffer.head]; return this->buffer.queue[this->buffer.head];
} }
/** /**
* @brief Gets the number of items on the queue * @brief Gets the number of items on the queue
* @details Returns the current number of items stored on the queue. * @details Returns the current number of items stored on the queue.
* @return type T item * @return number of items in the queue
*/ */
uint8_t size() { uint8_t count() {
return this->buffer.size; return this->buffer.count;
} }
}; };