timevar.c (timevar_add): Delete.

* timevar.c (timevar_add): Delete.
	(timevar_get): Also count time since the selected timer was
	last updated.  Do not examine the timevar stack if the
	selected timer is standalone.

From-SVN: r36184
This commit is contained in:
Zack Weinberg 2000-09-06 07:02:40 +00:00 committed by Zack Weinberg
parent f1d6a533e6
commit eab828ba93
2 changed files with 19 additions and 22 deletions

View File

@ -1,3 +1,10 @@
2000-09-06 Zack Weinberg <zack@wolery.cumb.org>
* timevar.c (timevar_add): Delete.
(timevar_get): Also count time since the selected timer was
last updated. Do not examine the timevar stack if the
selected timer is standalone.
2000-09-05 J. David Anglin <dave@hiauly1.hia.nrc.ca>
* gthr-dce.h (__gthread_objc_mutex_deallocate): Free mutex->backend.

View File

@ -95,8 +95,6 @@ static struct timevar_time_def start_time;
static void get_time
PARAMS ((struct timevar_time_def *));
static void timevar_add
PARAMS ((struct timevar_time_def *, struct timevar_time_def *));
static void timevar_accumulate
PARAMS ((struct timevar_time_def *, struct timevar_time_def *,
struct timevar_time_def *));
@ -197,18 +195,6 @@ get_time (now)
#endif /* __BEOS__ */
}
/* Add ELAPSED to TIMER. */
static void
timevar_add (timer, elapsed)
struct timevar_time_def *timer;
struct timevar_time_def *elapsed;
{
timer->user += elapsed->user;
timer->sys += elapsed->sys;
timer->wall += elapsed->wall;
}
/* Add the difference between STOP_TIME and START_TIME to TIMER. */
static void
@ -387,18 +373,22 @@ timevar_get (timevar, elapsed)
struct timevar_time_def *elapsed;
{
struct timevar_def *tv = &timevars[timevar];
struct timevar_time_def now;
*elapsed = tv->elapsed;
/* Is TIMEVAR currently running as a standalone timer? */
if (tv->standalone)
/* Add the time elapsed since the it was started. */
timevar_add (elapsed, &tv->start_time);
/* Is TIMEVAR at the top of the timer stack? */
if (stack->timevar == tv)
/* Add the elapsed time since it was pushed. */
timevar_add (elapsed, &start_time);
{
get_time (&now);
timevar_accumulate (elapsed, &tv->start_time, &now);
}
/* Or is TIMEVAR at the top of the timer stack? */
else if (stack->timevar == tv)
{
get_time (&now);
timevar_accumulate (elapsed, &start_time, &now);
}
}
/* Summarize timing variables to FP. The timing variable TV_TOTAL has