deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #664 from simonduq/rpl-link-metric-init-fix

Browse source 
RPL MRHOF: bypass EWMA when setting a parent's link metric for the first time
This commit is contained in:
Nicolas Tsiftes 2014-05-14 16:42:29 +02:00
parent c91782c638 33cfd92475
commit 443bbd3948
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/rpl/rpl-dag.c
View file

@ -1083,8 +1083,8 @@ rpl_recalculate_ranks(void)
*/ */
p = nbr_table_head(rpl_parents); p = nbr_table_head(rpl_parents);
while(p != NULL) { while(p != NULL) {
if(p->dag != NULL && p->dag->instance && p->updated) { if(p->dag != NULL && p->dag->instance && (p->flags & RPL_PARENT_FLAG_UPDATED)) {
p->updated = 0; p->flags &= ~RPL_PARENT_FLAG_UPDATED;
PRINTF("RPL: rpl_process_parent_event recalculate_ranks\n"); PRINTF("RPL: rpl_process_parent_event recalculate_ranks\n");
if(!rpl_process_parent_event(p->dag->instance, p)) { if(!rpl_process_parent_event(p->dag->instance, p)) {
PRINTF("RPL: A parent was dropped\n"); PRINTF("RPL: A parent was dropped\n");

4
core/net/rpl/rpl-icmp6.c
View file

@ -652,7 +652,7 @@ dao_input(void)
PRINTF("RPL: Loop detected when receiving a unicast DAO from a node with a lower rank! (%u < %u)\n", PRINTF("RPL: Loop detected when receiving a unicast DAO from a node with a lower rank! (%u < %u)\n",
DAG_RANK(parent->rank, instance), DAG_RANK(dag->rank, instance)); DAG_RANK(parent->rank, instance), DAG_RANK(dag->rank, instance));
parent->rank = INFINITE_RANK; parent->rank = INFINITE_RANK;
parent->updated = 1; parent->flags |= RPL_PARENT_FLAG_UPDATED;
return; return;
} }
@ -660,7 +660,7 @@ dao_input(void)
if(parent != NULL && parent == dag->preferred_parent) { if(parent != NULL && parent == dag->preferred_parent) {
PRINTF("RPL: Loop detected when receiving a unicast DAO from our parent\n"); PRINTF("RPL: Loop detected when receiving a unicast DAO from our parent\n");
parent->rank = INFINITE_RANK; parent->rank = INFINITE_RANK;
parent->updated = 1; parent->flags |= RPL_PARENT_FLAG_UPDATED;
return; return;
} }
} }

12
core/net/rpl/rpl-mrhof.c
View file

@ -122,8 +122,16 @@ neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR; packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
} }
new_etx = ((uint32_t)recorded_etx * ETX_ALPHA + if(p->flags & RPL_PARENT_FLAG_LINK_METRIC_VALID) {
(uint32_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; /* We already have a valid link metric, use weighted moving average to update it */
new_etx = ((uint32_t)recorded_etx * ETX_ALPHA +
(uint32_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE;
} else {
/* We don't have a valid link metric, set it to the current packet's ETX */
new_etx = packet_etx;
/* Set link metric as valid */
p->flags |= RPL_PARENT_FLAG_LINK_METRIC_VALID;
}
PRINTF("RPL: ETX changed from %u to %u (packet ETX = %u)\n", PRINTF("RPL: ETX changed from %u to %u (packet ETX = %u)\n",
(unsigned)(recorded_etx / RPL_DAG_MC_ETX_DIVISOR), (unsigned)(recorded_etx / RPL_DAG_MC_ETX_DIVISOR),

4
core/net/rpl/rpl.c
View file

@ -260,7 +260,7 @@ rpl_link_neighbor_callback(const linkaddr_t *addr, int status, int numtx)
if(parent != NULL) { if(parent != NULL) {
/* Trigger DAG rank recalculation. */ /* Trigger DAG rank recalculation. */
PRINTF("RPL: rpl_link_neighbor_callback triggering update\n"); PRINTF("RPL: rpl_link_neighbor_callback triggering update\n");
parent->updated = 1; parent->flags |= RPL_PARENT_FLAG_UPDATED;
if(instance->of->neighbor_link_callback != NULL) { if(instance->of->neighbor_link_callback != NULL) {
instance->of->neighbor_link_callback(parent, status, numtx); instance->of->neighbor_link_callback(parent, status, numtx);
} }
@ -286,7 +286,7 @@ rpl_ipv6_neighbor_callback(uip_ds6_nbr_t *nbr)
p->rank = INFINITE_RANK; p->rank = INFINITE_RANK;
/* Trigger DAG rank recalculation. */ /* Trigger DAG rank recalculation. */
PRINTF("RPL: rpl_ipv6_neighbor_callback infinite rank\n"); PRINTF("RPL: rpl_ipv6_neighbor_callback infinite rank\n");
p->updated = 1; p->flags |= RPL_PARENT_FLAG_UPDATED;
} }
} }
} }

5
core/net/rpl/rpl.h
View file

@ -104,6 +104,9 @@ typedef struct rpl_metric_container rpl_metric_container_t;
struct rpl_instance; struct rpl_instance;
struct rpl_dag; struct rpl_dag;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define RPL_PARENT_FLAG_UPDATED 0x1
#define RPL_PARENT_FLAG_LINK_METRIC_VALID 0x2
struct rpl_parent { struct rpl_parent {
struct rpl_parent *next; struct rpl_parent *next;
struct rpl_dag *dag; struct rpl_dag *dag;
@ -113,7 +116,7 @@ struct rpl_parent {
rpl_rank_t rank; rpl_rank_t rank;
uint16_t link_metric; uint16_t link_metric;
uint8_t dtsn; uint8_t dtsn;
uint8_t updated; uint8_t flags;
}; };
typedef struct rpl_parent rpl_parent_t; typedef struct rpl_parent rpl_parent_t;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/