src.ctf.fs: add stream port name to trace-info query, use it for stream intersection

[babeltrace.git] / bindings / python / bt2 / bt2 / trace_collection_message_iterator.py

diff --git a/bindings/python/bt2/bt2/trace_collection_message_iterator.py b/bindings/python/bt2/bt2/trace_collection_message_iterator.py
index 269e796227586e647907cea23301b64c8416529a..2185fcd5772aa1ccbaba13ad48d68123fd21d05e 100644 (file)
--- a/bindings/python/bt2/bt2/trace_collection_message_iterator.py
+++ b/bindings/python/bt2/bt2/trace_collection_message_iterator.py
@@ -140,14 +140,15 @@ class TraceCollectionMessageIterator(bt2.message_iterator._MessageIterator):
         begin = None
         end = None
 
         begin = None
         end = None
 

-        # find the trace info for this port's trace by name's prefix
+        # find the trace info for this port's trace

         try:
             for trace_info in trace_info_res:
         try:
             for trace_info in trace_info_res:

-                if port.name.startswith(str(trace_info['path'])):
-                    range_ns = trace_info['intersection-range-ns']
-                    begin = range_ns['begin']
-                    end = range_ns['end']
-                    break
+                for stream in trace_info['streams']:
+                    if stream['port-name'] == port.name:
+                        range_ns = trace_info['intersection-range-ns']
+                        begin = range_ns['begin']
+                        end = range_ns['end']
+                        break

         except Exception:
             pass
 
         except Exception:
             pass