diff --git a/include/sigar_util.h b/include/sigar_util.h index 81b24bc8..efc19ed5 100644 --- a/include/sigar_util.h +++ b/include/sigar_util.h @@ -93,10 +93,6 @@ int sigar_proc_list_procfs_get(sigar_t *sigar, int sigar_proc_fd_count(sigar_t *sigar, sigar_pid_t pid, sigar_uint64_t *total); -/* generic util functions for all platforms */ - -int sigar_proc_count(sigar_t *sigar, sigar_uint64_t *total); - /* linux + freebsd */ int sigar_procfs_args_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_args_t *procargs); diff --git a/src/sigar.c b/src/sigar.c index 9d200d53..51e344cc 100644 --- a/src/sigar.c +++ b/src/sigar.c @@ -137,9 +137,18 @@ SIGAR_DECLARE(int) sigar_proc_cpu_get(sigar_t *sigar, sigar_pid_t pid, SIGAR_DECLARE(int) sigar_proc_stat_get(sigar_t *sigar, sigar_proc_stat_t *procstat) { - int status = sigar_proc_count(sigar, &procstat->total); + int status; + sigar_proc_list_t proclist; - return status; + if ((status = sigar_proc_list_get(sigar, &proclist)) != SIGAR_OK) { + return status; + } + + procstat->total = proclist.number; + + sigar_proc_list_destroy(sigar, &proclist); + + return SIGAR_OK; } static char *sigar_error_string(int err) diff --git a/src/sigar_util.c b/src/sigar_util.c index c1d1a0d0..f33410e6 100644 --- a/src/sigar_util.c +++ b/src/sigar_util.c @@ -293,25 +293,6 @@ int sigar_procfs_args_get(sigar_t *sigar, sigar_pid_t pid, #endif /* WIN32 */ -/* os impls should use an optimized version of this */ -int sigar_proc_count(sigar_t *sigar, sigar_uint64_t *total) -{ - int status; - sigar_proc_list_t proclist; - - *total = 0; - - if ((status = sigar_proc_list_get(sigar, &proclist)) != SIGAR_OK) { - return status; - } - - *total = proclist.number; - - sigar_proc_list_destroy(sigar, &proclist); - - return SIGAR_OK; -} - int sigar_mem_calc_ram(sigar_t *sigar, sigar_mem_t *mem) { sigar_uint64_t lram = (mem->total / (1024 * 1024));