mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-15 21:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

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

Browse source 
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.
This commit is contained in:
Neal Norwitz 2004-06-13 20:45:11 +00:00
parent 0f5aed4e41
commit 7a135166f6
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/_hotshot.c
View file

@ -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;
}