projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
verify: Simplify dump_buf()
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index de00d986eb05246b25e853c3af524149f1b53e22..4fab977aeb8c3ddadadf1680692d7bf5210d70dd 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-11,7
+11,7
@@
#include "cgroup.h"
#include "smalloc.h"
#include "cgroup.h"
#include "smalloc.h"
-static struct fio_
mutex
*lock;
+static struct fio_
sem
*lock;
struct cgroup_member {
struct flist_head list;
struct cgroup_member {
struct flist_head list;
@@
-52,14
+52,27
@@
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;
if (td->o.cgroup_nodelete)
cm->cgroup_nodelete = 1;
- fio_
mutex
_down(lock);
+ fio_
sem
_down(lock);
flist_add_tail(&cm->list, clist);
flist_add_tail(&cm->list, clist);
- fio_
mutex
_up(lock);
+ fio_
sem
_up(lock);
}
void cgroup_kill(struct flist_head *clist)
}
void cgroup_kill(struct flist_head *clist)
@@
-67,7
+80,10
@@
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;
- fio_mutex_down(lock);
+ if (!lock)
+ return;
+
+ fio_sem_down(lock);
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);
@@
-78,7
+94,7
@@
void cgroup_kill(struct flist_head *clist)
sfree(cm);
}
sfree(cm);
}
- fio_
mutex
_up(lock);
+ fio_
sem
_up(lock);
}
static char *get_cgroup_root(struct thread_data *td, char *mnt)
}
static char *get_cgroup_root(struct thread_data *td, char *mnt)
@@
-99,7
+115,7
@@
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);
f = fopen(tmp, "w");
if (!f) {
sprintf(tmp, "%s/%s", path, filename);
f = fopen(tmp, "w");
if (!f) {
@@
-182,10
+198,12
@@
void cgroup_shutdown(struct thread_data *td, char **mnt)
static void fio_init cgroup_init(void)
{
static void fio_init cgroup_init(void)
{
- lock = fio_mutex_init(1);
+ lock = fio_sem_init(FIO_SEM_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)
{
- fio_
mutex
_remove(lock);
+ fio_
sem
_remove(lock);
}
}