projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for absolute random zones
[fio.git]
/
diskutil.c
diff --git
a/diskutil.c
b/diskutil.c
index 0f7a64209b57747139e66705a8fd2f71ebbe4697..618cae8b54f4c3138f55f2ea537e0b9b6ed12a69 100644
(file)
--- a/
diskutil.c
+++ b/
diskutil.c
@@
-3,6
+3,7
@@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
#include <dirent.h>
#include <libgen.h>
#include <math.h>
#include <dirent.h>
#include <libgen.h>
#include <math.h>
@@
-18,8
+19,6
@@
static struct disk_util *last_du;
static struct fio_mutex *disk_util_mutex;
static struct fio_mutex *disk_util_mutex;
-FLIST_HEAD(disk_list);
-
static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
int majdev, int mindev, char *path);
static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
int majdev, int mindev, char *path);
@@
-37,6
+36,7
@@
static void disk_util_free(struct disk_util *du)
}
fio_mutex_remove(du->lock);
}
fio_mutex_remove(du->lock);
+ free(du->sysfs_root);
sfree(du);
}
sfree(du);
}
@@
-85,7
+85,7
@@
static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
static void update_io_tick_disk(struct disk_util *du)
{
struct disk_util_stat __dus, *dus, *ldus;
static void update_io_tick_disk(struct disk_util *du)
{
struct disk_util_stat __dus, *dus, *ldus;
- struct time
val
t;
+ struct time
spec
t;
if (!du->users)
return;
if (!du->users)
return;
@@
-292,10
+292,8
@@
static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = smalloc(sizeof(*du));
dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = smalloc(sizeof(*du));
- if (!du) {
- log_err("fio: smalloc() pool exhausted\n");
+ if (!du)
return NULL;
return NULL;
- }
memset(du, 0, sizeof(*du));
INIT_FLIST_HEAD(&du->list);
memset(du, 0, sizeof(*du));
INIT_FLIST_HEAD(&du->list);
@@
-307,7
+305,7
@@
static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
return NULL;
}
strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ - 1);
return NULL;
}
strncpy((char *) du->dus.name, basename(path), FIO_DU_NAME_SZ - 1);
- du->sysfs_root =
path
;
+ du->sysfs_root =
strdup(path)
;
du->major = majdev;
du->minor = mindev;
INIT_FLIST_HEAD(&du->slavelist);
du->major = majdev;
du->minor = mindev;
INIT_FLIST_HEAD(&du->slavelist);
@@
-366,7
+364,7
@@
static int find_block_dir(int majdev, int mindev, char *path, int link_ok)
return 0;
while ((dir = readdir(D)) != NULL) {
return 0;
while ((dir = readdir(D)) != NULL) {
- char full_path[25
6
];
+ char full_path[25
7
];
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
continue;
@@
-432,9
+430,6
@@
static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
sprintf(path, "%s", tmp);
}
sprintf(path, "%s", tmp);
}
- if (td->o.ioscheduler && !td->sysfs_root)
- td->sysfs_root = strdup(path);
-
return disk_util_add(td, majdev, mindev, path);
}
return disk_util_add(td, majdev, mindev, path);
}
@@
-453,12
+448,8
@@
static struct disk_util *init_per_file_disk_util(struct thread_data *td,
mindev);
du = disk_util_exists(majdev, mindev);
mindev);
du = disk_util_exists(majdev, mindev);
- if (du) {
- if (td->o.ioscheduler && !td->sysfs_root)
- td->sysfs_root = strdup(du->sysfs_root);
-
+ if (du)
return du;
return du;
- }
/*
* for an fs without a device, we will repeatedly stat through
/*
* for an fs without a device, we will repeatedly stat through