trace: move TimeRange from prof.py to trace.py

Signed-off-by: Tomasz Grabiec <tgrabiec@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>

scripts/osv/prof.py

@@ -20,38 +20,6 @@ class ProfNode(tree.TreeNode):
             'resident_time': self.resident_time
         }
 
-class TimeRange(object):
-    """
-    Represents time from @begin inclusive to @end exclusive.
-    None in any of these means open range from that side.
-
-    """
-    def __init__(self, begin, end):
-        self.begin = begin
-        self.end = end
-
-    def __contains__(self, timestamp):
-        if self.begin and timestamp < self.begin:
-            return False
-        if self.end and timestamp >= self.end:
-            return False
-        return True
-
-    def intersection(self, other):
-        begin = max(self.begin, other.begin)
-
-        if self.end is None:
-            end = other.end
-        elif other.end is None:
-            end = self.end
-        else:
-            end = min(self.end, other.end)
-
-        if begin and end and begin > end:
-            return None
-
-        return TimeRange(begin, end)
-
 class ProfSample:
     def __init__(self, timestamp, thread, backtrace, resident_time=None):
         self.thread = thread
@@ -61,7 +29,7 @@ class ProfSample:
 
     @property
     def time_range(self):
-        return TimeRange(self.timestamp, self.timestamp + self.resident_time)
+        return trace.TimeRange(self.timestamp, self.timestamp + self.resident_time)
 
     def intersection(self, time_range):
         intersection = self.time_range.intersection(time_range)

scripts/osv/trace.py

@@ -32,6 +32,38 @@ def simple_symbol_formatter(addr):
 
 default_backtrace_formatter = BacktraceFormatter(simple_symbol_formatter)
 
+class TimeRange(object):
+    """
+    Represents time from @begin inclusive to @end exclusive.
+    None in any of these means open range from that side.
+
+    """
+    def __init__(self, begin, end):
+        self.begin = begin
+        self.end = end
+
+    def __contains__(self, timestamp):
+        if self.begin and timestamp < self.begin:
+            return False
+        if self.end and timestamp >= self.end:
+            return False
+        return True
+
+    def intersection(self, other):
+        begin = max(self.begin, other.begin)
+
+        if self.end is None:
+            end = other.end
+        elif other.end is None:
+            end = self.end
+        else:
+            end = min(self.end, other.end)
+
+        if begin and end and begin > end:
+            return None
+
+        return TimeRange(begin, end)
+
 class TracePoint:
     def __init__(self, key, name, signature, format):
         self.key = key

scripts/trace.py

@@ -113,7 +113,7 @@ def int_or_none(value):
 
 def show_profile(args, sample_producer):
     resolver = symbol_resolver(args)
-    time_range = prof.TimeRange(int_or_none(args.since), int_or_none(args.until))
+    time_range = trace.TimeRange(int_or_none(args.since), int_or_none(args.until))
 
     if args.min_duration:
         min_duration = prof.parse_time_as_nanos(args.min_duration)