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

Merge pull request #447 from triveria/refactor-canplayer 

Format code of canplayer
pull/455/head
Marc Kleine-Budde 2023-09-05 11:51:56 +02:00 committed by GitHub
parent 33b2ae6f88 ad850776c3
commit 2f9958c699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 193 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
.clang-format 100644
View File

@ -0,0 +1,118 @@
# SPDX-License-Identifier: GPL-2.0
#
# clang-format configuration file. Intended for clang-format >= 11.
#
# For more information, see:
#
# Documentation/process/clang-format.rst
# https://clang.llvm.org/docs/ClangFormat.html
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
#
---
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: false
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeComma
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: false
ColumnLimit: 200
CommentPragmas: "^ IWYU pragma:"
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 8
ContinuationIndentWidth: 8
Cpp11BracedListStyle: false
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: false
IncludeBlocks: Preserve
IncludeCategories:
- Regex: ".*"
Priority: 1
IncludeIsMainRegex: "(Test)?$"
IndentCaseLabels: false
IndentGotoLabels: false
IndentPPDirectives: None
IndentWidth: 8
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ""
MacroBlockEnd: ""
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 8
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
# Taken from git's rules
PenaltyBreakAssignment: 10
PenaltyBreakBeforeFirstCallParameter: 30
PenaltyBreakComment: 10
PenaltyBreakFirstLessLess: 0
PenaltyBreakString: 10
PenaltyExcessCharacter: 100
PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Right
ReflowComments: false
SortIncludes: false
SortUsingDeclarations: false
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatementsExceptForEachMacros
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp03
TabWidth: 8
UseTab: Always

159
canplayer.c
View File

@ -58,16 +58,16 @@
#include "lib.h" #include "lib.h"
#define DEFAULT_GAP 1 /* ms */ #define DEFAULT_GAP 1 /* ms */
#define DEFAULT_LOOPS 1 /* only one replay */ #define DEFAULT_LOOPS 1 /* only one replay */
#define CHANNELS 20 /* anyone using more than 20 CAN interfaces at a time? */ #define CHANNELS 20 /* anyone using more than 20 CAN interfaces at a time? */
#define COMMENTSZ 200 #define COMMENTSZ 200
#define BUFSZ (sizeof("(1345212884.318850)") + IFNAMSIZ + 4 + CL_CFSZ + COMMENTSZ) /* for one line in the logfile */ #define BUFSZ (sizeof("(1345212884.318850)") + IFNAMSIZ + 4 + CL_CFSZ + COMMENTSZ) /* for one line in the logfile */
#define STDOUTIDX 65536 /* interface index for printing on stdout - bigger than max uint16 */ #define STDOUTIDX 65536 /* interface index for printing on stdout - bigger than max uint16 */
struct assignment { struct assignment {
char txif[IFNAMSIZ]; char txif[IFNAMSIZ];
int txifidx; int txifidx;
char rxif[IFNAMSIZ]; char rxif[IFNAMSIZ];
}; };
static struct assignment asgn[CHANNELS]; static struct assignment asgn[CHANNELS];
@ -79,36 +79,40 @@ 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);
fprintf(stderr, "\nUsage: %s <options> [interface assignment]*\n\n", prg); fprintf(stderr, "\nUsage: %s <options> [interface assignment]*\n\n", prg);
fprintf(stderr, "Options:\n"); fprintf(stderr, "Options:\n");
fprintf(stderr, " -I <infile> (default stdin)\n"); fprintf(stderr, " -I <infile> (default stdin)\n");
fprintf(stderr, " -l <num> " fprintf(stderr,
"(process input file <num> times)\n" " -l <num> "
" " "(process input file <num> times)\n"
"(Use 'i' for infinite loop - default: %d)\n", DEFAULT_LOOPS); " "
fprintf(stderr, " -t (ignore timestamps: " "(Use 'i' for infinite loop - default: %d)\n",
"send frames immediately)\n"); DEFAULT_LOOPS);
fprintf(stderr, " -i (interactive - wait " fprintf(stderr, " -t (ignore timestamps: "
"for ENTER key to process next frame)\n"); "send frames immediately)\n");
fprintf(stderr, " -i (interactive - wait "
"for ENTER key to process next frame)\n");
fprintf(stderr, " -n <count> (terminate after " fprintf(stderr, " -n <count> (terminate after "
"processing <count> CAN frames)\n"); "processing <count> CAN frames)\n");
fprintf(stderr, " -g <ms> (gap in milli " fprintf(stderr,
"seconds - default: %d ms)\n", DEFAULT_GAP); " -g <ms> (gap in milli "
fprintf(stderr, " -s <s> (skip gaps in " "seconds - default: %d ms)\n",
"timestamps > 's' seconds)\n"); DEFAULT_GAP);
fprintf(stderr, " -x (disable local " fprintf(stderr, " -s <s> (skip gaps in "
"loopback of sent CAN frames)\n"); "timestamps > 's' seconds)\n");
fprintf(stderr, " -v (verbose: print " fprintf(stderr, " -x (disable local "
"sent CAN frames)\n\n"); "loopback of sent CAN frames)\n");
fprintf(stderr, "Interface assignment:\n"); fprintf(stderr, " -v (verbose: print "
"sent CAN frames)\n\n");
fprintf(stderr, "Interface assignment:\n");
fprintf(stderr, " 0..n assignments like <write-if>=<log-if>\n\n"); fprintf(stderr, " 0..n assignments like <write-if>=<log-if>\n\n");
fprintf(stderr, " e.g. vcan2=can0 (send frames received from can0 on " fprintf(stderr, " e.g. vcan2=can0 (send frames received from can0 on "
"vcan2)\n"); "vcan2)\n");
fprintf(stderr, " extra hook: stdout=can0 (print logfile line marked with can0 on " fprintf(stderr, " extra hook: stdout=can0 (print logfile line marked with can0 on "
"stdout)\n"); "stdout)\n");
fprintf(stderr, " No assignments => send frames to the interface(s) they " fprintf(stderr, " No assignments => send frames to the interface(s) they "
"had been received from\n\n"); "had been received from\n\n");
fprintf(stderr, "Lines in the logfile not beginning with '(' (start of " fprintf(stderr, "Lines in the logfile not beginning with '(' (start of "
"timestamp) are ignored.\n\n"); "timestamp) are ignored.\n\n");
} }
/* copied from /usr/src/linux/include/linux/time.h ... /* copied from /usr/src/linux/include/linux/time.h ...
@ -125,22 +129,20 @@ static inline int timeval_compare(struct timeval *lhs, struct timeval *rhs)
return lhs->tv_usec - rhs->tv_usec; return lhs->tv_usec - rhs->tv_usec;
} }
static inline void create_diff_tv(struct timeval *today, struct timeval *diff, static inline void create_diff_tv(struct timeval *today, struct timeval *diff, struct timeval *log)
struct timeval *log) { {
/* create diff_tv so that log_tv + diff_tv = today_tv */ /* create diff_tv so that log_tv + diff_tv = today_tv */
diff->tv_sec = today->tv_sec - log->tv_sec; diff->tv_sec = today->tv_sec - log->tv_sec;
diff->tv_usec = today->tv_usec - log->tv_usec; diff->tv_usec = today->tv_usec - log->tv_usec;
} }
static inline int frames_to_send(struct timeval *today, struct timeval *diff, static inline int frames_to_send(struct timeval *today, struct timeval *diff, struct timeval *log)
struct timeval *log)
{ {
/* return value <0 when log + diff < today */ /* return value <0 when log + diff < today */
struct timeval cmp; struct timeval cmp;
cmp.tv_sec = log->tv_sec + diff->tv_sec; cmp.tv_sec = log->tv_sec + diff->tv_sec;
cmp.tv_usec = log->tv_usec + diff->tv_usec; cmp.tv_usec = log->tv_usec + diff->tv_usec;
if (cmp.tv_usec >= 1000000) { if (cmp.tv_usec >= 1000000) {
@ -156,11 +158,11 @@ static inline int frames_to_send(struct timeval *today, struct timeval *diff,
return timeval_compare(&cmp, today); return timeval_compare(&cmp, today);
} }
int get_txidx(char *logif_name) { int get_txidx(char *logif_name)
{
int i; int i;
for (i=0; i<CHANNELS; i++) { for (i = 0; i < CHANNELS; i++) {
if (asgn[i].rxif[0] == 0) /* end of table content */ if (asgn[i].rxif[0] == 0) /* end of table content */
break; break;
if (strcmp(asgn[i].rxif, logif_name) == 0) /* found device name */ if (strcmp(asgn[i].rxif, logif_name) == 0) /* found device name */
@ -173,11 +175,11 @@ int get_txidx(char *logif_name) {
return asgn[i].txifidx; /* return interface index */ return asgn[i].txifidx; /* return interface index */
} }
char *get_txname(char *logif_name) { char *get_txname(char *logif_name)
{
int i; int i;
for (i=0; i<CHANNELS; i++) { for (i = 0; i < CHANNELS; i++) {
if (asgn[i].rxif[0] == 0) /* end of table content */ if (asgn[i].rxif[0] == 0) /* end of table content */
break; break;
if (strcmp(asgn[i].rxif, logif_name) == 0) /* found device name */ if (strcmp(asgn[i].rxif, logif_name) == 0) /* found device name */
@ -190,14 +192,13 @@ char *get_txname(char *logif_name) {
return asgn[i].txif; /* return interface name */ return asgn[i].txif; /* return interface name */
} }
int add_assignment(char *mode, int socket, char *txname, char *rxname, int add_assignment(char *mode, int socket, char *txname, char *rxname, int verbose)
int verbose) { {
struct ifreq ifr; struct ifreq ifr;
int i; int i;
/* find free entry */ /* find free entry */
for (i=0; i<CHANNELS; i++) { for (i = 0; i < CHANNELS; i++) {
if (asgn[i].txif[0] == 0) if (asgn[i].txif[0] == 0)
break; break;
} }
@ -231,8 +232,7 @@ int add_assignment(char *mode, int socket, char *txname, char *rxname,
asgn[i].txifidx = STDOUTIDX; asgn[i].txifidx = STDOUTIDX;
if (verbose > 1) /* use -v -v to see this */ if (verbose > 1) /* use -v -v to see this */
printf("added %s assignment: log-if=%s write-if=%s write-if-idx=%d\n", printf("added %s assignment: log-if=%s write-if=%s write-if-idx=%d\n", mode, asgn[i].rxif, asgn[i].txif, asgn[i].txifidx);
mode, asgn[i].rxif, asgn[i].txif, asgn[i].txifidx);
return 0; return 0;
} }
@ -246,7 +246,7 @@ int main(int argc, char **argv)
struct timespec sleep_ts; struct timespec sleep_ts;
int s; /* CAN_RAW socket */ int s; /* CAN_RAW socket */
FILE *infile = stdin; FILE *infile = stdin;
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 */ int count = 0; /* end replay after sending count frames. 0 = disabled */
@ -256,7 +256,7 @@ int main(int argc, char **argv)
static int infinite_loops = 0; static int infinite_loops = 0;
static int loops = DEFAULT_LOOPS; static int loops = DEFAULT_LOOPS;
int assignments; /* assignments defined on the commandline */ int assignments; /* assignments defined on the commandline */
int txidx; /* sendto() interface index */ int txidx; /* sendto() interface index */
int eof, txmtu, i, j; int eof, txmtu, i, j;
char *fret; char *fret;
@ -273,11 +273,10 @@ int main(int argc, char **argv)
case 'l': case 'l':
if (optarg[0] == 'i') if (optarg[0] == 'i')
infinite_loops = 1; infinite_loops = 1;
else else if (!(loops = atoi(optarg))) {
if (!(loops = atoi(optarg))) { fprintf(stderr, "Invalid argument for option -l !\n");
fprintf(stderr, "Invalid argument for option -l !\n"); return 1;
return 1; }
}
break; break;
case 't': case 't':
@ -344,7 +343,7 @@ 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; sleep_ts.tv_sec = gap / 1000;
sleep_ts.tv_nsec = (gap % 1000) * 1000000; sleep_ts.tv_nsec = (gap % 1000) * 1000000;
/* open socket */ /* open socket */
@ -353,7 +352,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
addr.can_family = AF_CAN; addr.can_family = AF_CAN;
addr.can_ifindex = 0; addr.can_ifindex = 0;
/* disable unneeded default receive filter on this RAW socket */ /* disable unneeded default receive filter on this RAW socket */
@ -365,8 +364,7 @@ int main(int argc, char **argv)
if (loopback_disable) { if (loopback_disable) {
int loopback = 0; int loopback = 0;
setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, &loopback, sizeof(loopback));
&loopback, sizeof(loopback));
} }
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
@ -376,14 +374,14 @@ int main(int argc, char **argv)
if (assignments) { if (assignments) {
/* add & check user assignments from commandline */ /* add & check user assignments from commandline */
for (i=0; i<assignments; i++) { for (i = 0; i < assignments; i++) {
if (strlen(argv[optind+i]) >= BUFSZ) { if (strlen(argv[optind + i]) >= BUFSZ) {
fprintf(stderr, "Assignment too long!\n"); fprintf(stderr, "Assignment too long!\n");
print_usage(basename(argv[0])); print_usage(basename(argv[0]));
return 1; return 1;
} }
strcpy(buf, argv[optind+i]); strcpy(buf, argv[optind + i]);
for (j=0; j<(int)BUFSZ; j++) { /* find '=' in assignment */ for (j = 0; j < (int)BUFSZ; j++) { /* find '=' in assignment */
if (buf[j] == '=') if (buf[j] == '=')
break; break;
} }
@ -393,22 +391,21 @@ int main(int argc, char **argv)
return 1; return 1;
} }
buf[j] = 0; /* cut string in two pieces */ buf[j] = 0; /* cut string in two pieces */
if (add_assignment("user", s, &buf[0], &buf[j+1], verbose)) if (add_assignment("user", s, &buf[0], &buf[j + 1], verbose))
return 1; return 1;
} }
} }
while (infinite_loops || loops--) { while (infinite_loops || loops--) {
if (infile != stdin) if (infile != stdin)
rewind(infile); /* for each loop */ rewind(infile); /* for each loop */
if (verbose > 1) /* use -v -v to see this */ if (verbose > 1) /* use -v -v to see this */
printf (">>>>>>>>> start reading file. remaining loops = %d\n", loops); printf(">>>>>>>>> start reading file. remaining loops = %d\n", loops);
/* read first non-comment frame from logfile */ /* read first non-comment frame from logfile */
while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] != '(') { while ((fret = fgets(buf, BUFSZ - 1, infile)) != NULL && buf[0] != '(') {
if (strlen(buf) >= BUFSZ-2) { if (strlen(buf) >= BUFSZ - 2) {
fprintf(stderr, "comment line too long for input buffer\n"); fprintf(stderr, "comment line too long for input buffer\n");
return 1; return 1;
} }
@ -419,8 +416,7 @@ int main(int argc, char **argv)
eof = 0; eof = 0;
if (sscanf(buf, "(%lu.%lu) %s %s", &log_tv.tv_sec, &log_tv.tv_usec, if (sscanf(buf, "(%lu.%lu) %s %s", &log_tv.tv_sec, &log_tv.tv_usec, device, ascframe) != 4) {
device, ascframe) != 4) {
fprintf(stderr, "incorrect line format in logfile\n"); fprintf(stderr, "incorrect line format in logfile\n");
return 1; return 1;
} }
@ -442,10 +438,7 @@ int main(int argc, char **argv)
} }
while (!eof) { while (!eof) {
while ((!use_timestamps) || (frames_to_send(&today_tv, &diff_tv, &log_tv) < 0)) {
while ((!use_timestamps) ||
(frames_to_send(&today_tv, &diff_tv, &log_tv) < 0)) {
/* wait for keypress to process next frame */ /* wait for keypress to process next frame */
if (interactive) if (interactive)
getchar(); getchar();
@ -458,7 +451,7 @@ int main(int argc, char **argv)
} }
txidx = get_txidx(device); /* get ifindex for sending the frame */ txidx = get_txidx(device); /* get ifindex for sending the frame */
if ((!txidx) && (!assignments)) { if ((!txidx) && (!assignments)) {
/* ifindex not found and no user assignments */ /* ifindex not found and no user assignments */
/* => assign this device automatically */ /* => assign this device automatically */
@ -480,10 +473,10 @@ int main(int argc, char **argv)
return 1; return 1;
} }
addr.can_family = AF_CAN; addr.can_family = AF_CAN;
addr.can_ifindex = txidx; /* send via this interface */ addr.can_ifindex = txidx; /* send via this interface */
if (sendto(s, &frame, txmtu, 0, (struct sockaddr*)&addr, sizeof(addr)) != txmtu) { if (sendto(s, &frame, txmtu, 0, (struct sockaddr *)&addr, sizeof(addr)) != txmtu) {
perror("sendto"); perror("sendto");
return 1; return 1;
} }
@ -502,8 +495,8 @@ int main(int argc, char **argv)
} }
/* read next non-comment frame from logfile */ /* read next non-comment frame from logfile */
while ((fret = fgets(buf, BUFSZ-1, infile)) != NULL && buf[0] != '(') { while ((fret = fgets(buf, BUFSZ - 1, infile)) != NULL && buf[0] != '(') {
if (strlen(buf) >= BUFSZ-2) { if (strlen(buf) >= BUFSZ - 2) {
fprintf(stderr, "comment line too long for input buffer\n"); fprintf(stderr, "comment line too long for input buffer\n");
return 1; return 1;
} }
@ -514,8 +507,7 @@ int main(int argc, char **argv)
break; break;
} }
if (sscanf(buf, "(%lu.%lu) %s %s", &log_tv.tv_sec, &log_tv.tv_usec, if (sscanf(buf, "(%lu.%lu) %s %s", &log_tv.tv_sec, &log_tv.tv_usec, device, ascframe) != 4) {
device, ascframe) != 4) {
fprintf(stderr, "incorrect line format in logfile\n"); fprintf(stderr, "incorrect line format in logfile\n");
return 1; return 1;
} }
@ -534,8 +526,7 @@ int main(int argc, char **argv)
/* test for logfile timestamps jumping backwards OR */ /* test for logfile timestamps jumping backwards OR */
/* if the user likes to skip long gaps in the timestamps */ /* if the user likes to skip long gaps in the timestamps */
if ((last_log_tv.tv_sec > log_tv.tv_sec) || if ((last_log_tv.tv_sec > log_tv.tv_sec) || (skipgap && labs(last_log_tv.tv_sec - log_tv.tv_sec) > (long)skipgap))
(skipgap && labs(last_log_tv.tv_sec - log_tv.tv_sec) > (long)skipgap))
create_diff_tv(&today_tv, &diff_tv, &log_tv); create_diff_tv(&today_tv, &diff_tv, &log_tv);
last_log_tv = log_tv; last_log_tv = log_tv;