* THE SOFTWARE.
*/
-%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_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);
- PyObject *py_comp;
-
- BT_ASSERT(self_component);
- py_comp = bt_self_component_get_data(self_component);
- BT_ASSERT(py_comp);
-
- /* Return new reference */
- Py_INCREF(py_comp);
- return py_comp;
-}
-
-static inline
-PyObject *create_pylist_from_messages(bt_message_array_const messages,
- uint64_t message_count)
-{
- 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]),
- SWIGTYPE_p_bt_message, 0));
- }
-
- return py_msg_list;
+/* Output argument typemap for message_iterator (always appends) */
+%typemap(in, numinputs=0)
+ (bt_message_iterator **)
+ (bt_message_iterator *temp_msg_iter = NULL) {
+ $1 = &temp_msg_iter;
}
-static
-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_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);
+%typemap(argout)
+ (bt_message_iterator **) {
+ if (*$1) {
+ /* SWIG_Python_AppendOutput() steals the created object */
+ $result = SWIG_Python_AppendOutput($result,
+ SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
+ SWIGTYPE_p_bt_message_iterator, 0));
} else {
- py_msg_list = Py_None;
- Py_INCREF(py_msg_list);
+ /* SWIG_Python_AppendOutput() steals Py_None */
+ Py_INCREF(Py_None);
+ $result = SWIG_Python_AppendOutput($result, Py_None);
}
-
- PyTuple_SET_ITEM(py_return_tuple, 1, py_msg_list);
-
- return py_return_tuple;
}
-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_next_status status;
-
- 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_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_next_status status;
+%include <babeltrace2/graph/message-iterator.h>
+%include <babeltrace2/graph/self-message-iterator.h>
- status = bt_port_output_message_iterator_next(iter, &messages,
- &message_count);
- return get_msg_range_common(status, messages, message_count);
-}
+/* Helper functions for Python */
+%{
+#include "native_bt_message_iterator.i.h"
%}
+bt_message_iterator_create_from_message_iterator_status
+bt_bt2_message_iterator_create_from_message_iterator(
+ bt_self_message_iterator *self_msg_iter,
+ bt_self_component_port_input *input_port,
+ bt_message_iterator **message_iterator);
+bt_message_iterator_create_from_sink_component_status
+bt_bt2_message_iterator_create_from_sink_component(
+ bt_self_component_sink *self_comp,
+ bt_self_component_port_input *input_port,
+ bt_message_iterator **message_iterator);
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_bt2_port_output_get_msg_range(
- bt_port_output_message_iterator *iter);
+ bt_message_iterator *iter);