[systemd-commits] 3 commits - configure.ac Makefile.am src/label.c

[Lennart Poettering]

 Makefile.am  |    4 +++-
 configure.ac |    2 +-
 src/label.c  |   16 +++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 455a946f40c0f9d158f0494cec043f6e028848d7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 27 21:47:25 2011 +0200

    selinux: also profile memory usage

diff --git a/src/label.c b/src/label.c
index 5157b79..b7bb033 100644
--- a/src/label.c
+++ b/src/label.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <malloc.h>
 
 #include "label.h"
 #include "util.h"
@@ -48,6 +49,7 @@ int label_init(void) {
 
 #ifdef HAVE_SELINUX
         usec_t n;
+        struct mallinfo before;
 
         if (!use_selinux())
                 return 0;
@@ -55,7 +57,9 @@ int label_init(void) {
         if (label_hnd)
                 return 0;
 
+        before = mallinfo();
         n = now(CLOCK_MONOTONIC);
+
         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
         if (!label_hnd) {
                 log_full(security_getenforce() == 1 ? LOG_ERR : LOG_DEBUG,
@@ -63,12 +67,18 @@ int label_init(void) {
                 r = security_getenforce() == 1 ? -errno : 0;
         } else  {
                 char buf[FORMAT_TIMESPAN_MAX];
+                struct mallinfo after;
+                int l;
 
                 n = now(CLOCK_MONOTONIC) - n;
-                log_info("Successfully loaded SELinux database in %s.",
-                         format_timespan(buf, sizeof(buf), n));
-        }
+                after = mallinfo();
 
+                l = after.uordblks > before.uordblks ? after.uordblks - before.uordblks : 0;
+
+                log_info("Successfully loaded SELinux database in %s, size on heap is %iK.",
+                         format_timespan(buf, sizeof(buf), n),
+                         l/1024);
+        }
 #endif
 
         return r;

commit 6a9bff42dce03b77f7818f553ad339e905ed1288
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 27 21:11:24 2011 +0200

    build-sys: fix make distcheck

diff --git a/Makefile.am b/Makefile.am
index db0db19..e7963a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -652,7 +652,8 @@ EXTRA_DIST += \
         src/logind-session.h \
         src/logind-user.h \
         src/logind-acl.h \
-        src/dbus-loop.h
+        src/dbus-loop.h \
+        src/spawn-agent.h
 
 MANPAGES = \
 	man/systemd.1 \
@@ -1490,6 +1491,7 @@ CLEANFILES = \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA) \
+	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA) \
         src/73-seat-late.rules \
         src/99-systemd.rules

commit 904a553a322030fa0ac0199e8f4ded3c328fb9d9
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 27 20:55:25 2011 +0200

    build-sys: prepare v31

diff --git a/configure.ac b/configure.ac
index 198a639..82ed85c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[30],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[31],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])