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

6672 arc_reclaim_thread() should use gethrtime() instead of ddi_get_lbolt()

Browse Source 
6673 want a macro to convert seconds to nanoseconds and vice-versa

Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Eli Rosenthal <eli.rosenthal@delphix.com>

illumos/illumos-gate@a8f6344fa0
This commit is contained in:
Alexander Motin 2016-03-08 18:16:50 +00:00
parent 117b5ba78e
commit 02919bd787
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uts/common/fs/zfs/arc.c
View File

@ -3352,7 +3352,7 @@ arc_kmem_reap_now(void)
static void
arc_reclaim_thread(void)
{
clock_t growtime = 0;
hrtime_t growtime = 0;
callb_cpr_t cpr;
CALLB_CPR_INIT(&cpr, &arc_reclaim_lock, callb_generic_cpr, FTAG);
@ -3373,7 +3373,7 @@ arc_reclaim_thread(void)
* Wait at least zfs_grow_retry (default 60) seconds
* before considering growing.
*/
growtime = ddi_get_lbolt() + (arc_grow_retry * hz);
growtime = gethrtime() + SEC2NSEC(arc_grow_retry);
arc_kmem_reap_now();
@ -3393,7 +3393,7 @@ arc_reclaim_thread(void)
}
} else if (free_memory < arc_c >> arc_no_grow_shift) {
arc_no_grow = B_TRUE;
} else if (ddi_get_lbolt() >= growtime) {
} else if (gethrtime() >= growtime) {
arc_no_grow = B_FALSE;
}
@ -3424,8 +3424,8 @@ arc_reclaim_thread(void)
* even if we aren't being signalled)
*/
CALLB_CPR_SAFE_BEGIN(&cpr);
(void) cv_timedwait(&arc_reclaim_thread_cv,
&arc_reclaim_lock, ddi_get_lbolt() + hz);
(void) cv_timedwait_hires(&arc_reclaim_thread_cv,
&arc_reclaim_lock, SEC2NSEC(1), MSEC2NSEC(1), 0);
CALLB_CPR_SAFE_END(&cpr, &arc_reclaim_lock);
}
}