Commit 18b5f6d6 authored by Niclas Finne's avatar Niclas Finne
Browse files

energest: made energest more configurable

* energest time defaults to rtimer but can be configured via
  ENERGEST_CONF_CURRENT_TIME and ENERGEST_CONF_SECOND.

* Additional energest types can be added by platform and application
  using ENERGEST_CONF_PLATFORM_ADDITIONS and ENERGEST_CONF_ADDITIONS.

* Energest times are now 64 bit and thereby non-wrapping in most systems.

* Removed unused energest types for serial and sensors.
parent 888a04e7
......@@ -30,7 +30,6 @@
*/
#include "contiki.h"
#include "sys/energest.h"
#include "sys/clock.h"
#include "sys/etimer.h"
#include "rtimer-arch.h"
......@@ -87,7 +86,6 @@ ISR(TIMERA1, timera1)
#endif
if(count % CLOCK_CONF_SECOND == 0) {
++seconds;
energest_flush();
}
last_tar = read_tar();
}
......
......@@ -30,7 +30,6 @@
*/
#include "contiki.h"
#include "sys/energest.h"
#include "sys/clock.h"
#include "sys/etimer.h"
#include "rtimer-arch.h"
......@@ -87,7 +86,6 @@ ISR(TIMER1_A1, timera1)
#endif
if(count % CLOCK_CONF_SECOND == 0) {
++seconds;
energest_flush();
}
last_tar = read_tar();
}
......
......@@ -59,8 +59,8 @@ compower_init(void)
void
compower_accumulate(struct compower_activity *e)
{
static uint32_t last_listen, last_transmit;
uint32_t listen, transmit;
static uint64_t last_listen, last_transmit;
uint64_t listen, transmit;
energest_flush();
......
......@@ -62,7 +62,7 @@
* with no user-visible elements.
*/
struct compower_activity {
uint32_t listen, transmit;
uint64_t listen, transmit;
};
/**
......
......@@ -42,9 +42,8 @@
#if ENERGEST_CONF_ON
int energest_total_count;
energest_t energest_total_time[ENERGEST_TYPE_MAX];
rtimer_clock_t energest_current_time[ENERGEST_TYPE_MAX];
uint64_t energest_total_time[ENERGEST_TYPE_MAX];
uint64_t energest_current_time[ENERGEST_TYPE_MAX];
unsigned char energest_current_mode[ENERGEST_TYPE_MAX];
/*---------------------------------------------------------------------------*/
......@@ -58,36 +57,30 @@ energest_init(void)
}
}
/*---------------------------------------------------------------------------*/
unsigned long
energest_type_time(int type)
{
return energest_total_time[type].current;
}
/*---------------------------------------------------------------------------*/
void
energest_type_set(int type, unsigned long val)
{
energest_total_time[type].current = val;
}
/*---------------------------------------------------------------------------*/
void
energest_flush(void)
{
rtimer_clock_t now;
uint64_t now;
int i;
for(i = 0; i < ENERGEST_TYPE_MAX; i++) {
if(energest_current_mode[i]) {
now = RTIMER_NOW();
energest_total_time[i].current += (rtimer_clock_t)
(now - energest_current_time[i]);
now = ENERGEST_CURRENT_TIME();
energest_total_time[i].current += now - energest_current_time[i];
energest_current_time[i] = now;
}
}
}
/*---------------------------------------------------------------------------*/
#else /* ENERGEST_CONF_ON */
void energest_type_set(int type, unsigned long val) {}
void energest_init(void) {}
unsigned long energest_type_time(int type) { return 0; }
void energest_flush(void) {}
void
energest_init(void)
{
}
void
energest_flush(void)
{
}
#endif /* ENERGEST_CONF_ON */
......@@ -40,66 +40,126 @@
#ifndef ENERGEST_H_
#define ENERGEST_H_
#include "sys/rtimer.h"
#include "contiki.h"
#ifndef ENERGEST_CURRENT_TIME
#ifdef ENERGEST_CONF_CURRENT_TIME
#define ENERGEST_CURRENT_TIME ENERGEST_CONF_CURRENT_TIME
#else
#define ENERGEST_CURRENT_TIME RTIMER_NOW
#define ENERGEST_SECOND RTIMER_SECOND
#endif /* ENERGEST_CONF_TIME */
#endif /* ENERGEST_TIME */
#ifndef ENERGEST_SECOND
#ifdef ENERGEST_CONF_SECOND
#define ENERGEST_SECOND ENERGEST_CONF_SECOND
#else /* ENERGEST_CONF_SECOND */
#define ENERGEST_SECOND RTIMER_SECOND
#endif /* ENERGEST_CONF_SECOND */
#endif /* ENERGEST_SECOND */
typedef struct {
/* unsigned long cumulative[2];*/
unsigned long current;
} energest_t;
enum energest_type {
/*
* Optional support for more energest types.
*
* #define ENERGEST_CONF_PLATFORM_ADDITIONS TYPE_NAME1, TYPE_NAME2
*
* #define ENERGEST_CONF_ADDITIONS TYPE_NAME3, TYPE_NAME4
*/
typedef enum energest_type {
ENERGEST_TYPE_CPU,
ENERGEST_TYPE_LPM,
ENERGEST_TYPE_TRANSMIT,
ENERGEST_TYPE_LISTEN,
#ifdef ENERGEST_CONF_PLATFORM_ADDITIONS
ENERGEST_CONF_PLATFORM_ADDITIONS,
#endif /* ENERGEST_CONF_PLATFORM_ADDITIONS */
ENERGEST_TYPE_SENSORS,
ENERGEST_TYPE_SERIAL,
#ifdef ENERGEST_CONF_ADDITIONS
ENERGEST_CONF_ADDITIONS,
#endif /* ENERGEST_CONF_ADDITIONS */
ENERGEST_TYPE_MAX
};
} energest_type_t;
void energest_init(void);
unsigned long energest_type_time(int type);
void energest_type_set(int type, unsigned long value);
void energest_flush(void);
#if ENERGEST_CONF_ON
/*extern int energest_total_count;*/
extern energest_t energest_total_time[ENERGEST_TYPE_MAX];
extern rtimer_clock_t energest_current_time[ENERGEST_TYPE_MAX];
extern uint64_t energest_total_time[ENERGEST_TYPE_MAX];
extern uint64_t energest_current_time[ENERGEST_TYPE_MAX];
extern unsigned char energest_current_mode[ENERGEST_TYPE_MAX];
#define ENERGEST_ON(type) do { \
/*++energest_total_count;*/ \
energest_current_time[type] = RTIMER_NOW(); \
energest_current_mode[type] = 1; \
} while(0)
#define ENERGEST_OFF(type) if(energest_current_mode[type] != 0) do { \
energest_total_time[type].current += (rtimer_clock_t)(RTIMER_NOW() - \
energest_current_time[type]); \
energest_current_mode[type] = 0; \
} while(0)
#define ENERGEST_SWITCH(type_off, type_on) do { \
rtimer_clock_t energest_local_variable_now = RTIMER_NOW(); \
if(energest_current_mode[type_off] != 0) { \
energest_total_time[type_off].current += (rtimer_clock_t)(energest_local_variable_now - \
energest_current_time[type_off]); \
energest_current_mode[type_off] = 0; \
} \
energest_current_time[type_on] = energest_local_variable_now; \
energest_current_mode[type_on] = 1; \
} while(0)
static inline uint64_t
energest_type_time(energest_type_t type)
{
return energest_total_time[type];
}
static inline void
energest_type_set(energest_type_t type, uint64_t value)
{
energest_total_time[type] = value;
}
static inline void
energest_on(energest_type_t type)
{
if(energest_current_mode[type] == 0) {
energest_current_time[type] = ENERGEST_CURRENT_TIME();
energest_current_mode[type] = 1;
}
}
#define ENERGEST_ON(type) energest_on(type)
static inline void
energest_off(energest_type_t type)
{
if(energest_current_mode[type] != 0) {
energest_total_time[type].current +=
ENERGEST_CURRENT_TIME() - energest_current_time[type];
energest_current_mode[type] = 0;
}
}
#define ENERGEST_OFF(type) energest_off(type)
static inline void
energest_switch(energest_type_t type_off, energest_type_t type_on)
{
uint64_t energest_local_variable_now = ENERGEST_CURRENT_TIME();
if(energest_current_mode[type_off] != 0) {
energest_total_time[type_off].current +=
energest_local_variable_now - energest_current_time[type_off];
energest_current_mode[type_off] = 0;
}
if(energest_current_mode[type_on] == 0) {
energest_current_time[type_on] = energest_local_variable_now;
energest_current_mode[type_on] = 1;
}
}
#define ENERGEST_SWITCH(type_off, type_on) energest_switch(type_off, type_on)
#else /* ENERGEST_CONF_ON */
static inline uint64_t energest_type_time(energest_type_t type) { return 0; }
static inline void energest_type_set(energest_type_t type, uint64_t time) { }
static inline void energest_on(energest_type_t type) { }
static inline void energest_off(energest_type_t type) { }
static inline void energest_switch(energest_type_t type_off,
energest_type_t type_on)
{
}
#define ENERGEST_ON(type) do { } while(0)
#define ENERGEST_OFF(type) do { } while(0)
#define ENERGEST_SWITCH(type_off, type_on) do { } while(0)
#endif /* ENERGEST_CONF_ON */
#endif /* ENERGEST_H_ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment