Commit 199d352c authored by Neal Norwitz's avatar Neal Norwitz

SF patch #969180, hotshot incorrectly computes elapsed time by Jason

Beardsley.

If the seconds are different, we still need to calculate the differences
between milliseconds.

Also, on a Gentoo Linux (2.6.5) dual Athlon MP box with glibc 2.3,
time can go backwards.  This probably happens when the process switches
the CPU it's running on.  Time can also go backwards when running NTP.
If we detect a negative time delta (ie, time went backwards), return
a delta of 0.  This prevents an illegal array access elsewhere.
I think it's safest to *not* update prev_timeofday in this case, so we
return without updating.

Backport candidate.
parent 146ac031
......@@ -820,12 +820,14 @@ get_tdelta(ProfilerObject *self)
GETTIMEOFDAY(&tv);
if (tv.tv_sec == self->prev_timeofday.tv_sec)
tdelta = tv.tv_usec - self->prev_timeofday.tv_usec;
else
tdelta = ((tv.tv_sec - self->prev_timeofday.tv_sec) * 1000000
+ tv.tv_usec);
tdelta = tv.tv_usec - self->prev_timeofday.tv_usec;
if (tv.tv_sec != self->prev_timeofday.tv_sec)
tdelta += (tv.tv_sec - self->prev_timeofday.tv_sec) * 1000000;
#endif
/* time can go backwards on some multiprocessor systems or by NTP */
if (tdelta < 0)
return 0;
self->prev_timeofday = tv;
return tdelta;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment