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

Merge pull request #7164 from smlng/enh/trickle/fix_7161

Browse Source 
trickle: enhancements
This commit is contained in:
Cenk Gündoğan 2017-06-16 23:46:55 +02:00 committed by GitHub
commit 25a5989cce
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/include/trickle.h
View File

@ -59,6 +59,9 @@ typedef struct {
/** /**
* @brief resets the trickle timer * @brief resets the trickle timer
* *
* @pre `trickle->I > trickle->Imin`
* @see https://tools.ietf.org/html/rfc6206#section-4.2, number 6
*
* @param[in] trickle the trickle timer * @param[in] trickle the trickle timer
*/ */
void trickle_reset_timer(trickle_t *trickle); void trickle_reset_timer(trickle_t *trickle);
@ -66,6 +69,9 @@ void trickle_reset_timer(trickle_t *trickle);
/** /**
* @brief start the trickle timer * @brief start the trickle timer
* *
* @pre `Imin > 0`
* @pre `(Imin << Imax) < (UINT32_MAX / 2)` to avoid overflow of uint32_t
*
* @param[in] pid target thread * @param[in] pid target thread
* @param[in] trickle trickle timer * @param[in] trickle trickle timer
* @param[in] msg_type msg_t.type for messages * @param[in] msg_type msg_t.type for messages
@ -93,6 +99,8 @@ void trickle_increment_counter(trickle_t *trickle);
/** /**
* @brief is called after the interval is over and calculates the next interval * @brief is called after the interval is over and calculates the next interval
* *
* @pre `(trickle->I > 0)` required for trickle algorithm to work
*
* @param[in] trickle trickle timer * @param[in] trickle trickle timer
*/ */
void trickle_interval(trickle_t *trickle); void trickle_interval(trickle_t *trickle);

16
sys/trickle/trickle.c
View File

@ -33,13 +33,14 @@ void trickle_callback(trickle_t *trickle)
void trickle_interval(trickle_t *trickle) void trickle_interval(trickle_t *trickle)
{ {
assert(trickle->I > 0);
uint32_t old_interval = trickle->I; uint32_t old_interval = trickle->I;
uint32_t max_interval = trickle->Imin << trickle->Imax; uint32_t max_interval = trickle->Imin << trickle->Imax;
uint32_t diff = old_interval - trickle->t; uint32_t diff = old_interval - trickle->t;
trickle->I *= 2; trickle->I *= 2;
if (trickle->I > max_interval) {
if ((trickle->I == 0) || (trickle->I > max_interval)) {
trickle->I = max_interval; trickle->I = max_interval;
old_interval = max_interval / 2; old_interval = max_interval / 2;
} }
@ -47,24 +48,29 @@ void trickle_interval(trickle_t *trickle)
DEBUG("trickle: I == %" PRIu32 ", diff == %" PRIu32 "\n", trickle->I, diff); DEBUG("trickle: I == %" PRIu32 ", diff == %" PRIu32 "\n", trickle->I, diff);
trickle->c = 0; trickle->c = 0;
/* old_interval == trickle->I / 2 */
trickle->t = random_uint32_range(old_interval, trickle->I); trickle->t = random_uint32_range(old_interval, trickle->I);
trickle->msg_time = (trickle->t + diff) * MS_PER_SEC; trickle->msg_time = (trickle->t + diff) * MS_PER_SEC;
xtimer_set_msg64(&trickle->msg_timer, trickle->msg_time, &trickle->msg, xtimer_set_msg64(&trickle->msg_timer, trickle->msg_time, &trickle->msg,
trickle->pid); trickle->pid);
} }
void trickle_reset_timer(trickle_t *trickle) void trickle_reset_timer(trickle_t *trickle)
{ {
assert(trickle->I > trickle->Imin);
trickle_stop(trickle); trickle_stop(trickle);
trickle_start(trickle->pid, trickle, trickle->msg.type, trickle->Imin, trickle->I = trickle->Imin;
trickle->Imax, trickle->k); trickle_interval(trickle);
} }
void trickle_start(kernel_pid_t pid, trickle_t *trickle, uint16_t msg_type, void trickle_start(kernel_pid_t pid, trickle_t *trickle, uint16_t msg_type,
uint32_t Imin, uint8_t Imax, uint8_t k) uint32_t Imin, uint8_t Imax, uint8_t k)
{ {
assert(Imin > 0);
assert((Imin << Imax) < (UINT32_MAX / 2));
trickle->pid = pid; trickle->pid = pid;
trickle->c = 0; trickle->c = 0;