Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- src/libs/zbxsysinfo/freebsd/memory.c.orig2 2011-05-05 17:19:15.000000000 +0400
- +++ src/libs/zbxsysinfo/freebsd/memory.c 2011-05-05 17:19:46.000000000 +0400
- @@ -145,36 +145,6 @@
- #endif /* HAVE_FUNCTION_SYSCTLBYNAME */
- }
- -static int VM_MEMORY_USED(AGENT_RESULT *result)
- -{
- -#if defined(HAVE_FUNCTION_SYSCTLBYNAME)
- - /* FreeBSD 6.2 i386; FreeBSD 7.0 i386 */
- - u_int totalpages, freepages, pagesize;
- - size_t len;
- -
- - len = sizeof(totalpages);
- -
- - if (0 != sysctlbyname("vm.stats.vm.v_page_count", &totalpages, &len, NULL, 0))
- - return SYSINFO_RET_FAIL;
- -
- - len = sizeof(freepages);
- -
- - if (0 != sysctlbyname("vm.stats.vm.v_free_count", &freepages, &len, NULL, 0))
- - return SYSINFO_RET_FAIL;
- -
- - len = sizeof(pagesize);
- -
- - if (0 != sysctlbyname("vm.stats.vm.v_page_size", &pagesize, &len, NULL, 0))
- - return SYSINFO_RET_FAIL;
- -
- - SET_UI64_RESULT(result, (zbx_uint64_t)(totalpages - freepages) * pagesize);
- -
- - return SYSINFO_RET_OK;
- -#else
- - return SYSINFO_RET_FAIL;
- -#endif /* HAVE_FUNCTION_SYSCTLBYNAME */
- -}
- -
- static int VM_MEMORY_PFREE(AGENT_RESULT *result)
- {
- #if defined(HAVE_FUNCTION_SYSCTLBYNAME)
- @@ -250,27 +220,6 @@
- #endif /* HAVE_FUNCTION_SYSCTLBYNAME */
- }
- -static int VM_MEMORY_SHARED(AGENT_RESULT *result)
- -{
- -#if defined(HAVE_SYS_VMMETER_VMTOTAL)
- - /* FreeBSD 6.2 i386; FreeBSD 7.0 i386 */
- - int mib[] = {CTL_VM, VM_METER};
- - size_t len;
- - struct vmtotal v;
- -
- - len = sizeof(v);
- -
- - if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
- - return SYSINFO_RET_FAIL;
- -
- - SET_UI64_RESULT(result, (zbx_uint64_t)(v.t_vmshr + v.t_rmshr) * sysconf(_SC_PAGESIZE));
- -
- - return SYSINFO_RET_OK;
- -#else
- - return SYSINFO_RET_FAIL;
- -#endif
- -}
- -
- int VM_MEMORY_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
- {
- MODE_FUNCTION fl[] =
- @@ -280,10 +229,8 @@
- {"active", VM_MEMORY_ACTIVE},
- {"inactive", VM_MEMORY_INACTIVE},
- {"wired", VM_MEMORY_WIRED},
- - {"used", VM_MEMORY_USED},
- {"pfree", VM_MEMORY_PFREE},
- {"pused", VM_MEMORY_PUSED},
- - {"shared", VM_MEMORY_SHARED},
- {"cached", VM_MEMORY_CACHED},
- {0, 0}
- };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement