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

Merge pull request #361 from nvt/rpl-mrhof-fix

Browse source 
MRHOF fixes
This commit is contained in:
Adam Dunkels 2013-10-07 11:45:31 -07:00
commit 4e1beb3ed3
3 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rpl/rpl-conf.h
View file

@ -162,7 +162,7 @@
* Initial metric attributed to a link when the ETX is unknown * Initial metric attributed to a link when the ETX is unknown
*/ */
#ifndef RPL_CONF_INIT_LINK_METRIC #ifndef RPL_CONF_INIT_LINK_METRIC
#define RPL_INIT_LINK_METRIC 5 * RPL_MIN_HOPRANKINC #define RPL_INIT_LINK_METRIC 5
#else #else
#define RPL_INIT_LINK_METRIC RPL_CONF_INIT_LINK_METRIC #define RPL_INIT_LINK_METRIC RPL_CONF_INIT_LINK_METRIC
#endif #endif

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

@ -548,7 +548,7 @@ rpl_add_parent(rpl_dag_t *dag, rpl_dio_t *dio, uip_ipaddr_t *addr)
p->dag = dag; p->dag = dag;
p->rank = dio->rank; p->rank = dio->rank;
p->dtsn = dio->dtsn; p->dtsn = dio->dtsn;
p->link_metric = RPL_INIT_LINK_METRIC; p->link_metric = RPL_INIT_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
#if RPL_DAG_MC != RPL_DAG_MC_NONE #if RPL_DAG_MC != RPL_DAG_MC_NONE
memcpy(&p->mc, &dio->mc, sizeof(p->mc)); memcpy(&p->mc, &dio->mc, sizeof(p->mc));
#endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */ #endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */

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

@ -90,46 +90,46 @@ calculate_path_metric(rpl_parent_t *p)
{ {
if(p == NULL) { if(p == NULL) {
return MAX_PATH_COST * RPL_DAG_MC_ETX_DIVISOR; return MAX_PATH_COST * RPL_DAG_MC_ETX_DIVISOR;
} else {
long link_metric = p->link_metric;
#if RPL_DAG_MC == RPL_DAG_MC_NONE
return p->rank + (uint16_t)link_metric;
#elif RPL_DAG_MC == RPL_DAG_MC_ETX
return p->mc.obj.etx + (uint16_t)link_metric;
#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY
return p->mc.obj.energy.energy_test + (uint16_t)link_metric;
#endif /* RPL_DAG_MC */
} }
#if RPL_DAG_MC == RPL_DAG_MC_NONE
return p->rank + (uint16_t)p->link_metric;
#elif RPL_DAG_MC == RPL_DAG_MC_ETX
return p->mc.obj.etx + (uint16_t)p->link_metric;
#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY
return p->mc.obj.energy.energy_est + (uint16_t)p->link_metric;
#else
#error "Unsupported RPL_DAG_MC configured. See rpl.h."
#endif /* RPL_DAG_MC */
} }
static void static void
reset(rpl_dag_t *sag) reset(rpl_dag_t *sag)
{ {
PRINTF("RPL: Reset MRHOF\n");
} }
static void static void
neighbor_link_callback(rpl_parent_t *p, int status, int numtx) neighbor_link_callback(rpl_parent_t *p, int status, int numtx)
{ {
uint16_t recorded_etx = p->link_metric;
uint16_t packet_etx = numtx * RPL_DAG_MC_ETX_DIVISOR;
uint16_t new_etx;
/* Do not penalize the ETX when collisions or transmission errors occur. */ /* Do not penalize the ETX when collisions or transmission errors occur. */
if(status == MAC_TX_OK || status == MAC_TX_NOACK) { if(status == MAC_TX_OK || status == MAC_TX_NOACK) {
int recorded_etx = p->link_metric;
int packet_etx = numtx * RPL_DAG_MC_ETX_DIVISOR;
int new_etx;
if(status == MAC_TX_NOACK) { if(status == MAC_TX_NOACK) {
packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR; packet_etx = MAX_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
} }
new_etx = ((uint16_t)recorded_etx * ETX_ALPHA + new_etx = ((uint32_t)recorded_etx * ETX_ALPHA +
(uint16_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; (uint32_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE;
PRINTF("RPL: ETX changed from %d to %d (packet ETX = %d) %d\n", PRINTF("RPL: ETX changed from %u to %u (packet ETX = %u)\n",
recorded_etx / p->dag->instance->min_hoprankinc, (unsigned)(recorded_etx / RPL_DAG_MC_ETX_DIVISOR),
new_etx / p->dag->instance->min_hoprankinc, (unsigned)(new_etx / RPL_DAG_MC_ETX_DIVISOR),
packet_etx / p->dag->instance->min_hoprankinc, (unsigned)(packet_etx / RPL_DAG_MC_ETX_DIVISOR));
dest->u8[7]);
p->link_metric = new_etx; p->link_metric = new_etx;
} }
} }
@ -143,9 +143,8 @@ calculate_rank(rpl_parent_t *p, rpl_rank_t base_rank)
if(base_rank == 0) { if(base_rank == 0) {
return INFINITE_RANK; return INFINITE_RANK;
} }
rank_increase = RPL_INIT_LINK_METRIC; rank_increase = RPL_INIT_LINK_METRIC * RPL_DAG_MC_ETX_DIVISOR;
} else { } else {
/* multiply first, then scale down to avoid truncation effects */
rank_increase = p->link_metric; rank_increase = p->link_metric;
if(base_rank == 0) { if(base_rank == 0) {
base_rank = p->rank; base_rank = p->rank;
@ -186,7 +185,7 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
rpl_path_metric_t p1_metric; rpl_path_metric_t p1_metric;
rpl_path_metric_t p2_metric; rpl_path_metric_t p2_metric;
dag = p1->dag; /* Both parents must be in the same DAG. */ dag = p1->dag; /* Both parents are in the same DAG. */
min_diff = RPL_DAG_MC_ETX_DIVISOR / min_diff = RPL_DAG_MC_ETX_DIVISOR /
PARENT_SWITCH_THRESHOLD_DIV; PARENT_SWITCH_THRESHOLD_DIV;
@ -209,13 +208,16 @@ best_parent(rpl_parent_t *p1, rpl_parent_t *p2)
return p1_metric < p2_metric ? p1 : p2; return p1_metric < p2_metric ? p1 : p2;
} }
#if RPL_DAG_MC == RPL_DAG_MC_NONE
static void static void
update_metric_container(rpl_instance_t *instance) update_metric_container(rpl_instance_t *instance)
{ {
instance->mc.type = RPL_DAG_MC; instance->mc.type = RPL_DAG_MC;
}
#if RPL_DAG_MC != RPL_DAG_MC_NONE #else
static void
update_metric_container(rpl_instance_t *instance)
{
rpl_path_metric_t path_metric; rpl_path_metric_t path_metric;
rpl_dag_t *dag; rpl_dag_t *dag;
#if RPL_DAG_MC == RPL_DAG_MC_ENERGY #if RPL_DAG_MC == RPL_DAG_MC_ENERGY
@ -230,7 +232,7 @@ update_metric_container(rpl_instance_t *instance)
dag = instance->current_dag; dag = instance->current_dag;
if (!dag->joined) { if (!dag->joined) {
/* We should probably do something here */ PRINTF("RPL: Cannot update the metric container when not joined\n");
return; return;
} }
@ -240,21 +242,15 @@ update_metric_container(rpl_instance_t *instance)
path_metric = calculate_path_metric(dag->preferred_parent); path_metric = calculate_path_metric(dag->preferred_parent);
} }
#endif /* RPL_DAG_MC != RPL_DAG_MC_NONE */ #if RPL_DAG_MC == RPL_DAG_MC_ETX
#if RPL_DAG_MC == RPL_DAG_MC_NONE
/* Do nothing more */
#elif RPL_DAG_MC == RPL_DAG_MC_ETX
instance->mc.length = sizeof(instance->mc.obj.etx); instance->mc.length = sizeof(instance->mc.obj.etx);
instance->mc.obj.etx = path_metric; instance->mc.obj.etx = path_metric;
PRINTF("RPL: My path ETX to the root is %u.%u\n", PRINTF("RPL: My path ETX to the root is %u.%u\n",
instance->mc.obj.etx / RPL_DAG_MC_ETX_DIVISOR, instance->mc.obj.etx / RPL_DAG_MC_ETX_DIVISOR,
(instance->mc.obj.etx % RPL_DAG_MC_ETX_DIVISOR * 100) / RPL_DAG_MC_ETX_DIVISOR); (instance->mc.obj.etx % RPL_DAG_MC_ETX_DIVISOR * 100) /
RPL_DAG_MC_ETX_DIVISOR);
#elif RPL_DAG_MC == RPL_DAG_MC_ENERGY #elif RPL_DAG_MC == RPL_DAG_MC_ENERGY
instance->mc.length = sizeof(instance->mc.obj.energy); instance->mc.length = sizeof(instance->mc.obj.energy);
if(dag->rank == ROOT_RANK(instance)) { if(dag->rank == ROOT_RANK(instance)) {
@ -265,10 +261,6 @@ update_metric_container(rpl_instance_t *instance)
instance->mc.obj.energy.flags = type << RPL_DAG_MC_ENERGY_TYPE; instance->mc.obj.energy.flags = type << RPL_DAG_MC_ENERGY_TYPE;
instance->mc.obj.energy.energy_est = path_metric; instance->mc.obj.energy.energy_est = path_metric;
#endif /* RPL_DAG_MC == RPL_DAG_MC_ETX */
#else
#error "Unsupported RPL_DAG_MC configured. See rpl.h."
#endif /* RPL_DAG_MC */
} }
#endif /* RPL_DAG_MC == RPL_DAG_MC_NONE */