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

RealCAN implementation 

Replay pre-recorded CAN Bus dumps respecting the original relative timestamps.

Fix code style

Conform to codebase style as per maintainer's suggestions.

Refactor code logic according to suggestions for PR #521
pull/521/head
GZZ8 2024-05-14 11:00:59 +02:00 committed by GGZ8
parent d05810f5fe
commit 277048eba6
1 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
canplayer.c
View File

@ -48,6 +48,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <stdbool.h>
#include <linux/can.h> #include <linux/can.h>
#include <linux/can/raw.h> #include <linux/can/raw.h>
@ -89,6 +90,12 @@ const int canfx_on = 1;
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
struct sleep {
struct timeval *sleep_vector;
size_t idx;
size_t size;
};
static void print_usage(char *prg) static void print_usage(char *prg)
{ {
fprintf(stderr, "%s - replay a compact CAN frame logfile to CAN devices.\n", prg); fprintf(stderr, "%s - replay a compact CAN frame logfile to CAN devices.\n", prg);
@ -117,6 +124,8 @@ static void print_usage(char *prg)
"loopback of sent CAN frames)\n"); "loopback of sent CAN frames)\n");
fprintf(stderr, " -v (verbose: print " fprintf(stderr, " -v (verbose: print "
"sent CAN frames)\n"); "sent CAN frames)\n");
fprintf(stderr, " -r (real-time: send "
"CAN frames in real-time)\n");
fprintf(stderr, " -h (show " fprintf(stderr, " -h (show "
"this help message)\n\n"); "this help message)\n\n");
fprintf(stderr, "Interface assignment:\n"); fprintf(stderr, "Interface assignment:\n");
@ -280,8 +289,11 @@ int main(int argc, char **argv)
int eof, txmtu, i, j; int eof, txmtu, i, j;
char *fret; char *fret;
unsigned long long sec, usec; unsigned long long sec, usec;
bool gap_from_file = false;
struct sleep timestamps;
struct timeval send_time, act_time, init_trace, init_time;
while ((opt = getopt(argc, argv, "I:l:tin:g:s:xvh")) != -1) { while ((opt = getopt(argc, argv, "I:l:tin:g:s:xvrh")) != -1) {
switch (opt) { switch (opt) {
case 'I': case 'I':
infile = fopen(optarg, "r"); infile = fopen(optarg, "r");
@ -336,6 +348,17 @@ int main(int argc, char **argv)
verbose++; verbose++;
break; break;
case 'r':
if (isatty(fileno(infile))) {
fprintf(stderr, "Specify an input file for option -r !\n");
exit(EXIT_FAILURE);
}
gap_from_file = true; /* using time delta from file */
init_trace.tv_sec = 0;
init_trace.tv_usec = 0;
timestamps.idx = 0; /*to avoid warning accessing idx variable*/
break;
case 'h': case 'h':
print_usage(basename(argv[0])); print_usage(basename(argv[0]));
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -368,8 +391,10 @@ int main(int argc, char **argv)
printf("interactive mode: press ENTER to process next CAN frame ...\n"); printf("interactive mode: press ENTER to process next CAN frame ...\n");
} }
sleep_ts.tv_sec = gap / 1000; if (!gap_from_file) {
sleep_ts.tv_nsec = (gap % 1000) * 1000000; sleep_ts.tv_sec = gap / 1000;
sleep_ts.tv_nsec = (gap % 1000) * 1000000;
}
/* open socket */ /* open socket */
if ((s = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) { if ((s = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
@ -548,6 +573,26 @@ int main(int argc, char **argv)
log_tv.tv_sec = sec; log_tv.tv_sec = sec;
log_tv.tv_usec = usec; log_tv.tv_usec = usec;
if (gap_from_file){
if (timestamps.idx == 0){
gettimeofday(&init_time, NULL);
if (log_tv.tv_sec > 0 || log_tv.tv_usec > 0)
init_trace = log_tv;
}
timersub(&log_tv, &init_trace, &send_time);
if (timestamps.idx > 0){
gettimeofday(&act_time, NULL);
timersub(&act_time, &init_time, &act_time);
while (timercmp(&act_time, &send_time, <)){
gettimeofday(&act_time, NULL);
timersub(&act_time, &init_time, &act_time);
}
}
timestamps.idx++;
}
/* /*
* ensure the fractions of seconds are 6 decimal places long to catch * ensure the fractions of seconds are 6 decimal places long to catch
* 3rd party or handcrafted logfiles that treat the timestamp as float * 3rd party or handcrafted logfiles that treat the timestamp as float
@ -570,7 +615,7 @@ int main(int argc, char **argv)
} /* while frames_to_send ... */ } /* while frames_to_send ... */
if (nanosleep(&sleep_ts, NULL)) if (!gap_from_file && nanosleep(&sleep_ts, NULL))
return 1; return 1;
delay_loops++; /* private statistics */ delay_loops++; /* private statistics */