projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix signed int/long truncation on 32-bit architectures
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index 14bbc57bd0862a46cac3ea0fbd9162288c77341f..f36683aeacf311561c6ba768565361c547fcd9bf 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-4,6
+4,8
@@
#include <stdio.h>
#include <stdlib.h>
#include <mntent.h>
#include <stdio.h>
#include <stdlib.h>
#include <mntent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include "fio.h"
#include "flist.h"
#include "cgroup.h"
#include "fio.h"
#include "flist.h"
#include "cgroup.h"
@@
-14,6
+16,7
@@
static struct fio_mutex *lock;
struct cgroup_member {
struct flist_head list;
char *root;
struct cgroup_member {
struct flist_head list;
char *root;
+ unsigned int cgroup_nodelete;
};
static char *find_cgroup_mnt(struct thread_data *td)
};
static char *find_cgroup_mnt(struct thread_data *td)
@@
-43,14
+46,16
@@
static char *find_cgroup_mnt(struct thread_data *td)
return mntpoint;
}
return mntpoint;
}
-static void add_cgroup(const char *name, struct flist_head *clist)
+static void add_cgroup(struct thread_data *td, const char *name,
+ struct flist_head *clist)
{
struct cgroup_member *cm;
cm = smalloc(sizeof(*cm));
INIT_FLIST_HEAD(&cm->list);
cm->root = smalloc_strdup(name);
{
struct cgroup_member *cm;
cm = smalloc(sizeof(*cm));
INIT_FLIST_HEAD(&cm->list);
cm->root = smalloc_strdup(name);
-
+ if (td->o.cgroup_nodelete)
+ cm->cgroup_nodelete = 1;
fio_mutex_down(lock);
flist_add_tail(&cm->list, clist);
fio_mutex_up(lock);
fio_mutex_down(lock);
flist_add_tail(&cm->list, clist);
fio_mutex_up(lock);
@@
-65,7
+70,8
@@
void cgroup_kill(struct flist_head *clist)
flist_for_each_safe(n, tmp, clist) {
cm = flist_entry(n, struct cgroup_member, list);
flist_for_each_safe(n, tmp, clist) {
cm = flist_entry(n, struct cgroup_member, list);
- rmdir(cm->root);
+ if (!cm->cgroup_nodelete)
+ rmdir(cm->root);
flist_del(&cm->list);
sfree(cm->root);
sfree(cm);
flist_del(&cm->list);
sfree(cm->root);
sfree(cm);
@@
-144,7
+150,7
@@
int cgroup_setup(struct thread_data *td, struct flist_head *clist, char **mnt)
goto err;
}
} else
goto err;
}
} else
- add_cgroup(root, clist);
+ add_cgroup(
td,
root, clist);
if (td->o.cgroup_weight) {
if (write_int_to_file(td, root, "blkio.weight",
if (td->o.cgroup_weight) {
if (write_int_to_file(td, root, "blkio.weight",