diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2009-03-12 19:54:54 +0000 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2009-03-12 19:54:54 +0000 |
| commit | 4333ada327bfce18df7d41eaff019fe560fda084 (patch) | |
| tree | 5f0a974ea77ae20f976410e99f2a85ed1348d0c2 /gdb/mi/mi-main.c | |
| parent | c5933f6db95fefa46e4e6ad036e04b34de5034c3 (diff) | |
| download | gdb-4333ada327bfce18df7d41eaff019fe560fda084.zip gdb-4333ada327bfce18df7d41eaff019fe560fda084.tar.gz gdb-4333ada327bfce18df7d41eaff019fe560fda084.tar.bz2 | |
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.
Diffstat (limited to 'gdb/mi/mi-main.c')
| -rw-r--r-- | gdb/mi/mi-main.c | 27 |
1 files changed, 14 insertions, 13 deletions
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) { |