/* Generate a core file for the inferior process.
- Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001-2018 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdb_bfd.h"
#include "readline/tilde.h"
#include <algorithm>
+#include "common/gdb_unlinker.h"
+#include "byte-vector.h"
/* The largest amount of memory to read from the target at once. We
must throttle it to limit the amount of memory used by GDB during
static void
write_gcore_file_1 (bfd *obfd)
{
- struct cleanup *cleanup;
- void *note_data = NULL;
+ gdb::unique_xmalloc_ptr<char> note_data;
int note_size = 0;
asection *note_sec = NULL;
generation should be converted to gdbarch_make_corefile_notes; at that
point, the target vector method can be removed. */
if (!gdbarch_make_corefile_notes_p (target_gdbarch ()))
- note_data = target_make_corefile_notes (obfd, ¬e_size);
+ note_data.reset (target_make_corefile_notes (obfd, ¬e_size));
else
- note_data = gdbarch_make_corefile_notes (target_gdbarch (), obfd, ¬e_size);
-
- cleanup = make_cleanup (xfree, note_data);
+ note_data.reset (gdbarch_make_corefile_notes (target_gdbarch (), obfd,
+ ¬e_size));
if (note_data == NULL || note_size == 0)
error (_("Target does not support core file generation."));
error (_("gcore: failed to get corefile memory sections from target."));
/* Write out the contents of the note section. */
- if (!bfd_set_section_contents (obfd, note_sec, note_data, 0, note_size))
+ if (!bfd_set_section_contents (obfd, note_sec, note_data.get (), 0,
+ note_size))
warning (_("writing note section (%s)"), bfd_errmsg (bfd_get_error ()));
-
- do_cleanups (cleanup);
}
/* write_gcore_file -- helper for gcore_command (exported).
throw_exception (except);
}
-static void
-do_bfd_delete_cleanup (void *arg)
-{
- bfd *obfd = (bfd *) arg;
- const char *filename = obfd->filename;
-
- gdb_bfd_unref ((bfd *) arg);
- unlink (filename);
-}
-
/* gcore_command -- implements the 'gcore' command.
Generate a core file from the inferior process. */
static void
-gcore_command (char *args, int from_tty)
+gcore_command (const char *args, int from_tty)
{
- struct cleanup *filename_chain;
- struct cleanup *bfd_chain;
- char *corefilename;
- bfd *obfd;
+ gdb::unique_xmalloc_ptr<char> corefilename;
/* No use generating a corefile without a target process. */
if (!target_has_execution)
noprocess ();
if (args && *args)
- corefilename = tilde_expand (args);
+ corefilename.reset (tilde_expand (args));
else
{
/* Default corefile name is "core.PID". */
- corefilename = xstrprintf ("core.%d", ptid_get_pid (inferior_ptid));
+ corefilename.reset (xstrprintf ("core.%d", inferior_ptid.pid ()));
}
- filename_chain = make_cleanup (xfree, corefilename);
if (info_verbose)
fprintf_filtered (gdb_stdout,
- "Opening corefile '%s' for output.\n", corefilename);
+ "Opening corefile '%s' for output.\n",
+ corefilename.get ());
/* Open the output file. */
- obfd = create_gcore_bfd (corefilename).release ();
+ gdb_bfd_ref_ptr obfd (create_gcore_bfd (corefilename.get ()));
- /* Need a cleanup that will close and delete the file. */
- bfd_chain = make_cleanup (do_bfd_delete_cleanup, obfd);
+ /* Arrange to unlink the file on failure. */
+ gdb::unlinker unlink_file (corefilename.get ());
/* Call worker function. */
- write_gcore_file (obfd);
+ write_gcore_file (obfd.get ());
/* Succeeded. */
- discard_cleanups (bfd_chain);
- gdb_bfd_unref (obfd);
+ unlink_file.keep ();
- fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename);
- do_cleanups (filename_chain);
+ fprintf_filtered (gdb_stdout, "Saved corefile %s\n", corefilename.get ());
}
static unsigned long
target_sbrk_arg = value_from_longest (builtin_type (gdbarch)->builtin_int,
sbrk_arg);
gdb_assert (target_sbrk_arg);
- ret = call_function_by_hand (sbrk_fn, 1, &target_sbrk_arg);
+ ret = call_function_by_hand (sbrk_fn, NULL, target_sbrk_arg);
if (ret == NULL)
return (bfd_vma) 0;
{
bfd_size_type size, total_size = bfd_section_size (obfd, osec);
file_ptr offset = 0;
- struct cleanup *old_chain = NULL;
- gdb_byte *memhunk;
/* Read-only sections are marked; we don't have to copy their contents. */
if ((bfd_get_section_flags (obfd, osec) & SEC_LOAD) == 0)
return;
size = std::min (total_size, (bfd_size_type) MAX_COPY_BYTES);
- memhunk = (gdb_byte *) xmalloc (size);
- old_chain = make_cleanup (xfree, memhunk);
+ gdb::byte_vector memhunk (size);
while (total_size > 0)
{
size = total_size;
if (target_read_memory (bfd_section_vma (obfd, osec) + offset,
- memhunk, size) != 0)
+ memhunk.data (), size) != 0)
{
warning (_("Memory read failed for corefile "
"section, %s bytes at %s."),
paddress (target_gdbarch (), bfd_section_vma (obfd, osec)));
break;
}
- if (!bfd_set_section_contents (obfd, osec, memhunk, offset, size))
+ if (!bfd_set_section_contents (obfd, osec, memhunk.data (),
+ offset, size))
{
warning (_("Failed to write corefile contents (%s)."),
bfd_errmsg (bfd_get_error ()));
total_size -= size;
offset += size;
}
-
- do_cleanups (old_chain); /* Frees MEMHUNK. */
}
static int
return 1;
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_gcore;
-
void
_initialize_gcore (void)
{
add_com ("generate-core-file", class_files, gcore_command, _("\
Save a core file with the current state of the debugged process.\n\
-Argument is optional filename. Default filename is 'core.<process_id>'."));
+Usage: generate-core-file [FILENAME]\n\
+Argument is optional filename. Default filename is 'core.PROCESS_ID'."));
add_com_alias ("gcore", "generate-core-file", class_files, 1);
}
projects / deliverable / binutils-gdb.git / blobdiff