-logger.verbose("Cgroups: Recognizing already existing cgroups...")
-for virt in VIRT_TECHS:
- filenames = os.listdir(os.path.join(BASE_DIR, virt))
- for filename in filenames:
- path = os.path.join(BASE_DIR, virt, filename)
- if os.path.isdir(path):
- CGROUPS[filename] = path
-
-logger.verbose("Cgroups: Initializing watchers...")
-wm = pyinotify.WatchManager()
-notifier = pyinotify.ThreadedNotifier(wm, CgroupWatch())
-for virt in VIRT_TECHS:
- wdd = wm.add_watch(os.path.join(BASE_DIR, virt),
- pyinotify.IN_DELETE | pyinotify.IN_CREATE,
- rec=False)
-notifier.daemon = True
-notifier.start()
-
-def get_cgroup_path(name):
- """ Returns the base path for the cgroup with a specific name """
- assert CGROUPS.has_key(name), \
- "No sliver %s managed by libvirt through cgroup!" % name
- return CGROUPS[name]
+#logger.verbose("Cgroups: Recognizing already existing cgroups...")
+#for virt in VIRT_TECHS:
+# filenames = os.listdir(os.path.join(BASE_DIR, virt))
+# for filename in filenames:
+# path = os.path.join(BASE_DIR, virt, filename)
+# if os.path.isdir(path):
+# CGROUPS[filename] = path
+
+#logger.verbose("Cgroups: Initializing watchers...")
+#wm = pyinotify.WatchManager()
+#notifier = pyinotify.ThreadedNotifier(wm, CgroupWatch())
+#for virt in VIRT_TECHS:
+# wdd = wm.add_watch(os.path.join(BASE_DIR, virt),
+# pyinotify.IN_DELETE | pyinotify.IN_CREATE,
+# rec=False)
+#notifier.daemon = True
+#notifier.start()
+
+def get_cgroup_paths(subsystem="cpuset"):
+ cpusetBases = [
+ # observed on f16-f18
+ os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'),
+ # as observed on f20
+ os.path.join(BASE_DIR, subsystem ),
+ # as observed on f16 libvirt 1.2.1
+ os.path.join(BASE_DIR, subsystem, 'machine'),
+ ]
+ # try several locations and return all the results
+ # get_cgroup_path will sort it out
+ def merge(l1,l2): return l1+l2
+ return reduce (lambda l1,l2: l1+l2,
+ [ [ dir for dir in
+ [ os.path.join(cpusetBase, f) for f in os.listdir(cpusetBase) ]
+ if os.path.isdir(dir) ]
+ for cpusetBase in cpusetBases if os.path.isdir (cpusetBase) ])
+
+def get_cgroup_path(name, subsystem="cpuset"):
+ """ Returns the base path for the cgroup with a specific name or None."""
+ result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
+ get_cgroup_paths(subsystem), None)
+
+ if result is None:
+ name = name + ".libvirt-lxc"
+ result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
+ get_cgroup_paths(subsystem), None)
+
+ return result