projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio.h: also check trim operations in fio_ro_check
[fio.git]
/
cgroup.c
diff --git
a/cgroup.c
b/cgroup.c
index 34b61ded08d0fa5e22527012c979e31163b1b8ec..629047b495b33c145ca545ac4856efdecaf78df5 100644
(file)
--- a/
cgroup.c
+++ b/
cgroup.c
@@
-5,13
+5,12
@@
#include <stdlib.h>
#include <mntent.h>
#include <sys/stat.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 "smalloc.h"
#include "fio.h"
#include "flist.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;
@@
-70,9
+69,9
@@
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)
@@
-83,7
+82,7
@@
void cgroup_kill(struct flist_head *clist)
if (!lock)
return;
if (!lock)
return;
- fio_
mutex
_down(lock);
+ 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);
@@
-94,7
+93,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)
@@
-102,9
+101,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%s", mnt, FIO_OS_PATH_SEPARATOR
, td->o.cgroup);
+ sprintf(str, "%s
/%s", mnt
, td->o.cgroup);
else
else
- sprintf(str, "%s
%s%s", mnt, FIO_OS_PATH_SEPARATOR
, td->o.name);
+ sprintf(str, "%s
/%s", mnt
, td->o.name);
return str;
}
return str;
}
@@
-116,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%s", path, FIO_OS_PATH_SEPARATOR
, filename);
+ sprintf(tmp, "%s
/%s", path
, filename);
f = fopen(tmp, "w");
if (!f) {
td_verror(td, errno, onerr);
f = fopen(tmp, "w");
if (!f) {
td_verror(td, errno, onerr);
@@
-148,6
+147,9
@@
int cgroup_setup(struct thread_data *td, struct flist_head *clist, char **mnt)
{
char *root;
{
char *root;
+ if (!clist)
+ return 1;
+
if (!*mnt) {
*mnt = find_cgroup_mnt(td);
if (!*mnt)
if (!*mnt) {
*mnt = find_cgroup_mnt(td);
if (!*mnt)
@@
-198,12
+200,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(FIO_MUTEX
_UNLOCKED);
+ 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)
{
if (!lock)
log_err("fio: failed to allocate cgroup lock\n");
}
static void fio_exit cgroup_exit(void)
{
- fio_
mutex
_remove(lock);
+ fio_
sem
_remove(lock);
}
}