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

Slight generalization to make it easier to switch metric.

Browse source
This commit is contained in:
nvt 2011-03-17 20:29:38 +01:00
parent cdaf58f892
commit 55c4df8ee7
2 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
core/net/neighbor-info.c
View file

@ -48,38 +48,38 @@
#define ETX_ALPHA 90 #define ETX_ALPHA 90
#define ETX_NOACK_PENALTY ETX_LIMIT #define ETX_NOACK_PENALTY ETX_LIMIT
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
NEIGHBOR_ATTRIBUTE(uint8_t, etx, NULL); NEIGHBOR_ATTRIBUTE(link_metric_t, etx, NULL);
static neighbor_info_subscriber_t subscriber_callback; static neighbor_info_subscriber_t subscriber_callback;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
update_etx(const rimeaddr_t *dest, int packet_etx) update_metric(const rimeaddr_t *dest, int packet_metric)
{ {
uint8_t *etxp; link_metric_t *metricp;
uint8_t recorded_etx, new_etx; link_metric_t recorded_metric, new_metric;
etxp = (uint8_t *)neighbor_attr_get_data(&etx, dest); metricp = (link_metric_t *)neighbor_attr_get_data(&etx, dest);
packet_etx = NEIGHBOR_INFO_ETX2FIX(packet_etx); packet_metric = NEIGHBOR_INFO_ETX2FIX(packet_metric);
if(etxp == NULL || *etxp == 0) { if(metricp == NULL || *metricp == 0) {
recorded_etx = NEIGHBOR_INFO_ETX2FIX(ETX_LIMIT); recorded_metric = NEIGHBOR_INFO_ETX2FIX(ETX_LIMIT);
new_etx = packet_etx; new_metric = packet_metric;
} else { } else {
recorded_etx = *etxp; recorded_metric = *metricp;
/* Update the EWMA of the ETX for the neighbor. */ /* Update the EWMA of the ETX for the neighbor. */
new_etx = ((uint16_t)recorded_etx * ETX_ALPHA + new_metric = ((uint16_t)recorded_metric * ETX_ALPHA +
(uint16_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; (uint16_t)packet_metric * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE;
} }
PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d) %d\n", PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d) %d\n",
NEIGHBOR_INFO_FIX2ETX(recorded_etx), NEIGHBOR_INFO_FIX2ETX(recorded_metric),
NEIGHBOR_INFO_FIX2ETX(new_etx), NEIGHBOR_INFO_FIX2ETX(new_metric),
NEIGHBOR_INFO_FIX2ETX(packet_etx), NEIGHBOR_INFO_FIX2ETX(packet_metric),
dest->u8[7]); dest->u8[7]);
if(neighbor_attr_has_neighbor(dest)) { if(neighbor_attr_has_neighbor(dest)) {
neighbor_attr_set_data(&etx, dest, &new_etx); neighbor_attr_set_data(&etx, dest, &new_metric);
if(new_etx != recorded_etx && subscriber_callback != NULL) { if(new_metric != recorded_metric && subscriber_callback != NULL) {
subscriber_callback(dest, 1, new_etx); subscriber_callback(dest, 1, new_metric);
} }
} }
} }
@ -103,7 +103,7 @@ void
neighbor_info_packet_sent(int status, int numtx) neighbor_info_packet_sent(int status, int numtx)
{ {
const rimeaddr_t *dest; const rimeaddr_t *dest;
uint8_t packet_etx; link_metric_t packet_metric;
dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER); dest = packetbuf_addr(PACKETBUF_ADDR_RECEIVER);
if(rimeaddr_cmp(dest, &rimeaddr_null)) { if(rimeaddr_cmp(dest, &rimeaddr_null)) {
@ -116,14 +116,14 @@ neighbor_info_packet_sent(int status, int numtx)
switch(status) { switch(status) {
case MAC_TX_OK: case MAC_TX_OK:
packet_etx = numtx; packet_metric = numtx;
add_neighbor(dest); add_neighbor(dest);
break; break;
case MAC_TX_COLLISION: case MAC_TX_COLLISION:
packet_etx = numtx; packet_metric = numtx;
break; break;
case MAC_TX_NOACK: case MAC_TX_NOACK:
packet_etx = ETX_NOACK_PENALTY; packet_metric = ETX_NOACK_PENALTY;
break; break;
default: default:
/* Do not penalize the ETX when collisions or transmission /* Do not penalize the ETX when collisions or transmission
@ -131,7 +131,7 @@ neighbor_info_packet_sent(int status, int numtx)
return; return;
} }
update_etx(dest, packet_etx); update_metric(dest, packet_metric);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -162,12 +162,12 @@ neighbor_info_subscribe(neighbor_info_subscriber_t s)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
uint8_t link_metric_t
neighbor_info_get_etx(const rimeaddr_t *addr) neighbor_info_get_metric(const rimeaddr_t *addr)
{ {
uint8_t *etxp; link_metric_t *metricp;
etxp = (uint8_t *)neighbor_attr_get_data(&etx, addr); metricp = (link_metric_t *)neighbor_attr_get_data(&etx, addr);
return etxp == NULL ? ETX_LIMIT : *etxp; return metricp == NULL ? ETX_LIMIT : *metricp;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

3
core/net/neighbor-info.h
View file

@ -52,6 +52,7 @@
#define NEIGHBOR_INFO_FIX2ETX(fix) ((fix) / NEIGHBOR_INFO_ETX_DIVISOR) #define NEIGHBOR_INFO_FIX2ETX(fix) ((fix) / NEIGHBOR_INFO_ETX_DIVISOR)
typedef void (*neighbor_info_subscriber_t)(const rimeaddr_t *, int known, int etx); typedef void (*neighbor_info_subscriber_t)(const rimeaddr_t *, int known, int etx);
typedef uint8_t link_metric_t;
/** /**
* Notify the neighbor information module about the status of * Notify the neighbor information module about the status of
@ -85,6 +86,6 @@ int neighbor_info_subscribe(neighbor_info_subscriber_t);
* *
* \return Returns ETX if the neighbor exists, and 0 if not. * \return Returns ETX if the neighbor exists, and 0 if not.
*/ */
uint8_t neighbor_info_get_etx(const rimeaddr_t *addr); link_metric_t neighbor_info_get_etx(const rimeaddr_t *addr);
#endif /* NEIGHBOR_INFO_H */ #endif /* NEIGHBOR_INFO_H */