X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace_collection_message_iterator.py;h=821b5eae84f2e002e279e05b8ef35c4dacade036;hb=5f2a1585bf407f3f3aa7e63d9041b75390cf8563;hp=4e7347a92a01128a6265f4b2328739540d3044c5;hpb=30947af01a064c13fd12c8faf8f13e3d9fd8087f;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py b/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py index 4e7347a9..821b5eae 100644 --- a/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py +++ b/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py @@ -345,34 +345,30 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): self._stream_inter_port_to_range = {} for src_comp_and_spec in self._src_comps_and_specs: - try: - inputs = src_comp_and_spec.spec.params['inputs'] - except KeyError as e: - raise ValueError( - 'all source components must be created with an "inputs" parameter in stream intersection mode' - ) from e - - params = {'inputs': inputs} - - # query the port's component for the `babeltrace.trace-info` + # Query the port's component for the `babeltrace.trace-infos` # object which contains the range for each stream, from which we can # compute the intersection of the streams in each trace. query_exec = bt2.QueryExecutor( - src_comp_and_spec.spec.component_class, 'babeltrace.trace-info', params + src_comp_and_spec.spec.component_class, + 'babeltrace.trace-infos', + src_comp_and_spec.spec.params, ) trace_infos = query_exec.query() for trace_info in trace_infos: begin = max( - [stream['range-ns']['begin'] for stream in trace_info['streams']] + [ + stream['range-ns']['begin'] + for stream in trace_info['stream-infos'] + ] ) end = min( - [stream['range-ns']['end'] for stream in trace_info['streams']] + [stream['range-ns']['end'] for stream in trace_info['stream-infos']] ) # Each port associated to this trace will have this computed # range. - for stream in trace_info['streams']: + for stream in trace_info['stream-infos']: # A port name is unique within a component, but not # necessarily across all components. Use a component # and port name pair to make it unique across the graph.