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

Simplify pause_sbt() logic. Don't call DELAY() if remainder is less

Browse Source 
than or equal to zero.
This commit is contained in:
Hans Petter Selasky 2013-08-30 10:39:56 +00:00
parent d4e069e581
commit 5a280dbdd6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_synch.c
View File

@ -356,10 +356,7 @@ msleep_spin_sbt(void *ident, struct mtx *mtx, const char *wmesg,
int
pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags)
{
int sbt_sec;
sbt_sec = sbintime_getsec(sbt);
KASSERT(sbt_sec >= 0, ("pause: timo must be >= 0"));
KASSERT(sbt >= 0, ("pause: timeout must be >= 0"));
/* silently convert invalid timeouts */
if (sbt == 0)
@ -370,11 +367,14 @@ pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags)
* We delay one second at a time to avoid overflowing the
* system specific DELAY() function(s):
*/
while (sbt_sec > 0) {
while (sbt >= SBT_1S) {
DELAY(1000000);
sbt_sec--;
sbt -= SBT_1S;
}
DELAY((sbt & 0xffffffff) / SBT_1US);
/* Do the delay remainder, if any */
sbt = (sbt + SBT_1US - 1) / SBT_1US;
if (sbt > 0)
DELAY(sbt);
return (0);
}
return (_sleep(&pause_wchan[curcpu], NULL, 0, wmesg, sbt, pr, flags));