AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-03-01 00:00:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

build-sys: check for mallinfo

Browse Source 
mallinfo is not specified by POSIX or the C standards, therefore
it's not available for all libc libraries (musl).

Add the ability to disable mallinfo statistics.

Fixes:
selinux-util.c: In function ‘mac_selinux_init’:
selinux-util.c:70:25: error: storage size of ‘before_mallinfo’ isn’t known
         struct mallinfo before_mallinfo, after_mallinfo;

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
This commit is contained in:
Romain Naour 2015-07-30 16:55:45 +02:00
parent 019c458afe
commit 24ccb6ebc5
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -223,6 +223,9 @@ else
fi
AC_SUBST(sushell)
# selinux-util.c uses struct mallinfo which is not available for all C libraries (musl).
AC_CHECK_FUNCS([mallinfo])
# ------------------------------------------------------------------------------
AC_CHECK_DECL([unshare],

15
src/shared/selinux-util.c
View File

@ -67,7 +67,10 @@ int mac_selinux_init(const char *prefix) {
#ifdef HAVE_SELINUX
usec_t before_timestamp, after_timestamp;
#ifdef HAVE_MALLINFO
struct mallinfo before_mallinfo, after_mallinfo;
#endif
if (!mac_selinux_use())
return 0;
@ -75,7 +78,10 @@ int mac_selinux_init(const char *prefix) {
if (label_hnd)
return 0;
#ifdef HAVE_MALLINFO
before_mallinfo = mallinfo();
#endif
before_timestamp = now(CLOCK_MONOTONIC);
if (prefix) {
@ -92,9 +98,14 @@ int mac_selinux_init(const char *prefix) {
r = security_getenforce() == 1 ? -errno : 0;
} else {
char timespan[FORMAT_TIMESPAN_MAX];
#ifdef HAVE_MALLINFO
int l;
#endif
after_timestamp = now(CLOCK_MONOTONIC);
#ifdef HAVE_MALLINFO
after_mallinfo = mallinfo();
l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
@ -102,6 +113,10 @@ int mac_selinux_init(const char *prefix) {
log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
(l+1023)/1024);
#else
log_debug("Successfully loaded SELinux database in %s",
format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
#endif
}
#endif