From: Hui Zhu <teawater@gmail.com>
To: Michael Snyder <msnyder@vmware.com>, Tom Tromey <tromey@redhat.com>
Cc: Joel Brobecker <brobecker@adacore.com>,
"gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: Re: [RFA] let record_resume fail immediately on error
Date: Tue, 10 Nov 2009 07:02:00 -0000 [thread overview]
Message-ID: <daef60380911092301t5da31e96g7e579c2e9b35d9fb@mail.gmail.com> (raw)
In-Reply-To: <daef60380911032115v69167866o65c3b90e4622a382@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6410 bytes --]
Hi Michael and Tom,
I make a new prec-fix-error-handler.txt according to the Tom's idea in
http://sourceware.org/ml/gdb-patches/2009-11/msg00152.html
It add a new argument "catch" to do_record_message. If catch is true,
it will call "record_message" with catch errors. If not, it will call
"record_message" directly.
In "record_resume", it call do_record_message with "catch = 0".
In "record_wait", it call do_record_message with "catch = 1".
Please help me review it.
Thanks,
Hui
2009-11-10 Hui Zhu <teawater@gmail.com>
* record.c (do_record_message): Add new argument "catch".
(record_resume_error): Deleted.
(record_resume): Call do_record_message with catch is 1.
(record_wait): Deleted record_resume_error.
Set status when do_record_message need stop the inferior.
---
record.c | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
--- a/record.c
+++ b/record.c
@@ -647,13 +647,17 @@ record_message (void *args)
static int
do_record_message (struct regcache *regcache,
- enum target_signal signal)
+ enum target_signal signal, int catch)
{
struct record_message_args args;
args.regcache = regcache;
args.signal = signal;
- return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
+
+ if (catch)
+ return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
+
+ return record_message (&args);
}
/* Set to 1 if record_store_registers and record_xfer_partial
@@ -954,7 +958,6 @@ record_close (int quitting)
}
static int record_resume_step = 0;
-static int record_resume_error;
/* "to_resume" target method. Resume the process record target. */
@@ -966,15 +969,7 @@ record_resume (struct target_ops *ops, p
if (!RECORD_IS_REPLAY)
{
- if (do_record_message (get_current_regcache (), signal))
- {
- record_resume_error = 0;
- }
- else
- {
- record_resume_error = 1;
- return;
- }
+ do_record_message (get_current_regcache (), signal, 0);
record_beneath_to_resume (record_beneath_to_resume_ops, ptid, 1,
signal);
}
@@ -1038,14 +1033,6 @@ record_wait (struct target_ops *ops,
if (!RECORD_IS_REPLAY && ops != &record_core_ops)
{
- if (record_resume_error)
- {
- /* If record_resume get error, return directly. */
- status->kind = TARGET_WAITKIND_STOPPED;
- status->value.sig = TARGET_SIGNAL_ABRT;
- return inferior_ptid;
- }
-
if (record_resume_step)
{
/* This is a single step. */
@@ -1090,8 +1077,12 @@ record_wait (struct target_ops *ops,
stepping, therefore gdb will not stop.
Therefore we will not return to gdb.
Record the insn and resume. */
- if (!do_record_message (regcache, TARGET_SIGNAL_0))
- break;
+ if (!do_record_message (regcache, TARGET_SIGNAL_0, 1))
+ {
+ status->kind = TARGET_WAITKIND_STOPPED;
+ status->value.sig = TARGET_SIGNAL_0;
+ break;
+ }
record_beneath_to_resume (record_beneath_to_resume_ops,
ptid, 1,
>
> OK. I will try to talk clear about it.
>
> I make do_record_message because in before, call a error in
> record_resume and record_wait will make inferior cannot keep running.
>
> Now, I found that call error in record_resume will not affect
> anything. So I change do_record_message to record_message in
> record_resume.
>
> But in record_wait, call error still make inferior cannot keep
> running, so I keep do_record_message.
>
> Thanks,
> Hui
>
>
> >
> >
> >> 2009-11-03 Hui Zhu <teawater@gmail.com>
> >>
> >> * record.c (record_resume_error): Deleted.
> >> (record_resume): Call record_message.
> >> (record_wait): Deleted record_resume_error.
> >> Set status when do_record_message need stop the inferior.
> >>
> >> ---
> >> record.c | 29 ++++++++++-------------------
> >> 1 file changed, 10 insertions(+), 19 deletions(-)
> >>
> >> --- a/record.c
> >> +++ b/record.c
> >> @@ -954,7 +954,6 @@ record_close (int quitting)
> >> }
> >>
> >> static int record_resume_step = 0;
> >> -static int record_resume_error;
> >>
> >> /* "to_resume" target method. Resume the process record target. */
> >>
> >> @@ -966,15 +965,11 @@ record_resume (struct target_ops *ops, p
> >>
> >> if (!RECORD_IS_REPLAY)
> >> {
> >> - if (do_record_message (get_current_regcache (), signal))
> >> - {
> >> - record_resume_error = 0;
> >> - }
> >> - else
> >> - {
> >> - record_resume_error = 1;
> >> - return;
> >> - }
> >> + struct record_message_args args;
> >> +
> >> + args.regcache = get_current_regcache ();
> >> + args.signal = signal;
> >> + record_message (&args);
> >> record_beneath_to_resume (record_beneath_to_resume_ops, ptid, 1,
> >> signal);
> >> }
> >> @@ -1038,14 +1033,6 @@ record_wait (struct target_ops *ops,
> >>
> >> if (!RECORD_IS_REPLAY && ops != &record_core_ops)
> >> {
> >> - if (record_resume_error)
> >> - {
> >> - /* If record_resume get error, return directly. */
> >> - status->kind = TARGET_WAITKIND_STOPPED;
> >> - status->value.sig = TARGET_SIGNAL_ABRT;
> >> - return inferior_ptid;
> >> - }
> >> -
> >> if (record_resume_step)
> >> {
> >> /* This is a single step. */
> >> @@ -1091,7 +1078,11 @@ record_wait (struct target_ops *ops,
> >> Therefore we will not return to gdb.
> >> Record the insn and resume. */
> >> if (!do_record_message (regcache, TARGET_SIGNAL_0))
> >> - break;
> >> + {
> >> + status->kind = TARGET_WAITKIND_STOPPED;
> >> + status->value.sig = TARGET_SIGNAL_0;
> >> + break;
> >> + }
> >>
> >> record_beneath_to_resume
> >> (record_beneath_to_resume_ops,
> >> ptid, 1,
> >
> >
[-- Attachment #2: prec-fix-error-handler.txt --]
[-- Type: text/plain, Size: 2377 bytes --]
---
record.c | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
--- a/record.c
+++ b/record.c
@@ -647,13 +647,17 @@ record_message (void *args)
static int
do_record_message (struct regcache *regcache,
- enum target_signal signal)
+ enum target_signal signal, int catch)
{
struct record_message_args args;
args.regcache = regcache;
args.signal = signal;
- return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
+
+ if (catch)
+ return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
+
+ return record_message (&args);
}
/* Set to 1 if record_store_registers and record_xfer_partial
@@ -954,7 +958,6 @@ record_close (int quitting)
}
static int record_resume_step = 0;
-static int record_resume_error;
/* "to_resume" target method. Resume the process record target. */
@@ -966,15 +969,7 @@ record_resume (struct target_ops *ops, p
if (!RECORD_IS_REPLAY)
{
- if (do_record_message (get_current_regcache (), signal))
- {
- record_resume_error = 0;
- }
- else
- {
- record_resume_error = 1;
- return;
- }
+ do_record_message (get_current_regcache (), signal, 0);
record_beneath_to_resume (record_beneath_to_resume_ops, ptid, 1,
signal);
}
@@ -1038,14 +1033,6 @@ record_wait (struct target_ops *ops,
if (!RECORD_IS_REPLAY && ops != &record_core_ops)
{
- if (record_resume_error)
- {
- /* If record_resume get error, return directly. */
- status->kind = TARGET_WAITKIND_STOPPED;
- status->value.sig = TARGET_SIGNAL_ABRT;
- return inferior_ptid;
- }
-
if (record_resume_step)
{
/* This is a single step. */
@@ -1090,8 +1077,12 @@ record_wait (struct target_ops *ops,
stepping, therefore gdb will not stop.
Therefore we will not return to gdb.
Record the insn and resume. */
- if (!do_record_message (regcache, TARGET_SIGNAL_0))
- break;
+ if (!do_record_message (regcache, TARGET_SIGNAL_0, 1))
+ {
+ status->kind = TARGET_WAITKIND_STOPPED;
+ status->value.sig = TARGET_SIGNAL_0;
+ break;
+ }
record_beneath_to_resume (record_beneath_to_resume_ops,
ptid, 1,
next prev parent reply other threads:[~2009-11-10 7:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-08 4:03 Michael Snyder
2009-09-08 5:00 ` Hui Zhu
2009-09-08 6:59 ` Joel Brobecker
2009-09-08 7:23 ` Hui Zhu
2009-09-08 7:25 ` Hui Zhu
2009-09-08 7:53 ` Hui Zhu
2009-09-08 16:57 ` Michael Snyder
2009-09-09 2:05 ` Hui Zhu
2009-09-12 2:40 ` Hui Zhu
2009-09-24 3:10 ` Hui Zhu
2009-09-26 18:35 ` Michael Snyder
2009-09-27 2:51 ` Hui Zhu
2009-09-28 9:27 ` Hui Zhu
2009-09-28 18:12 ` Joel Brobecker
2009-09-29 2:33 ` Hui Zhu
2009-09-29 21:29 ` Joel Brobecker
2009-09-29 23:57 ` Hui Zhu
2009-10-14 2:10 ` Joel Brobecker
2009-10-14 2:28 ` Hui Zhu
2009-10-14 2:42 ` Joel Brobecker
2009-10-15 4:38 ` Hui Zhu
2009-10-15 4:58 ` Joel Brobecker
2009-10-15 7:17 ` Hui Zhu
2009-10-15 16:23 ` Joel Brobecker
2009-10-15 17:18 ` Michael Snyder
2009-10-16 3:37 ` Hui Zhu
2009-10-20 3:17 ` Hui Zhu
2009-10-23 7:29 ` Hui Zhu
2009-11-03 2:17 ` Hui Zhu
2009-11-03 18:57 ` Michael Snyder
2009-11-04 5:15 ` Hui Zhu
2009-11-10 7:02 ` Hui Zhu [this message]
2009-11-10 22:05 ` Tom Tromey
2009-11-11 0:55 ` Hui Zhu
2009-11-24 6:16 ` Hui Zhu
2009-11-24 17:14 ` Tom Tromey
2009-11-25 2:00 ` Hui Zhu
2009-11-25 16:25 ` Joel Brobecker
2009-11-25 17:59 ` Tom Tromey
2009-11-26 6:40 ` Hui Zhu
2009-11-28 0:29 ` Hui Zhu
2009-12-01 22:27 ` Tom Tromey
2009-12-02 3:23 ` Hui Zhu
2009-12-07 15:01 ` Hui Zhu
2009-12-12 8:41 ` Hui Zhu
2009-12-21 20:45 ` Tom Tromey
2009-12-22 3:18 ` Hui Zhu
2009-09-08 16:54 ` Michael Snyder
2009-09-08 16:52 ` Michael Snyder
2009-09-08 16:50 ` Michael Snyder
2009-09-08 17:05 ` Joel Brobecker
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=daef60380911092301t5da31e96g7e579c2e9b35d9fb@mail.gmail.com \
--to=teawater@gmail.com \
--cc=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=msnyder@vmware.com \
--cc=tromey@redhat.com \
/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