From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH] log: Avoid time_t/__syscall_slong_t format mismatch with long int on X32 ABI
Date: Mon, 13 Mar 2023 13:07:15 +0100 [thread overview]
Message-ID: <20230313120715.3639260-1-sbrivio@redhat.com> (raw)
On X32 (ILP32 using AMD64 system call ABI) and glibc,
struct timespec::tv_nsec is __syscall_slong_t and not a long int, see
also https://sourceware.org/bugzilla/show_bug.cgi?id=16437 and
timespec(3type). Fine, we could cast that down to long and be done
with it.
But it turns out that also time_t (not guaranteed to be equivalent to
any type) is a long long int, and there we can't downcast.
To keep it simple, cast both to long long int, and change formats to
%lli, to avoid format warnings from gcc.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
log.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/log.c b/log.c
index d2f08fa..d7411ba 100644
--- a/log.c
+++ b/log.c
@@ -53,9 +53,9 @@ void name(const char *format, ...) { \
\
if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \
clock_gettime(CLOCK_REALTIME, &tp); \
- fprintf(stderr, "%li.%04li: ", \
- tp.tv_sec - log_start, \
- tp.tv_nsec / (100L * 1000)); \
+ fprintf(stderr, "%lli.%04lli: ", \
+ (long long int)tp.tv_sec - log_start, \
+ (long long int)tp.tv_nsec / (100L * 1000)); \
} \
\
if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
@@ -225,8 +225,9 @@ static void logfile_rotate_fallocate(int fd, struct timespec *ts)
return;
n = snprintf(buf, BUFSIZ,
- "%s - log truncated at %li.%04li", log_header,
- ts->tv_sec - log_start, ts->tv_nsec / (100L * 1000));
+ "%s - log truncated at %lli.%04lli", log_header,
+ (long long int)(ts->tv_sec - log_start),
+ (long long int)(ts->tv_nsec / (100L * 1000)));
/* Avoid partial lines by padding the header with spaces */
nl = memchr(buf + n + 1, '\n', BUFSIZ - n - 1);
@@ -256,9 +257,9 @@ static void logfile_rotate_move(int fd, struct timespec *ts)
char buf[BUFSIZ], *nl;
header_len = snprintf(buf, BUFSIZ,
- "%s - log truncated at %li.%04li\n", log_header,
- ts->tv_sec - log_start,
- ts->tv_nsec / (100L * 1000));
+ "%s - log truncated at %lli.%04lli\n", log_header,
+ (long long int)(ts->tv_sec - log_start),
+ (long long int)(ts->tv_nsec / (100L * 1000)));
if (lseek(fd, 0, SEEK_SET) == -1)
return;
if (write(fd, buf, header_len) == -1)
@@ -349,8 +350,9 @@ void logfile_write(int pri, const char *format, va_list ap)
if (clock_gettime(CLOCK_REALTIME, &ts))
return;
- n = snprintf(buf, BUFSIZ, "%li.%04li: %s",
- ts.tv_sec - log_start, ts.tv_nsec / (100L * 1000),
+ n = snprintf(buf, BUFSIZ, "%lli.%04lli: %s",
+ (long long int)(ts.tv_sec - log_start),
+ (long long int)(ts.tv_nsec / (100L * 1000)),
logfile_prefix[pri]);
n += vsnprintf(buf + n, BUFSIZ - n, format, ap);
--
@@ -53,9 +53,9 @@ void name(const char *format, ...) { \
\
if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \
clock_gettime(CLOCK_REALTIME, &tp); \
- fprintf(stderr, "%li.%04li: ", \
- tp.tv_sec - log_start, \
- tp.tv_nsec / (100L * 1000)); \
+ fprintf(stderr, "%lli.%04lli: ", \
+ (long long int)tp.tv_sec - log_start, \
+ (long long int)tp.tv_nsec / (100L * 1000)); \
} \
\
if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
@@ -225,8 +225,9 @@ static void logfile_rotate_fallocate(int fd, struct timespec *ts)
return;
n = snprintf(buf, BUFSIZ,
- "%s - log truncated at %li.%04li", log_header,
- ts->tv_sec - log_start, ts->tv_nsec / (100L * 1000));
+ "%s - log truncated at %lli.%04lli", log_header,
+ (long long int)(ts->tv_sec - log_start),
+ (long long int)(ts->tv_nsec / (100L * 1000)));
/* Avoid partial lines by padding the header with spaces */
nl = memchr(buf + n + 1, '\n', BUFSIZ - n - 1);
@@ -256,9 +257,9 @@ static void logfile_rotate_move(int fd, struct timespec *ts)
char buf[BUFSIZ], *nl;
header_len = snprintf(buf, BUFSIZ,
- "%s - log truncated at %li.%04li\n", log_header,
- ts->tv_sec - log_start,
- ts->tv_nsec / (100L * 1000));
+ "%s - log truncated at %lli.%04lli\n", log_header,
+ (long long int)(ts->tv_sec - log_start),
+ (long long int)(ts->tv_nsec / (100L * 1000)));
if (lseek(fd, 0, SEEK_SET) == -1)
return;
if (write(fd, buf, header_len) == -1)
@@ -349,8 +350,9 @@ void logfile_write(int pri, const char *format, va_list ap)
if (clock_gettime(CLOCK_REALTIME, &ts))
return;
- n = snprintf(buf, BUFSIZ, "%li.%04li: %s",
- ts.tv_sec - log_start, ts.tv_nsec / (100L * 1000),
+ n = snprintf(buf, BUFSIZ, "%lli.%04lli: %s",
+ (long long int)(ts.tv_sec - log_start),
+ (long long int)(ts.tv_nsec / (100L * 1000)),
logfile_prefix[pri]);
n += vsnprintf(buf + n, BUFSIZ - n, format, ap);
--
2.39.2
next reply other threads:[~2023-03-13 12:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 12:07 Stefano Brivio [this message]
2023-03-14 10:25 ` [PATCH] log: Avoid time_t/__syscall_slong_t format mismatch with long int on X32 ABI David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230313120715.3639260-1-sbrivio@redhat.com \
--to=sbrivio@redhat.com \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).