mirror of
https://github.com/systemd/systemd
synced 2024-07-21 18:24:38 +00:00
selinux: use mallocinfo2() if it exists
New glibc deprecated mallocinfo(), even newer glibc added mallocinfo2()
as replacement. Use it, if it exists.
Follow-up for 4b6f74f5a0
and related
commits.
This commit is contained in:
parent
8fc1efa88f
commit
1885169c2f
|
@ -555,6 +555,7 @@ foreach ident : [
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <sys/wait.h>'''],
|
#include <sys/wait.h>'''],
|
||||||
['mallinfo', '''#include <malloc.h>'''],
|
['mallinfo', '''#include <malloc.h>'''],
|
||||||
|
['mallinfo2', '''#include <malloc.h>'''],
|
||||||
['execveat', '''#include <unistd.h>'''],
|
['execveat', '''#include <unistd.h>'''],
|
||||||
['close_range', '''#include <unistd.h>'''],
|
['close_range', '''#include <unistd.h>'''],
|
||||||
['epoll_pwait2', '''#include <sys/epoll.h>'''],
|
['epoll_pwait2', '''#include <sys/epoll.h>'''],
|
||||||
|
|
|
@ -84,15 +84,24 @@ void mac_selinux_retest(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_SELINUX
|
#if HAVE_SELINUX
|
||||||
# if HAVE_MALLINFO
|
# if HAVE_MALLINFO2
|
||||||
static struct mallinfo mallinfo_nowarn(void) {
|
# define HAVE_GENERIC_MALLINFO 1
|
||||||
/* glibc has deprecated mallinfo(), but the replacement malloc_info() returns an XML blob ;=[ */
|
typedef struct mallinfo2 generic_mallinfo;
|
||||||
|
static generic_mallinfo generic_mallinfo_get(void) {
|
||||||
|
return mallinfo2();
|
||||||
|
}
|
||||||
|
# elif HAVE_MALLINFO
|
||||||
|
# define HAVE_GENERIC_MALLINFO 1
|
||||||
|
typedef struct mallinfo generic_mallinfo;
|
||||||
|
static generic_mallinfo generic_mallinfo_get(void) {
|
||||||
|
/* glibc has deprecated mallinfo(), let's suppress the deprecation warning if mallinfo2() doesn't
|
||||||
|
* exist yet. */
|
||||||
DISABLE_WARNING_DEPRECATED_DECLARATIONS
|
DISABLE_WARNING_DEPRECATED_DECLARATIONS
|
||||||
return mallinfo();
|
return mallinfo();
|
||||||
REENABLE_WARNING
|
REENABLE_WARNING
|
||||||
}
|
}
|
||||||
# else
|
# else
|
||||||
# warning "mallinfo() is missing, add mallinfo2() supported instead."
|
# define HAVE_GENERIC_MALLINFO 0
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
static int open_label_db(void) {
|
static int open_label_db(void) {
|
||||||
|
@ -100,8 +109,8 @@ static int open_label_db(void) {
|
||||||
usec_t before_timestamp, after_timestamp;
|
usec_t before_timestamp, after_timestamp;
|
||||||
char timespan[FORMAT_TIMESPAN_MAX];
|
char timespan[FORMAT_TIMESPAN_MAX];
|
||||||
|
|
||||||
# if HAVE_MALLINFO
|
# if HAVE_GENERIC_MALLINFO
|
||||||
struct mallinfo before_mallinfo = mallinfo_nowarn();
|
generic_mallinfo before_mallinfo = generic_mallinfo_get();
|
||||||
# endif
|
# endif
|
||||||
before_timestamp = now(CLOCK_MONOTONIC);
|
before_timestamp = now(CLOCK_MONOTONIC);
|
||||||
|
|
||||||
|
@ -110,10 +119,10 @@ static int open_label_db(void) {
|
||||||
return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
|
return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
|
||||||
|
|
||||||
after_timestamp = now(CLOCK_MONOTONIC);
|
after_timestamp = now(CLOCK_MONOTONIC);
|
||||||
# if HAVE_MALLINFO
|
# if HAVE_GENERIC_MALLINFO
|
||||||
struct mallinfo after_mallinfo = mallinfo_nowarn();
|
generic_mallinfo after_mallinfo = generic_mallinfo_get();
|
||||||
int l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
|
size_t l = LESS_BY((size_t) after_mallinfo.uordblks, (size_t) before_mallinfo.uordblks);
|
||||||
log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
|
log_debug("Successfully loaded SELinux database in %s, size on heap is %zuK.",
|
||||||
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
|
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
|
||||||
DIV_ROUND_UP(l, 1024));
|
DIV_ROUND_UP(l, 1024));
|
||||||
# else
|
# else
|
||||||
|
|
Loading…
Reference in a new issue