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

[SIGAR-45] Fix disk reads/writes for LVM managed volumes

Browse Source
This commit is contained in:
Doug MacEachern 2007-02-22 02:28:21 +00:00
parent 25994f6abd
commit 85407d98b4
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-02-21 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-45] Fix disk reads/writes for LVM managed volumes
2007-02-15 Doug MacEachern <dougm@hyperic.com> 2007-02-15 Doug MacEachern <dougm@hyperic.com>
* [SIGAR-42] Honor Solaris mnttab ignore flag in file_system_list * [SIGAR-42] Honor Solaris mnttab ignore flag in file_system_list

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

@ -1123,6 +1123,11 @@ int sigar_file_system_list_get(sigar_t *sigar,
#define FSDEV_ID(sb) (sb.st_ino + sb.st_dev) #define FSDEV_ID(sb) (sb.st_ino + sb.st_dev)
#define FSDEV_IS_DEV(dev) strnEQ(dev, "/dev/", 5)
#define ST_MAJOR(sb) major((sb).st_rdev)
#define ST_MINOR(sb) minor((sb).st_rdev)
static void fsdev_free(void *ptr) static void fsdev_free(void *ptr)
{ {
if (ptr != FSDEV_NONE) { if (ptr != FSDEV_NONE) {
@ -1192,8 +1197,7 @@ static char *get_fsdev(sigar_t *sigar,
} }
ptr = fsp->dev_name; ptr = fsp->dev_name;
if (strnEQ(ptr, "/dev/", 5)) { if (FSDEV_IS_DEV(ptr)) {
ptr += 5;
ent->value = sigar_strdup(ptr); ent->value = sigar_strdup(ptr);
if (debug) { if (debug) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG, sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
@ -1237,6 +1241,10 @@ static int get_iostat_sys(sigar_t *sigar,
return ENOENT; return ENOENT;
} }
if (FSDEV_IS_DEV(name)) {
name += 5; /* strip "/dev/" */
}
while (!sigar_isdigit(*fsdev)) { while (!sigar_isdigit(*fsdev)) {
fsdev++; fsdev++;
} }
@ -1271,35 +1279,41 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
{ {
FILE *fp; FILE *fp;
char buffer[1025], dev[1025]; char buffer[1025], dev[1025];
char *name, *ptr; char *ptr;
int len; struct stat sb;
name = get_fsdev(sigar, dirname, dev); if (!get_fsdev(sigar, dirname, dev)) {
if (!name) {
return ENOENT; return ENOENT;
} }
len = strlen(name); if (stat(dev, &sb) < 0) {
return errno;
}
if (SIGAR_LOG_IS_DEBUG(sigar)) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
PROC_DISKSTATS " %s -> %s [%d,%d]",
dirname, dev, ST_MAJOR(sb), ST_MINOR(sb));
}
if (!(fp = fopen(PROC_DISKSTATS, "r"))) { if (!(fp = fopen(PROC_DISKSTATS, "r"))) {
return errno; return errno;
} }
while ((ptr = fgets(buffer, sizeof(buffer), fp))) { while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
/* major, minor */ unsigned long major, minor;
ptr = sigar_skip_multiple_token(ptr, 2);
SIGAR_SKIP_SPACE(ptr);
if (strnEQ(ptr, name, len)) { major = sigar_strtoul(ptr);
minor = sigar_strtoul(ptr);
if ((major == ST_MAJOR(sb)) && (minor == ST_MINOR(sb))) {
int num, status=SIGAR_OK; int num, status=SIGAR_OK;
unsigned long unsigned long
rio, rmerge, rsect, ruse, rio, rmerge, rsect, ruse,
wio, wmerge, wsect, wuse, wio, wmerge, wsect, wuse,
running, use, aveq; running, use, aveq;
ptr += len; /* name */ ptr = sigar_skip_token(ptr); /* name */
SIGAR_SKIP_SPACE(ptr);
num = sscanf(ptr, num = sscanf(ptr,
"%lu %lu %lu %lu " "%lu %lu %lu %lu "
@ -1355,16 +1369,22 @@ static int get_iostat_procp(sigar_t *sigar,
{ {
FILE *fp; FILE *fp;
char buffer[1025], dev[1025]; char buffer[1025], dev[1025];
char *name, *ptr; char *ptr;
int len; struct stat sb;
name = get_fsdev(sigar, dirname, dev); if (!get_fsdev(sigar, dirname, dev)) {
if (!name) {
return ENOENT; return ENOENT;
} }
len = strlen(name); if (stat(dev, &sb) < 0) {
return errno;
}
if (SIGAR_LOG_IS_DEBUG(sigar)) {
sigar_log_printf(sigar, SIGAR_LOG_DEBUG,
PROC_PARTITIONS " %s -> %s [%d,%d]",
dirname, dev, ST_MAJOR(sb), ST_MINOR(sb));
}
if (!(fp = fopen(PROC_PARTITIONS, "r"))) { if (!(fp = fopen(PROC_PARTITIONS, "r"))) {
return errno; return errno;
@ -1372,11 +1392,13 @@ static int get_iostat_procp(sigar_t *sigar,
(void)fgets(buffer, sizeof(buffer), fp); /* skip header */ (void)fgets(buffer, sizeof(buffer), fp); /* skip header */
while ((ptr = fgets(buffer, sizeof(buffer), fp))) { while ((ptr = fgets(buffer, sizeof(buffer), fp))) {
/* major, minor, #blocks */ unsigned long major, minor;
ptr = sigar_skip_multiple_token(ptr, 3);
SIGAR_SKIP_SPACE(ptr);
if (strnEQ(ptr, name, len)) { major = sigar_strtoul(ptr);
minor = sigar_strtoul(ptr);
if ((major == ST_MAJOR(sb)) && (minor == ST_MINOR(sb))) {
ptr = sigar_skip_token(ptr); /* blocks */
ptr = sigar_skip_token(ptr); /* name */ ptr = sigar_skip_token(ptr); /* name */
fsusage->disk_reads = sigar_strtoull(ptr); /* rio */ fsusage->disk_reads = sigar_strtoull(ptr); /* rio */
ptr = sigar_skip_token(ptr); /* rmerge */ ptr = sigar_skip_token(ptr); /* rmerge */