Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Yao Qi <yao@codesourcery.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH] Fix ada inferior-data cleanup
Date: Sat, 26 Oct 2013 03:58:00 -0000	[thread overview]
Message-ID: <1382759789-777-1-git-send-email-yao@codesourcery.com> (raw)

Hi,
'struct ada_inferior_data' is registered to per-inferior-data with
cleanup ada_inferior_data_cleanup, which means the data will be
destroyed when the inferior exits.  It is unnecessary to call
observer_attach_inferior_exit to do cleanups again.

Regression tested by "make check RUNTESTFLAGS='--directory=gdb.ada'"
on x86 Fedora 16 linux.

gdb:

2013-10-26  Yao Qi  <yao@codesourcery.com>

	* ada-lang.c (ada_inferior_data_cleanup): Don't get data from
	inferior_data.  Don't check NULL.  Free 'arg'.
	(ada_inferior_exit): Remove.
	(_initialize_ada_language): Don't call
	observer_attach_inferior_exit.
---
 gdb/ada-lang.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 75f9fe8..600f835 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -336,11 +336,7 @@ static const struct inferior_data *ada_inferior_data;
 static void
 ada_inferior_data_cleanup (struct inferior *inf, void *arg)
 {
-  struct ada_inferior_data *data;
-
-  data = inferior_data (inf, ada_inferior_data);
-  if (data != NULL)
-    xfree (data);
+  xfree (arg);
 }
 
 /* Return our inferior data for the given inferior (INF).
@@ -366,16 +362,6 @@ get_ada_inferior_data (struct inferior *inf)
   return data;
 }
 
-/* Perform all necessary cleanups regarding our module's inferior data
-   that is required after the inferior INF just exited.  */
-
-static void
-ada_inferior_exit (struct inferior *inf)
-{
-  ada_inferior_data_cleanup (inf, NULL);
-  set_inferior_data (inf, ada_inferior_data, NULL);
-}
-
                         /* Utilities */
 
 /* If TYPE is a TYPE_CODE_TYPEDEF type, return the target type after
@@ -12958,7 +12944,6 @@ With an argument, catch only exceptions with the given name."),
      NULL, xcalloc, xfree);
 
   /* Setup per-inferior data.  */
-  observer_attach_inferior_exit (ada_inferior_exit);
   ada_inferior_data
     = register_inferior_data_with_cleanup (NULL, ada_inferior_data_cleanup);
 }
-- 
1.7.7.6


             reply	other threads:[~2013-10-26  3:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-26  3:58 Yao Qi [this message]
2013-10-28  3:43 ` Joel Brobecker
2013-10-28 12:06   ` Yao Qi
2013-10-28 11:28 ` Pedro Alves
2013-10-28 12:24   ` Yao Qi
2013-10-28 14:27     ` Pedro Alves

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382759789-777-1-git-send-email-yao@codesourcery.com \
    --to=yao@codesourcery.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox