diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2010-07-23 17:44:01 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2010-07-23 17:44:01 +0000 |
| commit | a85d8d8accaa7b19223eb8160ce0403c5b95838b (patch) | |
| tree | 9c3d1bdb2627563b170c795f9d972fe70202c0c2 /sys/cddl | |
| parent | e9a67923265634b0424571ddae0268c8d876e69f (diff) | |
| download | src-a85d8d8accaa7b19223eb8160ce0403c5b95838b.tar.gz src-a85d8d8accaa7b19223eb8160ce0403c5b95838b.zip | |
zfs arc_memory_throttle: available memory is free + cache
OpenSolaris freemem has the same meaning as our v_free_count +
v_cache_count.
Obtained from: Artem Belevich <fbsdlist@src.cx>,
Peter Jeremy <peterjeremy@acm.org>
Discussed with: pjd
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=210427
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index 2813924ef710..1666e41525b1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -3653,7 +3653,8 @@ static int arc_memory_throttle(uint64_t reserve, uint64_t inflight_data, uint64_t txg) { #ifdef _KERNEL - uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count); + uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count + + cnt.v_cache_count); static uint64_t page_load = 0; static uint64_t last_txg = 0; |