FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* utils.c (prompt_for_continue_wait_time): New static global.

Browse source 
(make_command_stats_cleanup): Initialize it.
	(report_command_stats): Subtract time waiting for user.
	(prompt_for_continue): Track time waiting for user.
	(defaulted_query): Track time waiting for user.
This commit is contained in:
Doug Evans 2012-08-08 21:55:01 +00:00
parent 4f485ebc90
commit 260c0b2ad4
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2012-08-08 Aaron Gamble <agamble@google.com>
* utils.c (prompt_for_continue_wait_time): New static global.
(make_command_stats_cleanup): Initialize it.
(report_command_stats): Subtract time waiting for user.
(prompt_for_continue): Track time waiting for user.
(defaulted_query): Track time waiting for user.
2012-08-08 Doug Evans <dje@google.com>
* eval.c (evaluate_subexp_standard): Fix thinko in handling

39
gdb/utils.c
View file

@ -106,6 +106,14 @@ static void prompt_for_continue (void);
static void set_screen_size (void);
static void set_width (void);
/* Time spent in prompt_for_continue in the currently executing command
waiting for user to respond.
Initialized in make_command_stats_cleanup.
Modified in prompt_for_continue and defaulted_query.
Used in report_command_stats. */
static struct timeval prompt_for_continue_wait_time;
/* A flag indicating whether to timestamp debugging messages. */
static int debug_timestamp = 0;
@ -537,6 +545,10 @@ report_command_stats (void *arg)
timeval_sub (&delta_wall_time,
&now_wall_time, &start_stats->start_wall_time);
/* Subtract time spend in prompt_for_continue from walltime. */
timeval_sub (&delta_wall_time,
&delta_wall_time, &prompt_for_continue_wait_time);
printf_unfiltered (msg_type == 0
? _("Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n")
: _("Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"),
@ -570,6 +582,7 @@ report_command_stats (void *arg)
struct cleanup *
make_command_stats_cleanup (int msg_type)
{
static const struct timeval zero_timeval = { 0 };
struct cmd_stats *new_stat = XMALLOC (struct cmd_stats);
#ifdef HAVE_SBRK
@ -581,6 +594,9 @@ make_command_stats_cleanup (int msg_type)
new_stat->start_cpu_time = get_run_time ();
gettimeofday (&new_stat->start_wall_time, NULL);
/* Initalize timer to keep track of how long we waited for the user. */
prompt_for_continue_wait_time = zero_timeval;
return make_cleanup_dtor (report_command_stats, new_stat, xfree);
}
@ -1190,6 +1206,9 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
int def_value;
char def_answer, not_def_answer;
char *y_string, *n_string, *question;
/* Used to add duration we waited for user to respond to
prompt_for_continue_wait_time. */
struct timeval prompt_started, prompt_ended, prompt_delta;
/* Set up according to which answer is the default. */
if (defchar == '\0')
@ -1247,6 +1266,9 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
/* Format the question outside of the loop, to avoid reusing args. */
question = xstrvprintf (ctlstr, args);
/* Used for calculating time spend waiting for user. */
gettimeofday (&prompt_started, NULL);
while (1)
{
wrap_here (""); /* Flush any buffered output. */
@ -1324,6 +1346,12 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
y_string, n_string);
}
/* Add time spend in this routine to prompt_for_continue_wait_time. */
gettimeofday (&prompt_ended, NULL);
timeval_sub (&prompt_delta, &prompt_ended, &prompt_started);
timeval_add (&prompt_for_continue_wait_time,
&prompt_for_continue_wait_time, &prompt_delta);
xfree (question);
if (annotation_level > 1)
printf_filtered (("\n\032\032post-query\n"));
@ -1797,6 +1825,11 @@ prompt_for_continue (void)
{
char *ignore;
char cont_prompt[120];
/* Used to add duration we waited for user to respond to
prompt_for_continue_wait_time. */
struct timeval prompt_started, prompt_ended, prompt_delta;
gettimeofday (&prompt_started, NULL);
if (annotation_level > 1)
printf_unfiltered (("\n\032\032pre-prompt-for-continue\n"));
@ -1824,6 +1857,12 @@ prompt_for_continue (void)
out to DOS. */
ignore = gdb_readline_wrapper (cont_prompt);
/* Add time spend in this routine to prompt_for_continue_wait_time. */
gettimeofday (&prompt_ended, NULL);
timeval_sub (&prompt_delta, &prompt_ended, &prompt_started);
timeval_add (&prompt_for_continue_wait_time,
&prompt_for_continue_wait_time, &prompt_delta);
if (annotation_level > 1)
printf_unfiltered (("\n\032\032post-prompt-for-continue\n"));