d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a race condition I introduced.

Browse Source 
Reviewed by: bde (with only minor complaints :-)
This commit is contained in:
Poul-Henning Kamp 1997-12-30 20:11:01 +00:00
parent 05d83ad6a4
commit cf26fc706f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=32126
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/i386/i386/microtime.s
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: Steve McCanne's microtime code
* $Id: microtime.s,v 1.38 1997/12/28 13:36:05 phk Exp $
* $Id: microtime.s,v 1.39 1997/12/28 17:32:59 phk Exp $
*/
#include <machine/asmacros.h>
@ -56,9 +56,22 @@ ENTRY(microtime)
subl _tsc_bias, %eax
mull _tsc_multiplier
movl %edx, %eax
addl _time+4, %eax /* usec += time.tv_sec */
movl _time, %edx /* sec = time.tv_sec */
popfl /* restore interrupt mask */
jmp common_microtime
cmpl $1000000, %eax /* usec valid? */
jb 1f
subl $1000000, %eax /* adjust usec */
incl %edx /* bump sec */
1:
movl 4(%esp), %ecx /* load timeval pointer arg */
movl %edx, (%ecx) /* tvp->tv_sec = sec */
movl %eax, 4(%ecx) /* tvp->tv_usec = usec */
ret
ALIGN_TEXT
i8254_microtime:
movb $TIMER_SEL0|TIMER_LATCH, %al /* prepare to latch */
@ -210,13 +223,12 @@ overflow:
popl %edx
popl %eax
#endif /* USE_CLOCKLOCK */
popfl /* restore interrupt mask */
common_microtime:
addl _time+4, %eax /* usec += time.tv_sec */
movl _time, %edx /* sec = time.tv_sec */
popfl /* restore interrupt mask */
cmpl $1000000, %eax /* usec valid? */
jb 1f
subl $1000000, %eax /* adjust usec */