pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-26 22:48:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stat: Make stat_compress_init/stat_init the same

Browse Source 
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.
This commit is contained in:
Christophe Fergeau 2016-01-11 18:59:04 +01:00
parent a57f227235
commit 02c8a0f386
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/stat.h
View File

@ -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)
{