proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-12 12:24:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cgmanager: tell dbus to do locking

Browse Source 
Thanks to S.Çağlar for figuring out that we needed this!

Also fix a memory leak found by coverity.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-03-06 10:23:17 -06:00
parent b711e4af87
commit 7c9a999558
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lxc/cgmanager.c
View File

@ -79,6 +79,7 @@ static bool cgm_keep_connection = false;
static struct cgroup_ops cgmanager_ops; static struct cgroup_ops cgmanager_ops;
static int nr_subsystems; static int nr_subsystems;
static char **subsystems; static char **subsystems;
static bool dbus_threads_initialized = false;
static void cgm_dbus_disconnect(void) static void cgm_dbus_disconnect(void)
{ {
@ -95,6 +96,13 @@ static void cgm_dbus_disconnect(void)
static bool do_cgm_dbus_connect(void) static bool do_cgm_dbus_connect(void)
{ {
DBusError dbus_error; DBusError dbus_error;
if (!dbus_threads_initialized) {
// tell dbus to do struct locking for thread safety
dbus_threads_init_default();
dbus_threads_initialized = true;
}
dbus_error_init(&dbus_error); dbus_error_init(&dbus_error);
connection = nih_dbus_connect(CGMANAGER_DBUS_SOCK, NULL); connection = nih_dbus_connect(CGMANAGER_DBUS_SOCK, NULL);
@ -935,6 +943,7 @@ static bool cgm_attach(const char *name, const char *lxcpath, pid_t pid)
} }
if (!cgm_dbus_connect()) { if (!cgm_dbus_connect()) {
ERROR("Error connecting to cgroup manager"); ERROR("Error connecting to cgroup manager");
lxc_container_put(c);
return false; return false;
} }
// cgm_create makes sure that we have the same cgroup name for all // cgm_create makes sure that we have the same cgroup name for all