mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Aggregator] check_interval in ms 

The check interval is now in milliseconds instead of microseconds.
This commit is contained in:
Matteo Cypriani 2011-07-24 20:20:32 +02:00
parent 1dae048f0c
commit f5895f23c4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
owlps-aggregator/owlps-aggregator.h
View File

@ -13,9 +13,9 @@
#define DEFAULT_CONFIG_FILE "/usr/local/etc/owlps/owlps-aggregator.conf"
#define DEFAULT_AGGREGATE_TIMEOUT 1500 // milliseconds
#define DEFAULT_KEEP_TIMEOUT 3000 // milliseconds
#define DEFAULT_CHECK_INTERVAL 500000 // microseconds
#define DEFAULT_AP_KEEP_TIMEOUT 600 // s
#define DEFAULT_AP_CHECK_INTERVAL 1000 // ms
#define DEFAULT_CHECK_INTERVAL 500 // milliseconds
#define DEFAULT_AP_KEEP_TIMEOUT 600 // seconds
#define DEFAULT_AP_CHECK_INTERVAL 1000 // milliseconds
#define POSITIONER_DEFAULT_IP "127.0.0.1"

7
owlps-aggregator/owlps-aggregatord.c
View File

@ -190,7 +190,7 @@ void parse_config_file(int argc, char **argv)
CFG_INT("aggregate_timeout", DEFAULT_AGGREGATE_TIMEOUT, CFGF_NONE),
CFG_INT("keep_timeout", DEFAULT_KEEP_TIMEOUT, CFGF_NONE),
// Time between two list checks (in microseconds):
// Time between two list checks (in milliseconds):
CFG_INT("check_interval", DEFAULT_CHECK_INTERVAL, CFGF_NONE),
// Autocalibration activated?
@ -678,7 +678,8 @@ void* monitor_requests(void *NULL_value)
sem_post(&lock_requests) ;
fflush(NULL) ;
usleep(cfg_getint(cfg, "check_interval")) ; // Wait to check again
// Wait to check again:
usleep(cfg_getint(cfg, "check_interval") * 1000) ;
}
/* Close output file & socket */
@ -1312,7 +1313,7 @@ void print_usage()
"\t-k keep_timeout\t\tAggregated requests are kept during"
" 'keep_timeout' milliseconds (default: %d ms).\n"
"\t-c check_interval\tTime between two checks of the stored"
" requests (default\t%d microseconds).\n"
" requests, in milliseconds (default: %d ms).\n"
"Autocalibration options:\n"
"\t-A\t\t\tEnable autocalibration (default: disabled).\n"