From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8410 invoked by alias); 6 May 2010 00:18:35 -0000 Received: (qmail 8392 invoked by uid 22791); 6 May 2010 00:18:34 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 06 May 2010 00:18:31 +0000 Received: (qmail 2388 invoked from network); 6 May 2010 00:18:29 -0000 Received: from unknown (HELO orlando.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 6 May 2010 00:18:29 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: Re: [RFA] remote.c, clean-up mix-up Date: Thu, 06 May 2010 00:18:00 -0000 User-Agent: KMail/1.12.2 (Linux/2.6.31-20-generic; KDE/4.3.2; x86_64; ; ) Cc: Michael Snyder References: <4BE1F306.8060006@vmware.com> <201005060008.20450.pedro@codesourcery.com> <201005060044.35984.pedro@codesourcery.com> In-Reply-To: <201005060044.35984.pedro@codesourcery.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201005060118.26368.pedro@codesourcery.com> X-IsSubscribed: yes 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 X-SW-Source: 2010-05/txt/msg00144.txt.bz2 On Thursday 06 May 2010 00:44:35, Pedro Alves wrote: > Here's what I'm testing. No regressions against x86_64-linux gdbserver. > 2010-05-05 Pedro Alves > > * remote.c (clear_threads_parsing_context): New. > (remote_threads_info): Delele unused null_cleanup. Install a > cleanup to clear the threads_parsing_context in case parsing > throws. Applied as below with a little comment added and typo in changelog fixed. -- Pedro Alves 2010-05-06 Pedro Alves * remote.c (clear_threads_parsing_context): New. (remote_threads_info): Delete unused null_cleanup. Install a cleanup to clear the threads_parsing_context in case parsing throws. --- gdb/remote.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) Index: src/gdb/remote.c =================================================================== --- src.orig/gdb/remote.c 2010-05-06 01:01:56.000000000 +0100 +++ src/gdb/remote.c 2010-05-06 01:10:47.000000000 +0100 @@ -2482,6 +2482,21 @@ const struct gdb_xml_element threads_ele { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; +/* Discard the contents of the constructed thread info context. */ + +static void +clear_threads_parsing_context (void *p) +{ + struct threads_parsing_context *context = p; + int i; + struct thread_item *item; + + for (i = 0; VEC_iterate (thread_item_t, context->items, i, item); ++i) + xfree (item->extra); + + VEC_free (thread_item_t, context->items); +} + #endif /* @@ -2512,15 +2527,20 @@ remote_threads_info (struct target_ops * { struct gdb_xml_parser *parser; struct threads_parsing_context context; - struct cleanup *back_to = make_cleanup (null_cleanup, NULL); + struct cleanup *clear_parsing_context; context.items = 0; + /* Note: this parser cleanup is already guarded by BACK_TO + above. */ parser = gdb_xml_create_parser_and_cleanup (_("threads"), threads_elements, &context); gdb_xml_use_dtd (parser, "threads.dtd"); + clear_parsing_context + = make_cleanup (clear_threads_parsing_context, &context); + if (gdb_xml_parse (parser, xml) == 0) { int i; @@ -2542,13 +2562,12 @@ remote_threads_info (struct target_ops * info = demand_private_info (item->ptid); info->core = item->core; info->extra = item->extra; - item->extra = 0; + item->extra = NULL; } - xfree (item->extra); } } - VEC_free (thread_item_t, context.items); + do_cleanups (clear_parsing_context); } do_cleanups (back_to);