From 1e6b2bcd5d420b17583e30fbe40b07403582903e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Fri, 15 Apr 2016 15:12:33 +0200
Subject: [PATCH] trickle: uses random.h and includes some enhancements
---
Makefile.dep | 1 +
sys/trickle/trickle.c | 25 +++++++++----------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index d2b09b295e..fa2407f07b 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -76,6 +76,7 @@ ifneq (,$(filter gnrc_rpl,$(USEMODULE)))
endif
ifneq (,$(filter trickle,$(USEMODULE)))
+ USEMODULE += random
USEMODULE += xtimer
endif
diff --git a/sys/trickle/trickle.c b/sys/trickle/trickle.c
index 7877c6287b..90c6aaa118 100644
--- a/sys/trickle/trickle.c
+++ b/sys/trickle/trickle.c
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include "inttypes.h"
+#include "random.h"
#include "trickle.h"
#define ENABLE_DEBUG (0)
@@ -33,27 +34,19 @@ void trickle_callback(trickle_t *trickle)
void trickle_interval(trickle_t *trickle)
{
- trickle->I = trickle->I * 2;
- DEBUG("TRICKLE new Interval %" PRIu32 "\n", trickle->I);
-
- if (trickle->I == 0) {
- DEBUG("%s:%d in %s: [WARNING] Interval was 0\n", RIOT_FILE_RELATIVE,
- __LINE__, DEBUG_FUNC);
+ uint32_t max_interval;
- if (trickle->Imax == 0) {
- DEBUG("%s:%d in %s: [WARNING] Imax == 0\n", RIOT_FILE_RELATIVE,
- __LINE__, DEBUG_FUNC);
- }
+ trickle->I = trickle->I * 2;
+ max_interval = trickle->Imin << trickle->Imax;
- trickle->I = (trickle->Imin << trickle->Imax);
+ if ((trickle->I == 0) || (trickle->I > max_interval)) {
+ trickle->I = max_interval;
}
- if (trickle->I > (trickle->Imin << trickle->Imax)) {
- trickle->I = (trickle->Imin << trickle->Imax);
- }
+ DEBUG("trickle: I == %" PRIu32 "\n", trickle->I);
trickle->c = 0;
- trickle->t = (trickle->I / 2) + (rand() % ((trickle->I / 2) + 1));
+ trickle->t = (trickle->I / 2) + (random_uint32() % ((trickle->I / 2) + 1));
trickle->msg_callback_time = trickle->t * SEC_IN_MS;
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->Imin = Imin;
trickle->Imax = Imax;
- trickle->I = trickle->Imin + (rand() % (4 * trickle->Imin));
+ trickle->I = trickle->Imin + (random_uint32() % (4 * trickle->Imin));
trickle->pid = pid;
trickle->msg_interval.content.ptr = (char *)trickle;
trickle->msg_interval.type = interval_msg_type;
--
GitLab