mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
added -d option to villas-signal and villas-pipe
This commit is contained in:
parent
bb6f4e2bbe
commit
c2cb2c8e02
2 changed files with 13 additions and 12 deletions
|
@ -167,7 +167,7 @@ static void * recv_loop(void *ctx)
|
|||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
int ret;
|
||||
int ret, level = V;
|
||||
char c;
|
||||
|
||||
ptid = pthread_self();
|
||||
|
@ -192,7 +192,7 @@ int main(int argc, char *argv[])
|
|||
sendd.enabled = false; // receive only
|
||||
break;
|
||||
case 'd':
|
||||
cfg.log.level = atoi(optarg);
|
||||
level = atoi(optarg);
|
||||
break;
|
||||
case 'h':
|
||||
case '?':
|
||||
|
@ -200,12 +200,9 @@ int main(int argc, char *argv[])
|
|||
exit(c == '?' ? EXIT_FAILURE : EXIT_SUCCESS);
|
||||
}
|
||||
}
|
||||
|
||||
log_init(&cfg.log, cfg.log.level, LOG_ALL);
|
||||
|
||||
log_init(&cfg.log, level, LOG_ALL);
|
||||
signals_init(quit);
|
||||
|
||||
/* Initialize log, configuration.. */
|
||||
cfg_parse(&cfg, argv[1]);
|
||||
rt_init(cfg.priority, cfg.affinity);
|
||||
memory_init();
|
||||
|
|
16
src/signal.c
16
src/signal.c
|
@ -33,12 +33,13 @@ void usage()
|
|||
{
|
||||
printf("Usage: villas-signal SIGNAL [OPTIONS]\n");
|
||||
printf(" SIGNAL is on of: 'mixed', 'random', 'sine', 'triangle', 'square', 'ramp'\n");
|
||||
printf(" -d LVL set debug level\n");
|
||||
printf(" -v NUM specifies how many values a message should contain\n");
|
||||
printf(" -r HZ how many messages per second\n");
|
||||
printf(" -n non real-time mode. do not throttle output.\n");
|
||||
printf(" -f HZ the frequency of the signal\n");
|
||||
printf(" -a FLT the amplitude\n");
|
||||
printf(" -d FLT the standard deviation for 'random' signals\n");
|
||||
printf(" -D FLT the standard deviation for 'random' signals\n");
|
||||
printf(" -l NUM only send LIMIT messages and stop\n\n");
|
||||
|
||||
print_copyright();
|
||||
|
@ -63,9 +64,7 @@ int main(int argc, char *argv[])
|
|||
int type = TYPE_MIXED;
|
||||
int values = 1;
|
||||
int limit = -1;
|
||||
int counter, tfd, steps;
|
||||
|
||||
log_init(&log, V, LOG_ALL);
|
||||
int counter, tfd, steps, level = V;
|
||||
|
||||
if (argc < 2) {
|
||||
usage();
|
||||
|
@ -88,8 +87,11 @@ int main(int argc, char *argv[])
|
|||
|
||||
/* Parse optional command line arguments */
|
||||
char c, *endptr;
|
||||
while ((c = getopt(argc-1, argv+1, "hv:r:f:l:a:d:n")) != -1) {
|
||||
while ((c = getopt(argc-1, argv+1, "hv:r:f:l:a:D:d:n")) != -1) {
|
||||
switch (c) {
|
||||
case 'd':
|
||||
level = strtoul(optarg, &endptr, 10);
|
||||
goto check;
|
||||
case 'l':
|
||||
limit = strtoul(optarg, &endptr, 10);
|
||||
goto check;
|
||||
|
@ -105,7 +107,7 @@ int main(int argc, char *argv[])
|
|||
case 'a':
|
||||
ampl = strtof(optarg, &endptr);
|
||||
goto check;
|
||||
case 'd':
|
||||
case 'D':
|
||||
stddev = strtof(optarg, &endptr);
|
||||
goto check;
|
||||
case 'n':
|
||||
|
@ -122,6 +124,8 @@ int main(int argc, char *argv[])
|
|||
check: if (optarg == endptr)
|
||||
error("Failed to parse parse option argument '-%c %s'", c, optarg);
|
||||
}
|
||||
|
||||
log_init(&log, level, LOG_ALL);
|
||||
|
||||
/* Allocate memory for message buffer */
|
||||
struct sample *s = alloc(SAMPLE_LEN(values));
|
||||
|
|
Loading…
Add table
Reference in a new issue