riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: assertion not to add twice to priority_queue

Browse Source
This commit is contained in:
Oleg Hahm 2015-08-22 12:06:13 +02:00
parent 98bd5ee09c
commit 07e2505ebd
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/include/priority_queue.h
View File

@ -98,6 +98,8 @@ priority_queue_node_t *priority_queue_remove_head(priority_queue_t *root);
* *
* @param[in,out] root the queue's root * @param[in,out] root the queue's root
* @param[in] new_obj the object to prepend * @param[in] new_obj the object to prepend
*
* @pre The queue does not already contain @p new_obj.
*/ */
void priority_queue_add(priority_queue_t *root, priority_queue_node_t *new_obj); void priority_queue_add(priority_queue_t *root, priority_queue_node_t *new_obj);

3
core/priority_queue.c
View File

@ -18,6 +18,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include <assert.h>
#include "priority_queue.h" #include "priority_queue.h"
@ -55,6 +56,8 @@ void priority_queue_add(priority_queue_t *root, priority_queue_node_t *new_obj)
priority_queue_node_t *node = (priority_queue_node_t *) root; priority_queue_node_t *node = (priority_queue_node_t *) root;
while (node->next != NULL) { while (node->next != NULL) {
/* not trying to add the same node twice */
assert(node->next != new_obj);
if (node->next->priority > new_obj->priority) { if (node->next->priority > new_obj->priority) {
new_obj->next = node->next; new_obj->next = node->next;
node->next = new_obj; node->next = new_obj;