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 #461 from marckleinebudde/canbusload 

canbusload: coding style cleanups + use less screen estate in redraw mode
pull/462/head
Marc Kleine-Budde 2023-09-27 12:46:15 +02:00 committed by GitHub
parent 3490282fc7 84919edbaa
commit 1be7e0e51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
canbusload.c
View File

@ -68,25 +68,25 @@
#define MAXSOCK 16 /* max. number of CAN interfaces given on the cmdline */ #define MAXSOCK 16 /* max. number of CAN interfaces given on the cmdline */
#define PERCENTRES 5 /* resolution in percent for bargraph */ #define PERCENTRES 5 /* resolution in percent for bargraph */
#define NUMBAR (100/PERCENTRES) /* number of bargraph elements */ #define NUMBAR (100 / PERCENTRES) /* number of bargraph elements */
extern int optind, opterr, optopt; extern int optind, opterr, optopt;
static struct { static struct {
char devname[IFNAMSIZ+1]; char devname[IFNAMSIZ + 1];
unsigned int bitrate; unsigned int bitrate;
unsigned int dbitrate; unsigned int dbitrate;
unsigned int recv_frames; unsigned int recv_frames;
unsigned int recv_bits_total; unsigned int recv_bits_total;
unsigned int recv_bits_payload; unsigned int recv_bits_payload;
unsigned int recv_bits_dbitrate; unsigned int recv_bits_dbitrate;
} stat[MAXSOCK+1]; } stat[MAXSOCK + 1];
static volatile int running = 1; static volatile int running = 1;
static volatile sig_atomic_t signal_num; static volatile sig_atomic_t signal_num;
static int max_devname_len; /* to prevent frazzled device name output */ static int max_devname_len; /* to prevent frazzled device name output */
static int max_bitrate_len; static int max_bitrate_len;
static int currmax; static int currmax;
static unsigned char redraw; static unsigned char redraw;
static unsigned char timestamp; static unsigned char timestamp;
static unsigned char color; static unsigned char color;
@ -180,18 +180,17 @@ void printstats(int signo)
} }
} }
for (i=0; i<currmax; i++) { for (i = 0; i < currmax; i++) {
if (color) { if (color) {
if (i%2) if (i % 2)
printf("%s", FGRED); printf("%s", FGRED);
else else
printf("%s", FGBLUE); printf("%s", FGBLUE);
} }
if (stat[i].bitrate) if (stat[i].bitrate)
percent = ((stat[i].recv_bits_total-stat[i].recv_bits_dbitrate) * 100) / stat[i].bitrate percent = ((stat[i].recv_bits_total - stat[i].recv_bits_dbitrate) * 100) / stat[i].bitrate +
+ (stat[i].recv_bits_dbitrate * 100) / stat[i].dbitrate; (stat[i].recv_bits_dbitrate * 100) / stat[i].dbitrate;
else else
percent = 0; percent = 0;
@ -211,20 +210,21 @@ void printstats(int signo)
if (percent > 100) if (percent > 100)
percent = 100; percent = 100;
for (j=0; j < NUMBAR; j++){ for (j = 0; j < NUMBAR; j++) {
if (j < percent/PERCENTRES) if (j < percent / PERCENTRES)
printf("X"); printf("X");
else else
printf("."); printf(".");
} }
printf("|"); printf("|");
} }
if (color) if (color)
printf("%s", ATTRESET); printf("%s", ATTRESET);
printf("\n"); if (!redraw || (i < currmax - 1))
printf("\n");
stat[i].recv_frames = 0; stat[i].recv_frames = 0;
stat[i].recv_bits_total = 0; stat[i].recv_bits_total = 0;
@ -232,7 +232,9 @@ void printstats(int signo)
stat[i].recv_bits_payload = 0; stat[i].recv_bits_payload = 0;
} }
printf("\n"); if (!redraw)
printf("\n");
fflush(stdout); fflush(stdout);
alarm(1); alarm(1);
@ -296,7 +298,7 @@ int main(int argc, char **argv)
print_usage(prg); print_usage(prg);
exit(0); exit(0);
} }
currmax = argc - optind; /* find real number of CAN devices */ currmax = argc - optind; /* find real number of CAN devices */
if (currmax > MAXSOCK) { if (currmax > MAXSOCK) {
@ -304,12 +306,11 @@ int main(int argc, char **argv)
return 1; return 1;
} }
for (i=0; i < currmax; i++) { for (i = 0; i < currmax; i++) {
ptr = argv[optind + i];
ptr = argv[optind+i];
nbytes = strlen(ptr); nbytes = strlen(ptr);
if (nbytes >= (int)(IFNAMSIZ+sizeof("@1000000")+1)) { if (nbytes >= (int)(IFNAMSIZ + sizeof("@1000000") + 1)) {
printf("name of CAN device '%s' is too long!\n", ptr); printf("name of CAN device '%s' is too long!\n", ptr);
return 1; return 1;
} }
@ -357,7 +358,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
nbytes = strlen(nptr+1); nbytes = strlen(nptr + 1);
if (nbytes > max_bitrate_len) if (nbytes > max_bitrate_len)
max_bitrate_len = nbytes; /* for nice printing */ max_bitrate_len = nbytes; /* for nice printing */
@ -387,23 +388,21 @@ int main(int argc, char **argv)
printf("%s", CLR_SCREEN); printf("%s", CLR_SCREEN);
while (running) { while (running) {
FD_ZERO(&rdfs); FD_ZERO(&rdfs);
for (i=0; i<currmax; i++) for (i = 0; i < currmax; i++)
FD_SET(s[i], &rdfs); FD_SET(s[i], &rdfs);
savesigmask = sigmask; savesigmask = sigmask;
if (pselect(s[currmax-1]+1, &rdfs, NULL, NULL, NULL, &sigmask) < 0) { if (pselect(s[currmax - 1] + 1, &rdfs, NULL, NULL, NULL, &sigmask) < 0) {
//perror("pselect"); //perror("pselect");
sigmask = savesigmask; sigmask = savesigmask;
continue; continue;
} }
for (i=0; i<currmax; i++) { /* check all CAN RAW sockets */ for (i = 0; i < currmax; i++) { /* check all CAN RAW sockets */
if (FD_ISSET(s[i], &rdfs)) { if (FD_ISSET(s[i], &rdfs)) {
nbytes = read(s[i], &frame, sizeof(frame)); nbytes = read(s[i], &frame, sizeof(frame));
if (nbytes < 0) { if (nbytes < 0) {
@ -426,7 +425,7 @@ int main(int argc, char **argv)
} }
} }
for (i=0; i<currmax; i++) for (i = 0; i < currmax; i++)
close(s[i]); close(s[i]);
if (signal_num) if (signal_num)