sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

canplayer: introduce option to limit the number of processed frames 

Analogue to the '-n <count>' option to limit the number of processed CAN
frames in candump and cangen this option makes sense in canplayer too.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/320/head
Oliver Hartkopp 2021-10-30 12:51:32 +02:00
parent ab9bd4f287
commit 0d84033fa4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
canplayer.c
View File

@ -89,6 +89,8 @@ void print_usage(char *prg)
"send frames immediately)\n"); "send frames immediately)\n");
fprintf(stderr, " -i (interactive - wait " fprintf(stderr, " -i (interactive - wait "
"for ENTER key to process next frame)\n"); "for ENTER key to process next frame)\n");
fprintf(stderr, " -n <count> (terminate after "
"processing <count> CAN frames)\n");
fprintf(stderr, " -g <ms> (gap in milli " fprintf(stderr, " -g <ms> (gap in milli "
"seconds - default: %d ms)\n", DEFAULT_GAP); "seconds - default: %d ms)\n", DEFAULT_GAP);
fprintf(stderr, " -s <s> (skip gaps in " fprintf(stderr, " -s <s> (skip gaps in "
@ -247,6 +249,7 @@ int main(int argc, char **argv)
unsigned long gap = DEFAULT_GAP; unsigned long gap = DEFAULT_GAP;
int use_timestamps = 1; int use_timestamps = 1;
int interactive = 0; /* wait for ENTER keypress to process next frame */ int interactive = 0; /* wait for ENTER keypress to process next frame */
int count = 0; /* end replay after sending count frames. 0 = disabled */
static int verbose, opt, delay_loops; static int verbose, opt, delay_loops;
static unsigned long skipgap; static unsigned long skipgap;
static int loopback_disable = 0; static int loopback_disable = 0;
@ -257,7 +260,7 @@ int main(int argc, char **argv)
int eof, txmtu, i, j; int eof, txmtu, i, j;
char *fret; char *fret;
while ((opt = getopt(argc, argv, "I:l:tig:s:xv?")) != -1) { while ((opt = getopt(argc, argv, "I:l:tin:g:s:xv?")) != -1) {
switch (opt) { switch (opt) {
case 'I': case 'I':
infile = fopen(optarg, "r"); infile = fopen(optarg, "r");
@ -285,6 +288,14 @@ int main(int argc, char **argv)
interactive = 1; interactive = 1;
break; break;
case 'n':
count = atoi(optarg);
if (count < 1) {
print_usage(basename(argv[0]));
exit(1);
}
break;
case 'g': case 'g':
gap = strtoul(optarg, NULL, 10); gap = strtoul(optarg, NULL, 10);
break; break;
@ -476,6 +487,9 @@ int main(int argc, char **argv)
else else
fprint_long_canframe(stdout, &frame, "\n", CANLIB_VIEW_INDENT_SFF, CANFD_MAX_DLEN); fprint_long_canframe(stdout, &frame, "\n", CANLIB_VIEW_INDENT_SFF, CANFD_MAX_DLEN);
} }
if (count && (--count == 0))
goto out;
} }
/* read next non-comment frame from logfile */ /* read next non-comment frame from logfile */