Skip to content

Commit

Permalink
[core] stats: avoid crash in psutil (windows only)
Browse files Browse the repository at this point in the history
  • Loading branch information
fabiencastan committed Oct 13, 2020
1 parent 7dc44a3 commit 88099dd
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions meshroom/core/stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,19 @@ def update(self, proc):
data = proc.as_dict(self.dynamicKeys)
for k, v in data.items():
self._addKV(k, v)

files = [f.path for f in proc.open_files()]
if self.lastIterIndexWithFiles != -1:
if set(files) != set(self.openFiles[self.lastIterIndexWithFiles]):
self.openFiles[self.iterIndex] = files
self.lastIterIndexWithFiles = self.iterIndex
elif files:
self.openFiles[self.iterIndex] = files
self.lastIterIndexWithFiles = self.iterIndex

## Note: Do not collect stats about open files for now,
# as there is bug in psutil-5.7.2 on Windows which crashes the application.
# https://github.com/giampaolo/psutil/issues/1763
#
# files = [f.path for f in proc.open_files()]
# if self.lastIterIndexWithFiles != -1:
# if set(files) != set(self.openFiles[self.lastIterIndexWithFiles]):
# self.openFiles[self.iterIndex] = files
# self.lastIterIndexWithFiles = self.iterIndex
# elif files:
# self.openFiles[self.iterIndex] = files
# self.lastIterIndexWithFiles = self.iterIndex
self.iterIndex += 1

def toDict(self):
Expand Down

0 comments on commit 88099dd

Please sign in to comment.