BSD support for track-memory: improve code and add comment

Signed-off-by: Laurent Cheylus <foxy@free.fr>

Author: lcheylus

pyperf/_psutil_memory.py

@@ -22,6 +22,7 @@ def __init__(self):
 
     def get(self):
         if BSD:
+            # uss (Unique Set Size) not supported on BSD, uses rss (Resident Set Size) instead
             usage = self.process.memory_info().rss
         else:
             usage = self.process.memory_full_info().uss

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, BSD, 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,12 +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
-            elif BSD:
-                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/_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, BSD, 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,16 +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
-            self.mem_thread = PeakMemoryUsageThread()
-            self.mem_thread.start()
-        elif BSD:
-            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()