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

cleanups

Browse source
This commit is contained in:
Steffen Vogel 2015-06-10 15:13:02 +02:00
parent ae1da5d8ff
commit b103212a02
3 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/include/path.h
View file

@ -62,9 +62,11 @@ struct path
/* The following fields are mostly managed by hook_ functions */
/** Histogram of sequence number displacement of received messages */
struct hist hist_seq;
struct hist hist_sequence;
/** Histogram for delay of received messages */
struct hist hist_delay;
/** Histogram for inter message delay (time between received messages) */
struct hist hist_gap;
/** Last message received */
struct timespec ts_recv;

32
server/src/path.c
View file

@ -11,7 +11,6 @@
#include "utils.h"
#include "path.h"
#include "socket.h"
#include "timing.h"
#include "config.h"
#include "stats.h"
@ -44,17 +43,6 @@ static void path_write(struct path *p)
static void * path_run_async(void *arg)
{
struct path *p = arg;
struct itimerspec its = {
.it_interval = time_from_double(1 / p->rate),
.it_value = { 1, 0 }
};
p->tfd = timerfd_create(CLOCK_REALTIME, 0);
if (p->tfd < 0)
serror("Failed to create timer");
if (timerfd_settime(p->tfd, 0, &its, NULL))
serror("Failed to start timer");
/* Block until 1/p->rate seconds elapsed */
while (timerfd_wait(p->tfd))
@ -93,9 +81,6 @@ static void * path_run(void *arg)
p->previous = &p->pool[(p->received-1) % p->poolsize];
p->current = &p->pool[ p->received % p->poolsize];
if (settings.debug >= 10)
msg_fprint(stdout, p->current);
p->received++;
/* Run hooks for filtering, stats collection and manipulation */
@ -130,8 +115,21 @@ int path_start(struct path *p)
return -1;
/* At fixed rate mode, we start another thread for sending */
if (p->rate)
if (p->rate) {
struct itimerspec its = {
.it_interval = time_from_double(1 / p->rate),
.it_value = { 1, 0 }
};
p->tfd = timerfd_create(CLOCK_REALTIME, 0);
if (p->tfd < 0)
serror("Failed to create timer");
if (timerfd_settime(p->tfd, 0, &its, NULL))
serror("Failed to start timer");
pthread_create(&p->sent_tid, NULL, &path_run_async, p);
}
return pthread_create(&p->recv_tid, NULL, &path_run, p);
}
@ -142,7 +140,7 @@ int path_stop(struct path *p)
path_print(p, buf, sizeof(buf));
info("Stopping path: %s", buf);
pthread_cancel(p->recv_tid);
pthread_join(p->recv_tid, NULL);

1
server/src/socket.c
View file

@ -59,7 +59,6 @@ int socket_init(int argc, char * argv[], struct settings *set)
i = if_create(index);
list_push(&i->sockets, s);
i->refcnt++;
}
FOREACH(&interfaces, it)