From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8999 invoked by alias); 17 Jun 2003 19:46:42 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 22187 invoked from network); 17 Jun 2003 19:38:11 -0000 Received: from unknown (HELO crack.them.org) (146.82.138.56) by sources.redhat.com with SMTP; 17 Jun 2003 19:38:11 -0000 Received: from dsl093-172-017.pit1.dsl.speakeasy.net ([66.93.172.17] helo=nevyn.them.org ident=mail) by crack.them.org with asmtp (Exim 3.12 #1 (Debian)) id 19SMIG-0005jc-00 for ; Tue, 17 Jun 2003 14:39:00 -0500 Received: from drow by nevyn.them.org with local (Exim 3.36 #1 (Debian)) id 19SLzm-0004ec-00 for ; Tue, 17 Jun 2003 15:19:54 -0400 Date: Tue, 17 Jun 2003 19:46:00 -0000 From: Daniel Jacobowitz To: gdb-patches@sources.redhat.com Subject: [commit] Fix new failures in break.exp Message-ID: <20030617191954.GA17838@nevyn.them.org> Mail-Followup-To: gdb-patches@sources.redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.1i X-SW-Source: 2003-06/txt/msg00579.txt.bz2 Oops, I apparently failed to run the testsuite before and after my last fork patch. break.exp does "catch fork; continue" and expects either the catch to fail, or the continue to succeed and the catch never to be hit. But catch fork was turned into an error () in some circumstances. This wraps the call to target_insert_fork_catchpoint in a catch_exceptions, and disables the catchpoint if we can't insert it - which both fixes the testsuite, and makes a lot more sense to me. Checked in. -- Daniel Jacobowitz MontaVista Software Debian GNU/Linux Developer 2003-06-17 Daniel Jacobowitz * breakpoint.c (insert_catchpoint): New function. (insert_breakpoints): Use catch_exceptions to call insert_catchpoint. Disable catchpoints if they fail to insert. Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.122 diff -u -p -r1.122 breakpoint.c --- breakpoint.c 8 Jun 2003 18:27:12 -0000 1.122 +++ breakpoint.c 17 Jun 2003 19:07:24 -0000 @@ -703,6 +703,35 @@ read_memory_nobpt (CORE_ADDR memaddr, ch } +/* A wrapper function for inserting catchpoints. */ +int +insert_catchpoint (struct ui_out *uo, void *args) +{ + struct breakpoint *b = (struct breakpoint *) args; + int val = -1; + + switch (b->type) + { + case bp_catch_fork: + val = target_insert_fork_catchpoint (PIDGET (inferior_ptid)); + break; + case bp_catch_vfork: + val = target_insert_vfork_catchpoint (PIDGET (inferior_ptid)); + break; + case bp_catch_exec: + val = target_insert_exec_catchpoint (PIDGET (inferior_ptid)); + break; + default: + warning ("Internal error, %s line %d.", __FILE__, __LINE__); + break; + } + + if (val < 0) + throw_exception (RETURN_ERROR); + + return 0; +} + /* insert_breakpoints is used when starting or continuing the program. remove_breakpoints is used when the program stops. Both return zero if successful, @@ -1054,32 +1083,15 @@ insert_breakpoints (void) && !b->inserted && !b->duplicate) { - val = -1; - switch (b->type) - { - case bp_catch_fork: - val = target_insert_fork_catchpoint (PIDGET (inferior_ptid)); - break; - case bp_catch_vfork: - val = target_insert_vfork_catchpoint (PIDGET (inferior_ptid)); - break; - case bp_catch_exec: - val = target_insert_exec_catchpoint (PIDGET (inferior_ptid)); - break; - default: - warning ("Internal error, %s line %d.", __FILE__, __LINE__); - break; - } + char prefix[64]; + + sprintf (prefix, "warning: inserting catchpoint %d: ", b->number); + val = catch_exceptions (uiout, insert_catchpoint, b, prefix, + RETURN_MASK_ERROR); if (val < 0) - { - fprintf_unfiltered (tmp_error_stream, - "Cannot insert catchpoint %d.", b->number); - } + b->enable_state = bp_disabled; else b->inserted = 1; - - if (val) - return_val = val; /* remember failure */ } }