projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename rate_poisson to rate_process
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index 86d4d5ea3b4331c1758561249b8583bce1e2ecc8..34b61ded08d0fa5e22527012c979e31163b1b8ec 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-52,9
+52,22
@@
static void add_cgroup(struct thread_data *td, const char *name,
{
struct cgroup_member *cm;
{
struct cgroup_member *cm;
+ if (!lock)
+ return;
+
cm = smalloc(sizeof(*cm));
cm = smalloc(sizeof(*cm));
+ if (!cm) {
+err:
+ log_err("fio: failed to allocate cgroup member\n");
+ return;
+ }
+
INIT_FLIST_HEAD(&cm->list);
cm->root = smalloc_strdup(name);
INIT_FLIST_HEAD(&cm->list);
cm->root = smalloc_strdup(name);
+ if (!cm->root) {
+ sfree(cm);
+ goto err;
+ }
if (td->o.cgroup_nodelete)
cm->cgroup_nodelete = 1;
fio_mutex_down(lock);
if (td->o.cgroup_nodelete)
cm->cgroup_nodelete = 1;
fio_mutex_down(lock);
@@
-67,6
+80,9
@@
void cgroup_kill(struct flist_head *clist)
struct flist_head *n, *tmp;
struct cgroup_member *cm;
struct flist_head *n, *tmp;
struct cgroup_member *cm;
+ if (!lock)
+ return;
+
fio_mutex_down(lock);
flist_for_each_safe(n, tmp, clist) {
fio_mutex_down(lock);
flist_for_each_safe(n, tmp, clist) {
@@
-183,6
+199,8
@@
void cgroup_shutdown(struct thread_data *td, char **mnt)
static void fio_init cgroup_init(void)
{
lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
static void fio_init cgroup_init(void)
{
lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
+ if (!lock)
+ log_err("fio: failed to allocate cgroup lock\n");
}
static void fio_exit cgroup_exit(void)
}
static void fio_exit cgroup_exit(void)