mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

crit: Use ns_pid, ns_sid and ns_gid

Browse Source 
Reflect commit 3086b0323cf8 "pstree: Dump and restore NSpid, NSsid etc"
in crit.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2017-09-05 11:19:41 +03:00
committed by Andrei Vagin
parent c9ca83f05a
commit 20bc6aed12
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crit/crit
View File

@@ -49,20 +49,22 @@ def info(opts):
json.dump(infs, sys.stdout, indent = 4) json.dump(infs, sys.stdout, indent = 4)
print print
def get_task_id(p, val):
return p[val] if val in p else p['ns_' + val][0]
# #
# Explorers # Explorers
# #
class ps_item: class ps_item:
def __init__(self, p, core): def __init__(self, p, core):
self.pid = p['pid'] self.pid = get_task_id(p, 'pid')
self.ppid = p['ppid'] self.ppid = p['ppid']
self.p = p self.p = p
self.core = core self.core = core
self.kids = [] self.kids = []
def show_ps(p, opts, depth = 0): def show_ps(p, opts, depth = 0):
print "%7d%7d%7d %s%s" % (p.pid, p.p['pgid'], p.p['sid'], print "%7d%7d%7d %s%s" % (p.pid, get_task_id(p.p, 'pgid'), get_task_id(p.p, 'sid'),
' ' * (4 * depth), p.core['tc']['comm']) ' ' * (4 * depth), p.core['tc']['comm'])
for kid in p.kids: for kid in p.kids:
show_ps(kid, opts, depth + 1) show_ps(kid, opts, depth + 1)
@@ -71,7 +73,7 @@ def explore_ps(opts):
pss = { } pss = { }
ps_img = pycriu.images.load(dinf(opts, 'pstree.img')) ps_img = pycriu.images.load(dinf(opts, 'pstree.img'))
for p in ps_img['entries']: for p in ps_img['entries']:
core = pycriu.images.load(dinf(opts, 'core-%d.img' % p['pid'])) core = pycriu.images.load(dinf(opts, 'core-%d.img' % get_task_id(p, 'pid')))
ps = ps_item(p, core['entries'][0]) ps = ps_item(p, core['entries'][0])
pss[ps.pid] = ps pss[ps.pid] = ps
@@ -162,7 +164,7 @@ def get_file_str(opts, fd):
def explore_fds(opts): def explore_fds(opts):
ps_img = pycriu.images.load(dinf(opts, 'pstree.img')) ps_img = pycriu.images.load(dinf(opts, 'pstree.img'))
for p in ps_img['entries']: for p in ps_img['entries']:
pid = p['pid'] pid = get_task_id(p, 'pid')
idi = pycriu.images.load(dinf(opts, 'ids-%s.img' % pid)) idi = pycriu.images.load(dinf(opts, 'ids-%s.img' % pid))
fdt = idi['entries'][0]['files_id'] fdt = idi['entries'][0]['files_id']
fdi = pycriu.images.load(dinf(opts, 'fdinfo-%d.img' % fdt)) fdi = pycriu.images.load(dinf(opts, 'fdinfo-%d.img' % fdt))
@@ -194,7 +196,7 @@ def explore_mems(opts):
ps_img = pycriu.images.load(dinf(opts, 'pstree.img')) ps_img = pycriu.images.load(dinf(opts, 'pstree.img'))
vids = vma_id() vids = vma_id()
for p in ps_img['entries']: for p in ps_img['entries']:
pid = p['pid'] pid = get_task_id(p, 'pid')
mmi = pycriu.images.load(dinf(opts, 'mm-%d.img' % pid))['entries'][0] mmi = pycriu.images.load(dinf(opts, 'mm-%d.img' % pid))['entries'][0]
print "%d" % pid print "%d" % pid
@@ -239,7 +241,7 @@ def explore_mems(opts):
def explore_rss(opts): def explore_rss(opts):
ps_img = pycriu.images.load(dinf(opts, 'pstree.img')) ps_img = pycriu.images.load(dinf(opts, 'pstree.img'))
for p in ps_img['entries']: for p in ps_img['entries']:
pid = p['pid'] pid = get_task_id(p, 'pid')
vmas = pycriu.images.load(dinf(opts, 'mm-%d.img' % pid))['entries'][0]['vmas'] vmas = pycriu.images.load(dinf(opts, 'mm-%d.img' % pid))['entries'][0]['vmas']
pms = pycriu.images.load(dinf(opts, 'pagemap-%d.img' % pid))['entries'] pms = pycriu.images.load(dinf(opts, 'pagemap-%d.img' % pid))['entries']