cgroups: introduce helper macros

parent 434c8e15
...@@ -1159,12 +1159,12 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops, ...@@ -1159,12 +1159,12 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
pivot_path = must_make_path(h->mountpoint, pivot_path = must_make_path(h->mountpoint,
h->container_base_path, h->container_base_path,
conf->cgroup_meta.dir, conf->cgroup_meta.dir,
"lxc.pivot", PIVOT_CGROUP,
"cgroup.procs", NULL); "cgroup.procs", NULL);
else else
pivot_path = must_make_path(h->mountpoint, pivot_path = must_make_path(h->mountpoint,
h->container_base_path, h->container_base_path,
"lxc.pivot", PIVOT_CGROUP,
"cgroup.procs", NULL); "cgroup.procs", NULL);
ret = mkdir_p(pivot_path, 0755); ret = mkdir_p(pivot_path, 0755);
...@@ -2714,7 +2714,7 @@ __cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops) ...@@ -2714,7 +2714,7 @@ __cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops)
return false; return false;
} }
ops->cgroup_pattern = must_copy_string(cgroup_pattern); ops->cgroup_pattern = must_copy_string(cgroup_pattern);
ops->monitor_pattern = must_copy_string("lxc.monitor"); ops->monitor_pattern = MONITOR_CGROUP;
return true; return true;
} }
......
...@@ -76,7 +76,6 @@ void cgroup_exit(struct cgroup_ops *ops) ...@@ -76,7 +76,6 @@ void cgroup_exit(struct cgroup_ops *ops)
free(ops->cgroup_pattern); free(ops->cgroup_pattern);
free(ops->container_cgroup); free(ops->container_cgroup);
free(ops->monitor_pattern);
for (it = ops->hierarchies; it && *it; it++) { for (it = ops->hierarchies; it && *it; it++) {
char **ctrlr; char **ctrlr;
......
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
#define PAYLOAD_CGROUP "lxc.payload"
#define MONITOR_CGROUP "lxc.monitor"
#define PIVOT_CGROUP "lxc.pivot"
struct lxc_handler; struct lxc_handler;
struct lxc_conf; struct lxc_conf;
struct lxc_list; struct lxc_list;
...@@ -96,6 +100,8 @@ struct cgroup_ops { ...@@ -96,6 +100,8 @@ struct cgroup_ops {
char **cgroup_use; char **cgroup_use;
char *cgroup_pattern; char *cgroup_pattern;
char *container_cgroup; char *container_cgroup;
/* Static memory, do not free.*/
char *monitor_pattern; char *monitor_pattern;
/* @hierarchies /* @hierarchies
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment