Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

replaced HOOK_INIT with HOOK_PATH_START and HOOK_DEINIT with HOOK_PATH_STOP

Browse source
This commit is contained in:
Steffen Vogel 2016-01-15 17:40:17 +01:00
parent 18d4051ca4
commit 20534d1c3d
4 changed files with 24 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/hooks.h
View file

@ -61,14 +61,11 @@ enum hook_type {
HOOK_PERIODIC = 1 << 7, /**< Called periodically. Period is set by global 'stats' option in the configuration file. */
HOOK_INIT = 1 << 8, /**< Called to allocate and init hook-private data */
HOOK_DEINIT = 1 << 9, /**< Called to free hook-private data */
/** @{ Classes of hooks */
/** Internal hooks are mandatory. */
HOOK_INTERNAL = 1 << 16,
/** Hooks which are using private data must allocate and free them propery. */
HOOK_PRIVATE = HOOK_INIT | HOOK_DEINIT,
HOOK_PRIVATE = HOOK_PATH_START | HOOK_PATH_STOP,
/** All path related actions */
HOOK_PATH = HOOK_PATH_START | HOOK_PATH_STOP | HOOK_PATH_RESTART,
/** Hooks which are used to collect statistics. */

6
lib/cfg.c
View file

@ -115,9 +115,6 @@ int config_parse_path(config_setting_t *cfg,
cfg_hook = config_setting_get_member(cfg, "hook");
if (cfg_hook)
config_parse_hooklist(cfg_hook, &p->hooks);
/* Initialize hooks and their private data / parameters */
path_run_hook(p, HOOK_INIT);
if (!config_setting_lookup_bool(cfg, "reverse", &reverse))
reverse = 0;
@ -144,9 +141,6 @@ int config_parse_path(config_setting_t *cfg,
if (cfg_hook)
config_parse_hooklist(cfg_hook, &r->hooks);
/* Initialize hooks and their private data / parameters */
path_run_hook(r, HOOK_INIT);
list_push(paths, r);
}

43
lib/hooks.c
View file

@ -92,7 +92,7 @@ int hook_skip_unchanged(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
x = h->private = alloc(sizeof(struct private));
if (!h->parameter)
@ -103,7 +103,7 @@ int hook_skip_unchanged(struct path *p, struct hook *h, int when)
error("Failed to parse parameter '%s' for hook 'deduplication'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
free(x);
break;
@ -137,7 +137,7 @@ int hook_convert(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
x = h->private = alloc(sizeof(struct private));
if (!h->parameter)
@ -151,7 +151,7 @@ int hook_convert(struct path *p, struct hook *h, int when)
error("Invalid parameter '%s' for hook 'convert'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
free(x);
break;
@ -186,7 +186,7 @@ int hook_fir(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
if (!h->parameter)
error("Missing parameter for hook 'fir'");
@ -203,7 +203,7 @@ int hook_fir(struct path *p, struct hook *h, int when)
error("Invalid parameter '%s' for hook 'fir'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
pool_destroy(&x->coeffs);
pool_destroy(&x->history);
@ -245,7 +245,7 @@ int hook_decimate(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
if (!h->parameter)
error("Missing parameter for hook 'decimate'");
@ -256,7 +256,7 @@ int hook_decimate(struct path *p, struct hook *h, int when)
error("Invalid parameter '%s' for hook 'decimate'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
free(x);
break;
@ -276,18 +276,19 @@ int hook_skip_first(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
if (!h->parameter)
error("Missing parameter for hook 'skip_first'");
x = h->private = alloc(sizeof(struct private));
x->started = time_now();
x->wait = strtof(h->parameter, NULL);
if (!x->wait)
error("Invalid parameter '%s' for hook 'skip_first'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
free(x);
break;
@ -295,10 +296,6 @@ int hook_skip_first(struct path *p, struct hook *h, int when)
x->started = p->ts.recv;
break;
case HOOK_PATH_START:
x->started = time_now();
break;
case HOOK_POST: {
double delta = time_delta(&x->started, &p->ts.recv);
return delta < x->wait
@ -368,7 +365,7 @@ REGISTER_HOOK("stats", 2, hook_stats, HOOK_STATS)
int hook_stats(struct path *p, struct hook *h, int when)
{
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
/** @todo Allow configurable bounds for histograms */
hist_create(&p->hist.owd, 0, 1, 100e-3);
hist_create(&p->hist.gap_msg, 90e-3, 110e-3, 1e-3);
@ -376,13 +373,6 @@ int hook_stats(struct path *p, struct hook *h, int when)
hist_create(&p->hist.gap_seq, -HIST_SEQ, +HIST_SEQ, 1);
break;
case HOOK_DEINIT:
hist_destroy(&p->hist.owd);
hist_destroy(&p->hist.gap_msg);
hist_destroy(&p->hist.gap_recv);
hist_destroy(&p->hist.gap_seq);
break;
case HOOK_PRE:
/* Exclude first message from statistics */
if (p->received > 0) {
@ -413,6 +403,11 @@ int hook_stats(struct path *p, struct hook *h, int when)
if (p->hist.gap_recv.total){ info("Inter-message arrival time:"); hist_print(&p->hist.gap_recv); }
if (p->hist.gap_msg.total) { info("Inter-message ts gap:"); hist_print(&p->hist.gap_msg); }
if (p->hist.gap_seq.total) { info("Inter-message sequence number gaps:"); hist_print(&p->hist.gap_seq); }
hist_destroy(&p->hist.owd);
hist_destroy(&p->hist.gap_msg);
hist_destroy(&p->hist.gap_recv);
hist_destroy(&p->hist.gap_seq);
break;
case HOOK_PATH_RESTART:
@ -473,7 +468,7 @@ int hook_stats_send(struct path *p, struct hook *h, int when)
} *x = h->private;
switch (when) {
case HOOK_INIT:
case HOOK_PATH_START:
if (!h->parameter)
error("Missing parameter for hook 'stats_send'");
@ -488,7 +483,7 @@ int hook_stats_send(struct path *p, struct hook *h, int when)
error("Invalid destination node '%s' for hook 'stats_send'", h->parameter);
break;
case HOOK_DEINIT:
case HOOK_PATH_STOP:
free(x->msg);
free(x);
break;

8
lib/path.c
View file

@ -37,8 +37,9 @@ int path_run_hook(struct path *p, enum hook_type t)
list_foreach(struct hook *h, &p->hooks) {
if (h->type & t) {
ret = ((hook_cb_t) h->cb)(p, h, t);
debug(22, "Running hook when=%u '%s' prio=%u ret=%d", t, h->name, h->priority, ret);
ret = ((hook_cb_t) h->cb)(p, h, t);
if (ret)
return ret;
}
@ -195,6 +196,7 @@ struct path * path_create(size_t poolsize, size_t values)
list_init(&p->destinations, NULL);
list_init(&p->hooks, free);
pool_create(&p->pool, poolsize, 16 + values * sizeof(float)); /** @todo */
list_foreach(struct hook *h, &hooks) {
@ -208,9 +210,7 @@ struct path * path_create(size_t poolsize, size_t values)
}
void path_destroy(struct path *p)
{
path_run_hook(p, HOOK_DEINIT);
{
list_destroy(&p->destinations);
list_destroy(&p->hooks);
pool_destroy(&p->pool);