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

Replace reads of rimestats with RIMESTATS_GET(x)

Browse source
This commit is contained in:
George Oikonomou 2013-03-20 21:08:47 +00:00
parent 8c0cf50dca
commit db078cf7e8
8 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/cc2530dk/udp-ipv6/project-conf.h
View file

@ -44,5 +44,6 @@
#define BUTTON_SENSOR_CONF_ON 1
#define UIP_CONF_ICMP6 1
#define RIMESTATS_CONF_ENABLED 1
#endif /* PROJECT_CONF_H_ */

8
examples/cc2530dk/udp-ipv6/server.c
View file

@ -92,10 +92,10 @@ static void
print_stats()
{
PRINTF("tl=%lu, ts=%lu, bs=%lu, bc=%lu\n",
rimestats.toolong, rimestats.tooshort, rimestats.badsynch,
rimestats.badcrc);
PRINTF("llrx=%lu, lltx=%lu, rx=%lu, tx=%lu\n", rimestats.llrx,
rimestats.lltx, rimestats.rx, rimestats.tx);
RIMESTATS_GET(toolong), RIMESTATS_GET(tooshort),
RIMESTATS_GET(badsynch), RIMESTATS_GET(badcrc));
PRINTF("llrx=%lu, lltx=%lu, rx=%lu, tx=%lu\n", RIMESTATS_GET(llrx),
RIMESTATS_GET(lltx), RIMESTATS_GET(rx), RIMESTATS_GET(tx));
}
#endif
/*---------------------------------------------------------------------------*/

12
examples/sensinode/broadcast-rime.c
View file

@ -36,7 +36,6 @@
* \author
* Adam Dunkels <adam@sics.se>
*/
#include "contiki.h"
#include "net/rime.h"
#include "lib/random.h"
@ -72,11 +71,12 @@ static void
print_rime_stats()
{
PRINTF("\nNetwork Stats\n");
PRINTF(" TX=%lu , RX=%lu\n", rimestats.tx, rimestats.rx);
PRINTF("LL-TX=%lu , LL-RX=%lu\n", rimestats.lltx, rimestats.llrx);
PRINTF(" Long=%lu , Short=%lu\n", rimestats.toolong, rimestats.tooshort);
PRINTF("T/Out=%lu , CCA-Err=%lu\n", rimestats.timedout,
rimestats.contentiondrop);
PRINTF(" TX=%lu , RX=%lu\n", RIMESTATS_GET(tx), RIMESTATS_GET(rx));
PRINTF("LL-TX=%lu , LL-RX=%lu\n", RIMESTATS_GET(lltx), RIMESTATS_GET(llrx));
PRINTF(" Long=%lu , Short=%lu\n", RIMESTATS_GET(toolong),
RIMESTATS_GET(tooshort));
PRINTF("T/Out=%lu , CCA-Err=%lu\n", RIMESTATS_GET(timedout),
RIMESTATS_GET(contentiondrop));
}
static const struct broadcast_callbacks bc_rx = { broadcast_recv };

1
examples/sensinode/udp-ipv6/project-conf.h
View file

@ -45,5 +45,6 @@
#define PROJECT_CONF_H_
#define BUTTON_SENSOR_CONF_ON 1
#define RIMESTATS_CONF_ENABLED 1
#endif /* PROJECT_CONF_H_ */

8
examples/sensinode/udp-ipv6/server.c
View file

@ -104,10 +104,10 @@ static void
print_stats()
{
PRINTF("tl=%lu, ts=%lu, bs=%lu, bc=%lu\n",
rimestats.toolong, rimestats.tooshort, rimestats.badsynch,
rimestats.badcrc);
PRINTF("llrx=%lu, lltx=%lu, rx=%lu, tx=%lu\n", rimestats.llrx,
rimestats.lltx, rimestats.rx, rimestats.tx);
RIMESTATS_GET(toolong), RIMESTATS_GET(tooshort),
RIMESTATS_GET(badsynch), RIMESTATS_GET(badcrc));
PRINTF("llrx=%lu, lltx=%lu, rx=%lu, tx=%lu\n", RIMESTATS_GET(llrx),
RIMESTATS_GET(lltx), RIMESTATS_GET(rx), RIMESTATS_GET(tx));
}
#else
#define print_stats()

36
examples/sky/sky-collect.c
View file

@ -246,24 +246,24 @@ PROCESS_THREAD(test_collect_process, ev, data)
msg->best_neighbor_rtmetric = n->rtmetric;
}
msg->tx = rimestats.tx;
msg->rx = rimestats.rx;
msg->reliabletx = rimestats.reliabletx;
msg->reliablerx = rimestats.reliablerx;
msg->rexmit = rimestats.rexmit;
msg->acktx = rimestats.acktx;
msg->noacktx = rimestats.noacktx;
msg->ackrx = rimestats.ackrx;
msg->timedout = rimestats.timedout;
msg->badackrx = rimestats.badackrx;
msg->toolong = rimestats.toolong;
msg->tooshort = rimestats.tooshort;
msg->badsynch = rimestats.badsynch;
msg->badcrc = rimestats.badcrc;
msg->contentiondrop = rimestats.contentiondrop;
msg->sendingdrop = rimestats.sendingdrop;
msg->lltx = rimestats.lltx;
msg->llrx = rimestats.llrx;
msg->tx = RIMESTATS_GET(tx);
msg->rx = RIMESTATS_GET(rx);
msg->reliabletx = RIMESTATS_GET(reliabletx);
msg->reliablerx = RIMESTATS_GET(reliablerx);
msg->rexmit = RIMESTATS_GET(rexmit);
msg->acktx = RIMESTATS_GET(acktx);
msg->noacktx = RIMESTATS_GET(noacktx);
msg->ackrx = RIMESTATS_GET(ackrx);
msg->timedout = RIMESTATS_GET(timedout);
msg->badackrx = RIMESTATS_GET(badackrx);
msg->toolong = RIMESTATS_GET(toolong);
msg->tooshort = RIMESTATS_GET(tooshort);
msg->badsynch = RIMESTATS_GET(badsynch);
msg->badcrc = RIMESTATS_GET(badcrc);
msg->contentiondrop = RIMESTATS_GET(contentiondrop);
msg->sendingdrop = RIMESTATS_GET(sendingdrop);
msg->lltx = RIMESTATS_GET(lltx);
msg->llrx = RIMESTATS_GET(llrx);
#if TIMESYNCH_CONF_ENABLED
msg->timestamp = timesynch_time();
#else