Merge lp:~jelmer/meliae/hurd into lp:meliae

[Jelmer Vernooij]

Raise NotImplementedError when trying to get memory details on GNU/Hurd.

[John A Meinel (jameinel)]

I'm guessing this is now going to the wrong place in CHANGES.txt, but I'm fine with having this added

[John A Meinel (jameinel)]

review: Approve

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2011-11-01 15:25:57 +0000
+++ CHANGES.txt	2016-12-25 17:55:34 +0000
@@ -14,6 +14,9 @@
   'obj[-1]' to get the last child, (same as obj.c[-1]).
   (Robert Xiao, #882356)
 
+* Raise NotImplementedError when trying to get memory counters on
+  GNU/Hurd. (Jelmer Vernooij)
+
 Meliae 0.4
 ##########
 

=== modified file 'meliae/perf_counter.py'
--- meliae/perf_counter.py	2010-07-12 20:10:34 +0000
+++ meliae/perf_counter.py	2016-12-25 17:55:34 +0000
@@ -120,6 +120,17 @@
 	return current, peak
 
 
+class _HurdPerformanceCounter(PerformanceCounter):
+
+    def get_timer(self):
+        # This returns wall-clock time
+        return time.time
+
+    def get_memory(self, process):
+        # TODO: Implement support for GNU Hurd.
+        raise NotImplementedError(self.get_memory)
+
+
 class _Win32PerformanceCounter(PerformanceCounter):
 
     def get_timer(self):
@@ -174,6 +185,8 @@
                     ('PeakPagefileUsage', ctypes.c_size_t),
                     ('PrivateUsage', ctypes.c_size_t),
                    ]
+elif sys.platform == 'gnu0':
+    perf_counter = _HurdPerformanceCounter()
 else:
     perf_counter = _LinuxPerformanceCounter()