This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFC] Fix MI timings
On Tuesday 10 March 2009 00:22:30 Daniel Jacobowitz wrote:
> On Tue, Mar 10, 2009 at 12:15:03AM +0300, Vladimir Prus wrote:
> > *This* patch.
>
> You must've been working on programs in some Other Real Language
> lately... :-)
'Tis true.
>
> > @@ -97,6 +97,8 @@ static void timestamp (struct mi_timestamp *tv);
> >
> > static void print_diff_now (struct mi_timestamp *start);
> > static void print_diff (struct mi_timestamp *start, struct mi_timestamp
> > *end); +void print_timing_maybe ();
> > +
> >
> > void
> > mi_cmd_gdb_exit (char *command, char **argv, int argc)
>
> Prototypes in .h files only please.
>
> > @@ -1567,6 +1561,15 @@ print_diff_now (struct mi_timestamp *start)
> > print_diff (start, &now);
> > }
> >
> > +void
> > +print_timing_maybe ()
>
> (void)
>
> > +{
> > + // If the command is -enable-timing then do_timings may be
> > + // true whilst current_command_ts is not initialized.
>
> /* */
>
> > +void print_timing_maybe ();
>
> (void)
>
> Also, since this is public, please give it an "mi_" prefix.
>
> I have nothing useful to say about the important part of the patch,
> though.
OK :-) Here's a revised patch, just in case.
- Volodya
commit 060c708c273bbfc17a9e8b464acaf64f797f1352
Author: Vladimir Prus <vladimir@codesourcery.com>
Date: Tue Mar 10 00:25:42 2009 +0300
Fix MI timings.
* mi/mi-main.c (mi_print_timing_maybe): New.
(captured_mi_execute_command): Simplify. Output timings to
CLI commands, too.
(mi_execute_async_cli_command): Do not print timings.
* mi/mi-main.h (mi_print_timing_maybe): Declare.
* mi/mi-interp.c (mi_on_normal_stop): Call mi_print_timing_maybe.
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 65c1b4f..131698b 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -362,6 +362,7 @@ mi_on_normal_stop (struct bpstats *bs, int print_frame)
fputs_unfiltered ("*stopped", raw_stdout);
mi_out_put (mi_uiout, raw_stdout);
mi_out_rewind (mi_uiout);
+ mi_print_timing_maybe ();
fputs_unfiltered ("\n", raw_stdout);
gdb_flush (raw_stdout);
}
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index b905a9e..2873b4d 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1139,7 +1139,8 @@ captured_mi_execute_command (struct ui_out *uiout, void *data)
{
struct mi_parse *context = (struct mi_parse *) data;
- struct mi_timestamp cmd_finished;
+ if (do_timings)
+ current_command_ts = context->cmd_start;
running_result_record_printed = 0;
switch (context->op)
@@ -1151,14 +1152,9 @@ captured_mi_execute_command (struct ui_out *uiout, void *data)
fprintf_unfiltered (raw_stdout, " token=`%s' command=`%s' args=`%s'\n",
context->token, context->command, context->args);
- if (do_timings)
- current_command_ts = context->cmd_start;
mi_cmd_execute (context);
- if (do_timings)
- timestamp (&cmd_finished);
-
/* Print the result if there were no errors.
Remember that on the way out of executing a command, you have
@@ -1174,10 +1170,7 @@ captured_mi_execute_command (struct ui_out *uiout, void *data)
? "^connected" : "^done", raw_stdout);
mi_out_put (uiout, raw_stdout);
mi_out_rewind (uiout);
- /* Have to check cmd_start, since the command could be
- -enable-timings. */
- if (do_timings && context->cmd_start)
- print_diff (context->cmd_start, &cmd_finished);
+ mi_print_timing_maybe ();
fputs_unfiltered ("\n", raw_stdout);
}
else
@@ -1212,7 +1205,8 @@ captured_mi_execute_command (struct ui_out *uiout, void *data)
fputs_unfiltered ("^done", raw_stdout);
mi_out_put (uiout, raw_stdout);
mi_out_rewind (uiout);
- fputs_unfiltered ("\n", raw_stdout);
+ mi_print_timing_maybe ();
+ fputs_unfiltered ("\n", raw_stdout);
}
else
mi_out_rewind (uiout);
@@ -1447,8 +1441,6 @@ mi_execute_async_cli_command (char *cli_command, char **argv, int argc)
/* Do this before doing any printing. It would appear that some
print code leaves garbage around in the buffer. */
do_cleanups (old_cleanups);
- if (do_timings)
- print_diff_now (current_command_ts);
}
}
@@ -1567,6 +1559,15 @@ print_diff_now (struct mi_timestamp *start)
print_diff (start, &now);
}
+void
+mi_print_timing_maybe (void)
+{
+ /* If the command is -enable-timing then do_timings may be
+ true whilst current_command_ts is not initialized. */
+ if (do_timings && current_command_ts)
+ print_diff_now (current_command_ts);
+}
+
static long
timeval_diff (struct timeval start, struct timeval end)
{
diff --git a/gdb/mi/mi-main.h b/gdb/mi/mi-main.h
index 977579e..1383177 100644
--- a/gdb/mi/mi-main.h
+++ b/gdb/mi/mi-main.h
@@ -30,5 +30,7 @@ extern char *current_token;
extern int running_result_record_printed;
+void mi_print_timing_maybe ();
+
#endif