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

Use timespec

Rikus Wessels 2025-03-10 18:16:58 +02:00
parent e2172546aa
commit 76b5891765
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
candump.c
View File

@ -221,15 +221,15 @@ static int idx2dindex(int ifidx, int socket)
} }
static int sprint_timestamp(char *ts_buffer, const char timestamp, static int sprint_timestamp(char *ts_buffer, const char timestamp,
const struct timeval *tv, struct timeval *const last_tv) const struct timespec *ts, struct timespec *const last_ts)
{ {
int numchars = 0; int numchars = 0;
switch (timestamp) { switch (timestamp) {
case 'a': /* absolute with timestamp */ case 'a': /* absolute with timestamp */
numchars = sprintf(ts_buffer, "(%010llu.%06llu) ", numchars = sprintf(ts_buffer, "(%010llu.%09llu) ",
(unsigned long long)tv->tv_sec, (unsigned long long)ts->tv_sec,
(unsigned long long)tv->tv_usec); (unsigned long long)ts->tv_nsec);
break; break;
case 'A': /* absolute with date */ case 'A': /* absolute with date */
@ -237,32 +237,32 @@ static int sprint_timestamp(char *ts_buffer, const char timestamp,
struct tm tm; struct tm tm;
char timestring[25]; char timestring[25];
tm = *localtime(&tv->tv_sec); tm = *localtime(&ts->tv_sec);
strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", &tm); strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", &tm);
numchars = sprintf(ts_buffer, "(%s.%06llu) ", timestring, numchars = sprintf(ts_buffer, "(%s.%09llu) ", timestring,
(unsigned long long)tv->tv_usec); (unsigned long long)ts->tv_nsec);
} }
break; break;
case 'd': /* delta */ case 'd': /* delta */
case 'z': /* starting with zero */ case 'z': /* starting with zero */
{ {
struct timeval diff; struct timespec diff;
if (last_tv->tv_sec == 0) /* first init */ if (last_ts->tv_sec == 0) /* first init */
*last_tv = *tv; *last_ts = *ts;
diff.tv_sec = tv->tv_sec - last_tv->tv_sec; diff.tv_sec = ts->tv_sec - last_ts->tv_sec;
diff.tv_usec = tv->tv_usec - last_tv->tv_usec; diff.tv_nsec = ts->tv_nsec - last_ts->tv_nsec;
if (diff.tv_usec < 0) if (diff.tv_nsec < 0)
diff.tv_sec--, diff.tv_usec += 1000000; diff.tv_sec--, diff.tv_nsec += 1000000000;
if (diff.tv_sec < 0) if (diff.tv_sec < 0)
diff.tv_sec = diff.tv_usec = 0; diff.tv_sec = diff.tv_nsec = 0;
numchars = sprintf(ts_buffer, "(%03llu.%06llu) ", numchars = sprintf(ts_buffer, "(%03llu.%09llu) ",
(unsigned long long)diff.tv_sec, (unsigned long long)diff.tv_sec,
(unsigned long long)diff.tv_usec); (unsigned long long)diff.tv_nsec);
if (timestamp == 'd') if (timestamp == 'd')
*last_tv = *tv; /* update for delta calculation */ *last_ts = *ts; /* update for delta calculation */
} }
break; break;
@ -322,7 +322,7 @@ int main(int argc, char **argv)
static cu_t cu; /* union for CAN CC/FD/XL frames */ static cu_t cu; /* union for CAN CC/FD/XL frames */
int nbytes, i; int nbytes, i;
struct ifreq ifr; struct ifreq ifr;
struct timeval tv, last_tv; struct timespec ts, last_ts;
int timeout_ms = -1; /* default to no timeout */ int timeout_ms = -1; /* default to no timeout */
FILE *logfile = NULL; FILE *logfile = NULL;
char fname[83]; /* suggested by -Wformat-overflow= */ char fname[83]; /* suggested by -Wformat-overflow= */
@ -334,8 +334,8 @@ int main(int argc, char **argv)
signal(SIGHUP, sigterm); signal(SIGHUP, sigterm);
signal(SIGINT, sigterm); signal(SIGINT, sigterm);
last_tv.tv_sec = 0; last_ts.tv_sec = 0;
last_tv.tv_usec = 0; last_ts.tv_nsec = 0;
progname = basename(argv[0]); progname = basename(argv[0]);
@ -784,7 +784,11 @@ int main(int argc, char **argv)
cmsg && (cmsg->cmsg_level == SOL_SOCKET); cmsg && (cmsg->cmsg_level == SOL_SOCKET);
cmsg = CMSG_NXTHDR(&msg,cmsg)) { cmsg = CMSG_NXTHDR(&msg,cmsg)) {
if (cmsg->cmsg_type == SO_TIMESTAMP) { if (cmsg->cmsg_type == SO_TIMESTAMP) {
struct timeval tv;
memcpy(&tv, CMSG_DATA(cmsg), sizeof(tv)); memcpy(&tv, CMSG_DATA(cmsg), sizeof(tv));
ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec;
ts.tv_nsec *= 1000;
} else if (cmsg->cmsg_type == SO_TIMESTAMPING) { } else if (cmsg->cmsg_type == SO_TIMESTAMPING) {
struct timespec *stamp = (struct timespec *)CMSG_DATA(cmsg); struct timespec *stamp = (struct timespec *)CMSG_DATA(cmsg);
@ -795,8 +799,7 @@ int main(int argc, char **argv)
* See chapter 2.1.2 Receive timestamps in * See chapter 2.1.2 Receive timestamps in
* linux/Documentation/networking/timestamping.txt * linux/Documentation/networking/timestamping.txt
*/ */
tv.tv_sec = stamp[2].tv_sec; ts = stamp[2];
tv.tv_usec = stamp[2].tv_nsec / 1000;
} else if (cmsg->cmsg_type == SO_RXQ_OVFL) { } else if (cmsg->cmsg_type == SO_RXQ_OVFL) {
memcpy(&obj->dropcnt, CMSG_DATA(cmsg), sizeof(__u32)); memcpy(&obj->dropcnt, CMSG_DATA(cmsg), sizeof(__u32));
} }
@ -832,7 +835,7 @@ int main(int argc, char **argv)
if ((log) || ((logfrmt) && (silent == SILENT_OFF))) { if ((log) || ((logfrmt) && (silent == SILENT_OFF))) {
alen = sprint_timestamp(afrbuf, logtimestamp, alen = sprint_timestamp(afrbuf, logtimestamp,
&tv, &last_tv); &ts, &last_ts);
alen += sprintf(afrbuf + alen, "%*s ", alen += sprintf(afrbuf + alen, "%*s ",
max_devname_len, devname[idx]); max_devname_len, devname[idx]);
@ -861,7 +864,7 @@ int main(int argc, char **argv)
/* print (colored) long CAN frame style to stdout */ /* print (colored) long CAN frame style to stdout */
alen = sprintf(afrbuf, " %s", (color > 2) ? col_on[idx % MAXCOL] : ""); alen = sprintf(afrbuf, " %s", (color > 2) ? col_on[idx % MAXCOL] : "");
alen += sprint_timestamp(afrbuf + alen, timestamp, &tv, &last_tv); alen += sprint_timestamp(afrbuf + alen, timestamp, &ts, &last_ts);
alen += sprintf(afrbuf + alen, " %s%*s", alen += sprintf(afrbuf + alen, " %s%*s",
(color && (color < 3)) ? col_on[idx % MAXCOL] : "", (color && (color < 3)) ? col_on[idx % MAXCOL] : "",
max_devname_len, devname[idx]); max_devname_len, devname[idx]);