Franck Pommereau

more fix to pid kill

...@@ -267,14 +267,14 @@ def extend (module) : ...@@ -267,14 +267,14 @@ def extend (module) :
267 for n, child in enumerate(children) : 267 for n, child in enumerate(children) :
268 assign.append("%s=%s.next(%s+%s)" 268 assign.append("%s=%s.next(%s+%s)"
269 % (child, parent, n, pidcount)) 269 % (child, parent, n, pidcount))
270 - for pid in self.pids.killed :
271 - pidcount = vars.fresh(add=True, base="next_%s" % pid)
272 - self.pids.next[pid] = pidcount
273 if guard is None : 270 if guard is None :
274 guard = snk.Expression("newpids(%s)" % ", ".join(assign)) 271 guard = snk.Expression("newpids(%s)" % ", ".join(assign))
275 else : 272 else :
276 guard = guard & snk.Expression("newpids(%s)" 273 guard = guard & snk.Expression("newpids(%s)"
277 % ", ".join(assign)) 274 % ", ".join(assign))
275 + for pid in self.pids.killed :
276 + pidcount = vars.fresh(add=True, base="next_%s" % pid)
277 + self.pids.next[pid] = pidcount
278 snk.Transition.__init__(self, name, guard, **args) 278 snk.Transition.__init__(self, name, guard, **args)
279 def vars (self) : 279 def vars (self) :
280 return self.pids.vars() | snk.Transition.vars(self) 280 return self.pids.vars() | snk.Transition.vars(self)
......