diff --git a/include/haproxy/tinfo-t.h b/include/haproxy/tinfo-t.h index 65006531f..3db77e56f 100644 --- a/include/haproxy/tinfo-t.h +++ b/include/haproxy/tinfo-t.h @@ -154,9 +154,7 @@ struct thread_ctx { uint emergency_bufs_left; /* number of emergency buffers left in magic_bufs[] */ uint32_t sched_wake_date; /* current task/tasklet's wake date in 32-bit ns or 0 if not supported */ - uint32_t sched_call_date; /* current task/tasklet's call date in 32-bit ns */ - - // 4 bytes hole here + uint64_t sched_call_date; /* current task/tasklet's call date in ns */ uint64_t prev_mono_time; /* previous system wide monotonic time (leaving poll) */ uint64_t curr_mono_time; /* latest system wide monotonic time (leaving poll) */ diff --git a/src/stream.c b/src/stream.c index fd9a02721..4d48ed7a2 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1664,7 +1664,7 @@ static void stream_cond_update_cpu_usage(struct stream *s) if (likely(!th_ctx->sched_wake_date)) return; - cpu = (uint32_t)now_mono_time() - th_ctx->sched_call_date; + cpu = now_mono_time() - th_ctx->sched_call_date; s->cpu_time += cpu; HA_ATOMIC_ADD(&th_ctx->sched_profile_entry->cpu_time, cpu); th_ctx->sched_wake_date = 0;