|
|
132741 |
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
|
132741 |
From: Fedora GDB patches <invalid@email.com>
|
|
|
132741 |
Date: Fri, 27 Oct 2017 21:07:50 +0200
|
|
|
132741 |
Subject: gdb-rhbz1007614-memleak-infpy_read_memory-test.patch
|
|
|
132741 |
|
|
|
132741 |
;; Fix 'memory leak in infpy_read_memory()' (RH BZ 1007614)
|
|
|
132741 |
;;=fedoratest
|
|
|
132741 |
|
|
|
132741 |
Original message by Tom Tromey:
|
|
|
132741 |
|
|
|
132741 |
<https://sourceware.org/ml/gdb-patches/2012-03/msg00955.html>
|
|
|
132741 |
Message-ID: <871uoc1va3.fsf@fleche.redhat.com>
|
|
|
132741 |
|
|
|
132741 |
Comment from Sergio Durigan Junior:
|
|
|
132741 |
|
|
|
132741 |
In order to correctly test this patch, I wrote a testcase based on Jan
|
|
|
132741 |
Kratochvil's <gdb/testsuite/gdb.base/gcore-excessive-memory.exp>. The
|
|
|
132741 |
testcase, which can be seen below, tests GDB in order to see if the
|
|
|
132741 |
amount of memory being leaked is minimal, as requested in the bugzilla.
|
|
|
132741 |
It is hard to define what "minimum" is, so I ran the testcase on all
|
|
|
132741 |
supported RHEL architectures and came up with an average.
|
|
|
132741 |
|
|
|
132741 |
commit cc0265cdda9dc7e8665e8bfcf5b4477489daf27c
|
|
|
132741 |
Author: Tom Tromey <tromey@redhat.com>
|
|
|
132741 |
Date: Wed Mar 28 17:38:08 2012 +0000
|
|
|
132741 |
|
|
|
132741 |
* python/py-inferior.c (infpy_read_memory): Remove cleanups and
|
|
|
132741 |
explicitly free 'buffer' on exit paths. Decref 'membuf_object'
|
|
|
132741 |
before returning.
|
|
|
132741 |
|
|
|
132741 |
diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c
|
|
|
132741 |
new file mode 100644
|
|
|
132741 |
--- /dev/null
|
|
|
132741 |
+++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.c
|
|
|
132741 |
@@ -0,0 +1,27 @@
|
|
|
132741 |
+/* This testcase is part of GDB, the GNU debugger.
|
|
|
132741 |
+
|
|
|
132741 |
+ Copyright 2014 Free Software Foundation, Inc.
|
|
|
132741 |
+
|
|
|
132741 |
+ This program is free software; you can redistribute it and/or modify
|
|
|
132741 |
+ it under the terms of the GNU General Public License as published by
|
|
|
132741 |
+ the Free Software Foundation; either version 3 of the License, or
|
|
|
132741 |
+ (at your option) any later version.
|
|
|
132741 |
+
|
|
|
132741 |
+ This program is distributed in the hope that it will be useful,
|
|
|
132741 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
132741 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
132741 |
+ GNU General Public License for more details.
|
|
|
132741 |
+
|
|
|
132741 |
+ You should have received a copy of the GNU General Public License
|
|
|
132741 |
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
132741 |
+
|
|
|
132741 |
+static struct x
|
|
|
132741 |
+ {
|
|
|
132741 |
+ char unsigned u[4096];
|
|
|
132741 |
+ } x, *px = &x;
|
|
|
132741 |
+
|
|
|
132741 |
+int
|
|
|
132741 |
+main (int argc, char *argv[])
|
|
|
132741 |
+{
|
|
|
132741 |
+ return 0;
|
|
|
132741 |
+}
|
|
|
132741 |
diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp
|
|
|
132741 |
new file mode 100644
|
|
|
132741 |
--- /dev/null
|
|
|
132741 |
+++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.exp
|
|
|
132741 |
@@ -0,0 +1,68 @@
|
|
|
132741 |
+# Copyright 2014 Free Software Foundation, Inc.
|
|
|
132741 |
+
|
|
|
132741 |
+# This program is free software; you can redistribute it and/or modify
|
|
|
132741 |
+# it under the terms of the GNU General Public License as published by
|
|
|
132741 |
+# the Free Software Foundation; either version 3 of the License, or
|
|
|
132741 |
+# (at your option) any later version.
|
|
|
132741 |
+#
|
|
|
132741 |
+# This program is distributed in the hope that it will be useful,
|
|
|
132741 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
132741 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
132741 |
+# GNU General Public License for more details.
|
|
|
132741 |
+#
|
|
|
132741 |
+# You should have received a copy of the GNU General Public License
|
|
|
132741 |
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
132741 |
+
|
|
|
132741 |
+set testfile py-gdb-rhbz1007614-memleak-infpy_read_memory
|
|
|
132741 |
+set srcfile ${testfile}.c
|
|
|
132741 |
+set binfile [standard_output_file ${testfile}]
|
|
|
132741 |
+
|
|
|
132741 |
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
|
|
|
132741 |
+ return -1
|
|
|
132741 |
+}
|
|
|
132741 |
+
|
|
|
132741 |
+if { [skip_python_tests] } { continue }
|
|
|
132741 |
+
|
|
|
132741 |
+set pid_of_gdb [exp_pid -i [board_info host fileid]]
|
|
|
132741 |
+
|
|
|
132741 |
+proc memory_v_pages_get {} {
|
|
|
132741 |
+ global pid_of_gdb
|
|
|
132741 |
+ set fd [open "/proc/$pid_of_gdb/statm"]
|
|
|
132741 |
+ gets $fd line
|
|
|
132741 |
+ close $fd
|
|
|
132741 |
+ # number of pages of virtual memory
|
|
|
132741 |
+ scan $line "%d" drs
|
|
|
132741 |
+ return $drs
|
|
|
132741 |
+}
|
|
|
132741 |
+
|
|
|
132741 |
+if { ![runto_main] } {
|
|
|
132741 |
+ untested $testfile.exp
|
|
|
132741 |
+ return -1
|
|
|
132741 |
+}
|
|
|
132741 |
+
|
|
|
132741 |
+set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py]
|
|
|
132741 |
+
|
|
|
132741 |
+gdb_test "source ${remote_python_file}" ""
|
|
|
132741 |
+
|
|
|
132741 |
+gdb_test "hello-world" ""
|
|
|
132741 |
+
|
|
|
132741 |
+set kbytes_before [memory_v_pages_get]
|
|
|
132741 |
+verbose -log "kbytes_before = $kbytes_before"
|
|
|
132741 |
+
|
|
|
132741 |
+gdb_test "hello-world" ""
|
|
|
132741 |
+
|
|
|
132741 |
+set kbytes_after [memory_v_pages_get]
|
|
|
132741 |
+verbose -log "kbytes_after = $kbytes_after"
|
|
|
132741 |
+
|
|
|
132741 |
+set kbytes_diff [expr $kbytes_after - $kbytes_before]
|
|
|
132741 |
+verbose -log "kbytes_diff = $kbytes_diff"
|
|
|
132741 |
+
|
|
|
132741 |
+# The value "1000" was calculated by running a few GDB sessions with this
|
|
|
132741 |
+# testcase, and seeing how much (in average) the memory consumption
|
|
|
132741 |
+# increased after the "hello-world" command issued above. The average
|
|
|
132741 |
+# was around 500 bytes, so I chose 1000 as a high estimate.
|
|
|
132741 |
+if { $kbytes_diff > 1000 } {
|
|
|
132741 |
+ fail "there is a memory leak on GDB (RHBZ 1007614)"
|
|
|
132741 |
+} else {
|
|
|
132741 |
+ pass "there is not a memory leak on GDB (RHBZ 1007614)"
|
|
|
132741 |
+}
|
|
|
132741 |
diff --git a/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py
|
|
|
132741 |
new file mode 100644
|
|
|
132741 |
--- /dev/null
|
|
|
132741 |
+++ b/gdb/testsuite/gdb.python/py-gdb-rhbz1007614-memleak-infpy_read_memory.py
|
|
|
132741 |
@@ -0,0 +1,30 @@
|
|
|
132741 |
+# Copyright (C) 2014 Free Software Foundation, Inc.
|
|
|
132741 |
+
|
|
|
132741 |
+# This program is free software; you can redistribute it and/or modify
|
|
|
132741 |
+# it under the terms of the GNU General Public License as published by
|
|
|
132741 |
+# the Free Software Foundation; either version 3 of the License, or
|
|
|
132741 |
+# (at your option) any later version.
|
|
|
132741 |
+#
|
|
|
132741 |
+# This program is distributed in the hope that it will be useful,
|
|
|
132741 |
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
132741 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
132741 |
+# GNU General Public License for more details.
|
|
|
132741 |
+#
|
|
|
132741 |
+# You should have received a copy of the GNU General Public License
|
|
|
132741 |
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
132741 |
+
|
|
|
132741 |
+class HelloWorld (gdb.Command):
|
|
|
132741 |
+ """Greet the whole world."""
|
|
|
132741 |
+
|
|
|
132741 |
+ def __init__ (self):
|
|
|
132741 |
+ super (HelloWorld, self).__init__ ("hello-world",
|
|
|
132741 |
+ gdb.COMMAND_OBSCURE)
|
|
|
132741 |
+
|
|
|
132741 |
+ def invoke (self, arg, from_tty):
|
|
|
132741 |
+ px = gdb.parse_and_eval("px")
|
|
|
132741 |
+ core = gdb.inferiors()[0]
|
|
|
132741 |
+ for i in range(256 * 1024):
|
|
|
132741 |
+ chunk = core.read_memory(px, 4096)
|
|
|
132741 |
+ print "Hello, World!"
|
|
|
132741 |
+
|
|
|
132741 |
+HelloWorld ()
|