Skip to content

Avoid using % in BigQueueC. #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid using % in BigQueueC. #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57862f8
Avoid using % in BigQueueC.
raidoz Sep 29, 2015
c2a5a1a
Handle cases where idx > 2*QUEUE_SIZE.
raidoz Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions tos/system/BigQueueC.nc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @date $Date: 2007-09-19 17:20:47 $
*/


generic module BigQueueC(typedef queue_t, uint16_t QUEUE_SIZE) {
provides interface BigQueue<queue_t> as Queue;
}
Expand All @@ -49,7 +49,7 @@ implementation {
uint16_t head = 0;
uint16_t tail = 0;
uint16_t size = 0;

command bool Queue.empty() {
return size == 0;
}
Expand Down Expand Up @@ -77,21 +77,21 @@ implementation {
for (i = head; i < head + size; i++) {
dbg_clear("QueueC", "[");
for (j = 0; j < sizeof(queue_t); j++) {
uint8_t v = ((uint8_t*)&queue[i % QUEUE_SIZE])[j];
dbg_clear("QueueC", "%0.2hhx", v);
uint8_t v = ((uint8_t*)&queue[i % QUEUE_SIZE])[j];
dbg_clear("QueueC", "%0.2hhx", v);
}
dbg_clear("QueueC", "] ");
}
dbg_clear("QueueC", "<- tail\n");
#endif
}

command queue_t Queue.dequeue() {
queue_t t = call Queue.head();
dbg("QueueC", "%s: size is %hhu\n", __FUNCTION__, size);
if (!call Queue.empty()) {
head++;
head %= QUEUE_SIZE;
if (head == QUEUE_SIZE) head = 0;
size--;
printQueue();
}
Expand All @@ -103,7 +103,7 @@ implementation {
dbg("QueueC", "%s: size is %hhu\n", __FUNCTION__, size);
queue[tail] = newVal;
tail++;
tail %= QUEUE_SIZE;
if (tail == QUEUE_SIZE) tail = 0;
size++;
printQueue();
return SUCCESS;
Expand All @@ -112,11 +112,11 @@ implementation {
return FAIL;
}
}

command queue_t Queue.element(uint16_t idx) {
idx += head;
idx %= QUEUE_SIZE;
while (idx >= QUEUE_SIZE) idx -= QUEUE_SIZE;
return queue[idx];
}
}

}