* THE SOFTWARE.
*/
-%include <babeltrace2/graph/message-iterator-const.h>
+%include <babeltrace2/graph/message-iterator.h>
%include <babeltrace2/graph/port-output-message-iterator.h>
%include <babeltrace2/graph/self-component-port-input-message-iterator.h>
%include <babeltrace2/graph/self-message-iterator.h>
/* Helper functions for Python */
%{
-static PyObject *bt_py3_get_user_component_from_user_msg_iter(
+static PyObject *bt_bt2_get_user_component_from_user_msg_iter(
bt_self_message_iterator *self_message_iterator)
{
bt_self_component *self_component = bt_self_message_iterator_borrow_component(self_message_iterator);
{
uint64_t i;
PyObject *py_msg_list = PyList_New(message_count);
+
BT_ASSERT(py_msg_list);
+
for (i = 0; i < message_count; i++) {
PyList_SET_ITEM(py_msg_list, i,
SWIG_NewPointerObj(SWIG_as_voidptr(messages[i]),
}
static
-PyObject *bt_py3_get_msg_range_common(bt_message_iterator_status status,
+PyObject *get_msg_range_common(bt_message_iterator_next_status status,
bt_message_array_const messages, uint64_t message_count)
{
PyObject *py_status;
PyObject *py_return_tuple;
- PyObject *py_msg_list = Py_None;
-
- py_status = SWIG_From_long_SS_long(status);
- if (status != BT_MESSAGE_ITERATOR_STATUS_OK) {
- goto end;
- }
-
- py_msg_list = create_pylist_from_messages(messages, message_count);
+ PyObject *py_msg_list;
-end:
py_return_tuple = PyTuple_New(2);
BT_ASSERT(py_return_tuple);
+
+ /* Set tuple[0], status. */
+ py_status = SWIG_From_long_SS_long(status);
PyTuple_SET_ITEM(py_return_tuple, 0, py_status);
+
+ /* Set tuple[1], message list on success, None otherwise. */
+ if (status == __BT_FUNC_STATUS_OK) {
+ py_msg_list = create_pylist_from_messages(messages, message_count);
+ } else {
+ py_msg_list = Py_None;
+ Py_INCREF(py_msg_list);
+ }
+
PyTuple_SET_ITEM(py_return_tuple, 1, py_msg_list);
return py_return_tuple;
}
-static PyObject
-*bt_py3_self_component_port_input_get_msg_range(
+static PyObject *bt_bt2_self_component_port_input_get_msg_range(
bt_self_component_port_input_message_iterator *iter)
{
bt_message_array_const messages;
uint64_t message_count = 0;
- bt_message_iterator_status status;
+ bt_message_iterator_next_status status;
- status = bt_self_component_port_input_message_iterator_next(iter, &messages,
- &message_count);
-
- return bt_py3_get_msg_range_common(status, messages, message_count);
+ status = bt_self_component_port_input_message_iterator_next(iter,
+ &messages, &message_count);
+ return get_msg_range_common(status, messages, message_count);
}
-static PyObject
-*bt_py3_port_output_get_msg_range(
+static PyObject *bt_bt2_port_output_get_msg_range(
bt_port_output_message_iterator *iter)
{
bt_message_array_const messages;
uint64_t message_count = 0;
- bt_message_iterator_status status;
+ bt_message_iterator_next_status status;
- status =
- bt_port_output_message_iterator_next(iter, &messages,
- &message_count);
-
- return bt_py3_get_msg_range_common(status, messages, message_count);
+ status = bt_port_output_message_iterator_next(iter, &messages,
+ &message_count);
+ return get_msg_range_common(status, messages, message_count);
}
%}
-PyObject *bt_py3_get_user_component_from_user_msg_iter(
- bt_self_message_iterator *self_message_iterator);
-PyObject *bt_py3_self_component_port_input_get_msg_range(
+PyObject *bt_bt2_get_user_component_from_user_msg_iter(
+ bt_self_message_iterator *self_message_iterator);
+PyObject *bt_bt2_self_component_port_input_get_msg_range(
bt_self_component_port_input_message_iterator *iter);
-PyObject *bt_py3_port_output_get_msg_range(
+PyObject *bt_bt2_port_output_get_msg_range(
bt_port_output_message_iterator *iter);