From patchwork Thu Jul 24 15:15:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 2165 Received: (qmail 2403 invoked by alias); 24 Jul 2014 15:15:31 -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 2359 invoked by uid 89); 24 Jul 2014 15:15:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 24 Jul 2014 15:15:25 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6OFFNBG019990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 24 Jul 2014 11:15:24 -0400 Received: from barimba (ovpn-113-99.phx2.redhat.com [10.3.113.99]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6OFFMQD031865 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Thu, 24 Jul 2014 11:15:22 -0400 From: Tom Tromey To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] fix to_open debug setting References: <1405975154-19517-1-git-send-email-tromey@redhat.com> <87ha2as33y.fsf@fleche.redhat.com> <87d2cxs9bu.fsf@fleche.redhat.com> <53D05C52.4060005@redhat.com> Date: Thu, 24 Jul 2014 09:15:21 -0600 In-Reply-To: <53D05C52.4060005@redhat.com> (Pedro Alves's message of "Thu, 24 Jul 2014 02:07:30 +0100") Message-ID: <87wqb2n5yu.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 >>>>> "Pedro" == Pedro Alves writes: Pedro> I think it'd be nice if this included the target's name, like your Pedro> generated debug methods. Here's a new version. I think it would also be nice to indent target debug output according to the depth of the calls. Right now I see: (gdb) target remote :9999 -> remote->to_open (...) Remote debugging using :9999 -> remote->to_can_async_p (...) <- remote->to_can_async_p (0x1dcf6c0) = 1 -> remote->to_can_async_p (...) <- remote->to_can_async_p (0x1dcf6c0) = 1 -> remote->to_program_signals (...) -> remote->to_can_async_p (...) [... lots more ...] <- remote->to_open (:9999, 1) (gdb) Now that this is mostly automated we could more easily indent those lines to get a better sense of the control flow. However I think that's a patch for another day. Tom b/gdb/ChangeLog: 2014-07-24 Tom Tromey * target.c (open_target): New function. (add_target_with_completer, add_deprecated_target_alias): Use set_cmd_sfunc, set_cmd_context. (debug_to_open): Remove. (setup_target_debug): Update. diff --git a/gdb/target.c b/gdb/target.c index d9b471b..4358722 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -118,8 +118,6 @@ static struct target_ops debug_target; static void init_dummy_target (void); -static void debug_to_open (char *, int); - /* Pointer to array of target architecture structures; the size of the array; the current index into the array; the allocated size of the array. */ @@ -345,6 +343,24 @@ complete_target_initialization (struct target_ops *t) install_delegators (t); } +/* This is used to implement the various target commands. */ + +static void +open_target (char *args, int from_tty, struct cmd_list_element *command) +{ + struct target_ops *ops = get_cmd_context (command); + + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "-> %s->to_open (...)\n", + ops->to_shortname); + + ops->to_open (args, from_tty); + + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "<- %s->to_open (%s, %d)\n", + ops->to_shortname, args, from_tty); +} + /* Add possible target architecture T to the list and add a new command 'target T->to_shortname'. Set COMPLETER as the command's completer if not NULL. */ @@ -380,8 +396,9 @@ Remaining arguments are interpreted by the target protocol. For more\n\ information on the arguments for a particular protocol, type\n\ `help target ' followed by the protocol name."), &targetlist, "target ", 0, &cmdlist); - c = add_cmd (t->to_shortname, no_class, t->to_open, t->to_doc, - &targetlist); + c = add_cmd (t->to_shortname, no_class, NULL, t->to_doc, &targetlist); + set_cmd_sfunc (c, open_target); + set_cmd_context (c, t); if (completer != NULL) set_cmd_completer (c, completer); } @@ -404,7 +421,9 @@ add_deprecated_target_alias (struct target_ops *t, char *alias) /* If we use add_alias_cmd, here, we do not get the deprecated warning, see PR cli/15104. */ - c = add_cmd (alias, no_class, t->to_open, t->to_doc, &targetlist); + c = add_cmd (alias, no_class, NULL, t->to_doc, &targetlist); + set_cmd_sfunc (c, open_target); + set_cmd_context (c, t); alt = xstrprintf ("target %s", t->to_shortname); deprecate_cmd (c, alt); } @@ -2963,13 +2982,6 @@ init_dummy_target (void) install_dummy_methods (&dummy_target); } -static void -debug_to_open (char *args, int from_tty) -{ - debug_target.to_open (args, from_tty); - - fprintf_unfiltered (gdb_stdlog, "target_open (%s, %d)\n", args, from_tty); -} void target_close (struct target_ops *targ) @@ -3415,7 +3427,6 @@ setup_target_debug (void) { memcpy (&debug_target, ¤t_target, sizeof debug_target); - current_target.to_open = debug_to_open; init_debug_target (¤t_target); }