Commit d45c5481 authored by Pavel Emelyanov's avatar Pavel Emelyanov

zdtm.py: Fix iterations

Currently --iter N results in sequential images for every new iteration.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 12cb5bb8
...@@ -390,6 +390,7 @@ class criu_cli: ...@@ -390,6 +390,7 @@ class criu_cli:
self.__test = None self.__test = None
self.__dump_path = None self.__dump_path = None
self.__iter = 0 self.__iter = 0
self.__prev_dump_iter = None
self.__page_server = (opts['page_server'] and True or False) self.__page_server = (opts['page_server'] and True or False)
self.__restore_sibling = (opts['sibling'] and True or False) self.__restore_sibling = (opts['sibling'] and True or False)
self.__fault = (opts['fault']) self.__fault = (opts['fault'])
...@@ -436,8 +437,9 @@ class criu_cli: ...@@ -436,8 +437,9 @@ class criu_cli:
os.mkdir(self.__ddir()) os.mkdir(self.__ddir())
a_opts = ["-t", self.__test.getpid()] a_opts = ["-t", self.__test.getpid()]
if self.__iter > 1: if self.__prev_dump_iter:
a_opts += ["--prev-images-dir", "../%d" % (self.__iter - 1), "--track-mem"] a_opts += ["--prev-images-dir", "../%d" % self.__prev_dump_iter, "--track-mem"]
self.__prev_dump_iter = self.__iter
if self.__page_server: if self.__page_server:
print "Adding page server" print "Adding page server"
...@@ -459,6 +461,7 @@ class criu_cli: ...@@ -459,6 +461,7 @@ class criu_cli:
self.__test.auto_reap = False self.__test.auto_reap = False
r_opts += self.__test.getropts() r_opts += self.__test.getropts()
self.__prev_dump_iter = None
self.__criu_act("restore", opts = r_opts + ["--restore-detached"]) self.__criu_act("restore", opts = r_opts + ["--restore-detached"])
@staticmethod @staticmethod
......
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