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

rest-engine: Allow adding periodic resources after starting REST engine

Browse source 
Without this fix, any periodic resources added after the REST engine was
already running were never started.
This commit is contained in:
Joakim Nohlgård 2016-07-06 19:00:02 +02:00
parent 98a795b967
commit e7070a5f79
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/rest-engine/rest-engine.c
View file

@ -114,6 +114,7 @@ rest_activate_resource(resource_t *resource, char *path)
resource->periodic->resource->url); resource->periodic->resource->url);
list_add(restful_periodic_services, resource->periodic); list_add(restful_periodic_services, resource->periodic);
} }
process_poll(&rest_engine_process);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/*- Internal API ------------------------------------------------------------*/ /*- Internal API ------------------------------------------------------------*/
@ -188,26 +189,39 @@ PROCESS_THREAD(rest_engine_process, ev, data)
{ {
PROCESS_BEGIN(); PROCESS_BEGIN();
PRINTF("Starting rest_engine_process\n");
/* pause to let REST server finish adding resources. */ /* pause to let REST server finish adding resources. */
PROCESS_PAUSE(); PROCESS_PAUSE();
/* initialize the PERIODIC_RESOURCE timers, which will be handled by this process. */ /* initialize the PERIODIC_RESOURCE timers, which will be handled by this process. */
periodic_resource_t *periodic_resource = NULL; periodic_resource_t *periodic_resource = NULL;
for(periodic_resource = PRINTF("Periodic: process\n");
(periodic_resource_t *)list_head(restful_periodic_services);
periodic_resource; periodic_resource = periodic_resource->next) { process_poll(&rest_engine_process);
if(periodic_resource->periodic_handler && periodic_resource->period) {
PRINTF("Periodic: Set timer for /%s to %lu\n",
periodic_resource->resource->url, periodic_resource->period);
etimer_set(&periodic_resource->periodic_timer,
periodic_resource->period);
}
}
while(1) { while(1) {
PROCESS_WAIT_EVENT(); PROCESS_WAIT_EVENT();
if(ev == PROCESS_EVENT_TIMER) { if(ev == PROCESS_EVENT_POLL) {
PRINTF("Periodic: poll\n");
for(periodic_resource =
(periodic_resource_t *)list_head(restful_periodic_services);
periodic_resource; periodic_resource = periodic_resource->next) {
if(periodic_resource->periodic_handler && periodic_resource->period) {
if(!etimer_expired(&periodic_resource->periodic_timer)) {
/* Already running */
continue;
}
PRINTF("Periodic: Set timer for /%s to %lu\n",
periodic_resource->resource->url, periodic_resource->period);
etimer_set(&periodic_resource->periodic_timer,
periodic_resource->period);
}
}
}
else if(ev == PROCESS_EVENT_TIMER) {
for(periodic_resource = for(periodic_resource =
(periodic_resource_t *)list_head(restful_periodic_services); (periodic_resource_t *)list_head(restful_periodic_services);
periodic_resource; periodic_resource = periodic_resource->next) { periodic_resource; periodic_resource = periodic_resource->next) {