From 6b6b73806f0c59f322ee1797a92749c2b4136294 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Tue, 2 Feb 2010 17:00:41 +0100 Subject: CCpp: give up settings limits on the first failure --- lib/Plugins/CCpp.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/Plugins/CCpp.cpp') diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 0adfc7c..b0c5a75 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -827,6 +827,14 @@ static int set_limits() log("warning: can't write limit to: %s", limits_name); close(fd); } + else + { + /* + give up when we failed to open /proc//limits for writing + because it probably means, that the kernel doesn't support it + */ + return 1; + } } return 0; } -- cgit From 076eb3126de1cfee2e2c3e51aae59c7e14640e8b Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Tue, 2 Feb 2010 18:32:22 +0100 Subject: fixed premature exit from set_limit() - don't exit if we find corelimit > 0 and don't exit if we can't write new limits --- lib/Plugins/CCpp.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lib/Plugins/CCpp.cpp') diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index 0957b39..a090a1d 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -795,7 +795,7 @@ static int set_limits() fclose(limits_fp); if (!ulimit_c || ulimit_c[0] != '0' || ulimit_c[1] != '\0') { /*process has nonzero ulimit -c, so need to modify it*/ - return 0; + continue; } /* echo -n 'Max core file size=1:unlimited' >/proc/PID/limits */ int fd = open(limits_name, O_WRONLY); @@ -804,17 +804,13 @@ static int set_limits() /*full_*/ ssize_t n = write(fd, CORE_SIZE_PATTERN, sizeof(CORE_SIZE_PATTERN)-1); if (n < sizeof(CORE_SIZE_PATTERN)-1) - log("warning: can't write limit to: %s", limits_name); + log("warning: can't write core_size limit to: %s", limits_name); close(fd); } - else - { - /* - give up when we failed to open /proc//limits for writing - because it probably means, that the kernel doesn't support it - */ - return 1; - } + else + { + log("warning: can't open %s for writing", limits_name); + } } closedir(dir); return 0; -- cgit From 62cb272099cbc2a733a6e0b90c9cdcd8e938a6c7 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 3 Feb 2010 12:55:44 +0100 Subject: CCpp analyzer: print __glib_assert_msg (rhbz#549735); limit backtrace size Signed-off-by: Denys Vlasenko --- lib/Plugins/CCpp.cpp | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) (limited to 'lib/Plugins/CCpp.cpp') diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index a090a1d..dadff97 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -266,7 +266,7 @@ static void GetBacktrace(const char *pDebugDumpDir, unsetenv("TERM"); putenv((char*)"TERM=dumb"); - char *args[15]; + char *args[17]; args[0] = (char*)"gdb"; args[1] = (char*)"-batch"; @@ -294,14 +294,14 @@ static void GetBacktrace(const char *pDebugDumpDir, * * Fedora GDB does not strictly need it, it will find the binary * by its build-id. But for binaries either without build-id - * (=built on non-Fedora GCC) or which do not have + * (= built on non-Fedora GCC) or which do not have * their debuginfo rpm installed gdb would not find BINARY_FILE * so it is still makes sense to supply "file BINARY_FILE". * * Unfortunately, "file BINARY_FILE" doesn't work well if BINARY_FILE * was deleted (as often happens during system updates): * gdb uses specified BINARY_FILE - * even if it is completely unrelated to the coredump + * even if it is completely unrelated to the coredump. * See https://bugzilla.redhat.com/show_bug.cgi?id=525721 * * TODO: check mtimes on COREFILE and BINARY_FILE and not supply @@ -316,16 +316,43 @@ static void GetBacktrace(const char *pDebugDumpDir, args[7] = (char*)corefile.c_str(); args[8] = (char*)"-ex"; - /* max 3000 frames: with no limit, gdb sometimes OOMs the machine */ - args[9] = (char*)"thread apply all backtrace 3000 full"; + /*args[9] = ... see below */ args[10] = (char*)"-ex"; args[11] = (char*)"info sharedlib"; /* glibc's abort() stores its message in this variable */ args[12] = (char*)"-ex"; args[13] = (char*)"print (char*)__abort_msg"; - args[14] = NULL; - - ExecVP(args, xatoi_u(UID.c_str()), /*redirect_stderr:*/ 1, pBacktrace); + args[14] = (char*)"-ex"; + args[15] = (char*)"print (char*)__glib_assert_msg"; + args[16] = NULL; + + /* Get the backtrace, but try to cap its size */ + /* Limit bt depth. With no limit, gdb sometimes OOMs the machine */ + unsigned bt_depth = 2048; + const char *thread_apply_all = "thread apply all "; + const char *full = " full"; + while (1) + { + string cmd = ssprintf("%sbacktrace %u%s", thread_apply_all, bt_depth, full); + args[9] = (char*)cmd.c_str(); + pBacktrace = ""; + ExecVP(args, xatoi_u(UID.c_str()), /*redirect_stderr:*/ 1, pBacktrace); + if (bt_depth <= 64 || pBacktrace.size() < 256*1024) + return; + bt_depth /= 2; + if (bt_depth <= 64 && thread_apply_all[0] != '\0') + { + /* This program likely has gazillion threads, dont try to bt them all */ + bt_depth = 256; + thread_apply_all = ""; + } + if (bt_depth <= 64 && full[0] != '\0') + { + /* Looks like there are gigantic local structures or arrays, disable "full" bt */ + bt_depth = 256; + full = ""; + } + } } static void GetIndependentBuildIdPC(const char *unstrip_n_output, -- cgit