diff options
author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-10-09 16:16:20 +0000 |
---|---|---|
committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-10-09 16:16:20 +0000 |
commit | 1053321244efa13162091932b8ef2f64b0501639 (patch) | |
tree | 426334bdb05e39545939baa13f62e42bd22727f0 | |
parent | c5cfd0af15bb548e7b2488224bf669c7be2cc3dc (diff) | |
download | zabbix-1053321244efa13162091932b8ef2f64b0501639.tar.gz zabbix-1053321244efa13162091932b8ef2f64b0501639.tar.xz zabbix-1053321244efa13162091932b8ef2f64b0501639.zip |
Minor changes.
git-svn-id: svn://svn.zabbix.com/trunk@2158 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r-- | src/libs/zbxsysinfo/osf/memory.c | 112 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/osf/osf.c (renamed from src/libs/zbxsysinfo/osf/linux.c) | 0 | ||||
-rw-r--r-- | src/libs/zbxsysinfo/unknown/unknown.c (renamed from src/libs/zbxsysinfo/unknown/linux.c) | 0 |
3 files changed, 0 insertions, 112 deletions
diff --git a/src/libs/zbxsysinfo/osf/memory.c b/src/libs/zbxsysinfo/osf/memory.c index 21461a80..7a735b7c 100644 --- a/src/libs/zbxsysinfo/osf/memory.c +++ b/src/libs/zbxsysinfo/osf/memory.c @@ -314,117 +314,5 @@ int VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double *value) int VM_MEMORY_FREE(const char *cmd, const char *parameter,double *value) { -/* Solaris */ -#ifdef HAVE_UNISTD_SYSCONF - *value=(double)sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE); - return SYSINFO_RET_OK; -#else -#ifdef HAVE_SYS_PSTAT_H - struct pst_static pst; - struct pst_dynamic dyn; - long page; - - if(pstat_getstatic(&pst, sizeof(pst), (size_t)1, 0) == -1) - { - return SYSINFO_RET_FAIL; - } - else - { - /* Get page size */ - page = pst.page_size; -/* return pst.physical_memory;*/ - - if (pstat_getdynamic(&dyn, sizeof(dyn), 1, 0) == -1) - { - return SYSINFO_RET_FAIL; - } - else - { -/* cout<<"total virtual memory allocated is " << dyn.psd_vm << " - pages, " << dyn.psd_vm * page << " bytes" << endl; - cout<<"active virtual memory is " << dyn.psd_avm <<" pages, " << - dyn.psd_avm * page << " bytes" << endl; - cout<<"total real memory is " << dyn.psd_rm << " pages, " << - dyn.psd_rm * page << " bytes" << endl; - cout<<"active real memory is " << dyn.psd_arm << " pages, " << - dyn.psd_arm * page << " bytes" << endl; - cout<<"free memory is " << dyn.psd_free << " pages, " << -*/ - /* Free memory in bytes */ - - *value=(double)dyn.psd_free * page; - return SYSINFO_RET_OK; - } - } -#else -#ifdef HAVE_SYSINFO_FREERAM - struct sysinfo info; - - if( 0 == sysinfo(&info)) - { -#ifdef HAVE_SYSINFO_MEM_UNIT - *value=(double)info.freeram * (double)info.mem_unit; -#else - *value=(double)info.freeram; -#endif - return SYSINFO_RET_OK; - } - else - { - return SYSINFO_RET_FAIL; - } -#else -#ifdef HAVE_SYS_VMMETER_VMTOTAL - int mib[2],len; - struct vmtotal v; - - len=sizeof(struct vmtotal); - mib[0]=CTL_VM; - mib[1]=VM_METER; - - sysctl(mib,2,&v,&len,NULL,0); - - *value=(double)(v.t_free<<2); - return SYSINFO_RET_OK; -#else -/* OS/X */ -#ifdef HAVE_MACH_HOST_INFO_H - vm_statistics_data_t page_info; - vm_size_t pagesize; - mach_msg_type_number_t count; - kern_return_t kret; - int ret; - - pagesize = 0; - kret = host_page_size (mach_host_self(), &pagesize); - - count = HOST_VM_INFO_COUNT; - kret = host_statistics (mach_host_self(), HOST_VM_INFO, - (host_info_t)&page_info, &count); - if (kret == KERN_SUCCESS) - { - double pw, pa, pi, pf, pu; - - pw = (double)page_info.wire_count*pagesize; - pa = (double)page_info.active_count*pagesize; - pi = (double)page_info.inactive_count*pagesize; - pf = (double)page_info.free_count*pagesize; - - pu = pw+pa+pi; - - *value=(double)pf; - ret = SYSINFO_RET_OK; - } - else - { - ret = SYSINFO_RET_FAIL; - } - return ret; -#else return SYSINFO_RET_FAIL; -#endif -#endif -#endif -#endif -#endif } diff --git a/src/libs/zbxsysinfo/osf/linux.c b/src/libs/zbxsysinfo/osf/osf.c index 71da5581..71da5581 100644 --- a/src/libs/zbxsysinfo/osf/linux.c +++ b/src/libs/zbxsysinfo/osf/osf.c diff --git a/src/libs/zbxsysinfo/unknown/linux.c b/src/libs/zbxsysinfo/unknown/unknown.c index 71da5581..71da5581 100644 --- a/src/libs/zbxsysinfo/unknown/linux.c +++ b/src/libs/zbxsysinfo/unknown/unknown.c |