From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32684 invoked by alias); 13 Jun 2013 01:29:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 32603 invoked by uid 89); 13 Jun 2013 01:29:08 -0000 X-Spam-SWARE-Status: No, score=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 13 Jun 2013 01:29:06 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1UmwLZ-0005gA-Aq from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 12 Jun 2013 18:29:05 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 12 Jun 2013 18:29:04 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Wed, 12 Jun 2013 18:29:04 -0700 From: Yao Qi To: Subject: [PATCH 1/6] Remove global variable tracepoint_list and stepping_list. Date: Thu, 13 Jun 2013 02:46:00 -0000 Message-ID: <1371086914-8398-2-git-send-email-yao@codesourcery.com> In-Reply-To: <1371086914-8398-1-git-send-email-yao@codesourcery.com> References: <1370610493-26468-1-git-send-email-yao@codesourcery.com> <1371086914-8398-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-06/txt/msg00301.txt.bz2 This patch is a refactor patch. Simply, it removes two global variables tracepoint_list and stepping_list. gdb: 2013-06-13 Pedro Alves Yao Qi * tracepoint.c (tracepoint_list, stepping_list): Remove. (clear_collection_list): Free fields 'aexpre_list' and 'list' in collection_list. (do_clear_collection_list, init_collection_list): New. (encode_actions): Add local variables 'tracepoint_list' and 'stepping_list'. Call init_collection_list and make cleanup which calls do_clear_collection_list. Don't call clear_collection_list. (_initialize_tracepoint): Delete references to 'tracepoint_list' and 'stepping_list'. --- gdb/tracepoint.c | 67 +++++++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 31 deletions(-) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 5bad3e8..9646090 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -873,8 +873,7 @@ struct collection_list /* True is the user requested a collection of "$_sdata", "static tracepoint data". */ int strace_data; - } -tracepoint_list, stepping_list; + }; /* MEMRANGE functions: */ @@ -1239,6 +1238,35 @@ clear_collection_list (struct collection_list *list) list->next_aexpr_elt = 0; memset (list->regs_mask, 0, sizeof (list->regs_mask)); list->strace_data = 0; + + xfree (list->aexpr_list); + xfree (list->list); +} + +/* A cleanup wrapper for function clear_collection_list. */ + +static void +do_clear_collection_list (void *list) +{ + struct collection_list *l = list; + + clear_collection_list (l); +} + +/* Initialize collection_list CLIST. */ + +static void +init_collection_list (struct collection_list *clist) +{ + memset (clist, 0, sizeof *clist); + + clist->listsize = 128; + clist->list = xcalloc (clist->listsize, + sizeof (struct memrange)); + + clist->aexpr_listsize = 128; + clist->aexpr_list = xcalloc (clist->aexpr_listsize, + sizeof (struct agent_expr *)); } /* Reduce a collection list to string form (for gdb protocol). */ @@ -1618,11 +1646,15 @@ encode_actions (struct bp_location *tloc, char ***tdp_actions, int frame_reg; LONGEST frame_offset; struct cleanup *back_to; + struct collection_list tracepoint_list, stepping_list; back_to = make_cleanup (null_cleanup, NULL); - clear_collection_list (&tracepoint_list); - clear_collection_list (&stepping_list); + init_collection_list (&tracepoint_list); + init_collection_list (&stepping_list); + + make_cleanup (do_clear_collection_list, &tracepoint_list); + make_cleanup (do_clear_collection_list, &stepping_list); *tdp_actions = NULL; *stepping_actions = NULL; @@ -5673,33 +5705,6 @@ _initialize_tracepoint (void) traceframe_number = -1; tracepoint_number = -1; - if (tracepoint_list.list == NULL) - { - tracepoint_list.listsize = 128; - tracepoint_list.list = xmalloc - (tracepoint_list.listsize * sizeof (struct memrange)); - } - if (tracepoint_list.aexpr_list == NULL) - { - tracepoint_list.aexpr_listsize = 128; - tracepoint_list.aexpr_list = xmalloc - (tracepoint_list.aexpr_listsize * sizeof (struct agent_expr *)); - } - - if (stepping_list.list == NULL) - { - stepping_list.listsize = 128; - stepping_list.list = xmalloc - (stepping_list.listsize * sizeof (struct memrange)); - } - - if (stepping_list.aexpr_list == NULL) - { - stepping_list.aexpr_listsize = 128; - stepping_list.aexpr_list = xmalloc - (stepping_list.aexpr_listsize * sizeof (struct agent_expr *)); - } - add_info ("scope", scope_info, _("List the variables local to a scope")); -- 1.7.7.6