sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 14:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from marckleinebudde/fix-candump

Browse Source 
candump: fix HW timestamps + dropcount
This commit is contained in:
Marc Kleine-Budde
2022-08-28 00:21:27 +02:00
committed by GitHub
parent 5736818292 2b5e93744b
commit e602e391a5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
candump.c
+5 -3
View File
@@ -303,7 +303,9 @@ int main(int argc, char **argv)
int join_filter; int join_filter;
char *ptr, *nptr; char *ptr, *nptr;
struct sockaddr_can addr; struct sockaddr_can addr;
char ctrlmsg[CMSG_SPACE(sizeof(struct timeval) + 3 * sizeof(struct timespec) + sizeof(__u32))]; char ctrlmsg[CMSG_SPACE(sizeof(struct timeval)) +
CMSG_SPACE(3 * sizeof(struct timespec)) +
CMSG_SPACE(sizeof(__u32))];
struct iovec iov; struct iovec iov;
struct msghdr msg; struct msghdr msg;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
@@ -783,11 +785,11 @@ int main(int argc, char **argv)
__u32 frames = obj->dropcnt - obj->last_dropcnt; __u32 frames = obj->dropcnt - obj->last_dropcnt;
if (silent != SILENT_ON) if (silent != SILENT_ON)
printf("DROPCOUNT: dropped %d CAN frame%s on '%s' socket (total drops %d)\n", printf("DROPCOUNT: dropped %u CAN frame%s on '%s' socket (total drops %u)\n",
frames, (frames > 1)?"s":"", devname[idx], obj->dropcnt); frames, (frames > 1)?"s":"", devname[idx], obj->dropcnt);
if (log) if (log)
fprintf(logfile, "DROPCOUNT: dropped %d CAN frame%s on '%s' socket (total drops %d)\n", fprintf(logfile, "DROPCOUNT: dropped %u CAN frame%s on '%s' socket (total drops %u)\n",
frames, (frames > 1)?"s":"", devname[idx], obj->dropcnt); frames, (frames > 1)?"s":"", devname[idx], obj->dropcnt);
obj->last_dropcnt = obj->dropcnt; obj->last_dropcnt = obj->dropcnt;