mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: activity: use #ifdef not #if on USE_MEMORY_PROFILING

Browse Source 
This avoids most build warnings with -Wundef, and all other USE_* flags
are tested this way, let's do it there as well. See gh issue #1369.
This commit is contained in:
Willy Tarreau 2021-08-28 12:04:25 +02:00
parent cbdc74b4b3
commit e15615c1ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/activity.c
View File

@ -39,7 +39,7 @@ struct activity activity[MAX_THREADS] __attribute__((aligned(64))) = { };
struct sched_activity sched_activity[256] __attribute__((aligned(64))) = { }; struct sched_activity sched_activity[256] __attribute__((aligned(64))) = { };
#if USE_MEMORY_PROFILING #ifdef USE_MEMORY_PROFILING
/* determine the number of buckets to store stats */ /* determine the number of buckets to store stats */
#define MEMPROF_HASH_BITS 10 #define MEMPROF_HASH_BITS 10
#define MEMPROF_HASH_BUCKETS (1U << MEMPROF_HASH_BITS) #define MEMPROF_HASH_BUCKETS (1U << MEMPROF_HASH_BITS)
@ -492,7 +492,7 @@ static int cmp_sched_activity_addr(const void *a, const void *b)
return 0; return 0;
} }
#if USE_MEMORY_PROFILING #ifdef USE_MEMORY_PROFILING
/* used by qsort below */ /* used by qsort below */
static int cmp_memprof_stats(const void *a, const void *b) static int cmp_memprof_stats(const void *a, const void *b)
{ {
@ -539,7 +539,7 @@ static int cmp_memprof_addr(const void *a, const void *b)
static int cli_io_handler_show_profiling(struct appctx *appctx) static int cli_io_handler_show_profiling(struct appctx *appctx)
{ {
struct sched_activity tmp_activity[256] __attribute__((aligned(64))); struct sched_activity tmp_activity[256] __attribute__((aligned(64)));
#if USE_MEMORY_PROFILING #ifdef USE_MEMORY_PROFILING
struct memprof_stats tmp_memstats[MEMPROF_HASH_BUCKETS + 1]; struct memprof_stats tmp_memstats[MEMPROF_HASH_BUCKETS + 1];
unsigned long long tot_alloc_calls, tot_free_calls; unsigned long long tot_alloc_calls, tot_free_calls;
unsigned long long tot_alloc_bytes, tot_free_bytes; unsigned long long tot_alloc_bytes, tot_free_bytes;
@ -639,7 +639,7 @@ static int cli_io_handler_show_profiling(struct appctx *appctx)
skip_tasks: skip_tasks:
#if USE_MEMORY_PROFILING #ifdef USE_MEMORY_PROFILING
if ((appctx->ctx.cli.i0 & 3) != 2) if ((appctx->ctx.cli.i0 & 3) != 2)
goto skip_mem; goto skip_mem;