diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2015-07-14 17:05:27 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2015-07-14 17:05:27 -0400 |
commit | 51f2b3bc12727e1125b7f3ddfb0c32827b39dea3 (patch) | |
tree | 6cc487d30e93450190bde84d47e66e13c69618d5 | |
parent | grs/Interpret.py: add documentation. (diff) | |
download | grss-51f2b3bc12727e1125b7f3ddfb0c32827b39dea3.tar.gz grss-51f2b3bc12727e1125b7f3ddfb0c32827b39dea3.tar.bz2 grss-51f2b3bc12727e1125b7f3ddfb0c32827b39dea3.zip |
grs/Constants.py: elevate grs_group/dir to CONSTs.
-rw-r--r-- | grs/Constants.py | 2 | ||||
-rwxr-xr-x | grsrun | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/grs/Constants.py b/grs/Constants.py index b9ea1d9..0eebec0 100644 --- a/grs/Constants.py +++ b/grs/Constants.py @@ -149,3 +149,5 @@ CONST.PIDFILE = '/run/grs.pid' CONST.PORTAGE_CONFIGDIR = '/etc/portage' CONST.PORTAGE_DIRTYFILE = '/etc/portage/.grs_dirty' CONST.WORLD_CONFIG = '/etc/grs/world.conf' +CONST.GRS_CGROUP = 'grs' +CONST.GRS_CGROUPDIR = '/sys/fs/cgroup/grs' @@ -42,23 +42,19 @@ def main(): elif o == '-u': update_run = True - cgroupdir = '/sys/fs/cgroup' - grs_cgroup = 'grs' - grs_cgroupdir = os.path.join(cgroupdir, grs_cgroup) - - os.makedirs(grs_cgroupdir, mode=0o555, exist_ok=True) - if not os.path.ismount(grs_cgroupdir): - cmd = 'mount -t cgroup -o none,name=grs grs %s' % grs_cgroupdir + os.makedirs(CONST.GRS_CGROUPDIR, mode=0o555, exist_ok=True) + if not os.path.ismount(CONST.GRS_CGROUPDIR): + cmd = 'mount -t cgroup -o none,name=grs grs %s' % CONST.GRS_CGROUPDIR Execute(cmd) count = 0 for name in CONST.names: if not os.fork(): subcgroup = 'run-%s' % name - subcgroupdir = os.path.join(grs_cgroupdir, subcgroup) + subcgroupdir = os.path.join(CONST.GRS_CGROUPDIR, subcgroup) os.makedirs(subcgroupdir, exist_ok=True) - cmd = 'cgclassify -g name=%s:/%s %d' % (grs_cgroup, subcgroup, os.getpid()) + cmd = 'cgclassify -g name=%s:/%s %d' % (CONST.GRS_CGROUP, subcgroup, os.getpid()) Execute(cmd) mr = Interpret(CONST.pidfiles[count], run_number=count, subcgroupdir=subcgroupdir, \ |