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

use device service_time for partitions in 2.6 kernels

Browse Source
This commit is contained in:
Doug MacEachern 2007-11-04 02:50:27 +00:00
parent 60b0114c50
commit fc5add25ba
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1182,6 +1182,7 @@ int sigar_file_system_list_get(sigar_t *sigar,
typedef struct { typedef struct {
char name[256]; char name[256];
int is_partition;
sigar_disk_usage_t disk; sigar_disk_usage_t disk;
} iodev_t; } iodev_t;
@ -1278,6 +1279,7 @@ static iodev_t *get_fsdev(sigar_t *sigar,
iodev_t *iodev; iodev_t *iodev;
ent->value = iodev = malloc(sizeof(*iodev)); ent->value = iodev = malloc(sizeof(*iodev));
SIGAR_ZERO(iodev); SIGAR_ZERO(iodev);
iodev->is_partition = 1;
SIGAR_SSTRCPY(iodev->name, fsp->dev_name); SIGAR_SSTRCPY(iodev->name, fsp->dev_name);
if (debug) { if (debug) {
@ -1351,12 +1353,16 @@ static int get_iostat_sys(sigar_t *sigar,
static int get_iostat_proc_dstat(sigar_t *sigar, static int get_iostat_proc_dstat(sigar_t *sigar,
const char *dirname, const char *dirname,
sigar_disk_usage_t *disk, sigar_disk_usage_t *disk,
iodev_t **iodev) iodev_t **iodev,
sigar_disk_usage_t *device_usage)
{ {
FILE *fp; FILE *fp;
char buffer[1025]; char buffer[1025];
char *ptr; char *ptr;
struct stat sb; struct stat sb;
int status=ENOENT;
SIGAR_DISK_STATS_INIT(device_usage);
if (!(*iodev = get_fsdev(sigar, dirname))) { if (!(*iodev = get_fsdev(sigar, dirname))) {
return ENOENT; return ENOENT;
@ -1383,8 +1389,10 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
major = sigar_strtoul(ptr); major = sigar_strtoul(ptr);
minor = sigar_strtoul(ptr); minor = sigar_strtoul(ptr);
if ((major == ST_MAJOR(sb)) && (minor == ST_MINOR(sb))) { if ((major == ST_MAJOR(sb)) &&
int num, status=SIGAR_OK; ((minor == ST_MINOR(sb)) || (minor == 0)))
{
int num;
unsigned long unsigned long
rio, rmerge, rsect, ruse, rio, rmerge, rsect, ruse,
wio, wmerge, wsect, wuse, wio, wmerge, wsect, wuse,
@ -1433,14 +1441,19 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
disk->read_bytes *= 512; disk->read_bytes *= 512;
disk->write_bytes *= 512; disk->write_bytes *= 512;
fclose(fp); if (minor == ST_MINOR(sb)) {
return status; status = SIGAR_OK;
break;
}
else if (minor == 0) {
memcpy(device_usage, disk, sizeof(*device_usage));
}
} }
} }
fclose(fp); fclose(fp);
return ENOENT; return status;
} }
static int get_iostat_procp(sigar_t *sigar, static int get_iostat_procp(sigar_t *sigar,
@ -1514,6 +1527,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
{ {
int status; int status;
iodev_t *iodev = NULL; iodev_t *iodev = NULL;
sigar_disk_usage_t device_usage;
SIGAR_DISK_STATS_INIT(disk); SIGAR_DISK_STATS_INIT(disk);
/* /*
@ -1528,7 +1542,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
status = get_iostat_sys(sigar, name, disk, &iodev); status = get_iostat_sys(sigar, name, disk, &iodev);
break; break;
case IOSTAT_DISKSTATS: case IOSTAT_DISKSTATS:
status = get_iostat_proc_dstat(sigar, name, disk, &iodev); status = get_iostat_proc_dstat(sigar, name, disk, &iodev, &device_usage);
break; break;
case IOSTAT_PARTITIONS: case IOSTAT_PARTITIONS:
status = get_iostat_procp(sigar, name, disk, &iodev); status = get_iostat_procp(sigar, name, disk, &iodev);
@ -1547,9 +1561,18 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
sigar_uptime_t uptime; sigar_uptime_t uptime;
sigar_uint64_t interval, ios; sigar_uint64_t interval, ios;
double tput, util; double tput, util;
sigar_disk_usage_t *partition_usage=NULL;
sigar_uptime_get(sigar, &uptime); sigar_uptime_get(sigar, &uptime);
if (iodev->is_partition &&
(sigar->iostat == IOSTAT_DISKSTATS))
{
/* 2.6 kernels do not have per-partition times */
partition_usage = disk;
disk = &device_usage;
}
disk->snaptime = uptime.uptime; disk->snaptime = uptime.uptime;
if (iodev->disk.snaptime) { if (iodev->disk.snaptime) {
@ -1572,7 +1595,10 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
disk->service_time = tput ? util / tput : 0.0; disk->service_time = tput ? util / tput : 0.0;
} }
memcpy(&iodev->disk, &disk, sizeof(&iodev->disk)); memcpy(&iodev->disk, disk, sizeof(&iodev->disk));
if (partition_usage) {
partition_usage->service_time = disk->service_time;
}
} }
return status; return status;