From 405e95e6bb283db39b15a787b57a6b57c609962b Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Sat, 14 Apr 2007 21:25:20 +0000 Subject: [PATCH] move sigar_proc_stat_get to sigar.c --- src/os/aix/aix_sigar.c | 9 --------- src/os/darwin/darwin_sigar.c | 9 --------- src/os/hpux/hpux_sigar.c | 9 --------- src/os/linux/linux_sigar.c | 9 --------- src/os/netware/netware_sigar.c | 9 --------- src/os/osf1/osf1_sigar.c | 9 --------- src/os/solaris/solaris_sigar.c | 9 --------- src/os/stub/stub_sigar.c | 9 --------- src/os/win32/win32_sigar.c | 9 --------- src/sigar.c | 8 ++++++++ 10 files changed, 8 insertions(+), 81 deletions(-) diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c index a01bd8ec..a241c451 100644 --- a/src/os/aix/aix_sigar.c +++ b/src/os/aix/aix_sigar.c @@ -986,15 +986,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_OK; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - static int sigar_getprocs(sigar_t *sigar, sigar_pid_t pid) { int status, num; diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index 3b562a9b..32401710 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -671,15 +671,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_OK; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - static int sigar_get_pinfo(sigar_t *sigar, sigar_pid_t pid) { int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, 0 }; diff --git a/src/os/hpux/hpux_sigar.c b/src/os/hpux/hpux_sigar.c index 5f89d378..efdf9c99 100644 --- a/src/os/hpux/hpux_sigar.c +++ b/src/os/hpux/hpux_sigar.c @@ -235,15 +235,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_OK; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - static int sigar_pstat_getproc(sigar_t *sigar, sigar_pid_t pid) { int status, num; diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c index 1354eea0..3949b6d4 100644 --- a/src/os/linux/linux_sigar.c +++ b/src/os/linux/linux_sigar.c @@ -656,15 +656,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_OK; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - static int proc_stat_read(sigar_t *sigar, sigar_pid_t pid) { char buffer[BUFSIZ], *ptr=buffer, *tmp; diff --git a/src/os/netware/netware_sigar.c b/src/os/netware/netware_sigar.c index 479f7f36..7ec683c2 100644 --- a/src/os/netware/netware_sigar.c +++ b/src/os/netware/netware_sigar.c @@ -179,15 +179,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_ENOTIMPL; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_mem_t *procmem) { diff --git a/src/os/osf1/osf1_sigar.c b/src/os/osf1/osf1_sigar.c index d46ecdf9..cdc8b94d 100644 --- a/src/os/osf1/osf1_sigar.c +++ b/src/os/osf1/osf1_sigar.c @@ -198,15 +198,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_OK; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_mem_t *procmem) { diff --git a/src/os/solaris/solaris_sigar.c b/src/os/solaris/solaris_sigar.c index 7a2446d7..f7a97d46 100644 --- a/src/os/solaris/solaris_sigar.c +++ b/src/os/solaris/solaris_sigar.c @@ -637,15 +637,6 @@ int sigar_proc_list_get(sigar_t *sigar, return sigar_proc_list_procfs_get(sigar, proclist); } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_mem_t *procmem) { diff --git a/src/os/stub/stub_sigar.c b/src/os/stub/stub_sigar.c index f66c9426..8ae582f9 100644 --- a/src/os/stub/stub_sigar.c +++ b/src/os/stub/stub_sigar.c @@ -83,15 +83,6 @@ int sigar_proc_list_get(sigar_t *sigar, return SIGAR_ENOTIMPL; } -int sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - int sigar_proc_mem_get(sigar_t *sigar, sigar_pid_t pid, sigar_proc_mem_t *procmem) { diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c index d7050c87..aa9c33b7 100644 --- a/src/os/win32/win32_sigar.c +++ b/src/os/win32/win32_sigar.c @@ -976,15 +976,6 @@ SIGAR_DECLARE(int) sigar_proc_list_get(sigar_t *sigar, } } -SIGAR_DECLARE(int) sigar_proc_stat_get(sigar_t *sigar, - sigar_proc_stat_t *procstat) -{ - int status = /* XXX optimize */ - sigar_proc_count(sigar, &procstat->total); - - return status; -} - #define PROCESS_DAC (PROCESS_QUERY_INFORMATION|PROCESS_VM_READ) static HANDLE open_process(sigar_pid_t pid) diff --git a/src/sigar.c b/src/sigar.c index 594be6cf..9d200d53 100644 --- a/src/sigar.c +++ b/src/sigar.c @@ -134,6 +134,14 @@ SIGAR_DECLARE(int) sigar_proc_cpu_get(sigar_t *sigar, sigar_pid_t pid, return SIGAR_OK; } +SIGAR_DECLARE(int) sigar_proc_stat_get(sigar_t *sigar, + sigar_proc_stat_t *procstat) +{ + int status = sigar_proc_count(sigar, &procstat->total); + + return status; +} + static char *sigar_error_string(int err) { switch (err) {