From fd9f76e34788826ec841ca1761b429ff8793be8b Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 18 Oct 2016 12:01:56 +0200 Subject: [PATCH] Move line profiling from experimental plugin to profiler module; fix NPE --- python/helpers/profiler/vmprof_profiler.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python/helpers/profiler/vmprof_profiler.py b/python/helpers/profiler/vmprof_profiler.py index e941abdcab15..2157055a1d7d 100644 --- a/python/helpers/profiler/vmprof_profiler.py +++ b/python/helpers/profiler/vmprof_profiler.py @@ -1,10 +1,10 @@ +import os +import shutil +import tempfile import vmprof -import os import six from _prof_imports import TreeStats, CallTreeStat -import tempfile -import shutil class VmProfProfile(object): @@ -30,7 +30,10 @@ class VmProfProfile(object): if not os.path.exists(self.basepath): os.makedirs(self.basepath) self.file = tempfile.NamedTemporaryFile(delete=False, dir=self.basepath) - vmprof.enable(self.file.fileno()) + try: + vmprof.enable(self.file.fileno(), lines=True) + except: + vmprof.enable(self.file.fileno()) self.is_enabled = True def disable(self): -- 2.32.0