mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2026-02-08 19:01:19 +01:00
f14d19024b
pool-os.h relies on a number of includes solely because the
pool_alloc_area() function was inlined, and this only because we want
the normal version to be inlined so that we can track the calling
places for the memory profiler. It's worth noting that it already
does not work at -O0, and that when UAF is enabled we don't care a
dime about profiling.
This patch does two things at once:
- force-inline the functions so that pool_alloc_area() is still
inlined at -O0 to help track malloc() users ;
- uninline the UAF version of these (that rely on mmap/munmap)
and move them to pools.c so that we can remove all unneeded
includes.
Doing so reduces by ~270kB or 0.15% the total build size.
85 lines
2.2 KiB
C
85 lines
2.2 KiB
C
/*
|
|
* include/haproxy/pool-os.h
|
|
* OS-level interface for memory management
|
|
*
|
|
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation, version 2.1
|
|
* exclusively.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _HAPROXY_POOL_OS_H
|
|
#define _HAPROXY_POOL_OS_H
|
|
|
|
#include <stdlib.h>
|
|
#include <haproxy/api.h>
|
|
|
|
|
|
#ifndef DEBUG_UAF
|
|
|
|
/************* normal allocator *************/
|
|
|
|
/* allocates an area of size <size> and returns it. The semantics are similar
|
|
* to those of malloc().
|
|
*/
|
|
static forceinline void *pool_alloc_area(size_t size)
|
|
{
|
|
return malloc(size);
|
|
}
|
|
|
|
/* frees an area <area> of size <size> allocated by pool_alloc_area(). The
|
|
* semantics are identical to free() except that the size is specified and
|
|
* may be ignored.
|
|
*/
|
|
static forceinline void pool_free_area(void *area, size_t __maybe_unused size)
|
|
{
|
|
free(area);
|
|
}
|
|
|
|
#else
|
|
|
|
/************* use-after-free allocator *************/
|
|
|
|
void *pool_alloc_area_uaf(size_t size);
|
|
void pool_free_area_uaf(void *area, size_t size);
|
|
|
|
|
|
/* allocates an area of size <size> and returns it. The semantics are similar
|
|
* to those of malloc().
|
|
*/
|
|
static forceinline void *pool_alloc_area(size_t size)
|
|
{
|
|
return pool_alloc_area_uaf(size);
|
|
}
|
|
|
|
/* frees an area <area> of size <size> allocated by pool_alloc_area(). The
|
|
* semantics are identical to free() except that the size is specified and
|
|
* may be ignored.
|
|
*/
|
|
static forceinline void pool_free_area(void *area, size_t size)
|
|
{
|
|
pool_free_area_uaf(area, size);
|
|
}
|
|
|
|
#endif /* DEBUG_UAF */
|
|
|
|
#endif /* _HAPROXY_POOL_OS_H */
|
|
|
|
/*
|
|
* Local variables:
|
|
* c-indent-level: 8
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|