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

Updated to use clock_seconds() on all platforms

Browse source
This commit is contained in:
Niclas Finne 2011-09-19 17:42:19 +02:00
parent f71b0bc794
commit 6d3571ed59
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/lib/print-stats.c
View file

@ -46,14 +46,10 @@
#include <stdio.h> #include <stdio.h>
#ifdef __AVR__ #ifdef __AVR__
/* AVR clock_time() is only 16 bit, time would wrap in ~500 seconds */
/* Might as well use program flash while we are dirtying the core */
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args) #define PRINTA(FORMAT,args...) printf_P(PSTR(FORMAT),##args)
#define DISPLAYTIME clock_seconds()
#else #else
#define PRINTA(...) printf(__VA_ARGS__) #define PRINTA(...) printf(__VA_ARGS__)
#define DISPLAYTIME (unsigned long)clock_time() / CLOCK_SECOND
#endif #endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -62,7 +58,7 @@ print_stats(void)
{ {
PRINTA("S %d.%d clock %lu tx %lu rx %lu rtx %lu rrx %lu rexmit %lu acktx %lu noacktx %lu ackrx %lu timedout %lu badackrx %lu toolong %lu tooshort %lu badsynch %lu badcrc %lu contentiondrop %lu sendingdrop %lu lltx %lu llrx %lu\n", PRINTA("S %d.%d clock %lu tx %lu rx %lu rtx %lu rrx %lu rexmit %lu acktx %lu noacktx %lu ackrx %lu timedout %lu badackrx %lu toolong %lu tooshort %lu badsynch %lu badcrc %lu contentiondrop %lu sendingdrop %lu lltx %lu llrx %lu\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
DISPLAYTIME, clock_seconds(),
rimestats.tx, rimestats.rx, rimestats.tx, rimestats.rx,
rimestats.reliabletx, rimestats.reliablerx, rimestats.reliabletx, rimestats.reliablerx,
rimestats.rexmit, rimestats.acktx, rimestats.noacktx, rimestats.rexmit, rimestats.acktx, rimestats.noacktx,
@ -74,7 +70,7 @@ print_stats(void)
#if ENERGEST_CONF_ON #if ENERGEST_CONF_ON
PRINTA("E %d.%d clock %lu cpu %lu lpm %lu irq %lu gled %lu yled %lu rled %lu tx %lu listen %lu sensors %lu serial %lu\n", PRINTA("E %d.%d clock %lu cpu %lu lpm %lu irq %lu gled %lu yled %lu rled %lu tx %lu listen %lu sensors %lu serial %lu\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1],
DISPLAYTIME, clock_seconds(),
energest_total_time[ENERGEST_TYPE_CPU].current, energest_total_time[ENERGEST_TYPE_CPU].current,
energest_total_time[ENERGEST_TYPE_LPM].current, energest_total_time[ENERGEST_TYPE_LPM].current,
energest_total_time[ENERGEST_TYPE_IRQ].current, energest_total_time[ENERGEST_TYPE_IRQ].current,