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

moved hook_run() function to path.c

Browse source
This commit is contained in:
Steffen Vogel 2015-09-19 12:20:17 +02:00
parent f7d10ebf7b
commit 66fcf82d1c
5 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/include/hooks.h
View file

@ -64,15 +64,6 @@ struct hook {
*/
const struct hook * hook_lookup(const char *name);
/** Conditionally execute the hooks
*
* @param p A pointer to the path structure.
* @param t Which type of hooks should be executed?
* @retval 0 All registred hooks for the specified type have been executed successfully.
* @retval <0 On of the hook functions signalized, that the processing should be aborted; message should be skipped.
*/
int hook_run(struct path *p, enum hook_type t);
/* The following prototypes are example hooks */

9
server/include/path.h
View file

@ -138,4 +138,13 @@ void path_print_stats(struct path *p);
*/
int path_print(struct path *p, char *buf, int len);
/** Conditionally execute the hooks
*
* @param p A pointer to the path structure.
* @param t Which type of hooks should be executed?
* @retval 0 All registred hooks for the specified type have been executed successfully.
* @retval <0 On of the hook functions signalized, that the processing should be aborted; message should be skipped.
*/
int path_run_hook(struct path *p, enum hook_type t);
#endif /* _PATH_H_ */

9
server/src/hooks.c
View file

@ -48,15 +48,6 @@ const struct hook* hook_lookup(const char *name)
return NULL; /* No matching hook was found */
}
int hook_run(struct path *p, enum hook_type t)
{
int ret = 0;
FOREACH(&p->hooks[t], it)
ret += ((hook_cb_t) it->ptr)(p);
return ret;
}
int hook_print(struct path *p)
{

21
server/src/path.c
View file

@ -39,6 +39,15 @@ static void path_write(struct path *p)
}
}
int path_run_hook(struct path *p, enum hook_type t)
{
int ret = 0;
FOREACH(&p->hooks[t], it)
ret += ((hook_cb_t) it->ptr)(p);
return ret;
}
/** Send messages asynchronously */
static void * path_run_async(void *arg)
{
@ -71,7 +80,7 @@ static void * path_run(void *arg)
debug(10, "Received %u messages from node '%s'", recv, p->in->name);
/* Run preprocessing hooks */
if (hook_run(p, HOOK_PRE)) {
if (path_run_hook(p, HOOK_PRE)) {
p->skipped += recv;
continue;
}
@ -84,14 +93,14 @@ static void * path_run(void *arg)
p->received++;
/* Run hooks for filtering, stats collection and manipulation */
if (hook_run(p, HOOK_MSG)) {
if (path_run_hook(p, HOOK_MSG)) {
p->skipped++;
continue;
}
}
/* Run post processing hooks */
if (hook_run(p, HOOK_POST)) {
if (path_run_hook(p, HOOK_POST)) {
p->skipped += recv;
continue;
}
@ -111,7 +120,7 @@ int path_start(struct path *p)
info("Starting path: %s (poolsize = %u)", buf, p->poolsize);
if (hook_run(p, HOOK_PATH_START))
if (path_run_hook(p, HOOK_PATH_START))
return -1;
/* At fixed rate mode, we start another thread for sending */
@ -151,7 +160,7 @@ int path_stop(struct path *p)
close(p->tfd);
}
if (hook_run(p, HOOK_PATH_STOP))
if (path_run_hook(p, HOOK_PATH_STOP))
return -1;
return 0;
@ -177,7 +186,7 @@ int path_print(struct path *p, char *buf, int len)
int path_reset(struct path *p)
{
if (hook_run(p, HOOK_PATH_RESTART))
if (path_run_hook(p, HOOK_PATH_RESTART))
return -1;
p->sent =

2
server/src/server.c
View file

@ -191,7 +191,7 @@ int main(int argc, char *argv[])
for (;;) FOREACH(&paths, it) {
usleep(settings.stats * 1e6);
hook_run(it->path, HOOK_PERIODIC);
path_run_hook(it->path, HOOK_PERIODIC);
}
}
else