Move line profiling from experimental plugin to profiler module; fix NPE

diff --git a/python/helpers/profiler/vmprof_profiler.py b/python/helpers/profiler/vmprof_profiler.py
index e941abdcab1566be05d909266439866c9554cdf2..2157055a1d7dc9b67b09714d2bf73e69eccce4ae 100644 (file)
--- 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):