Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: gdb-patches@sourceware.org
Subject: [patch] Fix linux-nat.c {,lp->}status typo
Date: Sun, 18 Jul 2010 14:51:00 -0000	[thread overview]
Message-ID: <20100718145110.GA16697@host1.dyn.jankratochvil.net> (raw)

Hi,

while reading the code I found this suspicious code, IMO a typo.

              if (WIFSTOPPED (lp->status))
                {
                  if (WSTOPSIG (lp->status) != SIGSTOP)
		  [...]
                }
              else if (WIFEXITED (status) || WIFSIGNALED (status))
	      [...]

STATUS value is not filtered by linux_nat_filter_event.  LP->STATUS is.

That "status = 0;" would be better as some __deinitiailize_var (status) but
there is no such GCC extension.

The DEBUG_LINUX_NAT print could be possibly still STATUS, it depends on the
opinion IMO.

No regressions on {x86_64,x86_64-m32,i686}-fedora12-linux-gnu.
(I haven't tried to find an impact of this bug.)


Thanks,
Jan


2010-07-18  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* linux-nat.c (linux_nat_wait_1): Reset STATUS after calling
	linux_nat_wait_1.  Use always LP->STATUS afterwards.

--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -3365,6 +3365,9 @@ retry:
 
 	  lp = linux_nat_filter_event (lwpid, status, options);
 
+	  /* STATUS is now no longer valid, use LP->STATUS instead.  */
+	  status = 0;
+
 	  if (lp
 	      && ptid_is_pid (ptid)
 	      && ptid_get_pid (lp->ptid) != ptid_get_pid (ptid))
@@ -3373,7 +3376,7 @@ retry:
 
 	      if (debug_linux_nat)
 		fprintf (stderr, "LWP %ld got an event %06x, leaving pending.\n",
-			 ptid_get_lwp (lp->ptid), status);
+			 ptid_get_lwp (lp->ptid), lp->status);
 
 	      if (WIFSTOPPED (lp->status))
 		{
@@ -3410,7 +3413,7 @@ retry:
 		      lp->signalled = 0;
 		    }
 		}
-	      else if (WIFEXITED (status) || WIFSIGNALED (status))
+	      else if (WIFEXITED (lp->status) || WIFSIGNALED (lp->status))
 		{
 		  if (debug_linux_nat)
 		    fprintf (stderr, "Process %ld exited while stopping LWPs\n",


             reply	other threads:[~2010-07-18 14:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-18 14:51 Jan Kratochvil [this message]
2010-07-20 12:22 ` Pedro Alves
2010-07-20 12:35   ` Jan Kratochvil

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=20100718145110.GA16697@host1.dyn.jankratochvil.net \
    --to=jan.kratochvil@redhat.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