Add BSD support for track-memory (#220)

- Add BSD bool variable (= true if running on BSD OS)
- Use psutil to get memory infos on BSD
- Use psutil.memory_info().rss on BSD instead of memory_full_info().uss
  (not supported)

Signed-off-by: Laurent Cheylus <[email protected]>
Co-authored-by: Victor Stinner <[email protected]>

Author: lcheylus

pyperf/_psutil_memory.py

@@ -1,6 +1,6 @@
 import os
 try:
-    from pyperf._utils import USE_PSUTIL
+    from pyperf._utils import USE_PSUTIL, BSD
     if not USE_PSUTIL:
         raise ImportError
     else:
@@ -21,7 +21,12 @@ def __init__(self):
         self._quit = False
 
     def get(self):
-        usage = self.process.memory_full_info().uss
+        if BSD:
+            # USS (Unique Set Size) is not supported on BSD,
+            # use RSS (Resident Set Size) instead.
+            usage = self.process.memory_info().rss
+        else:
+            usage = self.process.memory_full_info().uss
         self.peak_usage = max(self.peak_usage, usage)
 
     def run(self):

pyperf/_runner.py

@@ -12,9 +12,10 @@
                                set_highest_priority)
 from pyperf._formatter import format_timedelta
 from pyperf._hooks import get_hook_names
-from pyperf._utils import (MS_WINDOWS, MAC_OS, abs_executable,
+from pyperf._utils import (MS_WINDOWS, abs_executable,
                            WritePipe, get_python_names,
                            merge_profile_stats)
+from pyperf._system import OS_LINUX
 from pyperf._worker import WorkerProcessTask
 
 
@@ -346,10 +347,10 @@ def _process_args_impl(self):
         if args.track_memory:
             if MS_WINDOWS:
                 from pyperf._win_memory import check_tracking_memory
-            elif MAC_OS:
-                from pyperf._psutil_memory import check_tracking_memory
-            else:
+            elif OS_LINUX:
                 from pyperf._linux_memory import check_tracking_memory
+            else:
+                from pyperf._psutil_memory import check_tracking_memory
             err_msg = check_tracking_memory()
             if err_msg:
                 raise CLIError("unable to track the memory usage "

pyperf/_utils.py

@@ -15,6 +15,7 @@
 USE_PSUTIL = not bool(sysconfig.get_config_var('Py_GIL_DISABLED'))
 MS_WINDOWS = (sys.platform == 'win32')
 MAC_OS = (sys.platform == 'darwin')
+BSD = ('bsd' in sys.platform)
 
 if MS_WINDOWS:
     import msvcrt

pyperf/_worker.py

@@ -7,7 +7,8 @@
 from pyperf._formatter import (format_number, format_value, format_values,
                                format_timedelta)
 from pyperf._hooks import instantiate_selected_hooks
-from pyperf._utils import MS_WINDOWS, MAC_OS, percentile, median_abs_dev
+from pyperf._utils import MS_WINDOWS, percentile, median_abs_dev
+from pyperf._system import OS_LINUX
 
 
 MAX_LOOPS = 2 ** 32
@@ -327,12 +328,12 @@ def start(self):
         if MS_WINDOWS:
             from pyperf._win_memory import get_peak_pagefile_usage
             self.get_peak_profile_usage = get_peak_pagefile_usage
-        elif MAC_OS:
-            from pyperf._psutil_memory import PeakMemoryUsageThread
+        elif OS_LINUX:
+            from pyperf._linux_memory import PeakMemoryUsageThread
             self.mem_thread = PeakMemoryUsageThread()
             self.mem_thread.start()
         else:
-            from pyperf._linux_memory import PeakMemoryUsageThread
+            from pyperf._psutil_memory import PeakMemoryUsageThread
             self.mem_thread = PeakMemoryUsageThread()
             self.mem_thread.start()