kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-22 21:13:52 +01:00
Code Releases Activity

Merge pull request #5324 from cgundogan/pr/trickle/enhance

Browse Source 
trickle: uses random.h and includes some enhancements
This commit is contained in:
Oleg Hahm 2016-05-31 23:36:35 +02:00
commit 5ed98da18a
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.dep
View File

@ -76,6 +76,7 @@ ifneq (,$(filter gnrc_rpl,$(USEMODULE)))
endif endif
ifneq (,$(filter trickle,$(USEMODULE))) ifneq (,$(filter trickle,$(USEMODULE)))
USEMODULE += random
USEMODULE += xtimer USEMODULE += xtimer
endif endif

25
sys/trickle/trickle.c
View File

@ -18,6 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "inttypes.h" #include "inttypes.h"
#include "random.h"
#include "trickle.h" #include "trickle.h"
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
@ -33,27 +34,19 @@ void trickle_callback(trickle_t *trickle)
void trickle_interval(trickle_t *trickle) void trickle_interval(trickle_t *trickle)
{ {
uint32_t max_interval;
trickle->I = trickle->I * 2; trickle->I = trickle->I * 2;
DEBUG("TRICKLE new Interval %" PRIu32 "\n", trickle->I); max_interval = trickle->Imin << trickle->Imax;
if (trickle->I == 0) { if ((trickle->I == 0) || (trickle->I > max_interval)) {
DEBUG("%s:%d in %s: [WARNING] Interval was 0\n", RIOT_FILE_RELATIVE, trickle->I = max_interval;
__LINE__, DEBUG_FUNC);
if (trickle->Imax == 0) {
DEBUG("%s:%d in %s: [WARNING] Imax == 0\n", RIOT_FILE_RELATIVE,
__LINE__, DEBUG_FUNC);
} }
trickle->I = (trickle->Imin << trickle->Imax); DEBUG("trickle: I == %" PRIu32 "\n", trickle->I);
}
if (trickle->I > (trickle->Imin << trickle->Imax)) {
trickle->I = (trickle->Imin << trickle->Imax);
}
trickle->c = 0; trickle->c = 0;
trickle->t = (trickle->I / 2) + (rand() % ((trickle->I / 2) + 1)); trickle->t = (trickle->I / 2) + random_uint32_range(0, (trickle->I / 2) + 1);
trickle->msg_callback_time = trickle->t * SEC_IN_MS; trickle->msg_callback_time = trickle->t * SEC_IN_MS;
xtimer_set_msg64(&trickle->msg_callback_timer, trickle->msg_callback_time, xtimer_set_msg64(&trickle->msg_callback_timer, trickle->msg_callback_time,
@ -80,7 +73,7 @@ void trickle_start(kernel_pid_t pid, trickle_t *trickle, uint16_t interval_msg_t
trickle->k = k; trickle->k = k;
trickle->Imin = Imin; trickle->Imin = Imin;
trickle->Imax = Imax; trickle->Imax = Imax;
trickle->I = trickle->Imin + (rand() % (4 * trickle->Imin)); trickle->I = trickle->Imin + random_uint32_range(0, 4 * trickle->Imin);
trickle->pid = pid; trickle->pid = pid;
trickle->msg_interval.content.ptr = (char *)trickle; trickle->msg_interval.content.ptr = (char *)trickle;
trickle->msg_interval.type = interval_msg_type; trickle->msg_interval.type = interval_msg_type;