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

Improved configuration for low-power wireless networks. Removed legacy code regarding netsim and energest. Fixed bug with state transitions, in which timers were stopped incorrectly.

Browse source
This commit is contained in:
nvt-se 2010-04-12 14:39:52 +00:00
parent 40f7541f88
commit 75690c3399
2 changed files with 57 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
apps/deluge/deluge.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: deluge.c,v 1.8 2010/03/18 14:25:54 nvt-se Exp $ * $Id: deluge.c,v 1.9 2010/04/12 14:39:52 nvt-se Exp $
*/ */
/** /**
@ -63,11 +63,7 @@
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#include <stdio.h> #include <stdio.h>
#define PRINTF(...) \ #define PRINTF(...) printf(__VA_ARGS__)
do { \
printf("[Node %02u] ", (unsigned) node_id); \
printf(__VA_ARGS__); \
} while(0)
#else #else
#define PRINTF(...) #define PRINTF(...)
#endif #endif
@ -101,10 +97,6 @@ static unsigned next_object_id;
static const struct broadcast_callbacks broadcast_call = {broadcast_recv, NULL}; static const struct broadcast_callbacks broadcast_call = {broadcast_recv, NULL};
static const struct unicast_callbacks unicast_call = {unicast_recv, NULL}; static const struct unicast_callbacks unicast_call = {unicast_recv, NULL};
#if ENERGEST_CONF_ON
static long cpu_start_time, tx_start_time, listen_start_time;
#endif
#if NETSIM #if NETSIM
static char label[128]; static char label[128];
#endif #endif
@ -125,6 +117,7 @@ checksum(unsigned char *buf, unsigned len)
static void static void
transition(int state) transition(int state)
{ {
if(state != deluge_state) {
switch(deluge_state) { switch(deluge_state) {
case DELUGE_STATE_MAINTAIN: case DELUGE_STATE_MAINTAIN:
ctimer_stop(&summary_timer); ctimer_stop(&summary_timer);
@ -137,9 +130,9 @@ transition(int state)
ctimer_stop(&tx_timer); ctimer_stop(&tx_timer);
break; break;
} }
deluge_state = state; deluge_state = state;
} }
}
static int static int
write_page(struct deluge_object *obj, unsigned pagenum, unsigned char *data) write_page(struct deluge_object *obj, unsigned pagenum, unsigned char *data)
@ -327,11 +320,13 @@ handle_summary(struct deluge_msg_summary *msg, const rimeaddr_t *sender)
oldest_request = oldest_data = now = clock_time(); oldest_request = oldest_data = now = clock_time();
for(i = 0; i < msg->highest_available; i++) { for(i = 0; i < msg->highest_available; i++) {
page = &current_object.pages[i]; page = &current_object.pages[i];
if(page->last_request < oldest_request) if(page->last_request < oldest_request) {
oldest_request = page->last_request; oldest_request = page->last_request;
if(page->last_request < oldest_data) }
if(page->last_request < oldest_data) {
oldest_data = page->last_data; oldest_data = page->last_data;
} }
}
if(((now - oldest_request) / CLOCK_SECOND) <= 2 * r_interval || if(((now - oldest_request) / CLOCK_SECOND) <= 2 * r_interval ||
((now - oldest_data) / CLOCK_SECOND) <= r_interval) { ((now - oldest_data) / CLOCK_SECOND) <= r_interval) {
@ -340,11 +335,14 @@ handle_summary(struct deluge_msg_summary *msg, const rimeaddr_t *sender)
rimeaddr_copy(&current_object.summary_from, sender); rimeaddr_copy(&current_object.summary_from, sender);
transition(DELUGE_STATE_RX); transition(DELUGE_STATE_RX);
if(ctimer_expired(&rx_timer)) {
ctimer_set(&rx_timer, ctimer_set(&rx_timer,
CONST_OMEGA * ESTIMATED_TX_TIME + (random_rand() % T_R), CONST_OMEGA * ESTIMATED_TX_TIME + ((unsigned)random_rand() % T_R),
send_request, &current_object); send_request, &current_object);
} }
} }
}
static void static void
send_page(struct deluge_object *obj, unsigned pagenum) send_page(struct deluge_object *obj, unsigned pagenum)
@ -431,73 +429,56 @@ handle_packet(struct deluge_msg_packet *msg)
{ {
struct deluge_page *page; struct deluge_page *page;
uint16_t crc; uint16_t crc;
#if ENERGEST_CONF_ON struct deluge_msg_packet packet;
long cpu_time, listen_time, tx_time;
#endif memcpy(&packet, msg, sizeof(packet));
PRINTF("Incoming packet for object id %u, version %u, page %u, packet num %u!\n", PRINTF("Incoming packet for object id %u, version %u, page %u, packet num %u!\n",
(unsigned) msg->object_id, (unsigned) msg->version, (unsigned)packet.object_id, (unsigned)packet.version,
(unsigned) msg->pagenum, (unsigned) msg->packetnum); (unsigned)packet.pagenum, (unsigned)packet.packetnum);
if(msg->pagenum != current_object.current_rx_page) { if(packet.pagenum != current_object.current_rx_page) {
return; return;
} }
if(msg->version != current_object.version) { if(packet.version != current_object.version) {
neighbor_inconsistency = 1; neighbor_inconsistency = 1;
} }
page = &current_object.pages[msg->pagenum]; page = &current_object.pages[packet.pagenum];
if(msg->version == page->version && !(page->flags & PAGE_COMPLETE)) { if(packet.version == page->version && !(page->flags & PAGE_COMPLETE)) {
memcpy(&current_object.current_page[S_PKT * msg->packetnum], memcpy(&current_object.current_page[S_PKT * packet.packetnum],
msg->payload, S_PKT); packet.payload, S_PKT);
crc = checksum(msg->payload, S_PKT); crc = checksum(packet.payload, S_PKT);
if(msg->crc != crc) { if(packet.crc != crc) {
PRINTF("packet crc: %hu, calculated crc: %hu\n", msg->crc, crc); PRINTF("packet crc: %hu, calculated crc: %hu\n", packet.crc, crc);
return; return;
} }
page->last_data = clock_time(); page->last_data = clock_time();
page->packet_set |= (1 << msg->packetnum); page->packet_set |= (1 << packet.packetnum);
#if NETSIM
#define RX_FRACTION \
(float) (current_object.current_rx_page + 1) / \
OBJECT_PAGE_COUNT(current_object)
snprintf(label, sizeof (label), "v:%u %u%%", msg->version,
(unsigned) (100 * RX_FRACTION));
ether_set_text(label);
#endif
if(page->packet_set == ALL_PACKETS) { if(page->packet_set == ALL_PACKETS) {
write_page(&current_object, msg->pagenum, current_object.current_page); write_page(&current_object, packet.pagenum, current_object.current_page);
page->version = msg->version; page->version = packet.version;
page->flags = PAGE_COMPLETE; page->flags = PAGE_COMPLETE;
PRINTF("Page %u completed\n", msg->pagenum); PRINTF("Page %u completed\n", packet.pagenum);
current_object.current_rx_page++; current_object.current_rx_page++;
if(msg->pagenum == OBJECT_PAGE_COUNT(current_object) - 1) { if(packet.pagenum == OBJECT_PAGE_COUNT(current_object) - 1) {
current_object.version = current_object.update_version; current_object.version = current_object.update_version;
leds_on(LEDS_RED); leds_on(LEDS_RED);
PRINTF("Update completed for object %u, version %u\n", PRINTF("Update completed for object %u, version %u\n",
current_object.object_id, msg->version); current_object.object_id, packet.version);
#if ENERGEST_CONF_ON
cpu_time = energest_type_time(ENERGEST_TYPE_CPU) - cpu_start_time;
tx_time = energest_type_time(ENERGEST_TYPE_TRANSMIT) - tx_start_time;
listen_time = energest_type_time(ENERGEST_TYPE_LISTEN) - listen_start_time;
PRINTF("Time estimation: CPU %ld, TX %ld, Listen %ld\n",
cpu_time, tx_time, listen_time);
PRINTF("Energy: %lumJ\n",
(unsigned long) ((1.8 * cpu_time + 20.0 * listen_time +
17.7 * tx_time) * 3 / RTIMER_SECOND));
#endif
} else if(current_object.current_rx_page < OBJECT_PAGE_COUNT(current_object)) { } else if(current_object.current_rx_page < OBJECT_PAGE_COUNT(current_object)) {
if(ctimer_expired(&rx_timer)) {
ctimer_set(&rx_timer, ctimer_set(&rx_timer,
CONST_OMEGA * ESTIMATED_TX_TIME + (random_rand() % T_R), CONST_OMEGA * ESTIMATED_TX_TIME + (random_rand() % T_R),
send_request, &current_object); send_request, &current_object);
} }
}
/* Deluge R.3 */ /* Deluge R.3 */
transition(DELUGE_STATE_MAINTAIN); transition(DELUGE_STATE_MAINTAIN);
} }
@ -562,12 +543,6 @@ handle_profile(struct deluge_msg_profile *msg)
return; return;
} }
#ifdef ENERGEST_CONF_ON
cpu_start_time = energest_type_time(ENERGEST_TYPE_CPU);
tx_start_time = energest_type_time(ENERGEST_TYPE_TRANSMIT);
listen_start_time = energest_type_time(ENERGEST_TYPE_LISTEN);
#endif
PRINTF("Received profile of version %u with a vector of %u pages.\n", PRINTF("Received profile of version %u with a vector of %u pages.\n",
msg->version, msg->npages); msg->version, msg->npages);
@ -609,7 +584,7 @@ handle_profile(struct deluge_msg_profile *msg)
transition(DELUGE_STATE_RX); transition(DELUGE_STATE_RX);
ctimer_set(&rx_timer, ctimer_set(&rx_timer,
CONST_OMEGA * ESTIMATED_TX_TIME + (random_rand() % T_R), CONST_OMEGA * ESTIMATED_TX_TIME + ((unsigned)random_rand() % T_R),
send_request, obj); send_request, obj);
} }
@ -664,7 +639,7 @@ PROCESS_THREAD(deluge_process, ev, data)
{ {
static struct etimer et; static struct etimer et;
static unsigned time_counter; static unsigned time_counter;
static int r_rand; static unsigned r_rand;
PROCESS_EXITHANDLER(goto exit); PROCESS_EXITHANDLER(goto exit);
@ -691,7 +666,7 @@ PROCESS_THREAD(deluge_process, ev, data)
r_interval = (2 * r_interval >= T_HIGH) ? T_HIGH : 2 * r_interval; r_interval = (2 * r_interval >= T_HIGH) ? T_HIGH : 2 * r_interval;
} }
r_rand = r_interval / 2 + (random_rand() % (r_interval / 2)); r_rand = r_interval / 2 + ((unsigned)random_rand() % (r_interval / 2));
recv_adv = 0; recv_adv = 0;
old_summary = 0; old_summary = 0;

10
apps/deluge/deluge.h
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: deluge.h,v 1.3 2009/03/01 12:49:43 nvt-se Exp $ * $Id: deluge.h,v 1.4 2010/04/12 14:39:53 nvt-se Exp $
*/ */
/** /**
@ -61,16 +61,16 @@ PROCESS_NAME(deluge_process);
/* All pages up to, and including, this page are complete. */ /* All pages up to, and including, this page are complete. */
#define PAGE_AVAILABLE 1 #define PAGE_AVAILABLE 1
#define S_PKT 32 /* Deluge packet size. */ #define S_PKT 64 /* Deluge packet size. */
#define N_PKT 4 /* Packets per page. */ #define N_PKT 4 /* Packets per page. */
#define S_PAGE (S_PKT * N_PKT) /* Fixed page size. */ #define S_PAGE (S_PKT * N_PKT) /* Fixed page size. */
/* Bounds for the round time in seconds. */ /* Bounds for the round time in seconds. */
#define T_LOW 2 #define T_LOW 2
#define T_HIGH 32 #define T_HIGH 64
/* Random interval for request transmissions in jiffies. */ /* Random interval for request transmissions in jiffies. */
#define T_R (CLOCK_SECOND / 2) #define T_R (CLOCK_SECOND * 2)
/* Bound for the number of advertisements. */ /* Bound for the number of advertisements. */
#define CONST_K 1 #define CONST_K 1
@ -93,7 +93,7 @@ PROCESS_NAME(deluge_process);
#define CONST_ALPHA 0.5 #define CONST_ALPHA 0.5
#define CONST_OMEGA 8 #define CONST_OMEGA 8
#define ESTIMATED_TX_TIME (CLOCK_SECOND / 8) #define ESTIMATED_TX_TIME (CLOCK_SECOND)
struct deluge_msg_summary { struct deluge_msg_summary {
uint16_t object_id; uint16_t object_id;