From 02c8a0f3865343a5153ec0a743b8a0dc4c31cbff Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 11 Jan 2016 18:59:04 +0100 Subject: [PATCH] stat: Make stat_compress_init/stat_init the same When COMPRESS_STAT is not set, and RED_WORKER_STAT is set, stat_time() will be a no-op, but stat_start_time_init() will try to use stat_info_t::clock. This causes a compile warning on 32 bit arches (not sure why not on 64 bit builds), as well as an error from valgrind. Since stat_time() and stat_compress_time() are both doing the same work, this commit makes them the same function, which ensures stat_info_t::clock will be set and stat_start_time_init() can be used regardless of the _init() method which is called. --- server/stat.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/server/stat.h b/server/stat.h index adbf46bf..6cb00469 100644 --- a/server/stat.h +++ b/server/stat.h @@ -101,17 +101,24 @@ static inline void stat_reset(G_GNUC_UNUSED stat_info_t *info) #endif } -static inline void stat_compress_init(G_GNUC_UNUSED stat_info_t *info, - G_GNUC_UNUSED const char *name, - G_GNUC_UNUSED clockid_t clock) +static inline void stat_init(G_GNUC_UNUSED stat_info_t *info, + G_GNUC_UNUSED const char *name, + G_GNUC_UNUSED clockid_t clock) { -#ifdef COMPRESS_STAT +#if defined(RED_WORKER_STAT) || defined(COMPRESS_STAT) info->name = name; info->clock = clock; stat_reset(info); #endif } +static inline void stat_compress_init(G_GNUC_UNUSED stat_info_t *info, + G_GNUC_UNUSED const char *name, + G_GNUC_UNUSED clockid_t clock) +{ + stat_init(info, name, clock); +} + static inline void stat_compress_add(G_GNUC_UNUSED stat_info_t *info, G_GNUC_UNUSED stat_start_time_t start, G_GNUC_UNUSED int orig_size, @@ -134,17 +141,6 @@ static inline double stat_byte_to_mega(uint64_t size) return (double)size / (1000 * 1000); } -static inline void stat_init(G_GNUC_UNUSED stat_info_t *info, - G_GNUC_UNUSED const char *name, - G_GNUC_UNUSED clockid_t clock) -{ -#ifdef RED_WORKER_STAT - info->name = name; - info->clock = clock; - stat_reset(info); -#endif -} - static inline void stat_add(G_GNUC_UNUSED stat_info_t *info, G_GNUC_UNUSED stat_start_time_t start) {