projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Free disk util on exit, not on stats display
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index f36683aeacf311561c6ba768565361c547fcd9bf..ea6bbd69168d7578fcf5836f8d9267f05bc15448 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-22,7
+22,8
@@
struct cgroup_member {
static char *find_cgroup_mnt(struct thread_data *td)
{
char *mntpoint = NULL;
static char *find_cgroup_mnt(struct thread_data *td)
{
char *mntpoint = NULL;
- struct mntent *mnt;
+ struct mntent *mnt, dummy;
+ char buf[256] = {0};
FILE *f;
f = setmntent("/proc/mounts", "r");
FILE *f;
f = setmntent("/proc/mounts", "r");
@@
-31,7
+32,7
@@
static char *find_cgroup_mnt(struct thread_data *td)
return NULL;
}
return NULL;
}
- while ((mnt = getmntent
(f
)) != NULL) {
+ while ((mnt = getmntent
_r(f, &dummy, buf, sizeof(buf)
)) != NULL) {
if (!strcmp(mnt->mnt_type, "cgroup") &&
strstr(mnt->mnt_opts, "blkio"))
break;
if (!strcmp(mnt->mnt_type, "cgroup") &&
strstr(mnt->mnt_opts, "blkio"))
break;
@@
-85,9
+86,9
@@
static char *get_cgroup_root(struct thread_data *td, char *mnt)
char *str = malloc(64);
if (td->o.cgroup)
char *str = malloc(64);
if (td->o.cgroup)
- sprintf(str, "%s
/%s", mnt
, td->o.cgroup);
+ sprintf(str, "%s
%s%s", mnt, FIO_OS_PATH_SEPARATOR
, td->o.cgroup);
else
else
- sprintf(str, "%s
/%s", mnt
, td->o.name);
+ sprintf(str, "%s
%s%s", mnt, FIO_OS_PATH_SEPARATOR
, td->o.name);
return str;
}
return str;
}
@@
-98,8
+99,8
@@
static int write_int_to_file(struct thread_data *td, const char *path,
{
char tmp[256];
FILE *f;
{
char tmp[256];
FILE *f;
-
- sprintf(tmp, "%s
/%s", path
, filename);
+
+ sprintf(tmp, "%s
%s%s", path, FIO_OS_PATH_SEPARATOR
, filename);
f = fopen(tmp, "w");
if (!f) {
td_verror(td, errno, onerr);
f = fopen(tmp, "w");
if (!f) {
td_verror(td, errno, onerr);