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

[SIGAR-6] Use rounding for mem.ram on Linux rather than /proc/mtrr

This commit is contained in:
Doug MacEachern 2006-06-09 18:39:28 +00:00
parent 8e5ff7d47d
commit 5ff5b9d145
2 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2006-06-09 Doug MacEachern <dougm@hyperic.com> 2006-06-09 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-6] Use rounding for mem.ram on Linux rather than /proc/mtrr
* [SIGAR-5] Fix netinfo default gateway where the first gateway in the routing table * [SIGAR-5] Fix netinfo default gateway where the first gateway in the routing table
had been selected without checking for the default destination == 0.0.0.0 had been selected without checking for the default destination == 0.0.0.0

57
src/os/linux/linux_sigar.c
View File

@ -258,58 +258,6 @@ static int is_ht_enabled(sigar_t *sigar)
return sigar->ht_enabled; return sigar->ht_enabled;
} }
static int get_ram(sigar_t *sigar, sigar_mem_t *mem)
{
char buffer[BUFSIZ], *ptr;
FILE *fp;
int total = 0;
if (sigar->ram > 0) {
/* return cached value */
mem->ram = sigar->ram;
return SIGAR_OK;
}
if (sigar->ram == 0) {
return ENOENT;
}
/*
* Memory Type Range Registers
* write-back registers add up to the total.
*/
if (!(fp = fopen("/proc/mtrr", "r"))) {
return errno;
}
while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
if (!(ptr = strstr(ptr, "size="))) {
continue;
}
if (!strstr(ptr, "write-back")) {
continue;
}
ptr += 5;
while (sigar_isspace(*ptr)) {
++ptr;
}
total += atoi(ptr);
}
fclose(fp);
if (total == 0) {
return ENOENT;
}
mem->ram = sigar->ram = total;
return SIGAR_OK;
}
#define MEMINFO_PARAM(a) a ":", SSTRLEN(a ":") #define MEMINFO_PARAM(a) a ":", SSTRLEN(a ":")
static SIGAR_INLINE sigar_uint64_t sigar_meminfo(char *buffer, static SIGAR_INLINE sigar_uint64_t sigar_meminfo(char *buffer,
@ -360,10 +308,7 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
mem->shared = SIGAR_FIELD_NOTIMPL; /* XXX where did this go in 2.6?? */ mem->shared = SIGAR_FIELD_NOTIMPL; /* XXX where did this go in 2.6?? */
if (get_ram(sigar, mem) != SIGAR_OK) { sigar_mem_calc_ram(sigar, mem);
/* XXX other options on failure? */
sigar_mem_calc_ram(sigar, mem);
}
return SIGAR_OK; return SIGAR_OK;
} }