bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused code

This commit is contained in:
Doug MacEachern 2005-12-09 21:55:06 +00:00
parent e7a3509a14
commit b18c9b2c3d
3 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/os/solaris/kstats.c
View File

@ -48,17 +48,6 @@ int sigar_get_kstats(sigar_t *sigar)
unsigned int i, ncpu = sysconf(_SC_NPROCESSORS_CONF); unsigned int i, ncpu = sysconf(_SC_NPROCESSORS_CONF);
int is_debug = SIGAR_LOG_IS_DEBUG(sigar); int is_debug = SIGAR_LOG_IS_DEBUG(sigar);
ksp = kstat_lookup(kc, "unix", -1, "vminfo");
sigar->ks.vminfo = ksp;
if (ksp) {
kstat_read(kc, ksp, &sigar->vminfo);
if (!sigar->vminfo_snaptime) {
sigar->vminfo_snaptime = ksp->ks_snaptime;
}
}
if (ncpu != sigar->ncpu) { if (ncpu != sigar->ncpu) {
if (!sigar->ks.lcpu) { if (!sigar->ks.lcpu) {
/* init */ /* init */

4
src/os/solaris/sigar_os.h
View File

@ -184,7 +184,6 @@ struct sigar_t {
/* kstat_lookup() as needed */ /* kstat_lookup() as needed */
struct { struct {
kstat_t *vminfo;
kstat_t **cpu; kstat_t **cpu;
processorid_t *cpuid; processorid_t *cpuid;
unsigned int lcpu; /* number malloced slots in the cpu array above */ unsigned int lcpu; /* number malloced slots in the cpu array above */
@ -209,9 +208,6 @@ struct sigar_t {
int syspages[KSTAT_SYSPAGES_MAX]; int syspages[KSTAT_SYSPAGES_MAX];
} koffsets; } koffsets;
vminfo_t vminfo;
hrtime_t vminfo_snaptime;
int pagesize; int pagesize;
time_t last_getprocs; time_t last_getprocs;

62
src/os/solaris/solaris_sigar.c
View File

@ -69,8 +69,6 @@ int sigar_os_open(sigar_t **sig)
KSTAT_LIST_INIT(sigar, ge); KSTAT_LIST_INIT(sigar, ge);
KSTAT_LIST_INIT(sigar, eri); KSTAT_LIST_INIT(sigar, eri);
sigar->vminfo_snaptime = 0;
sigar->koffsets.system[0] = -1; sigar->koffsets.system[0] = -1;
sigar->koffsets.mempages[0] = -1; sigar->koffsets.mempages[0] = -1;
sigar->koffsets.syspages[0] = -1; sigar->koffsets.syspages[0] = -1;
@ -197,65 +195,6 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap) int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
{ {
#if defined(SIGAR_SWAP_KSTAT)
kstat_ctl_t *kc = sigar->kc;
kstat_t *ksp;
vminfo_t vminfo;
if (sigar_kstat_update(sigar) == -1) {
return errno;
}
if ((ksp = sigar->ks.vminfo) && kstat_read(kc, ksp, &vminfo) >= 0) {
/* XXX: need some adjustments here */
swap->total = vminfo.swap_resv + vminfo.swap_avail;
swap->used = vminfo.swap_alloc;
swap->free = swap->total - swap->used;
return SIGAR_OK;
}
return -1;
#elif defined(SIGAR_SWAP_SC_LIST)
unsigned int i;
size_t num;
swaptbl_t *stab;
char path[256];
swap->total = swap->used = swap->free = 0;
num = swapctl(SC_GETNSWP, 0);
switch (num) {
case 0:
return SIGAR_OK;
case -1:
return errno;
default:
break;
}
stab = malloc((num * sizeof(swapent_t)) + sizeof(swaptbl_t));
for (i=0; i<num; i++) {
stab->swt_ent[i].ste_path = &path[0]; /* ignored */
}
stab->swt_n = num;
num = swapctl(SC_LIST, stab);
for (i=0; i<num; i++) {
swap->total += stab->swt_ent[i].ste_pages;
swap->free += stab->swt_ent[i].ste_free;
}
free(stab);
swap->total <<= sigar->pagesize;
swap->free <<= sigar->pagesize;
swap->used = swap->total - swap->free;
return SIGAR_OK;
#else
struct anoninfo anon; struct anoninfo anon;
/* XXX vm/anon.h says: /* XXX vm/anon.h says:
@ -277,7 +216,6 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
swap->used <<= sigar->pagesize; swap->used <<= sigar->pagesize;
return SIGAR_OK; return SIGAR_OK;
#endif
} }
int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu) int sigar_cpu_get(sigar_t *sigar, sigar_cpu_t *cpu)