Re: [patch] Do not disappoint on "Create a core file of GDB?"

Jan Kratochvil
2010-01-15T00:35:42Z

On Tue, 12 Jan 2010 17:58:48 +0100, Tom Tromey wrote:
> Jan> 2010-01-11 Jan Kratochvil <jan.kratochvil@redhat.com>
> Jan> * configure.ac (AC_CHECK_FUNCS): Check for setrlimit and getrlimit.
> Jan> * configure: Regenerate.
> Jan> * config.in: Regenerate.
> Jan> * utils.c: Include sys/resource.h.
> Jan> (dump_core, can_dump_core): New.
> Jan> (internal_vproblem): Update the comment. Check can_dump_core while
> Jan> setting dump_core_p. Replace two abort calls by dump_core calls.
>
> Looks good to me.
> Ok.

Checked-in.

Thanks,
Jan

http://sourceware.org/ml/gdb-cvs/2010-01/msg00131.html

--- src/gdb/ChangeLog 2010/01/14 21:24:04 1.11253
+++ src/gdb/ChangeLog 2010/01/15 00:34:37 1.11254
@@ -1,3 +1,13 @@
+2010-01-15 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * configure.ac (AC_CHECK_FUNCS): Check for setrlimit and getrlimit.
+ * configure: Regenerate.
+ * config.in: Regenerate.
+ * utils.c: Include sys/resource.h.
+ (dump_core, can_dump_core): New.
+ (internal_vproblem): Update the comment. Check can_dump_core while
+ setting dump_core_p. Replace two abort calls by dump_core calls.
+
2010-01-14 Jan Kratochvil <jan.kratochvil@redhat.com>
Eli Zaretskii <eliz@gnu.org>

--- src/gdb/config.in 2009/11/11 04:42:39 1.114
+++ src/gdb/config.in 2010/01/15 00:34:37 1.115
@@ -165,6 +165,9 @@
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE

+/* Define to 1 if you have the `getrlimit' function. */
+#undef HAVE_GETRLIMIT
+
/* Define to 1 if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE

@@ -366,6 +369,9 @@
/* Define to 1 if you have the `setpgrp' function. */
#undef HAVE_SETPGRP

+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
/* Define to 1 if you have the `setsid' function. */
#undef HAVE_SETSID

--- src/gdb/configure 2010/01/12 12:22:52 1.296
+++ src/gdb/configure 2010/01/15 00:34:37 1.297
@@ -11233,7 +11233,8 @@
for ac_func in canonicalize_file_name realpath getrusage getuid \
getgid pipe poll pread64 sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair syscall \
- ttrace wborder setlocale iconvlist libiconvlist btowc
+ ttrace wborder setlocale iconvlist libiconvlist btowc \
+ setrlimit getrlimit
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
--- src/gdb/configure.ac 2010/01/01 09:44:06 1.111
+++ src/gdb/configure.ac 2010/01/15 00:34:37 1.112
@@ -801,7 +801,8 @@
AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid \
getgid pipe poll pread64 sbrk setpgid setpgrp setsid \
sigaction sigprocmask sigsetmask socketpair syscall \
- ttrace wborder setlocale iconvlist libiconvlist btowc])
+ ttrace wborder setlocale iconvlist libiconvlist btowc \
+ setrlimit getrlimit])
AM_LANGINFO_CODESET

# Check the return and argument types of ptrace. No canned test for
--- src/gdb/utils.c 2010/01/12 21:40:24 1.221
+++ src/gdb/utils.c 2010/01/15 00:34:37 1.222
@@ -26,6 +26,9 @@
#include "event-top.h"
#include "exceptions.h"
#include "gdbthread.h"
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif /* HAVE_SYS_RESOURCE_H */

#ifdef TUI
#include "tui/tui.h" /* For tui_get_command_dimension. */
@@ -843,6 +846,44 @@
error (("%s"), message);
}

+/* Dump core trying to increase the core soft limit to hard limit first. */
+
+static void
+dump_core (void)
+{
+#ifdef HAVE_SETRLIMIT
+ struct rlimit rlim = { RLIM_INFINITY, RLIM_INFINITY };
+
+ setrlimit (RLIMIT_CORE, &rlim);
+#endif /* HAVE_SETRLIMIT */
+
+ abort (); /* NOTE: GDB has only three calls to abort(). */
+}
+
+/* Check whether GDB will be able to dump core using the dump_core function. */
+
+static int
+can_dump_core (const char *reason)
+{
+#ifdef HAVE_GETRLIMIT
+ struct rlimit rlim;
+
+ /* Be quiet and assume we can dump if an error is returned. */
+ if (getrlimit (RLIMIT_CORE, &rlim) != 0)
+ return 1;
+
+ if (rlim.rlim_max == 0)
+ {
+ fprintf_unfiltered (gdb_stderr,
+ _("%s\nUnable to dump core, use `ulimit -c unlimited'"
+ " before executing GDB next time.\n"), reason);
+ return 0;
+ }
+#endif /* HAVE_GETRLIMIT */
+
+ return 1;
+}
+
/* Allow the user to configure the debugger behavior with respect to
what to do when an internal problem is detected. */

@@ -893,7 +934,7 @@
case 1:
dejavu = 2;
fputs_unfiltered (msg, gdb_stderr);
- abort (); /* NOTE: GDB has only four calls to abort(). */
+ abort (); /* NOTE: GDB has only three calls to abort(). */
default:
dejavu = 3;
/* Newer GLIBC versions put the warn_unused_result attribute
@@ -902,7 +943,7 @@
does not fix this problem. This is the solution suggested
at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509. */
if (write (STDERR_FILENO, msg, sizeof (msg)) != sizeof (msg))
- abort (); /* NOTE: GDB has only four calls to abort(). */
+ abort (); /* NOTE: GDB has only three calls to abort(). */
exit (1);
}
}
@@ -951,13 +992,18 @@

if (problem->should_dump_core == internal_problem_ask)
{
- /* Default (yes/batch case) is to dump core. This leaves a GDB
- `dropping' so that it is easier to see that something went
- wrong in GDB. */
- dump_core_p = query (_("%s\nCreate a core file of GDB? "), reason);
+ if (!can_dump_core (reason))
+ dump_core_p = 0;
+ else
+ {
+ /* Default (yes/batch case) is to dump core. This leaves a GDB
+ `dropping' so that it is easier to see that something went
+ wrong in GDB. */
+ dump_core_p = query (_("%s\nCreate a core file of GDB? "), reason);
+ }
}
else if (problem->should_dump_core == internal_problem_yes)
- dump_core_p = 1;
+ dump_core_p = can_dump_core (reason);
else if (problem->should_dump_core == internal_problem_no)
dump_core_p = 0;
else
@@ -966,7 +1012,7 @@
if (quit_p)
{
if (dump_core_p)
- abort (); /* NOTE: GDB has only four calls to abort(). */
+ dump_core ();
else
exit (1);
}
@@ -976,7 +1022,7 @@
{
#ifdef HAVE_WORKING_FORK
if (fork () == 0)
- abort (); /* NOTE: GDB has only four calls to abort(). */
+ dump_core ();
#endif
}
}