3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-04-29 18:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] verify chunk hosts a subprocess before killing it

Browse source 
a chunk can be marked as "RUNNING" without hosting a subprocess, if a node is duplicated in the graph
This commit is contained in:
Yann Lanthony 2018-07-18 17:00:08 +02:00
parent f5d11a8a7a
commit 5897dc13b6
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meshroom/core/desc.py
View file

@ -368,6 +368,10 @@ class CommandLineNode(Node):
return cmdPrefix + chunk.node.nodeDesc.commandLine.format(**chunk.node._cmdVars) + cmdSuffix
def stopProcess(self, chunk):
# the same node could exists several times in the graph and
# only one would have the running subprocess; ignore all others
if not hasattr(chunk, "subprocess"):
return
if chunk.subprocess:
# kill process tree
processes = chunk.subprocess.children(recursive=True) + [chunk.subprocess]