Fix: return event timestamp in _timestamp_at_pos

[babeltrace.git] / bindings / python / babeltrace.i.in

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index 5142952ec5fdeac715a28e01510354b29ed68f07..3dc1791010dc4202b34cb1346ca1a64b0ec9b20d 100644 (file)
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -99,6 +99,7 @@ const char *_bt_python_get_array_string(struct bt_definition *field);
 const char *_bt_python_get_sequence_string(struct bt_definition *field);
 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);
 
 /* =================================================================
                CONTEXT.H, CONTEXT-INTERNAL.H
@@ -223,21 +224,24 @@ class TraceCollection:
                event after the the generator has gone out of scope may result in a
                crash or data corruption.
                """
-               begin_pos_ptr = _bt_iter_pos()
-               end_pos_ptr = _bt_iter_pos()
+               begin_pos_ptr = _bt_python_create_iter_pos()
+               end_pos_ptr = _bt_python_create_iter_pos()
                begin_pos_ptr.type = SEEK_BEGIN
                end_pos_ptr.type = SEEK_LAST
 
                for event in self._events(begin_pos_ptr, end_pos_ptr):
                        yield event
 
+               _bt_iter_free_pos(begin_pos_ptr)
+               _bt_iter_free_pos(end_pos_ptr)
+
        def events_timestamps(self, timestamp_begin, timestamp_end):
                """
                Generator function to iterate over the events of open in the current
                TraceCollection from timestamp_begin to timestamp_end.
                """
-               begin_pos_ptr = _bt_iter_pos()
-               end_pos_ptr = _bt_iter_pos()
+               begin_pos_ptr = _bt_python_create_iter_pos()
+               end_pos_ptr = _bt_python_create_iter_pos()
                begin_pos_ptr.type = end_pos_ptr.type = SEEK_TIME
                begin_pos_ptr.u.seek_time = timestamp_begin
                end_pos_ptr.u.seek_time = timestamp_end
@@ -245,6 +249,9 @@ class TraceCollection:
                for event in self._events(begin_pos_ptr, end_pos_ptr):
                        yield event
 
+               _bt_iter_free_pos(begin_pos_ptr)
+               _bt_iter_free_pos(end_pos_ptr)
+
        @property
        def timestamp_begin(self):
                pos_ptr = _bt_iter_pos()
@@ -264,7 +271,10 @@ class TraceCollection:
                ev_ptr = _bt_ctf_iter_read_event(ctf_it_ptr)
                _bt_ctf_iter_destroy(ctf_it_ptr)
                if ev_ptr is None:
-                       return None;
+                       return None
+               ev = Event.__new__(Event)
+               ev._e = ev_ptr
+               return ev.timestamp
 
        def _events(self, begin_pos_ptr, end_pos_ptr):
                ctf_it_ptr = _bt_ctf_iter_create(self._tc, begin_pos_ptr, end_pos_ptr)