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

extended random sample generator with more signal types

Browse source
This commit is contained in:
Steffen Vogel 2015-12-02 13:54:23 +01:00
parent af62bcee16
commit 2d2699e967
4 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -1,5 +1,5 @@
# Executables
TARGETS = server pipe random test
TARGETS = server pipe signal test
# Libraries
LIBS = libs2ss.so
@ -79,7 +79,7 @@ all: $(LIBS) $(TARGETS)
server: server.o $(OBJS) libs2ss.so
pipe: pipe.o $(OBJS) libs2ss.so
test: test.o $(OBJS) libs2ss.so
random: random.o msg.o utils.o timing.o log.o
signal: signal.o msg.o utils.o timing.o log.o
# Libraries
libs2ss.so: CFLAGS += -fPIC $(LIB_CFLAGS)
@ -90,14 +90,13 @@ libs2ss.so: $(LIB_OBJS)
install: $(TARGETS)
install -m 0644 libs2ss.so $(PREFIX)/lib
install -m 0755 server -T $(PREFIX)/bin/s2ss
install -m 0755 send $(PREFIX)/bin/s2ss-send
install -m 0755 receive $(PREFIX)/bin/s2ss-receive
install -m 0755 random $(PREFIX)/bin/s2ss-random
install -m 0755 pipe $(PREFIX)/bin/s2ss-pipe
install -m 0755 signal $(PREFIX)/bin/s2ss-signal
install -m 0755 test $(PREFIX)/bin/s2ss-test
release: all
tar czf s2ss-$(COMMIT)-docs.tar.gz documentation/html/
tar czf s2ss-$(COMMIT).tar.gz server/server server/test server/send server/receive server/random server/etc/
tar czf s2ss-$(COMMIT).tar.gz server/server server/test server/pipe server/signal server/etc/
rsync *.tar.gz $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/
rsync --archive --delete documentation/html/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/doc/

6
include/msg.h
View file

@ -71,10 +71,4 @@ int msg_fprint(FILE *f, struct msg *m, int flags, double offset);
*/
int msg_fscan(FILE *f, struct msg *m, int *flags, double *offset);
/** Change the values of an existing message in a random fashion.
*
* @param m A pointer to the message whose values will be updated
*/
void msg_random(struct msg *m);
#endif /* _MSG_H_ */

8
lib/msg.c
View file

@ -165,11 +165,3 @@ skip: if (fgets(line, sizeof(line), f) == NULL)
return m->length;
}
void msg_random(struct msg *m)
{
for (int i = 0; i < m->length; i++)
m->data[i].f += box_muller(0, 1);
m->endian = MSG_ENDIAN_HOST;
}

59
src/random.c → src/signal.c
View file

@ -11,6 +11,8 @@
**********************************************************************************/
#include <unistd.h>
#include <math.h>
#include <string.h>
#include "config.h"
#include "utils.h"
@ -19,10 +21,19 @@
#define CLOCKID CLOCK_REALTIME
enum SIGNAL_TYPE {
TYPE_RANDOM,
TYPE_SINE,
TYPE_SQUARE,
TYPE_TRIANGLE,
TYPE_MIXED
};
int main(int argc, char *argv[])
{
if (argc < 3 || argc > 4) {
printf("Usage: %s VALUES RATE [LIMIT]\n", argv[0]);
if (argc < 4 || argc > 5) {
printf("Usage: %s SIGNAL VALUES RATE [LIMIT]\n", argv[0]);
printf(" SIGNAL is on of: mixed random sine triangle square\n");
printf(" VALUES is the number of values a message contains\n");
printf(" RATE how many messages per second\n");
printf(" LIMIT only send LIMIT messages\n\n");
@ -35,9 +46,22 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
struct msg m = MSG_INIT(atoi(argv[1]));
double rate = atof(argv[2]);
int limit = argc >= 4 ? atoi(argv[3]) : -1;
struct msg m = MSG_INIT(atoi(argv[2]));
double rate = atof(argv[3]);
int limit = argc >= 5 ? atoi(argv[4]) : -1;
int type = TYPE_MIXED;
/* Parse signal type */
if (!strcmp(argv[1], "random"))
type = TYPE_RANDOM;
else if (!strcmp(argv[1], "sine"))
type = TYPE_SINE;
else if (!strcmp(argv[1], "triangle"))
type = TYPE_TRIANGLE;
else if (!strcmp(argv[1], "square"))
type = TYPE_SQUARE;
else if (!strcmp(argv[1], "mixed"))
type = TYPE_MIXED;
/* Setup timer */
struct itimerspec its = {
@ -55,14 +79,29 @@ int main(int argc, char *argv[])
/* Print header */
fprintf(stderr, "# %-20s\t\t%s\n", "sec.nsec(seq)", "data[]");
struct timespec start = time_now();
/* Block until 1/p->rate seconds elapsed */
while (limit-- > 0 || argc < 4) {
struct timespec ts = time_now();
while (limit-- > 0 || argc < 5) {
struct timespec now = time_now();
double running = time_delta(&start, &now);
m.ts.sec = ts.tv_sec;
m.ts.nsec = ts.tv_nsec;
m.ts.sec = now.tv_sec;
m.ts.nsec = now.tv_nsec;
msg_random(&m);
for (int i = 0; i < m.length; i++) {
int rtype = type != TYPE_MIXED ? type : i % 4;
double ampl = i+1;
double freq = i+1;
switch (rtype) {
case TYPE_RANDOM: m.data[i].f += box_muller(0, 0.02); break;
case TYPE_SINE: m.data[i].f = ampl * sin(running * freq * M_PI); break;
case TYPE_TRIANGLE: m.data[i].f = ampl * (fabs(fmod(running * freq, 1) - .5) - 0.25) * 4; break;
case TYPE_SQUARE: m.data[i].f = ampl * ( (fmod(running * freq, 1) < .5) ? -1 : 1); break;
}
}
msg_fprint(stdout, &m, MSG_PRINT_ALL & ~MSG_PRINT_OFFSET, 0);
fflush(stdout);