X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbabeltrace.i.in;h=4fee29d1d678db8632f4db3fb607536e7ba87267;hb=7d7466d89f0d46afc31a1520903b9f9e2aa183b1;hp=f9d2c736dff41636ec4b817c1978a5e662499800;hpb=54d1c81f52d1f8ac081a4b06996cc69db9294ce6;p=babeltrace.git diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in index f9d2c736..4fee29d1 100644 --- a/bindings/python/babeltrace.i.in +++ b/bindings/python/babeltrace.i.in @@ -101,10 +101,10 @@ int _bt_python_field_integer_get_signedness(const struct bt_ctf_field *field); enum ctf_type_id _bt_python_get_field_type(const struct bt_ctf_field *field); struct bt_iter_pos *_bt_python_create_iter_pos(void); struct bt_ctf_iter *_bt_python_ctf_iter_create_intersect( - struct bt_context *ctx, - struct bt_iter_pos *inter_begin_pos, - struct bt_iter_pos *inter_end_pos); -int _bt_python_has_intersection(struct bt_context *ctx); + struct bt_context *ctx, + struct bt_iter_pos *inter_begin_pos, + struct bt_iter_pos *inter_end_pos); +int _bt_python_trace_collection_has_intersection(struct bt_context *ctx); /* ================================================================= CONTEXT.H, CONTEXT-INTERNAL.H @@ -141,7 +141,7 @@ class TraceCollection: def __init__(self, intersect_mode=False): self._tc = _bt_context_create() - self._intersect_mode = intersect_mode + self._intersect_mode = intersect_mode def __del__(self): _bt_context_put(self._tc) @@ -213,13 +213,13 @@ class TraceCollection: raise TypeError("in remove_trace, " "argument 2 must be a TraceHandle instance") - @property - def intersect_mode(self): - return self._intersect_mode + @property + def intersect_mode(self): + return self._intersect_mode - @property - def has_intersection(self): - return _bt_python_has_intersection(self._tc) + @property + def has_intersection(self): + return _bt_python_trace_collection_has_intersection(self._tc) @property def events(self): @@ -292,18 +292,18 @@ class TraceCollection: return ev.timestamp def _events(self, begin_pos_ptr, end_pos_ptr): - if self.intersect_mode: - if not self.has_intersection: - # There are no events to provide. - return - - ctf_it_ptr = _bt_python_ctf_iter_create_intersect( - self._tc, begin_pos_ptr, end_pos_ptr - ) - else: - ctf_it_ptr = _bt_ctf_iter_create( - self._tc, begin_pos_ptr, end_pos_ptr - ) + if self.intersect_mode: + if not self.has_intersection: + # There are no events to provide. + return + + ctf_it_ptr = _bt_python_ctf_iter_create_intersect( + self._tc, begin_pos_ptr, end_pos_ptr + ) + else: + ctf_it_ptr = _bt_ctf_iter_create( + self._tc, begin_pos_ptr, end_pos_ptr + ) if ctf_it_ptr is None: raise NotImplementedError(