|
 |
a52f674 |
From c45acb6e734f183d16af7f80cb62c1e26d679c52 Mon Sep 17 00:00:00 2001
|
|
|
d66047d |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
d66047d |
Date: Wed, 20 Nov 2013 22:11:10 +0100
|
|
|
d66047d |
Subject: [PATCH] valgrind: make running PID 1 in valgrind useful
|
|
|
d66047d |
|
|
|
d66047d |
Since valgrind only generates useful output on exit() (rather than
|
|
|
d66047d |
exec()) we need to explicitly exit when valgrind is detected.
|
|
|
d66047d |
|
|
|
d66047d |
Conflicts:
|
|
|
d66047d |
src/core/main.c
|
|
|
d66047d |
---
|
|
|
d66047d |
configure.ac | 2 +-
|
|
|
d66047d |
src/core/main.c | 13 +++++++++++++
|
|
|
d66047d |
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
d66047d |
|
|
|
d66047d |
diff --git a/configure.ac b/configure.ac
|
|
|
d66047d |
index 9904e25..6232cf8 100644
|
|
|
d66047d |
--- a/configure.ac
|
|
|
d66047d |
+++ b/configure.ac
|
|
|
d66047d |
@@ -814,7 +814,7 @@ AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
|
|
|
d66047d |
|
|
|
d66047d |
AC_SUBST(TELINIT)
|
|
|
d66047d |
|
|
|
d66047d |
-AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h])
|
|
|
d66047d |
+AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h])
|
|
|
d66047d |
|
|
|
d66047d |
# ------------------------------------------------------------------------------
|
|
|
d66047d |
have_myhostname=no
|
|
|
d66047d |
diff --git a/src/core/main.c b/src/core/main.c
|
|
|
d66047d |
index 00fd394..58c3a9e 100644
|
|
|
d66047d |
--- a/src/core/main.c
|
|
|
d66047d |
+++ b/src/core/main.c
|
|
|
d66047d |
@@ -34,6 +34,10 @@
|
|
|
d66047d |
#include <sys/prctl.h>
|
|
|
d66047d |
#include <sys/mount.h>
|
|
|
d66047d |
|
|
|
d66047d |
+#ifdef HAVE_VALGRIND_VALGRIND_H
|
|
|
d66047d |
+#include <valgrind/valgrind.h>
|
|
|
d66047d |
+#endif
|
|
|
d66047d |
+
|
|
|
d66047d |
#include "manager.h"
|
|
|
d66047d |
#include "log.h"
|
|
|
d66047d |
#include "load-fragment.h"
|
|
|
d66047d |
@@ -1855,6 +1859,15 @@ finish:
|
|
|
d66047d |
if (fds)
|
|
|
d66047d |
fdset_free(fds);
|
|
|
d66047d |
|
|
|
d66047d |
+#ifdef HAVE_VALGRIND_VALGRIND_H
|
|
|
d66047d |
+ /* If we are PID 1 and running under valgrind, then let's exit
|
|
|
d66047d |
+ * here explicitly. valgrind will only generate nice output on
|
|
|
d66047d |
+ * exit(), not on exec(), hence let's do the former not the
|
|
|
d66047d |
+ * latter here. */
|
|
|
d66047d |
+ if (getpid() == 1 && RUNNING_ON_VALGRIND)
|
|
|
d66047d |
+ return 0;
|
|
|
d66047d |
+#endif
|
|
|
d66047d |
+
|
|
|
d66047d |
if (shutdown_verb) {
|
|
|
d66047d |
const char * command_line[] = {
|
|
|
d66047d |
SYSTEMD_SHUTDOWN_BINARY_PATH,
|