mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-31 07:11:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: Fix timestamp 32bit integer overflow

Browse source 
We are specifically requesting wall time for the logging output, but
using 32 bits for micro-seconds does overflow, leaving us with an
arbitrary integer.

Signed-off-by: Robert Griebl <robert.griebl@qt.io>
This commit is contained in:
Robert Griebl 2025-05-13 15:03:16 +02:00
parent 6137c8c213
commit b703d87bd8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/connection.c
View file

@ -1495,7 +1495,7 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target,
struct argument_details arg; struct argument_details arg;
const char *signature = closure->message->signature; const char *signature = closure->message->signature;
struct timespec tp; struct timespec tp;
unsigned int time; uint64_t time;
uint32_t nval; uint32_t nval;
FILE *f; FILE *f;
char *buffer; char *buffer;
@ -1506,10 +1506,9 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target,
return; return;
clock_gettime(CLOCK_REALTIME, &tp); clock_gettime(CLOCK_REALTIME, &tp);
time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); time = (tp.tv_sec * 1000000LL) + (tp.tv_nsec / 1000);
fprintf(f, "[%7u.%03u] ", time / 1000, time % 1000);
fprintf(f, "[%7" PRIu64 ".%03u] ", time / 1000, (unsigned int) (time % 1000));
if (queue_name) if (queue_name)
fprintf(f, "{%s} ", queue_name); fprintf(f, "{%s} ", queue_name);

8
src/wayland-client.c
View file

@ -1557,7 +1557,7 @@ queue_event(struct wl_display *display, int len)
const struct wl_message *message; const struct wl_message *message;
struct wl_event_queue *queue; struct wl_event_queue *queue;
struct timespec tp; struct timespec tp;
unsigned int time; uint64_t time;
int num_zombie_fds; int num_zombie_fds;
wl_connection_copy(display->connection, p, sizeof p); wl_connection_copy(display->connection, p, sizeof p);
@ -1577,11 +1577,11 @@ queue_event(struct wl_display *display, int len)
if (debug_client) { if (debug_client) {
clock_gettime(CLOCK_REALTIME, &tp); clock_gettime(CLOCK_REALTIME, &tp);
time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000); time = (tp.tv_sec * 1000000LL) + (tp.tv_nsec / 1000);
fprintf(stderr, "[%7u.%03u] discarded [%s]#%d.[event %d]" fprintf(stderr, "[%7" PRIu64 ".%03u] discarded [%s]#%d.[event %d]"
"(%d fd, %d byte)\n", "(%d fd, %d byte)\n",
time / 1000, time % 1000, time / 1000, (unsigned int) (time % 1000),
zombie ? "zombie" : "unknown", zombie ? "zombie" : "unknown",
id, opcode, id, opcode,
num_zombie_fds, size); num_zombie_fds, size);