From patchwork Fri Apr 24 15:28:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 6429 Received: (qmail 73562 invoked by alias); 24 Apr 2015 15:29:05 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 73549 invoked by uid 89); 24 Apr 2015 15:29:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pd0-f172.google.com Received: from mail-pd0-f172.google.com (HELO mail-pd0-f172.google.com) (209.85.192.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 24 Apr 2015 15:29:03 +0000 Received: by pdea3 with SMTP id a3so51908261pde.3 for ; Fri, 24 Apr 2015 08:29:02 -0700 (PDT) X-Received: by 10.66.123.73 with SMTP id ly9mr16150873pab.156.1429889342136; Fri, 24 Apr 2015 08:29:02 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc1-power7.osuosl.org. [140.211.15.137]) by mx.google.com with ESMTPSA id sf6sm11394311pbb.82.2015.04.24.08.29.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 08:29:01 -0700 (PDT) From: Yao Qi To: gdb-patches@sourceware.org Subject: [rfc] Fix PR 18208: update /proc/pid/coredump_filter by c code Date: Fri, 24 Apr 2015 16:28:56 +0100 Message-Id: <1429889336-12277-1-git-send-email-qiyaoltc@gmail.com> X-IsSubscribed: yes From: Yao Qi Hi, We see some fails in gdb.base/coredump-filter.exp when we do remote gdbserver testing, like what I did for arm/aarch64 linux testing or run it with board file remote-gdbserver-on-localhost $ make check RUNTESTFLAGS='--target_board=remote-gdbserver-on-localhost coredump-filter.exp' we find that this line in the test doesn't work as expected, remote_exec target "sh -c \"echo $filter_flag > /proc/$ipid/coredump_filter\"" although such pattern has been used in gdb testsuite somewhere else, but the special thing here is that we redirect the output to /proc/$ipid/coredump_filter on the remote target. DejaGNU will redirect the output from the remote target to local, and looks tcl gets confused by these two redirection. After trying pass different parameters to remote_exec and hacking remote_exec/rsh_exec/local_exec, I got no success, I decide to give up, and try to update /proc/$ipid/coredump_filter by the c code directly. This patch adds a c function set_coredump_filter to update coredump_filter, and GDB calls it. Now this test passes on boardfile unix, native-gdbserver and remote-gdbserver-on-localhost. It also passes my board files for arm and aarch64 testing. gdb/testsuite: 2015-04-24 Yao Qi PR gdb/18208 * gdb.base/coredump-filter.c (set_coredump_filter): New function. * gdb.base/coredump-filter.exp (do_save_core): Call inferior function set_coredump_filter, and remove remote_exec call. Remove argument ipid. Callers update. (top level): Don't get inferior's PID. --- gdb/testsuite/gdb.base/coredump-filter.c | 16 ++++++++++++++++ gdb/testsuite/gdb.base/coredump-filter.exp | 15 ++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gdb/testsuite/gdb.base/coredump-filter.c b/gdb/testsuite/gdb.base/coredump-filter.c index 192c469..18b9d9c 100644 --- a/gdb/testsuite/gdb.base/coredump-filter.c +++ b/gdb/testsuite/gdb.base/coredump-filter.c @@ -59,3 +59,19 @@ main (int argc, char *argv[]) return 0; /* break-here */ } + +/* Write V to /proc/self/coredump_filter. Return 0 on success. */ + +int +set_coredump_filter (int v) +{ + FILE *f = fopen("/proc/self/coredump_filter", "r+"); + + if (f == NULL) + return 1; + + fprintf(f, "%#x", v); + + fclose (f); + return 0; +} diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp index f872de0..dbebaf0 100644 --- a/gdb/testsuite/gdb.base/coredump-filter.exp +++ b/gdb/testsuite/gdb.base/coredump-filter.exp @@ -34,10 +34,10 @@ if { ![runto_main] } { gdb_breakpoint [gdb_get_line_number "break-here"] gdb_continue_to_breakpoint "break-here" ".* break-here .*" -proc do_save_core { filter_flag core ipid } { - verbose -log "writing $filter_flag to /proc/$ipid/coredump_filter" +proc do_save_core { filter_flag core } { + verbose -log "writing $filter_flag to /proc//coredump_filter" - remote_exec target "sh -c \"echo $filter_flag > /proc/$ipid/coredump_filter\"" + gdb_test "p set_coredump_filter ($filter_flag)" " = 0" # Generate a corefile. gdb_gcore_cmd "$core" "save corefile" @@ -146,11 +146,8 @@ if { !$core_supported } { return -1 } -# Get the inferior's PID. -set infpid "" gdb_test_multiple "info inferiors" "getting inferior pid" { - -re "process \($decimal\).*\r\n$gdb_prompt $" { - set infpid $expect_out(1,string) + -re "process $decimal.*\r\n$gdb_prompt $" { } -re "Remote target.*$gdb_prompt $" { # If the target does not provide PID information (like usermode QEMU), @@ -184,12 +181,12 @@ foreach item $all_anon_corefiles { # Generate corefiles for the "anon" case. foreach item $all_anon_corefiles { with_test_prefix "saving corefile for [lindex $item 0]" { - do_save_core [lindex $item 1] [subst [lindex $item 2]] $infpid + do_save_core [lindex $item 1] [subst [lindex $item 2]] } } with_test_prefix "saving corefile for non-Private-Shared-Anon-File" { - do_save_core "0x60" $non_private_shared_anon_file_core $infpid + do_save_core "0x60" $non_private_shared_anon_file_core } clean_restart $testfile