oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed I/O stats so it works for unpartionned devices (e.g. cdrom).

Browse Source 
svn path=/trunk/; revision=2757
This commit is contained in:
Benoît Dejean
2008-06-22 11:27:30 +00:00
parent 229eab1213
commit 7f779e078d
1 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
sysdeps/linux/fsusage.c
View File

@@ -15,6 +15,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <mntent.h>
/* /*
@@ -25,37 +26,52 @@
static char * static gboolean
get_partition(const char *mountpoint) get_device(glibtop* server, const char *mountpoint,
char* device, size_t device_size)
{ {
FILE *partitions; const struct mntent *mnt;
char *name = NULL; FILE *fp;
char line[1024]; gboolean found = FALSE;
struct stat statb;
if(stat(mountpoint, &statb) == -1) if (!(fp = setmntent(MOUNTED, "r"))) {
return NULL; glibtop_warn_io_r(server, "Could not open %s", MOUNTED);
goto out;
if((partitions = fopen("/proc/partitions", "r")) == NULL)
return NULL;
while(fgets(line, sizeof line, partitions))
{
unsigned major, minor;
char dev[32];
if(sscanf(line, "%u %u %*u %31s", &major, &minor, dev) != 3)
continue;
if(MKDEV(major, minor) != statb.st_dev)
continue;
name = g_strdup(dev);
break;
} }
fclose(partitions); while ((mnt = getmntent(fp)))
return name; {
if (!strcmp(mountpoint, mnt->mnt_dir)) {
if (!strncmp(mnt->mnt_fsname, "/dev/", 5)) {
g_strlcpy(device, mnt->mnt_fsname + 5, device_size);
found = TRUE;
}
break;
}
}
endmntent(fp);
out:
return found;
}
/*
TRUE if device is like "hda3" and then set prefix to "hda".
*/
static gboolean
is_partition(const char* device, char* prefix, size_t prefix_size)
{
g_strlcpy(prefix, device, prefix_size);
for ( ; *prefix; prefix++) {
if (isdigit(*prefix)) {
*prefix = '\0';
return TRUE;
}
}
return FALSE;
} }
@@ -88,23 +104,12 @@ get_sys_path(glibtop* server, const char *device, char **stat_path, const char *
const char* linux_2_6_25_format = "%*llu %*llu %llu %*llu" const char* linux_2_6_25_format = "%*llu %*llu %llu %*llu"
"%*llu %*llu %llu %*llu"; "%*llu %*llu %llu %*llu";
if(g_str_has_prefix(device, "hd") || g_str_has_prefix(device, "sd")) char prefix[32];
{
char *prefix;
char *path;
size_t offset;
offset = strcspn(device, "0123456789"); if (is_partition(device, prefix, sizeof prefix)) {
prefix = g_strdup(device); *stat_path = g_strdup_printf("/sys/block/%s/%s/stat",
prefix [offset] = '\0';
path = g_strdup_printf("/sys/block/%s/%s/stat",
prefix, device); prefix, device);
g_free(prefix);
*stat_path = path;
if (server->os_version_code < LINUX_VERSION_CODE(2, 6, 25)) if (server->os_version_code < LINUX_VERSION_CODE(2, 6, 25))
*parse_format = "%*llu %llu %*llu %llu"; *parse_format = "%*llu %llu %*llu %llu";
else else
@@ -124,17 +129,16 @@ get_sys_path(glibtop* server, const char *device, char **stat_path, const char *
static void linux_2_6_0(glibtop *server, glibtop_fsusage *buf, const char *path) static void linux_2_6_0(glibtop *server, glibtop_fsusage *buf, const char *path)
{ {
char *device;
char *filename; char *filename;
const char *format; const char *format;
int ret; int ret;
char buffer[BUFSIZ]; char buffer[BUFSIZ];
char device[64];
device = get_partition(path); if (!get_device(server, path, device, sizeof device))
if(!device) return; return;
get_sys_path(server, device, &filename, &format); get_sys_path(server, device, &filename, &format);
g_free(device);
ret = try_file_to_buffer(buffer, sizeof buffer, filename); ret = try_file_to_buffer(buffer, sizeof buffer, filename);