bt2: replace copy of headers for SWIG with includes
authorSimon Marchi <simon.marchi@efficios.com>
Fri, 21 Jun 2019 22:37:24 +0000 (18:37 -0400)
committerPhilippe Proulx <eeppeliteloop@gmail.com>
Thu, 27 Jun 2019 03:09:07 +0000 (23:09 -0400)
The current approach of writing SWIG interface files is to copy paste
declarations.  This can be tedious and error prone, when the API is
modified.

This patch changes the interface files to include the Babeltrace header
files containing those declarations instead.

The main difficulty with this is that we can't rely on parameter names
for typemap matching anymore.  In most cases, using just the type is
fine (e.g. the only reason a function takes a
bt_self_component_port_input ** is as an output parameter).

In the case of "user data" it's a bit more tricky, since the type is
"void *".  In these cases (in native_bt_component.i and
native_bt_port.i), I made it so we clear the typemap at the end of the
file, so hopefully it doesn't apply to an unexpected function in another
file.

In native_bt_field_class.i, the typemap for

    (bt_field_class_enumeration_mapping_label_array *label_array, uint64_t *count)

doesn't work if I leave out the parameter names, for some reason, so I
have put the parameter names used in the headers.

Change-Id: I2e98c60c2dcb7c8ea243b4cf36e0fcfaf53e9cde
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1531
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
24 files changed:
src/bindings/python/bt2/bt2/native_bt.i
src/bindings/python/bt2/bt2/native_bt_clock_class.i
src/bindings/python/bt2/bt2/native_bt_clock_snapshot.i
src/bindings/python/bt2/bt2/native_bt_component.i
src/bindings/python/bt2/bt2/native_bt_component_class.i
src/bindings/python/bt2/bt2/native_bt_connection.i
src/bindings/python/bt2/bt2/native_bt_event.i
src/bindings/python/bt2/bt2/native_bt_event_class.i
src/bindings/python/bt2/bt2/native_bt_field.i
src/bindings/python/bt2/bt2/native_bt_field_class.i
src/bindings/python/bt2/bt2/native_bt_field_path.i
src/bindings/python/bt2/bt2/native_bt_graph.i
src/bindings/python/bt2/bt2/native_bt_message.i
src/bindings/python/bt2/bt2/native_bt_notifier.i
src/bindings/python/bt2/bt2/native_bt_packet.i
src/bindings/python/bt2/bt2/native_bt_plugin.i
src/bindings/python/bt2/bt2/native_bt_port.i
src/bindings/python/bt2/bt2/native_bt_query_exec.i
src/bindings/python/bt2/bt2/native_bt_stream.i
src/bindings/python/bt2/bt2/native_bt_stream_class.i
src/bindings/python/bt2/bt2/native_bt_trace.i
src/bindings/python/bt2/bt2/native_bt_trace_class.i
src/bindings/python/bt2/bt2/native_bt_value.i
src/bindings/python/bt2/setup.py.in

index e538b268b448268c07fdd76c4af3544541495c1c..bde8d806343b8d37656308a8fe2a3124f3aaf6a6 100644 (file)
@@ -61,11 +61,11 @@ typedef int bt_bool;
  * functions on which we apply this typemap don't guarantee that the value of
  * `temp_value` will be unchanged or valid.
  */
-%typemap(in, numinputs=0) (const char **OUT) (char *temp_value = (void *) 1) {
+%typemap(in, numinputs=0) (const char **) (char *temp_value = (void *) 1) {
        $1 = &temp_value;
 }
 
-%typemap(argout) (const char **OUT) {
+%typemap(argout) (const char **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result, SWIG_Python_str_FromChar(*$1));
@@ -77,11 +77,11 @@ typedef int bt_bool;
 }
 
 /* Output argument typemap for value output (always appends) */
-%typemap(in, numinputs=0) (bt_value **OUT) (struct bt_value *temp_value = NULL) {
+%typemap(in, numinputs=0) (bt_value **) (struct bt_value *temp_value = NULL) {
        $1 = &temp_value;
 }
 
-%typemap(argout) (bt_value **OUT) {
+%typemap(argout) (bt_value **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
@@ -95,30 +95,30 @@ typedef int bt_bool;
 }
 
 /* Output argument typemap for initialized uint64_t output parameter (always appends) */
-%typemap(in, numinputs=0) (uint64_t *OUT) (uint64_t temp) {
+%typemap(in, numinputs=0) (uint64_t *) (uint64_t temp) {
        $1 = &temp;
 }
 
-%typemap(argout) uint64_t *OUT {
+%typemap(argout) uint64_t * {
        $result = SWIG_Python_AppendOutput(resultobj,
                        SWIG_From_unsigned_SS_long_SS_long((*$1)));
 }
 
 /* Output argument typemap for initialized int64_t output parameter (always appends) */
-%typemap(in, numinputs=0) (int64_t *OUT) (int64_t temp) {
+%typemap(in, numinputs=0) (int64_t *) (int64_t temp) {
        $1 = &temp;
 }
 
-%typemap(argout) (int64_t *OUT) {
+%typemap(argout) (int64_t *) {
        $result = SWIG_Python_AppendOutput(resultobj, SWIG_From_long_SS_long((*$1)));
 }
 
 /* Output argument typemap for initialized unsigned int output parameter (always appends) */
-%typemap(in, numinputs=0) (unsigned int *OUT) (unsigned int temp) {
+%typemap(in, numinputs=0) (unsigned int *) (unsigned int temp) {
        $1 = &temp;
 }
 
-%typemap(argout) (unsigned int *OUT) {
+%typemap(argout) (unsigned int *) {
        $result = SWIG_Python_AppendOutput(resultobj,
                        SWIG_From_unsigned_SS_long_SS_long((uint64_t) (*$1)));
 }
@@ -179,12 +179,7 @@ typedef int bt_bool;
        $result = $1;
 }
 
-/* From property.h */
-
-typedef enum bt_property_availability {
-       BT_PROPERTY_AVAILABILITY_AVAILABLE,
-       BT_PROPERTY_AVAILABILITY_NOT_AVAILABLE,
-} bt_property_availability;
+%include <babeltrace2/property.h>
 
 /* Per-module interface files */
 %include "native_bt_clock_class.i"
index bf8ea4379f6b4a70b8982f3ed4ca70f9a9e15bb9..4e7bfb224837c1a9fc1715b3ee2ea19faa036bd1 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From clock-class-const.h */
-
-typedef enum bt_clock_class_status {
-       BT_CLOCK_CLASS_STATUS_OK = 0,
-       BT_CLOCK_CLASS_STATUS_NOMEM = -12,
-       BT_CLOCK_CLASS_STATUS_OVERFLOW = -75,
-} bt_clock_class_status;
-
-extern const char *bt_clock_class_get_name(
-               const bt_clock_class *clock_class);
-
-extern const char *bt_clock_class_get_description(
-               const bt_clock_class *clock_class);
-
-extern uint64_t bt_clock_class_get_frequency(
-               const bt_clock_class *clock_class);
-
-extern uint64_t bt_clock_class_get_precision(
-               const bt_clock_class *clock_class);
-
-extern void bt_clock_class_get_offset(const bt_clock_class *clock_class,
-               int64_t *OUT, uint64_t *OUT);
-
-extern bt_bool bt_clock_class_origin_is_unix_epoch(
-               const bt_clock_class *clock_class);
-
-extern bt_uuid bt_clock_class_get_uuid(
-               const bt_clock_class *clock_class);
-
-extern bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
-               const bt_clock_class *clock_class,
-               uint64_t cycles, int64_t *OUT);
-
-extern void bt_clock_class_get_ref(const bt_clock_class *clock_class);
-
-extern void bt_clock_class_put_ref(const bt_clock_class *clock_class);
-
-/* From clock-class.h */
-
-extern bt_clock_class *bt_clock_class_create(bt_self_component *self_comp);
-
-extern bt_clock_class_status bt_clock_class_set_name(
-               bt_clock_class *clock_class, const char *name);
-
-extern bt_clock_class_status bt_clock_class_set_description(
-               bt_clock_class *clock_class, const char *description);
-
-extern void bt_clock_class_set_frequency(bt_clock_class *clock_class,
-               uint64_t freq);
-
-extern void bt_clock_class_set_precision(bt_clock_class *clock_class,
-               uint64_t precision);
-
-extern void bt_clock_class_set_offset(bt_clock_class *clock_class,
-               int64_t seconds, uint64_t cycles);
-
-extern void bt_clock_class_set_origin_is_unix_epoch(bt_clock_class *clock_class,
-               bt_bool origin_is_unix_epoch);
-
-extern void bt_clock_class_set_uuid(bt_clock_class *clock_class,
-               bt_uuid uuid);
+%include <babeltrace2/trace-ir/clock-class-const.h>
+%include <babeltrace2/trace-ir/clock-class.h>
index a2ca8e866e086b0acc1bd2cc45282770d08020cd..5423bafe500f0d2b3cf5456f8232224a09946421 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From clock-snapshot-const.h */
-
-typedef enum bt_clock_snapshot_status {
-       BT_CLOCK_SNAPSHOT_STATUS_OK = 0,
-       BT_CLOCK_SNAPSHOT_STATUS_OVERFLOW = -75,
-} bt_clock_snapshot_status;
-
-extern const bt_clock_class *bt_clock_snapshot_borrow_clock_class_const(
-               const bt_clock_snapshot *clock_snapshot);
-
-extern uint64_t bt_clock_snapshot_get_value(
-               const bt_clock_snapshot *clock_snapshot);
-
-extern bt_clock_snapshot_status bt_clock_snapshot_get_ns_from_origin(
-               const bt_clock_snapshot *clock_snapshot,
-               int64_t *OUT);
+%include <babeltrace2/trace-ir/clock-snapshot-const.h>
index e663c7220c8e76c7404c6687b6450e9876cd486c..33b3a7f637f6ec28085f118a8d12a2d239c629cb 100644 (file)
 
 /* Output argument typemap for self port output (always appends) */
 %typemap(in, numinputs=0)
-       (bt_self_component_port_input **OUT)
+       (bt_self_component_port_input **)
        (bt_self_component_port_input *temp_self_port = NULL) {
        $1 = &temp_self_port;
 }
 
-%typemap(argout) bt_self_component_port_input **OUT {
+%typemap(argout) bt_self_component_port_input ** {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
 
 /* Output argument typemap for self port output (always appends) */
 %typemap(in, numinputs=0)
-       (bt_self_component_port_output **OUT)
+       (bt_self_component_port_output **)
        (bt_self_component_port_output *temp_self_port = NULL) {
        $1 = &temp_self_port;
 }
 
-%typemap(argout) (bt_self_component_port_output **OUT) {
+%typemap(argout) (bt_self_component_port_output **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
@@ -68,7 +68,7 @@
  * The user data Python object is kept as the user data of the port, we pass
  * the PyObject pointer directly to the port creation function.
  */
-%typemap(in) void *PY_SELF_PORT_USER_DATA {
+%typemap(in) void *user_data {
        $1 = $input;
 }
 
  * The port, if created successfully, now owns a reference to the Python object,
  * we reflect that here.
  */
-%typemap(argout) void *PY_SELF_PORT_USER_DATA {
+%typemap(argout) void *user_data {
        if (PyLong_AsLong($result) == BT_SELF_COMPONENT_STATUS_OK) {
                Py_INCREF($1);
        }
 }
 
-/* From component-const.h */
+%include <babeltrace2/graph/component-const.h>
+%include <babeltrace2/graph/component-source-const.h>
+%include <babeltrace2/graph/component-filter-const.h>
+%include <babeltrace2/graph/component-sink-const.h>
+%include <babeltrace2/graph/self-component.h>
+%include <babeltrace2/graph/self-component-source.h>
+%include <babeltrace2/graph/self-component-filter.h>
+%include <babeltrace2/graph/self-component-sink.h>
 
-extern const char *bt_component_get_name(const bt_component *component);
-
-extern bt_logging_level bt_component_get_logging_level(
-               const bt_component *component);
-
-extern const bt_component_class *bt_component_borrow_class_const(
-               const bt_component *component);
-
-extern bt_component_class_type bt_component_get_class_type(
-               const bt_component *component);
-
-bt_bool bt_component_is_source(const bt_component *component);
-
-bt_bool bt_component_is_filter(const bt_component *component);
-
-bt_bool bt_component_is_sink(const bt_component *component);
-
-extern bt_bool bt_component_graph_is_canceled(
-               const bt_component *component);
-
-extern void bt_component_get_ref(const bt_component *component);
-
-extern void bt_component_put_ref(const bt_component *component);
-
-/* From component-source-const.h */
-
-const bt_component *bt_component_source_as_component_const(
-               const bt_component_source *component);
-
-extern const bt_component_class_source *
-bt_component_source_borrow_class_const(
-               const bt_component_source *component);
-
-extern uint64_t bt_component_source_get_output_port_count(
-               const bt_component_source *component);
-
-extern const bt_port_output *
-bt_component_source_borrow_output_port_by_name_const(
-               const bt_component_source *component, const char *name);
-
-extern const bt_port_output *
-bt_component_source_borrow_output_port_by_index_const(
-               const bt_component_source *component, uint64_t index);
-
-extern void bt_component_source_get_ref(
-               const bt_component_source *component_source);
-
-extern void bt_component_source_put_ref(
-               const bt_component_source *component_source);
-
-/* From component-filter-const.h */
-
-const bt_component *bt_component_filter_as_component_const(
-               const bt_component_filter *component);
-
-extern const bt_component_class_filter *
-bt_component_filter_borrow_class_const(
-               const bt_component_filter *component);
-
-extern uint64_t bt_component_filter_get_input_port_count(
-               const bt_component_filter *component);
-
-extern const bt_port_input *
-bt_component_filter_borrow_input_port_by_name_const(
-               const bt_component_filter *component, const char *name);
-
-extern const bt_port_input *
-bt_component_filter_borrow_input_port_by_index_const(
-               const bt_component_filter *component, uint64_t index);
-
-extern uint64_t bt_component_filter_get_output_port_count(
-               const bt_component_filter *component);
-
-extern const bt_port_output *
-bt_component_filter_borrow_output_port_by_name_const(
-               const bt_component_filter *component, const char *name);
-
-extern const bt_port_output *
-bt_component_filter_borrow_output_port_by_index_const(
-               const bt_component_filter *component, uint64_t index);
-
-extern void bt_component_filter_get_ref(
-               const bt_component_filter *component_filter);
-
-extern void bt_component_filter_put_ref(
-               const bt_component_filter *component_filter);
-
-/* From component-sink-const.h */
-
-const bt_component *bt_component_sink_as_component_const(
-               const bt_component_sink *component);
-
-extern const bt_component_class_sink *
-bt_component_sink_borrow_class_const(
-               const bt_component_sink *component);
-
-extern uint64_t bt_component_sink_get_input_port_count(
-               const bt_component_sink *component);
-
-extern const bt_port_input *
-bt_component_sink_borrow_input_port_by_name_const(
-               const bt_component_sink *component, const char *name);
-
-extern const bt_port_input *
-bt_component_sink_borrow_input_port_by_index_const(
-               const bt_component_sink *component, uint64_t index);
-
-extern void bt_component_sink_get_ref(
-               const bt_component_sink *component_sink);
-
-extern void bt_component_sink_put_ref(
-               const bt_component_sink *component_sink);
-
-/* From self-component.h */
-
-typedef enum bt_self_component_status {
-       BT_SELF_COMPONENT_STATUS_OK = 0,
-       BT_SELF_COMPONENT_STATUS_END = 1,
-       BT_SELF_COMPONENT_STATUS_AGAIN = 11,
-       BT_SELF_COMPONENT_STATUS_ERROR = -1,
-       BT_SELF_COMPONENT_STATUS_NOMEM = -12,
-} bt_self_component_status;
-
-const bt_component *bt_self_component_as_component(
-               bt_self_component *self_component);
-
-extern void *bt_self_component_get_data(
-               const bt_self_component *self_component);
-
-extern void bt_self_component_set_data(
-               bt_self_component *self_component, void *data);
-
-/* From self-component-source.h */
-
-bt_self_component *bt_self_component_source_as_self_component(
-               bt_self_component_source *self_comp_source);
-
-const bt_component_source *
-bt_self_component_source_as_component_source(
-               bt_self_component_source *self_comp_source);
-
-extern bt_self_component_port_output *
-bt_self_component_source_borrow_output_port_by_name(
-               bt_self_component_source *self_component,
-               const char *name);
-
-extern bt_self_component_port_output *
-bt_self_component_source_borrow_output_port_by_index(
-               bt_self_component_source *self_component,
-               uint64_t index);
-
-extern bt_self_component_status
-bt_self_component_source_add_output_port(
-               bt_self_component_source *self_component,
-               const char *name, void *PY_SELF_PORT_USER_DATA,
-               bt_self_component_port_output **OUT);
-
-/* From self-component-filter.h */
-
-bt_self_component *bt_self_component_filter_as_self_component(
-               bt_self_component_filter *self_comp_filter);
-
-const bt_component_filter *
-bt_self_component_filter_as_component_filter(
-               bt_self_component_filter *self_comp_filter);
-
-extern bt_self_component_port_output *
-bt_self_component_filter_borrow_output_port_by_name(
-               bt_self_component_filter *self_component,
-               const char *name);
-
-extern bt_self_component_port_output *
-bt_self_component_filter_borrow_output_port_by_index(
-               bt_self_component_filter *self_component,
-               uint64_t index);
-
-extern bt_self_component_status
-bt_self_component_filter_add_output_port(
-               bt_self_component_filter *self_component,
-               const char *name, void *PY_SELF_PORT_USER_DATA,
-               bt_self_component_port_output **OUT);
-
-extern bt_self_component_port_input *
-bt_self_component_filter_borrow_input_port_by_name(
-               bt_self_component_filter *self_component,
-               const char *name);
-
-extern bt_self_component_port_input *
-bt_self_component_filter_borrow_input_port_by_index(
-               bt_self_component_filter *self_component,
-               uint64_t index);
-
-extern bt_self_component_status
-bt_self_component_filter_add_input_port(
-               bt_self_component_filter *self_component,
-               const char *name, void *PY_SELF_PORT_USER_DATA,
-               bt_self_component_port_input **OUT);
-
-/* From self-component-sink.h */
-
-bt_self_component *bt_self_component_sink_as_self_component(
-               bt_self_component_sink *self_comp_sink);
-
-const bt_component_sink *
-bt_self_component_sink_as_component_sink(
-               bt_self_component_sink *self_comp_sink);
-
-extern bt_self_component_port_input *
-bt_self_component_sink_borrow_input_port_by_name(
-               bt_self_component_sink *self_component,
-               const char *name);
-
-extern bt_self_component_port_input *
-bt_self_component_sink_borrow_input_port_by_index(
-               bt_self_component_sink *self_component, uint64_t index);
-
-extern bt_self_component_status
-bt_self_component_sink_add_input_port(
-               bt_self_component_sink *self_component,
-               const char *name, void *PY_SELF_PORT_USER_DATA,
-               bt_self_component_port_input **OUT);
+/*
+ * This type map relies on the rather common "user_data" name, so don't pollute
+ * the typemap namespace.
+ */
+%clear void *user_data;
index 6deb22ef5ae22f10815dc704786cb892b24e41af..0fe55f44bf2ec7cf4aae7552f8d510ce8bcd32ab 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From component-class-const.h */
-
-typedef enum bt_component_class_status {
-       BT_COMPONENT_CLASS_STATUS_OK = 0,
-       BT_COMPONENT_CLASS_STATUS_NOMEM = -12,
-} bt_component_class_status;
-
-typedef enum bt_component_class_type {
-       BT_COMPONENT_CLASS_TYPE_SOURCE = 0,
-       BT_COMPONENT_CLASS_TYPE_FILTER = 1,
-       BT_COMPONENT_CLASS_TYPE_SINK = 2,
-} bt_component_class_type;
-
-extern const char *bt_component_class_get_name(
-               const bt_component_class *component_class);
-
-extern const char *bt_component_class_get_description(
-               const bt_component_class *component_class);
-
-extern const char *bt_component_class_get_help(
-               const bt_component_class *component_class);
-
-extern bt_component_class_type bt_component_class_get_type(
-               const bt_component_class *component_class);
-
-bt_bool bt_component_class_is_source(
-               const bt_component_class *component_class);
-
-bt_bool bt_component_class_is_filter(
-               const bt_component_class *component_class);
-
-bt_bool bt_component_class_is_sink(
-               const bt_component_class *component_class);
-
-extern void bt_component_class_get_ref(
-               const bt_component_class *component_class);
-
-extern void bt_component_class_put_ref(
-               const bt_component_class *component_class);
-
-/* From component-class-source-const.h */
-
-const bt_component_class *
-bt_component_class_source_as_component_class_const(
-               const bt_component_class_source *comp_cls_source);
-
-extern void bt_component_class_source_get_ref(
-               const bt_component_class_source *component_class_source);
-
-extern void bt_component_class_source_put_ref(
-               const bt_component_class_source *component_class_source);
-
-/* From component-class-source.h */
-
-typedef bt_self_component_status
-(*bt_component_class_source_init_method)(
-               bt_self_component_source *self_component,
-               const bt_value *params, void *init_method_data);
-
-typedef void (*bt_component_class_source_finalize_method)(
-               bt_self_component_source *self_component);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_source_message_iterator_init_method)(
-               bt_self_message_iterator *message_iterator,
-               bt_self_component_source *self_component,
-               bt_self_component_port_output *port);
-
-typedef void
-(*bt_component_class_source_message_iterator_finalize_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_source_message_iterator_next_method)(
-               bt_self_message_iterator *message_iterator,
-               bt_message_array_const msgs, uint64_t capacity,
-               uint64_t *count);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_source_message_iterator_seek_ns_from_origin_method)(
-               bt_self_message_iterator *message_iterator,
-               int64_t ns_from_origin);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_source_message_iterator_seek_beginning_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_bool
-(*bt_component_class_source_message_iterator_can_seek_ns_from_origin_method)(
-               bt_self_message_iterator *message_iterator,
-               int64_t ns_from_origin);
-
-typedef bt_bool
-(*bt_component_class_source_message_iterator_can_seek_beginning_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_query_status (*bt_component_class_source_query_method)(
-               bt_self_component_class_source *comp_class,
-               const bt_query_executor *query_executor,
-               const char *object, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_value **result);
-
-typedef bt_self_component_status
-(*bt_component_class_source_output_port_connected_method)(
-               bt_self_component_source *self_component,
-               bt_self_component_port_output *self_port,
-               const bt_port_input *other_port);
-
-bt_component_class *bt_component_class_source_as_component_class(
-               bt_component_class_source *comp_cls_source);
-
-extern
-bt_component_class_source *bt_component_class_source_create(
-               const char *name,
-               bt_component_class_source_message_iterator_next_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_init_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_init_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_finalize_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_finalize_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_output_port_connected_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_output_port_connected_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_query_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_query_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_message_iterator_init_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_init_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_message_iterator_finalize_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_finalize_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_message_iterator_seek_ns_from_origin_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_seek_ns_from_origin_method method);
-
-extern bt_component_class_status
-bt_component_class_source_set_message_iterator_seek_beginning_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_seek_beginning_method method);
-
-extern bt_bool
-bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_can_seek_ns_from_origin_method method);
-
-extern bt_bool
-bt_component_class_source_set_message_iterator_can_seek_beginning_method(
-               bt_component_class_source *comp_class,
-               bt_component_class_source_message_iterator_can_seek_beginning_method method);
-
-/* From component-class-filter-const.h */
-
-const bt_component_class *
-bt_component_class_filter_as_component_class_const(
-               const bt_component_class_filter *comp_cls_filter);
-
-extern void bt_component_class_filter_get_ref(
-               const bt_component_class_filter *component_class_filter);
-
-extern void bt_component_class_filter_put_ref(
-               const bt_component_class_filter *component_class_filter);
-
-/* From component-class-filter.h */
-
-typedef bt_self_component_status
-(*bt_component_class_filter_init_method)(
-               bt_self_component_filter *self_component,
-               const bt_value *params, void *init_method_data);
-
-typedef void (*bt_component_class_filter_finalize_method)(
-               bt_self_component_filter *self_component);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_filter_message_iterator_init_method)(
-               bt_self_message_iterator *message_iterator,
-               bt_self_component_filter *self_component,
-               bt_self_component_port_output *port);
-
-typedef void
-(*bt_component_class_filter_message_iterator_finalize_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_filter_message_iterator_next_method)(
-               bt_self_message_iterator *message_iterator,
-               bt_message_array_const msgs, uint64_t capacity,
-               uint64_t *count);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_filter_message_iterator_seek_ns_from_origin_method)(
-               bt_self_message_iterator *message_iterator,
-               int64_t ns_from_origin);
-
-typedef bt_self_message_iterator_status
-(*bt_component_class_filter_message_iterator_seek_beginning_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_bool
-(*bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method)(
-               bt_self_message_iterator *message_iterator,
-               int64_t ns_from_origin);
-
-typedef bt_bool
-(*bt_component_class_filter_message_iterator_can_seek_beginning_method)(
-               bt_self_message_iterator *message_iterator);
-
-typedef bt_query_status
-(*bt_component_class_filter_query_method)(
-               bt_self_component_class_filter *comp_class,
-               const bt_query_executor *query_executor,
-               const char *object, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_value **result);
-
-typedef bt_self_component_status
-(*bt_component_class_filter_input_port_connected_method)(
-               bt_self_component_filter *self_component,
-               bt_self_component_port_input *self_port,
-               const bt_port_output *other_port);
-
-typedef bt_self_component_status
-(*bt_component_class_filter_output_port_connected_method)(
-               bt_self_component_filter *self_component,
-               bt_self_component_port_output *self_port,
-               const bt_port_input *other_port);
-
-bt_component_class *bt_component_class_filter_as_component_class(
-               bt_component_class_filter *comp_cls_filter);
-
-extern
-bt_component_class_filter *bt_component_class_filter_create(
-               const char *name,
-               bt_component_class_filter_message_iterator_next_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_init_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_init_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_finalize_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_finalize_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_input_port_connected_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_input_port_connected_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_output_port_connected_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_output_port_connected_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_query_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_query_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_message_iterator_init_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_init_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_message_iterator_finalize_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_finalize_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_seek_ns_from_origin_method method);
-
-extern bt_component_class_status
-bt_component_class_filter_set_message_iterator_seek_beginning_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_seek_beginning_method method);
-
-extern bt_bool
-bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method method);
-
-extern bt_bool
-bt_component_class_filter_set_message_iterator_can_seek_beginning_method(
-               bt_component_class_filter *comp_class,
-               bt_component_class_filter_message_iterator_can_seek_beginning_method method);
-
-/* From component-class-sink-const.h */
-
-const bt_component_class *
-bt_component_class_sink_as_component_class_const(
-               const bt_component_class_sink *comp_cls_sink);
-
-extern void bt_component_class_sink_get_ref(
-               const bt_component_class_sink *component_class_sink);
-
-extern void bt_component_class_sink_put_ref(
-               const bt_component_class_sink *component_class_sink);
-
-/* From component-class-sink.h */
-
-typedef bt_self_component_status (*bt_component_class_sink_init_method)(
-               bt_self_component_sink *self_component,
-               const bt_value *params, void *init_method_data);
-
-typedef void (*bt_component_class_sink_finalize_method)(
-               bt_self_component_sink *self_component);
-
-typedef bt_query_status
-(*bt_component_class_sink_query_method)(
-               bt_self_component_class_sink *comp_class,
-               const bt_query_executor *query_executor,
-               const char *object, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_value **result);
-
-typedef bt_self_component_status
-(*bt_component_class_sink_input_port_connected_method)(
-               bt_self_component_sink *self_component,
-               bt_self_component_port_input *self_port,
-               const bt_port_output *other_port);
-
-typedef bt_self_component_status
-(*bt_component_class_sink_graph_is_configured_method)(
-               bt_self_component_sink *self_component);
-
-typedef bt_self_component_status (*bt_component_class_sink_consume_method)(
-       bt_self_component_sink *self_component);
-
-bt_component_class *bt_component_class_sink_as_component_class(
-               bt_component_class_sink *comp_cls_sink);
-
-extern
-bt_component_class_sink *bt_component_class_sink_create(
-               const char *name,
-               bt_component_class_sink_consume_method method);
-
-extern bt_component_class_status bt_component_class_sink_set_init_method(
-               bt_component_class_sink *comp_class,
-               bt_component_class_sink_init_method method);
-
-extern bt_component_class_status bt_component_class_sink_set_finalize_method(
-               bt_component_class_sink *comp_class,
-               bt_component_class_sink_finalize_method method);
-
-extern bt_component_class_status
-bt_component_class_sink_set_input_port_connected_method(
-               bt_component_class_sink *comp_class,
-               bt_component_class_sink_input_port_connected_method method);
-
-extern bt_component_class_status
-bt_component_class_sink_set_graph_is_configured_method(
-               bt_component_class_sink *comp_class,
-               bt_component_class_sink_graph_is_configured_method method);
-
-extern bt_component_class_status bt_component_class_sink_set_query_method(
-               bt_component_class_sink *comp_class,
-               bt_component_class_sink_query_method method);
-
-/* From self-component-class-source.h */
-
-const bt_component_class_source *
-bt_self_component_class_source_as_component_class_source(
-               bt_self_component_class_source *self_comp_cls_source);
-
-/* From self-component-class-filter.h */
-
-const bt_component_class_filter *
-bt_self_component_class_filter_as_component_class_filter(
-               bt_self_component_class_filter *self_comp_cls_filter);
-
-/* From self-component-class-sink.h */
-
-const bt_component_class_sink *
-bt_self_component_class_sink_as_component_class_sink(
-               bt_self_component_class_sink *self_comp_cls_sink);
+%include <babeltrace2/graph/component-class-const.h>
+%include <babeltrace2/graph/component-class-source-const.h>
+%include <babeltrace2/graph/component-class-source.h>
+%include <babeltrace2/graph/component-class-filter-const.h>
+%include <babeltrace2/graph/component-class-filter.h>
+%include <babeltrace2/graph/component-class-sink-const.h>
+%include <babeltrace2/graph/component-class-sink.h>
+%include <babeltrace2/graph/self-component-class-source.h>
+%include <babeltrace2/graph/self-component-class-filter.h>
+%include <babeltrace2/graph/self-component-class-sink.h>
 
 %{
 /*
index dbdb04a533049da6e4a6801b6517d4878e26505d..bb22858303aa8781f2399071dba51a7e3ab52a53 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From connection-const.h */
-
-extern const bt_port_input *bt_connection_borrow_downstream_port_const(
-               const bt_connection *connection);
-
-extern const bt_port_output *bt_connection_borrow_upstream_port_const(
-               const bt_connection *connection);
-
-extern void bt_connection_get_ref(const bt_connection *connection);
-
-extern void bt_connection_put_ref(const bt_connection *connection);
+%include <babeltrace2/graph/connection-const.h>
index 82ddbfae8e75375c9a72acaa726bd974cd11e31e..7812b0cd1f3495684f20f1c5279562fdfb9dcbc9 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From event-const.h */
-
-typedef enum bt_event_status {
-       BT_EVENT_STATUS_OK = 0,
-       BT_EVENT_STATUS_NOMEM = -12,
-} bt_event_status;
-
-extern const bt_event_class *bt_event_borrow_class_const(
-               const bt_event *event);
-
-extern const bt_packet *bt_event_borrow_packet_const(
-               const bt_event *event);
-
-extern const bt_stream *bt_event_borrow_stream_const(
-               const bt_event *event);
-
-extern const bt_field *bt_event_borrow_common_context_field_const(
-               const bt_event *event);
-
-extern const bt_field *bt_event_borrow_specific_context_field_const(
-               const bt_event *event);
-
-extern const bt_field *bt_event_borrow_payload_field_const(
-               const bt_event *event);
-
-/* From event.h */
-
-extern bt_event_class *bt_event_borrow_class(bt_event *event);
-
-extern bt_packet *bt_event_borrow_packet(bt_event *event);
-
-extern bt_stream *bt_event_borrow_stream(bt_event *event);
-
-extern bt_field *
-bt_event_borrow_common_context_field(bt_event *event);
-
-extern bt_field *
-bt_event_borrow_specific_context_field(bt_event *event);
-
-extern bt_field *bt_event_borrow_payload_field(bt_event *event);
+%include <babeltrace2/trace-ir/event-const.h>
+%include <babeltrace2/trace-ir/event.h>
index cac0c41150106f960a4f08393ce8ac98d6756e5c..5bf6ebd293deec98f9a3b5fc944fa796d21eed65 100644 (file)
  * parameter (always appends).
  */
 %typemap(in, numinputs=0)
-       (bt_event_class_log_level *OUT)
+       (bt_event_class_log_level *)
        (bt_event_class_log_level temp = -1) {
        $1 = &temp;
 }
 
-%typemap(argout) bt_event_class_log_level *OUT {
+%typemap(argout) bt_event_class_log_level * {
        /* SWIG_Python_AppendOutput() steals the created object */
        $result = SWIG_Python_AppendOutput($result, SWIG_From_int(*$1));
 }
 
-/* From event-class-const.h */
-
-typedef enum bt_event_class_status {
-       BT_EVENT_CLASS_STATUS_OK = 0,
-       BT_EVENT_CLASS_STATUS_NOMEM = -12,
-} bt_event_class_status;
-
-typedef enum bt_event_class_log_level {
-       BT_EVENT_CLASS_LOG_LEVEL_EMERGENCY,
-       BT_EVENT_CLASS_LOG_LEVEL_ALERT,
-       BT_EVENT_CLASS_LOG_LEVEL_CRITICAL,
-       BT_EVENT_CLASS_LOG_LEVEL_ERROR,
-       BT_EVENT_CLASS_LOG_LEVEL_WARNING,
-       BT_EVENT_CLASS_LOG_LEVEL_NOTICE,
-       BT_EVENT_CLASS_LOG_LEVEL_INFO,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_SYSTEM,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROGRAM,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_PROCESS,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_MODULE,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_UNIT,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_FUNCTION,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG_LINE,
-       BT_EVENT_CLASS_LOG_LEVEL_DEBUG,
-} bt_event_class_log_level;
-
-extern const bt_stream_class *bt_event_class_borrow_stream_class_const(
-               const bt_event_class *event_class);
-
-extern const char *bt_event_class_get_name(const bt_event_class *event_class);
-
-extern uint64_t bt_event_class_get_id(const bt_event_class *event_class);
-
-extern bt_property_availability bt_event_class_get_log_level(
-               const bt_event_class *event_class,
-               bt_event_class_log_level *OUT);
-
-extern const char *bt_event_class_get_emf_uri(
-               const bt_event_class *event_class);
-
-extern const bt_field_class *
-bt_event_class_borrow_specific_context_field_class_const(
-               const bt_event_class *event_class);
-
-extern const bt_field_class *bt_event_class_borrow_payload_field_class_const(
-               const bt_event_class *event_class);
-
-extern void bt_event_class_get_ref(const bt_event_class *event_class);
-
-extern void bt_event_class_put_ref(const bt_event_class *event_class);
-
-/* From event-class.h */
-
-extern bt_event_class *bt_event_class_create(
-               bt_stream_class *stream_class);
-
-extern bt_event_class *bt_event_class_create_with_id(
-               bt_stream_class *stream_class, uint64_t id);
-
-extern bt_stream_class *bt_event_class_borrow_stream_class(
-               bt_event_class *event_class);
-
-extern bt_event_class_status bt_event_class_set_name(
-               bt_event_class *event_class, const char *name);
-
-extern void bt_event_class_set_log_level(bt_event_class *event_class,
-               bt_event_class_log_level log_level);
-
-extern bt_event_class_status bt_event_class_set_emf_uri(
-               bt_event_class *event_class, const char *emf_uri);
-
-extern bt_event_class_status
-bt_event_class_set_specific_context_field_class(bt_event_class *event_class,
-               bt_field_class *field_class);
-
-extern bt_field_class *
-bt_event_class_borrow_specific_context_field_class(bt_event_class *event_class);
-
-extern bt_event_class_status bt_event_class_set_payload_field_class(
-               bt_event_class *event_class,
-               bt_field_class *field_class);
-
-extern bt_field_class *bt_event_class_borrow_payload_field_class(
-               bt_event_class *event_class);
+%include <babeltrace2/trace-ir/event-class-const.h>
+%include <babeltrace2/trace-ir/event-class.h>
index f4511f454180b43090db15095b732e236585a65f..8b944c63c20e8ea2bac1a8b5a944cf35f68670e4 100644 (file)
 /* For label type mappings. */
 %include "native_bt_field_class.i"
 
-/* From field-const.h */
-
-typedef enum bt_field_status {
-       BT_FIELD_STATUS_OK = 0,
-       BT_FIELD_STATUS_NOMEM = -12,
-} bt_field_status;
-
-extern const bt_field_class *bt_field_borrow_class_const(
-               const bt_field *field);
-
-extern bt_field_class_type bt_field_get_class_type(
-               const bt_field *field);
-
-extern int64_t bt_field_signed_integer_get_value(const bt_field *field);
-
-extern uint64_t bt_field_unsigned_integer_get_value(
-               const bt_field *field);
-
-extern double bt_field_real_get_value(const bt_field *field);
-
-extern bt_field_status bt_field_unsigned_enumeration_get_mapping_labels(
-               const bt_field *field,
-               bt_field_class_enumeration_mapping_label_array *LABELARRAY,
-               uint64_t *LABELCOUNT);
-
-extern bt_field_status bt_field_signed_enumeration_get_mapping_labels(
-               const bt_field *field,
-               bt_field_class_enumeration_mapping_label_array *LABELARRAY,
-               uint64_t *LABELCOUNT);
-
-extern const char *bt_field_string_get_value(const bt_field *field);
-
-extern uint64_t bt_field_string_get_length(const bt_field *field);
-
-extern const bt_field *
-bt_field_structure_borrow_member_field_by_index_const(
-               const bt_field *field, uint64_t index);
-
-extern const bt_field *
-bt_field_structure_borrow_member_field_by_name_const(
-               const bt_field *field, const char *name);
-
-extern uint64_t bt_field_array_get_length(const bt_field *field);
-
-extern const bt_field *
-bt_field_array_borrow_element_field_by_index_const(
-               const bt_field *field, uint64_t index);
-
-extern uint64_t bt_field_variant_get_selected_option_field_index(
-               const bt_field *field);
-
-extern const bt_field *
-bt_field_variant_borrow_selected_option_field_const(
-               const bt_field *field);
-
-/* From field.h */
-
-extern void bt_field_signed_integer_set_value(bt_field *field,
-               int64_t value);
-
-extern void bt_field_unsigned_integer_set_value(bt_field *field,
-               uint64_t value);
-
-extern void bt_field_real_set_value(bt_field *field, double value);
-
-extern bt_field_status bt_field_string_set_value(bt_field *field,
-               const char *value);
-
-extern bt_field_status bt_field_string_append(bt_field *field,
-               const char *value);
-
-extern bt_field_status bt_field_string_append_with_length(bt_field *field,
-               const char *value, uint64_t length);
-
-extern bt_field_status bt_field_string_clear(bt_field *field);
-
-extern bt_field *bt_field_structure_borrow_member_field_by_index(
-               bt_field *field, uint64_t index);
-
-extern bt_field *bt_field_structure_borrow_member_field_by_name(
-               bt_field *field, const char *name);
-
-extern bt_field *bt_field_array_borrow_element_field_by_index(
-               bt_field *field, uint64_t index);
-
-extern bt_field_status bt_field_dynamic_array_set_length(bt_field *field,
-               uint64_t length);
-
-extern bt_field_status bt_field_variant_select_option_field(
-               bt_field *field, uint64_t index);
-
-extern bt_field *bt_field_variant_borrow_selected_option_field(
-               bt_field *field);
+%include <babeltrace2/trace-ir/field-const.h>
+%include <babeltrace2/trace-ir/field.h>
index b6173c067d21f0aee92ca10c894f051e96f55838..e5ed2a89c379f713c7bcf2fc28edbb4ef82e9c4d 100644 (file)
  * THE SOFTWARE.
  */
 
+/* Parameter names seem to be required for multi-argument typemaps to match. */
 %typemap(in, numinputs=0)
-       (bt_field_class_enumeration_mapping_label_array *LABELARRAY, uint64_t *LABELCOUNT)
+       (bt_field_class_enumeration_mapping_label_array *label_array, uint64_t *count)
        (bt_field_class_enumeration_mapping_label_array temp_array, uint64_t temp_label_count = 0) {
        $1 = &temp_array;
        $2 = &temp_label_count;
 }
 
 %typemap(argout)
-       (bt_field_class_enumeration_mapping_label_array *LABELARRAY, uint64_t *LABELCOUNT) {
+       (bt_field_class_enumeration_mapping_label_array *label_array, uint64_t *count) {
        if (*$1) {
                PyObject *py_label_list = PyList_New(*$2);
                for (int i = 0; i < *$2; i++) {
 
 /* Output argument typemap for value output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_field_class_signed_enumeration_mapping_ranges **ENUM_RANGE_MAPPING)
+       (const bt_field_class_signed_enumeration_mapping_ranges **)
        (bt_field_class_signed_enumeration_mapping_ranges *temp_value = NULL) {
        $1 = &temp_value;
 }
 
 %typemap(argout)
-       (const bt_field_class_signed_enumeration_mapping_ranges **ENUM_RANGE_MAPPING) {
+       (const bt_field_class_signed_enumeration_mapping_ranges **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
 
 /* Output argument typemap for value output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_field_class_unsigned_enumeration_mapping_ranges **ENUM_RANGE_MAPPING)
+       (const bt_field_class_unsigned_enumeration_mapping_ranges **)
        (bt_field_class_unsigned_enumeration_mapping_ranges *temp_value = NULL) {
        $1 = &temp_value;
 }
 
 %typemap(argout)
-       (const bt_field_class_unsigned_enumeration_mapping_ranges **ENUM_RANGE_MAPPING ) {
+       (const bt_field_class_unsigned_enumeration_mapping_ranges **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
        }
 }
 
-/* From field-class-const.h */
-
-typedef enum bt_field_class_status {
-       BT_FIELD_CLASS_STATUS_OK = 0,
-       BT_FIELD_CLASS_STATUS_NOMEM = -12,
-} bt_field_class_status;
-
-typedef enum bt_field_class_type {
-       BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER,
-       BT_FIELD_CLASS_TYPE_SIGNED_INTEGER,
-       BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
-       BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
-       BT_FIELD_CLASS_TYPE_REAL,
-       BT_FIELD_CLASS_TYPE_STRING,
-       BT_FIELD_CLASS_TYPE_STRUCTURE,
-       BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
-       BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY,
-       BT_FIELD_CLASS_TYPE_VARIANT,
-} bt_field_class_type;
-
-typedef enum bt_field_class_integer_preferred_display_base {
-       BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_BINARY,
-       BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL,
-       BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL,
-       BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL,
-} bt_field_class_integer_preferred_display_base;
-
-extern bt_field_class_type bt_field_class_get_type(
-               const bt_field_class *field_class);
-
-extern uint64_t bt_field_class_integer_get_field_value_range(
-               const bt_field_class *field_class);
-
-extern bt_field_class_integer_preferred_display_base
-bt_field_class_integer_get_preferred_display_base(
-               const bt_field_class *field_class);
-
-extern bt_bool bt_field_class_real_is_single_precision(
-               const bt_field_class *field_class);
-
-extern uint64_t bt_field_class_enumeration_get_mapping_count(
-               const bt_field_class *field_class);
-
-extern const bt_field_class_unsigned_enumeration_mapping *
-bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
-               const bt_field_class *field_class, uint64_t index);
-
-extern const bt_field_class_signed_enumeration_mapping *
-bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
-               const bt_field_class *field_class, uint64_t index);
-
-const bt_field_class_enumeration_mapping *
-bt_field_class_unsigned_enumeration_mapping_as_mapping_const(
-               const bt_field_class_unsigned_enumeration_mapping *mapping);
-
-const bt_field_class_enumeration_mapping *
-bt_field_class_signed_enumeration_mapping_as_mapping_const(
-               const bt_field_class_signed_enumeration_mapping *mapping);
-
-extern const char *bt_field_class_enumeration_mapping_get_label(
-               const bt_field_class_enumeration_mapping *mapping);
-
-extern uint64_t bt_field_class_enumeration_mapping_get_range_count(
-               const bt_field_class_enumeration_mapping *mapping);
-
-extern void
-bt_field_class_unsigned_enumeration_mapping_get_range_by_index(
-               const bt_field_class_unsigned_enumeration_mapping *mapping,
-               uint64_t index, uint64_t *OUT, uint64_t *OUT);
-
-extern void
-bt_field_class_signed_enumeration_mapping_get_range_by_index(
-               const bt_field_class_signed_enumeration_mapping *mapping,
-               uint64_t index, int64_t *OUT, int64_t *OUT);
-
-extern bt_field_class_status
-bt_field_class_unsigned_enumeration_get_mapping_labels_by_value(
-               const bt_field_class *field_class, uint64_t value,
-               bt_field_class_enumeration_mapping_label_array *LABELARRAY,
-               uint64_t *LABELCOUNT);
-
-extern bt_field_class_status
-bt_field_class_signed_enumeration_get_mapping_labels_by_value(
-               const bt_field_class *field_class, int64_t value,
-               bt_field_class_enumeration_mapping_label_array *LABELARRAY,
-               uint64_t *LABELCOUNT);
-
-extern uint64_t bt_field_class_structure_get_member_count(
-               const bt_field_class *field_class);
-
-extern const bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_by_index_const(
-               const bt_field_class *field_class, uint64_t index);
-
-extern const bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_by_name_const(
-               const bt_field_class *field_class, const char *name);
-
-extern const char *bt_field_class_structure_member_get_name(
-               const bt_field_class_structure_member *member);
-
-extern const bt_field_class *
-bt_field_class_structure_member_borrow_field_class_const(
-               const bt_field_class_structure_member *member);
-
-extern const bt_field_class *
-bt_field_class_array_borrow_element_field_class_const(
-               const bt_field_class *field_class);
-
-extern uint64_t bt_field_class_static_array_get_length(
-               const bt_field_class *field_class);
-
-extern const bt_field_path *
-bt_field_class_dynamic_array_borrow_length_field_path_const(
-               const bt_field_class *field_class);
-
-extern const bt_field_path *
-bt_field_class_variant_borrow_selector_field_path_const(
-               const bt_field_class *field_class);
-
-extern uint64_t bt_field_class_variant_get_option_count(
-               const bt_field_class *field_class);
-
-extern const bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_by_index_const(
-               const bt_field_class *field_class, uint64_t index);
-
-extern const bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_by_name_const(
-               const bt_field_class *field_class, const char *name);
-
-extern const char *bt_field_class_variant_option_get_name(
-               const bt_field_class_variant_option *option);
-
-extern const bt_field_class *
-bt_field_class_variant_option_borrow_field_class_const(
-               const bt_field_class_variant_option *option);
-
-extern void bt_field_class_get_ref(const bt_field_class *field_class);
-
-extern void bt_field_class_put_ref(const bt_field_class *field_class);
-
-/* From field-class.h */
-
-extern bt_field_class *bt_field_class_unsigned_integer_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class *bt_field_class_signed_integer_create(
-               bt_trace_class *trace_class);
-
-extern void bt_field_class_integer_set_field_value_range(
-               bt_field_class *field_class, uint64_t size);
-
-extern void bt_field_class_integer_set_preferred_display_base(
-               bt_field_class *field_class,
-               bt_field_class_integer_preferred_display_base base);
-
-extern bt_field_class *bt_field_class_real_create(bt_trace_class *trace_class);
-
-extern void bt_field_class_real_set_is_single_precision(
-               bt_field_class *field_class,
-               bt_bool is_single_precision);
-
-extern bt_field_class *bt_field_class_unsigned_enumeration_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class *bt_field_class_signed_enumeration_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class_status bt_field_class_unsigned_enumeration_map_range(
-               bt_field_class *field_class, const char *label,
-               uint64_t range_lower, uint64_t range_upper);
-
-extern bt_field_class_status bt_field_class_signed_enumeration_map_range(
-               bt_field_class *field_class, const char *label,
-               int64_t range_lower, int64_t range_upper);
-
-extern bt_field_class *bt_field_class_string_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class *bt_field_class_structure_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class_status bt_field_class_structure_append_member(
-               bt_field_class *struct_field_class,
-               const char *name, bt_field_class *field_class);
-
-extern bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_by_index(
-               bt_field_class *field_class, uint64_t index);
-
-extern bt_field_class_structure_member *
-bt_field_class_structure_borrow_member_by_name(
-               bt_field_class *field_class, const char *name);
-
-extern bt_field_class *bt_field_class_static_array_create(
-               bt_trace_class *trace_class,
-               bt_field_class *elem_field_class, uint64_t length);
-
-extern bt_field_class *bt_field_class_dynamic_array_create(
-               bt_trace_class *trace_class,
-               bt_field_class *elem_field_class);
-
-extern bt_field_class *bt_field_class_array_borrow_element_field_class(
-               bt_field_class *field_class);
-
-extern bt_field_class_status
-bt_field_class_dynamic_array_set_length_field_class(
-               bt_field_class *field_class,
-               bt_field_class *length_field_class);
-
-extern bt_field_class *bt_field_class_variant_create(
-               bt_trace_class *trace_class);
-
-extern bt_field_class_status
-bt_field_class_variant_set_selector_field_class(bt_field_class *field_class,
-               bt_field_class *selector_field_class);
-
-extern bt_field_class_status bt_field_class_variant_append_option(
-               bt_field_class *var_field_class,
-               const char *name, bt_field_class *field_class);
-
-extern bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_by_index(
-               bt_field_class *field_class, uint64_t index);
-
-extern bt_field_class_variant_option *
-bt_field_class_variant_borrow_option_by_name(
-               bt_field_class *field_class, char *name);
-
-extern bt_field_class *bt_field_class_variant_option_borrow_field_class(
-               bt_field_class_variant_option *option);
+%include <babeltrace2/trace-ir/field-class-const.h>
+%include <babeltrace2/trace-ir/field-class.h>
index 5369f442a36eb38ea4e2801614476e07c10a8916..562e9d5208685b5bcf68f78b59d7e9e72e558473 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From field-path-const.h */
-
-typedef enum bt_field_path_item_type {
-       BT_FIELD_PATH_ITEM_TYPE_INDEX,
-       BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT,
-} bt_field_path_item_type;
-
-typedef enum bt_scope {
-       BT_SCOPE_PACKET_CONTEXT,
-       BT_SCOPE_EVENT_COMMON_CONTEXT,
-       BT_SCOPE_EVENT_SPECIFIC_CONTEXT,
-       BT_SCOPE_EVENT_PAYLOAD,
-} bt_scope;
-
-extern bt_scope bt_field_path_get_root_scope(
-               const bt_field_path *field_path);
-
-extern uint64_t bt_field_path_get_item_count(
-               const bt_field_path *field_path);
-
-extern const bt_field_path_item *bt_field_path_borrow_item_by_index_const(
-               const bt_field_path *field_path, uint64_t index);
-
-extern bt_field_path_item_type bt_field_path_item_get_type(
-               const bt_field_path_item *field_path_item);
-
-extern uint64_t bt_field_path_item_index_get_index(
-               const bt_field_path_item *field_path_item);
-
-extern void bt_field_path_get_ref(const bt_field_path *field_path);
-
-extern void bt_field_path_put_ref(const bt_field_path *field_path);
+%include <babeltrace2/trace-ir/field-path-const.h>
index 7fe76cc31f734d2333666705ae50a22aecc46201..9f9e1d3b9f5ab739771ad43b1aa4fadb677697bf 100644 (file)
 
 /* Output argument typemap for connection output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_connection **BTOUTCONN)
+       (const bt_connection **)
        (bt_connection *temp_conn = NULL) {
        $1 = &temp_conn;
 }
 
 %typemap(argout)
-       (const bt_connection **BTOUTCONN) {
+       (const bt_connection **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
 
 /* Output argument typemap for component output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_component_source **OUT)
+       (const bt_component_source **)
        (bt_component_source *temp_comp = NULL) {
        $1 = &temp_comp;
 }
 
 %typemap(in, numinputs=0)
-       (const bt_component_filter **OUT)
+       (const bt_component_filter **)
        (bt_component_filter *temp_comp = NULL) {
        $1 = &temp_comp;
 }
 
 %typemap(in, numinputs=0)
-       (const bt_component_sink **OUT)
+       (const bt_component_sink **)
        (bt_component_sink *temp_comp = NULL) {
        $1 = &temp_comp;
 }
 
-%typemap(argout) (const bt_component_source **OUT) {
+%typemap(argout) (const bt_component_source **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
@@ -75,7 +75,7 @@
        }
 }
 
-%typemap(argout) (const bt_component_filter **OUT) {
+%typemap(argout) (const bt_component_filter **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
@@ -88,7 +88,7 @@
        }
 }
 
-%typemap(argout) (const bt_component_sink **OUT) {
+%typemap(argout) (const bt_component_sink **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
        }
 }
 
-/* From graph-const.h */
-
-typedef enum bt_graph_status {
-       BT_GRAPH_STATUS_OK = 0,
-       BT_GRAPH_STATUS_END = 1,
-       BT_GRAPH_STATUS_AGAIN = 11,
-       BT_GRAPH_STATUS_CANCELED = 125,
-       BT_GRAPH_STATUS_ERROR = -1,
-       BT_GRAPH_STATUS_NOMEM = -12,
-} bt_graph_status;
-
-extern bt_bool bt_graph_is_canceled(const bt_graph *graph);
-
-extern void bt_graph_get_ref(const bt_graph *graph);
-
-extern void bt_graph_put_ref(const bt_graph *graph);
-
-/* From graph.h */
-
-typedef enum bt_graph_listener_status {
-       BT_GRAPH_LISTENER_STATUS_OK = 0,
-       BT_GRAPH_LISTENER_STATUS_ERROR = -1,
-       BT_GRAPH_LISTENER_STATUS_NOMEM = -12,
-} bt_graph_listener_status;
-
-
-typedef bt_graph_listener_status
-(*bt_graph_filter_component_input_port_added_listener_func)(
-               const bt_component_filter *component,
-               const bt_port_input *port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_sink_component_input_port_added_listener_func)(
-               const bt_component_sink *component,
-               const bt_port_input *port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_source_component_output_port_added_listener_func)(
-               const bt_component_source *component,
-               const bt_port_output *port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_filter_component_output_port_added_listener_func)(
-               const bt_component_filter *component,
-               const bt_port_output *port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_source_filter_component_ports_connected_listener_func)(
-               const bt_component_source *source_component,
-               const bt_component_filter *filter_component,
-               const bt_port_output *upstream_port,
-               const bt_port_input *downstream_port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_source_sink_component_ports_connected_listener_func)(
-               const bt_component_source *source_component,
-               const bt_component_sink *sink_component,
-               const bt_port_output *upstream_port,
-               const bt_port_input *downstream_port, void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_filter_filter_component_ports_connected_listener_func)(
-               const bt_component_filter *filter_component_upstream,
-               const bt_component_filter *filter_component_downstream,
-               const bt_port_output *upstream_port,
-               const bt_port_input *downstream_port,
-               void *data);
-
-typedef bt_graph_listener_status
-(*bt_graph_filter_sink_component_ports_connected_listener_func)(
-               const bt_component_filter *filter_component,
-               const bt_component_sink *sink_component,
-               const bt_port_output *upstream_port,
-               const bt_port_input *downstream_port, void *data);
-
-typedef void (* bt_graph_listener_removed_func)(void *data);
-
-extern bt_graph *bt_graph_create(void);
-
-extern bt_graph_status bt_graph_add_source_component(bt_graph *graph,
-               const bt_component_class_source *component_class,
-               const char *name, const bt_value *params,
-               bt_logging_level log_level, const bt_component_source **OUT);
-
-extern bt_graph_status bt_graph_add_source_component_with_init_method_data(
-               bt_graph *graph,
-               const bt_component_class_source *component_class,
-               const char *name, const bt_value *params,
-               void *init_method_data, bt_logging_level log_level,
-               const bt_component_source **OUT);
-
-extern bt_graph_status bt_graph_add_filter_component(bt_graph *graph,
-               const bt_component_class_filter *component_class,
-               const char *name, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_component_filter **OUT);
-
-extern bt_graph_status bt_graph_add_filter_component_with_init_method_data(
-               bt_graph *graph,
-               const bt_component_class_filter *component_class,
-               const char *name, const bt_value *params,
-               void *init_method_data, bt_logging_level log_level,
-               const bt_component_filter **OUT);
-
-extern bt_graph_status bt_graph_add_sink_component(
-               bt_graph *graph, const bt_component_class_sink *component_class,
-               const char *name, const bt_value *params,
-               bt_logging_level log_level,
-               const bt_component_sink **OUT);
-
-extern bt_graph_status bt_graph_add_sink_component_with_init_method_data(
-               bt_graph *graph, const bt_component_class_sink *component_class,
-               const char *name, const bt_value *params,
-               void *init_method_data, bt_logging_level log_level,
-               const bt_component_sink **OUT);
-
-extern bt_graph_status bt_graph_connect_ports(bt_graph *graph,
-               const bt_port_output *upstream,
-               const bt_port_input *downstream,
-               const bt_connection **BTOUTCONN);
-
-extern bt_graph_status bt_graph_run(bt_graph *graph);
-
-extern bt_graph_status bt_graph_consume(bt_graph *graph);
-
-extern bt_graph_status bt_graph_add_filter_component_input_port_added_listener(
-               bt_graph *graph,
-               bt_graph_filter_component_input_port_added_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status bt_graph_add_sink_component_input_port_added_listener(
-               bt_graph *graph,
-               bt_graph_sink_component_input_port_added_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status bt_graph_add_source_component_output_port_added_listener(
-               bt_graph *graph,
-               bt_graph_source_component_output_port_added_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status bt_graph_add_filter_component_output_port_added_listener(
-               bt_graph *graph,
-               bt_graph_filter_component_output_port_added_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_source_filter_component_ports_connected_listener(
-               bt_graph *graph,
-               bt_graph_source_filter_component_ports_connected_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_filter_filter_component_ports_connected_listener(
-               bt_graph *graph,
-               bt_graph_filter_filter_component_ports_connected_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_source_sink_component_ports_connected_listener(
-               bt_graph *graph,
-               bt_graph_source_sink_component_ports_connected_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status
-bt_graph_add_filter_sink_component_ports_connected_listener(
-               bt_graph *graph,
-               bt_graph_filter_sink_component_ports_connected_listener_func listener,
-               bt_graph_listener_removed_func listener_removed, void *data,
-               int *listener_id);
-
-extern bt_graph_status bt_graph_cancel(bt_graph *graph);
+%include <babeltrace2/graph/graph-const.h>
+%include <babeltrace2/graph/graph.h>
 
 /* Helper functions for Python */
 
index 0c81b938981cb6b2b8516ec8f2fb70d2d765d063..b56a6d276ba607f483588fd5375cd776daa8010c 100644 (file)
 
 /* Output argument typemap for clock value output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_clock_snapshot **BTOUTCLOCKSNAPSHOT)
+       (const bt_clock_snapshot **)
        (bt_clock_snapshot *temp_clock_snapshot = NULL) {
        $1 = &temp_clock_snapshot;
 }
 
 %typemap(argout)
-       (const bt_clock_snapshot **BTOUTCLOCKSNAPSHOT) {
+       (const bt_clock_snapshot **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
        }
 }
 
-/* From message-const.h */
-
-typedef enum bt_message_type {
-       BT_MESSAGE_TYPE_EVENT = 0,
-       BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY = 1,
-       BT_MESSAGE_TYPE_STREAM_BEGINNING = 2,
-       BT_MESSAGE_TYPE_STREAM_END = 3,
-       BT_MESSAGE_TYPE_PACKET_BEGINNING = 4,
-       BT_MESSAGE_TYPE_PACKET_END = 5,
-       BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING = 6,
-       BT_MESSAGE_TYPE_STREAM_ACTIVITY_END = 7,
-       BT_MESSAGE_TYPE_DISCARDED_EVENTS = 8,
-       BT_MESSAGE_TYPE_DISCARDED_PACKETS = 9,
-} bt_message_type;
-
-extern bt_message_type bt_message_get_type(const bt_message *message);
-
-extern void bt_message_get_ref(const bt_message *message);
-
-extern void bt_message_put_ref(const bt_message *message);
-
-/* From message-event-const.h */
-
-extern const bt_event *bt_message_event_borrow_event_const(
-               const bt_message *message);
-
-extern const bt_clock_snapshot *
-bt_message_event_borrow_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_class *
-bt_message_event_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-/* From message-event.h */
-
-extern
-bt_message *bt_message_event_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_event_class *event_class,
-               const bt_packet *packet);
-
-extern
-bt_message *bt_message_event_create_with_default_clock_snapshot(
-               bt_self_message_iterator *message_iterator,
-               const bt_event_class *event_class,
-               const bt_packet *packet, uint64_t raw_clock_value);
-
-extern bt_event *bt_message_event_borrow_event(
-               bt_message *message);
-
-/* From message-message-iterator-inactivity-const.h */
-
-extern const bt_clock_snapshot *
-bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
-               const bt_message *msg);
-
-/* From message-message-iterator-inactivity.h */
-
-extern
-bt_message *bt_message_message_iterator_inactivity_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_clock_class *default_clock_class, uint64_t raw_value);
-
-/* From message-stream-beginning-const.h */
-
-extern const bt_stream *bt_message_stream_beginning_borrow_stream_const(
-               const bt_message *message);
-
-/* From message-stream-beginning.h */
-
-extern
-bt_message *bt_message_stream_beginning_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern bt_stream *bt_message_stream_beginning_borrow_stream(
-               bt_message *message);
-
-/* From message-stream-end-const.h */
-
-extern const bt_stream *bt_message_stream_end_borrow_stream_const(
-               const bt_message *message);
-
-/* From message-stream-end.h */
-
-extern
-bt_message *bt_message_stream_end_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern bt_stream *bt_message_stream_end_borrow_stream(
-               bt_message *message);
-
-/* From message-packet-beginning-const.h */
-
-extern const bt_packet *bt_message_packet_beginning_borrow_packet_const(
-               const bt_message *message);
-
-extern const bt_clock_snapshot *
-bt_message_packet_beginning_borrow_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_class *
-bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-/* From message-packet-beginning.h */
-
-extern
-bt_message *bt_message_packet_beginning_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_packet *packet);
-
-extern
-bt_message *bt_message_packet_beginning_create_with_default_clock_snapshot(
-               bt_self_message_iterator *message_iterator,
-               const bt_packet *packet, uint64_t raw_value);
-
-extern bt_packet *bt_message_packet_beginning_borrow_packet(
-               bt_message *message);
-
-/* From message-packet-end-const.h */
-
-extern const bt_packet *bt_message_packet_end_borrow_packet_const(
-               const bt_message *message);
-
-extern const bt_clock_snapshot *
-bt_message_packet_end_borrow_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_class *
-bt_message_packet_end_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-/* From message-packet-end.h */
-
-extern
-bt_message *bt_message_packet_end_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_packet *packet);
-
-extern
-bt_message *bt_message_packet_end_create_with_default_clock_snapshot(
-               bt_self_message_iterator *message_iterator,
-               const bt_packet *packet, uint64_t raw_value);
-
-extern bt_packet *bt_message_packet_end_borrow_packet(
-               bt_message *message);
-
-/* From message-stream-activity-const.h */
-
-typedef enum bt_message_stream_activity_clock_snapshot_state {
-       BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_KNOWN,
-       BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_UNKNOWN,
-       BT_MESSAGE_STREAM_ACTIVITY_CLOCK_SNAPSHOT_STATE_INFINITE,
-} bt_message_stream_activity_clock_snapshot_state;
-
-/* From message-stream-activity-beginning-const.h */
-
-extern bt_message_stream_activity_clock_snapshot_state
-bt_message_stream_activity_beginning_borrow_default_clock_snapshot_const(
-               const bt_message *msg, const bt_clock_snapshot **BTOUTCLOCKSNAPSHOT);
-
-extern const bt_clock_class *
-bt_message_stream_activity_beginning_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-extern const bt_stream *
-bt_message_stream_activity_beginning_borrow_stream_const(
-               const bt_message *message);
-
-/* From message-stream-activity-beginning.h */
-
-extern bt_message *bt_message_stream_activity_beginning_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern bt_stream *bt_message_stream_activity_beginning_borrow_stream(
-               bt_message *message);
-
-extern void bt_message_stream_activity_beginning_set_default_clock_snapshot_state(
-               bt_message *msg,
-               bt_message_stream_activity_clock_snapshot_state state);
-
-extern void bt_message_stream_activity_beginning_set_default_clock_snapshot(
-               bt_message *msg, uint64_t raw_value);
-
-/* From message-stream-activity-end-const.h */
-
-extern bt_message_stream_activity_clock_snapshot_state
-bt_message_stream_activity_end_borrow_default_clock_snapshot_const(
-               const bt_message *msg, const bt_clock_snapshot **BTOUTCLOCKSNAPSHOT);
-
-extern const bt_clock_class *
-bt_message_stream_activity_end_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-extern const bt_stream *
-bt_message_stream_activity_end_borrow_stream_const(
-               const bt_message *message);
-
-/* From message-stream-activity-end.h */
-
-extern bt_message *bt_message_stream_activity_end_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern void bt_message_stream_activity_end_set_default_clock_snapshot_state(
-               bt_message *msg,
-               bt_message_stream_activity_clock_snapshot_state state);
-
-extern void bt_message_stream_activity_end_set_default_clock_snapshot(
-               bt_message *msg, uint64_t raw_value);
-
-extern bt_stream *bt_message_stream_activity_end_borrow_stream(
-               bt_message *message);
-
-/* From message-discarded-events-const.h */
-
-extern const bt_clock_snapshot *
-bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_snapshot *
-bt_message_discarded_events_borrow_end_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_class *
-bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-extern const bt_stream *
-bt_message_discarded_events_borrow_stream_const(const bt_message *message);
-
-extern bt_property_availability bt_message_discarded_events_get_count(
-               const bt_message *message, uint64_t *OUT);
-
-/* From message-discarded-events.h */
-
-extern bt_message *bt_message_discarded_events_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern bt_message *bt_message_discarded_events_create_with_default_clock_snapshots(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream, uint64_t beginning_raw_value,
-               uint64_t end_raw_value);
-
-extern bt_stream *bt_message_discarded_events_borrow_stream(
-               bt_message *message);
-
-extern void bt_message_discarded_events_set_count(bt_message *message,
-               uint64_t count);
-
-/* From message-discarded-packets-const.h */
-
-extern const bt_clock_snapshot *
-bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_snapshot *
-bt_message_discarded_packets_borrow_end_default_clock_snapshot_const(
-               const bt_message *msg);
-
-extern const bt_clock_class *
-bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
-               const bt_message *msg);
-
-extern const bt_stream *
-bt_message_discarded_packets_borrow_stream_const(const bt_message *message);
-
-extern bt_property_availability bt_message_discarded_packets_get_count(
-               const bt_message *message, uint64_t *OUT);
-
-/* From message-discarded-packets.h */
-
-extern bt_message *bt_message_discarded_packets_create(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream);
-
-extern bt_message *bt_message_discarded_packets_create_with_default_clock_snapshots(
-               bt_self_message_iterator *message_iterator,
-               const bt_stream *stream, uint64_t beginning_raw_value,
-               uint64_t end_raw_value);
-
-extern bt_stream *bt_message_discarded_packets_borrow_stream(
-               bt_message *message);
-
-extern void bt_message_discarded_packets_set_count(bt_message *message,
-               uint64_t count);
+%include <babeltrace2/graph/message-const.h>
+%include <babeltrace2/graph/message-discarded-events-const.h>
+%include <babeltrace2/graph/message-discarded-events.h>
+%include <babeltrace2/graph/message-discarded-packets-const.h>
+%include <babeltrace2/graph/message-discarded-packets.h>
+%include <babeltrace2/graph/message-event-const.h>
+%include <babeltrace2/graph/message-event.h>
+%include <babeltrace2/graph/message-message-iterator-inactivity-const.h>
+%include <babeltrace2/graph/message-message-iterator-inactivity.h>
+%include <babeltrace2/graph/message-packet-beginning-const.h>
+%include <babeltrace2/graph/message-packet-beginning.h>
+%include <babeltrace2/graph/message-packet-end-const.h>
+%include <babeltrace2/graph/message-packet-end.h>
+%include <babeltrace2/graph/message-stream-activity-beginning-const.h>
+%include <babeltrace2/graph/message-stream-activity-beginning.h>
+%include <babeltrace2/graph/message-stream-activity-const.h>
+%include <babeltrace2/graph/message-stream-activity-end-const.h>
+%include <babeltrace2/graph/message-stream-activity-end.h>
+%include <babeltrace2/graph/message-stream-beginning-const.h>
+%include <babeltrace2/graph/message-stream-beginning.h>
+%include <babeltrace2/graph/message-stream-end-const.h>
+%include <babeltrace2/graph/message-stream-end.h>
index b5f53900456101c8de83b29d3d59002517ee02bf..47bd3a9b65413c019816a46fb2a6fdd317984d38 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From message-iterator-const.h */
-
-typedef enum bt_message_iterator_status {
-       BT_MESSAGE_ITERATOR_STATUS_OK = 0,
-       BT_MESSAGE_ITERATOR_STATUS_END = 1,
-       BT_MESSAGE_ITERATOR_STATUS_AGAIN = 11,
-       BT_MESSAGE_ITERATOR_STATUS_ERROR = -1,
-       BT_MESSAGE_ITERATOR_STATUS_NOMEM = -12,
-} bt_message_iterator_status;
-
-/* From self-message-iterator.h */
-
-typedef enum bt_self_message_iterator_status {
-       BT_SELF_MESSAGE_ITERATOR_STATUS_OK = BT_MESSAGE_ITERATOR_STATUS_OK,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_END = BT_MESSAGE_ITERATOR_STATUS_END,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN = BT_MESSAGE_ITERATOR_STATUS_AGAIN,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR = BT_MESSAGE_ITERATOR_STATUS_ERROR,
-       BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM = BT_MESSAGE_ITERATOR_STATUS_NOMEM,
-} bt_self_message_iterator_status;
-
-extern bt_self_component *
-bt_self_message_iterator_borrow_component(
-               bt_self_message_iterator *message_iterator);
-
-extern bt_self_port_output *
-bt_self_message_iterator_borrow_port(
-               bt_self_message_iterator *message_iterator);
-
-extern void bt_self_message_iterator_set_data(
-               bt_self_message_iterator *message_iterator,
-               void *user_data);
-
-extern void *bt_self_message_iterator_get_data(
-               const bt_self_message_iterator *message_iterator);
-
-/* From self-component-port-input-message-iterator.h */
-
-bt_message_iterator *
-bt_self_component_port_input_message_iterator_as_message_iterator(
-               bt_self_component_port_input_message_iterator *iterator);
-
-extern bt_self_component_port_input_message_iterator *
-bt_self_component_port_input_message_iterator_create(
-               bt_self_component_port_input *input_port);
-
-extern bt_component *
-bt_self_component_port_input_message_iterator_borrow_component(
-               bt_self_component_port_input_message_iterator *iterator);
-
-extern bt_message_iterator_status
-bt_self_component_port_input_message_iterator_next(
-               bt_self_component_port_input_message_iterator *iterator,
-               bt_message_array_const *msgs, uint64_t *count);
-
-extern bt_bool
-bt_self_component_port_input_message_iterator_can_seek_ns_from_origin(
-               bt_self_component_port_input_message_iterator *iterator,
-               int64_t ns_from_origin);
-
-extern bt_bool bt_self_component_port_input_message_iterator_can_seek_beginning(
-               bt_self_component_port_input_message_iterator *iterator);
-
-extern bt_message_iterator_status
-bt_self_component_port_input_message_iterator_seek_ns_from_origin(
-               bt_self_component_port_input_message_iterator *iterator,
-               int64_t ns_from_origin);
-
-extern bt_message_iterator_status
-bt_self_component_port_input_message_iterator_seek_beginning(
-               bt_self_component_port_input_message_iterator *iterator);
-
-extern void bt_self_component_port_input_message_iterator_get_ref(
-               const bt_self_component_port_input_message_iterator *self_component_port_input_message_iterator);
-
-extern void bt_self_component_port_input_message_iterator_put_ref(
-               const bt_self_component_port_input_message_iterator *self_component_port_input_message_iterator);
-
-/* From port-output-message-iterator.h */
-
-bt_message_iterator *
-bt_port_output_message_iterator_as_message_iterator(
-               bt_port_output_message_iterator *iterator);
-
-extern bt_port_output_message_iterator *
-bt_port_output_message_iterator_create(
-               bt_graph *graph,
-               const bt_port_output *output_port);
-
-extern bt_message_iterator_status
-bt_port_output_message_iterator_next(
-               bt_port_output_message_iterator *iterator,
-               bt_message_array_const *msgs, uint64_t *count);
-
-extern bt_bool bt_port_output_message_iterator_can_seek_ns_from_origin(
-               bt_port_output_message_iterator *iterator,
-               int64_t ns_from_origin);
-
-extern bt_bool bt_port_output_message_iterator_can_seek_beginning(
-               bt_port_output_message_iterator *iterator);
-
-extern bt_message_iterator_status
-bt_port_output_message_iterator_seek_ns_from_origin(
-               bt_port_output_message_iterator *iterator,
-               int64_t ns_from_origin);
-
-extern bt_message_iterator_status
-bt_port_output_message_iterator_seek_beginning(
-               bt_port_output_message_iterator *iterator);
-
-extern void bt_port_output_message_iterator_get_ref(
-               const bt_port_output_message_iterator *port_output_message_iterator);
-
-extern void bt_port_output_message_iterator_put_ref(
-               const bt_port_output_message_iterator *port_output_message_iterator);
+%include <babeltrace2/graph/message-iterator-const.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 */
 %{
index b4c907359fdf4dedc00495ec68d0cfbb4b61d8fc..10357937dabe32c24f26a5a169f390f69ddeaf0f 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From packet-const.h */
-
-typedef enum bt_packet_status {
-       BT_PACKET_STATUS_OK = 0,
-       BT_PACKET_STATUS_NOMEM = -12,
-} bt_packet_status;
-
-extern const bt_stream *bt_packet_borrow_stream_const(
-               const bt_packet *packet);
-
-extern
-const bt_field *bt_packet_borrow_context_field_const(
-               const bt_packet *packet);
-
-extern void bt_packet_get_ref(const bt_packet *packet);
-
-extern void bt_packet_put_ref(const bt_packet *packet);
-
-/* From packet.h */
-
-extern bt_packet *bt_packet_create(const bt_stream *stream);
-
-extern bt_stream *bt_packet_borrow_stream(bt_packet *packet);
-
-extern
-bt_field *bt_packet_borrow_context_field(bt_packet *packet);
-
-extern
-bt_packet_status bt_packet_move_context_field(bt_packet *packet,
-               bt_packet_context_field *context);
+%include <babeltrace2/trace-ir/packet-const.h>
+%include <babeltrace2/trace-ir/packet.h>
index 44633f2c4a0311e97ffa74a6a52a2a4340558a87..9d2677c74e852e7c9807d0c667d4d25c5ac7744f 100644 (file)
 
 /* Output argument typemap for plugin output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_plugin **OUT)
+       (const bt_plugin **)
        (bt_plugin *temp_plugin = NULL) {
        $1 = &temp_plugin;
 }
 
 %typemap(argout)
-       (const bt_plugin **OUT) {
+       (const bt_plugin **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
 
 /* Output argument typemap for plugin set output (always appends) */
 %typemap(in, numinputs=0)
-       (const bt_plugin_set **OUT)
+       (const bt_plugin_set **)
        (bt_plugin_set *temp_plugin_set = NULL) {
        $1 = &temp_plugin_set;
 }
 
 %typemap(argout)
-       (const bt_plugin_set **OUT) {
+       (const bt_plugin_set **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
        }
 }
 
-/* From plugin-const.h */
-
-typedef enum bt_plugin_status {
-       BT_PLUGIN_STATUS_OK = 0,
-       BT_PLUGIN_STATUS_NOT_FOUND = 2,
-       BT_PLUGIN_STATUS_ERROR = -1,
-       BT_PLUGIN_STATUS_LOADING_ERROR = -2,
-       BT_PLUGIN_STATUS_NOMEM = -12,
-} bt_plugin_status;
-
-extern const char *bt_plugin_get_name(const bt_plugin *plugin);
-
-extern const char *bt_plugin_get_author(const bt_plugin *plugin);
-
-extern const char *bt_plugin_get_license(const bt_plugin *plugin);
-
-extern const char *bt_plugin_get_description(const bt_plugin *plugin);
-
-extern const char *bt_plugin_get_path(const bt_plugin *plugin);
-
-extern uint64_t bt_plugin_get_source_component_class_count(
-               const bt_plugin *plugin);
-
-extern uint64_t bt_plugin_get_filter_component_class_count(
-               const bt_plugin *plugin);
-
-extern uint64_t bt_plugin_get_sink_component_class_count(
-               const bt_plugin *plugin);
-
-extern const bt_component_class_source *
-bt_plugin_borrow_source_component_class_by_index_const(
-               const bt_plugin *plugin, uint64_t index);
-
-extern const bt_component_class_filter *
-bt_plugin_borrow_filter_component_class_by_index_const(
-               const bt_plugin *plugin, uint64_t index);
-
-extern const bt_component_class_sink *
-bt_plugin_borrow_sink_component_class_by_index_const(
-               const bt_plugin *plugin, uint64_t index);
-
-extern const bt_component_class_source *
-bt_plugin_borrow_source_component_class_by_name_const(
-               const bt_plugin *plugin, const char *name);
-
-extern const bt_component_class_filter *
-bt_plugin_borrow_filter_component_class_by_name_const(
-               const bt_plugin *plugin, const char *name);
-
-extern const bt_component_class_sink *
-bt_plugin_borrow_sink_component_class_by_name_const(
-               const bt_plugin *plugin, const char *name);
-
-extern void bt_plugin_get_ref(const bt_plugin *plugin);
-
-extern void bt_plugin_put_ref(const bt_plugin *plugin);
-
-/* From plugin-set-const.h */
-
-extern uint64_t bt_plugin_set_get_plugin_count(
-               const bt_plugin_set *plugin_set);
-
-extern const bt_plugin *bt_plugin_set_borrow_plugin_by_index_const(
-               const bt_plugin_set *plugin_set, uint64_t index);
-
-extern void bt_plugin_set_get_ref(const bt_plugin_set *plugin_set);
-
-extern void bt_plugin_set_put_ref(const bt_plugin_set *plugin_set);
+%include <babeltrace2/plugin/plugin-const.h>
+%include <babeltrace2/plugin/plugin-set-const.h>
 
 /* Helpers */
 
 bt_property_availability bt_plugin_get_version_wrapper(
-               const bt_plugin *plugin, unsigned int *OUT,
-               unsigned int *OUT, unsigned int *OUT, const char **OUT);
+               const bt_plugin *plugin, unsigned int *major,
+               unsigned int *minor, unsigned int *patch, const char **extra);
 
 bt_plugin_status bt_plugin_find_wrapper(const char *plugin_name,
-               bt_bool fail_on_load_error, const bt_plugin **OUT);
+               bt_bool fail_on_load_error, const bt_plugin **plugin);
 
 bt_plugin_status bt_plugin_find_all_from_file_wrapper(
                const char *path, bt_bool fail_on_load_error,
-               const bt_plugin_set **OUT);
+               const bt_plugin_set **plugin_set);
 
 bt_plugin_status bt_plugin_find_all_from_dir_wrapper(
                const char *path, bt_bool recurse, bt_bool fail_on_load_error,
-               const bt_plugin_set **OUT);
+               const bt_plugin_set **plugin_set);
 
 %{
 
index 873c613627c35eda227e27a218d3a3d8de92763a..590ded69faf0da9a2b20f58e5d3d35773be09149 100644 (file)
  * The pointer saved as the port's user data is directly the PyObject *.
  *
  * As per the CPython calling convention, we need to return a new reference to
- * the returned object, which will be transferred to the caller.  The following
- * typedef allows us to apply the typemap.
+ * the returned object, which will be transferred to the caller.
  */
-%{
-typedef void *PY_SELF_PORT_USER_DATA;
-%}
 
-%typemap(out) PY_SELF_PORT_USER_DATA {
+%typemap(out) void * {
        Py_INCREF($1);
        $result = $1;
 }
 
-/* From port-const.h */
+%include <babeltrace2/graph/port-const.h>
+%include <babeltrace2/graph/port-output-const.h>
+%include <babeltrace2/graph/port-input-const.h>
+%include <babeltrace2/graph/self-component-port.h>
+%include <babeltrace2/graph/self-component-port-output.h>
+%include <babeltrace2/graph/self-component-port-input.h>
 
-typedef enum bt_port_type {
-       BT_PORT_TYPE_INPUT = 0,
-       BT_PORT_TYPE_OUTPUT = 1,
-} bt_port_type;
-
-extern const char *bt_port_get_name(const bt_port *port);
-
-extern bt_port_type bt_port_get_type(const bt_port *port);
-
-extern const bt_connection *bt_port_borrow_connection_const(
-               const bt_port *port);
-
-extern const bt_component *bt_port_borrow_component_const(
-               const bt_port *port);
-
-extern bt_bool bt_port_is_connected(const bt_port *port);
-
-bt_bool bt_port_is_input(const bt_port *port);
-
-bt_bool bt_port_is_output(const bt_port *port);
-
-extern void bt_port_get_ref(const bt_port *port);
-
-extern void bt_port_put_ref(const bt_port *port);
-
-/* From port-output-const.h */
-
-const bt_port *bt_port_output_as_port_const(const bt_port_output *port_output);
-
-extern void bt_port_output_get_ref(const bt_port_output *port_output);
-
-extern void bt_port_output_put_ref(const bt_port_output *port_output);
-
-/* From port-input-const.h */
-
-const bt_port *bt_port_input_as_port_const(const bt_port_input *port_input);
-
-extern void bt_port_input_get_ref(const bt_port_input *port_input);
-
-extern void bt_port_input_put_ref(const bt_port_input *port_input);
-
-/* From self-component-port.h */
-
-typedef enum bt_self_component_port_status {
-       BT_SELF_PORT_STATUS_OK = 0,
-} bt_self_component_port_status;
-
-const bt_port *bt_self_component_port_as_port(
-               bt_self_component_port *self_port);
-
-extern bt_self_component *bt_self_component_port_borrow_component(
-               bt_self_component_port *self_port);
-
-extern PY_SELF_PORT_USER_DATA bt_self_component_port_get_data(
-               const bt_self_component_port *self_port);
-
-/* From self-component-port-output.h */
-
-bt_self_component_port *
-bt_self_component_port_output_as_self_component_port(
-               bt_self_component_port_output *self_component_port);
-
-const bt_port_output *bt_self_component_port_output_as_port_output(
-               bt_self_component_port_output *self_component_port);
-
-/* From self-component-port-input.h */
-
-bt_self_component_port *
-bt_self_component_port_input_as_self_component_port(
-               bt_self_component_port_input *self_component_port);
-
-const bt_port_input *bt_self_component_port_input_as_port_input(
-               const bt_self_component_port_input *self_component_port);
+/*
+ * Clear this typemap, since it is a bit broad and could apply to something we
+ * don't want.
+ */
+%clear void *;
index 932bae8dc7cb0e45e79630b0c9464cf07147799c..c8ccb29bb7ae8811964604bb92803bb0ef126557 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From query-executor-const.h */
-
-typedef enum bt_query_executor_status {
-       BT_QUERY_EXECUTOR_STATUS_OK = 0,
-       BT_QUERY_EXECUTOR_STATUS_AGAIN = 11,
-       BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED = 95,
-       BT_QUERY_EXECUTOR_STATUS_CANCELED = 125,
-       BT_QUERY_EXECUTOR_STATUS_ERROR = -1,
-       BT_QUERY_EXECUTOR_STATUS_NOMEM = -12,
-       BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT = -23,
-       BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS = -24,
-} bt_query_executor_status;
-
-extern
-bt_bool bt_query_executor_is_canceled(
-               const bt_query_executor *query_executor);
-
-extern void bt_query_executor_get_ref(
-               const bt_query_executor *query_executor);
-
-extern void bt_query_executor_put_ref(
-               const bt_query_executor *query_executor);
-
-/* From query-executor.h */
-
-extern
-bt_query_executor *bt_query_executor_create(void);
-
-extern
-bt_query_executor_status bt_query_executor_query(
-               bt_query_executor *query_executor,
-               const bt_component_class *component_class,
-               const char *object, const bt_value *params,
-               bt_logging_level logging_level, const bt_value **OUT);
-
-extern
-bt_query_executor_status bt_query_executor_cancel(
-               bt_query_executor *query_executor);
+%include <babeltrace2/graph/query-executor-const.h>
+%include <babeltrace2/graph/query-executor.h>
index 394d98726314adffb1a8170d220a6c0ee2e05e1c..95a9d36659335818a37757241a960c60fca51823 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From stream-const.h */
-
-typedef enum bt_stream_status {
-       BT_STREAM_STATUS_OK = 0,
-       BT_STREAM_STATUS_NOMEM = -12,
-} bt_stream_status;
-
-extern const bt_stream_class *bt_stream_borrow_class_const(
-               const bt_stream *stream);
-
-extern const bt_trace *bt_stream_borrow_trace_const(
-               const bt_stream *stream);
-
-extern const char *bt_stream_get_name(const bt_stream *stream);
-
-extern uint64_t bt_stream_get_id(const bt_stream *stream);
-
-extern void bt_stream_get_ref(const bt_stream *stream);
-
-extern void bt_stream_put_ref(const bt_stream *stream);
-
-/* From stream.h */
-
-extern bt_stream *bt_stream_create(bt_stream_class *stream_class,
-               bt_trace *trace);
-
-extern bt_stream *bt_stream_create_with_id(
-               bt_stream_class *stream_class,
-               bt_trace *trace, uint64_t id);
-
-extern bt_trace *bt_stream_borrow_trace(bt_stream *stream);
-
-extern bt_stream_class *bt_stream_borrow_class(bt_stream *stream);
-
-extern bt_stream_status bt_stream_set_name(bt_stream *stream,
-               const char *name);
+%include <babeltrace2/trace-ir/stream-const.h>
+%include <babeltrace2/trace-ir/stream.h>
index e59270432f208fadd58760fe200003cc894e1e3b..69937babd6fcf6e2c78ca32670b804574f997029 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From stream-class-const.h */
-
-typedef enum bt_stream_class_status {
-       BT_STREAM_CLASS_STATUS_OK = 0,
-       BT_STREAM_CLASS_STATUS_NOMEM = -12,
-} bt_stream_class_status;
-
-extern const bt_trace_class *bt_stream_class_borrow_trace_class_const(
-               const bt_stream_class *stream_class);
-
-extern const char *bt_stream_class_get_name(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_assigns_automatic_event_class_id(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_assigns_automatic_stream_id(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_packets_have_end_default_clock_snapshot(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_supports_discarded_events(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_supports_discarded_packets(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_discarded_events_have_default_clock_snapshots(
-               const bt_stream_class *stream_class);
-
-extern bt_bool bt_stream_class_discarded_packets_have_default_clock_snapshots(
-               const bt_stream_class *stream_class);
-
-extern uint64_t bt_stream_class_get_id(
-               const bt_stream_class *stream_class);
-
-extern const bt_field_class *
-bt_stream_class_borrow_packet_context_field_class_const(
-               const bt_stream_class *stream_class);
-
-extern const bt_field_class *
-bt_stream_class_borrow_event_common_context_field_class_const(
-               const bt_stream_class *stream_class);
-
-extern uint64_t bt_stream_class_get_event_class_count(
-               const bt_stream_class *stream_class);
-
-extern const bt_event_class *
-bt_stream_class_borrow_event_class_by_index_const(
-               const bt_stream_class *stream_class, uint64_t index);
-
-extern const bt_event_class *
-bt_stream_class_borrow_event_class_by_id_const(
-               const bt_stream_class *stream_class, uint64_t id);
-
-extern const bt_clock_class *
-bt_stream_class_borrow_default_clock_class_const(
-               const bt_stream_class *stream_class);
-
-extern void bt_stream_class_get_ref(const bt_stream_class *stream_class);
-
-extern void bt_stream_class_put_ref(const bt_stream_class *stream_class);
-
-/* From stream-class-const.h */
-
-extern bt_stream_class *bt_stream_class_create(
-               bt_trace_class *trace_class);
-
-extern bt_stream_class *bt_stream_class_create_with_id(
-               bt_trace_class *trace_class, uint64_t id);
-
-extern bt_trace_class *bt_stream_class_borrow_trace_class(
-               bt_stream_class *stream_class);
-
-extern bt_stream_class_status bt_stream_class_set_name(
-               bt_stream_class *stream_class, const char *name);
-
-extern void bt_stream_class_set_assigns_automatic_event_class_id(
-               bt_stream_class *stream_class, bt_bool value);
-
-extern void bt_stream_class_set_assigns_automatic_stream_id(
-               bt_stream_class *stream_class, bt_bool value);
-
-extern void bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
-               bt_stream_class *stream_class, bt_bool value);
-
-extern void bt_stream_class_set_packets_have_end_default_clock_snapshot(
-               bt_stream_class *stream_class, bt_bool value);
-
-extern void bt_stream_class_set_supports_discarded_events(
-               bt_stream_class *stream_class,
-               bt_bool supports_discarded_events,
-               bt_bool with_default_clock_snapshots);
-
-extern void bt_stream_class_set_supports_discarded_packets(
-               bt_stream_class *stream_class,
-               bt_bool supports_discarded_packets,
-               bt_bool with_default_clock_snapshots);
-
-extern bt_stream_class_status
-bt_stream_class_set_packet_context_field_class(
-               bt_stream_class *stream_class,
-               bt_field_class *field_class);
-
-extern bt_field_class *
-bt_stream_class_borrow_packet_context_field_class(
-               bt_stream_class *stream_class);
-
-extern bt_stream_class_status
-bt_stream_class_set_event_common_context_field_class(
-               bt_stream_class *stream_class,
-               bt_field_class *field_class);
-
-extern bt_field_class *
-bt_stream_class_borrow_event_common_context_field_class(
-               bt_stream_class *stream_class);
-
-extern bt_event_class *
-bt_stream_class_borrow_event_class_by_index(
-               bt_stream_class *stream_class, uint64_t index);
-
-extern bt_event_class *
-bt_stream_class_borrow_event_class_by_id(
-               bt_stream_class *stream_class, uint64_t id);
-
-extern bt_clock_class *bt_stream_class_borrow_default_clock_class(
-               bt_stream_class *stream_class);
-
-extern bt_stream_class_status bt_stream_class_set_default_clock_class(
-               bt_stream_class *stream_class,
-               bt_clock_class *clock_class);
+%include <babeltrace2/trace-ir/stream-class-const.h>
+%include <babeltrace2/trace-ir/stream-class.h>
index 2d8f538bf744b4d8fbb41e2e4851540afe2c3555..8fcc5db9319371e2f8c1a1d6934d03eed30a1d44 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From trace-const.h */
-
-typedef enum bt_trace_status {
-       BT_TRACE_STATUS_OK = 0,
-       BT_TRACE_STATUS_NOMEM = -12,
-} bt_trace_status;
-
-typedef void (* bt_trace_destruction_listener_func)(
-               const bt_trace *trace, void *data);
-
-extern const bt_trace_class *bt_trace_borrow_class_const(
-               const bt_trace *trace);
-
-extern const char *bt_trace_get_name(const bt_trace *trace);
-
-extern uint64_t bt_trace_get_stream_count(const bt_trace *trace);
-
-extern const bt_stream *bt_trace_borrow_stream_by_index_const(
-               const bt_trace *trace, uint64_t index);
-
-extern const bt_stream *bt_trace_borrow_stream_by_id_const(
-               const bt_trace *trace, uint64_t id);
-
-extern bt_trace_status bt_trace_add_destruction_listener(
-               const bt_trace *trace,
-               bt_trace_destruction_listener_func listener,
-               void *data, uint64_t *listener_id);
-
-extern bt_trace_status bt_trace_remove_destruction_listener(
-               const bt_trace *trace, uint64_t listener_id);
-
-extern void bt_trace_get_ref(const bt_trace *trace);
-
-extern void bt_trace_put_ref(const bt_trace *trace);
-
-/* From trace.h */
-
-extern bt_trace_class *bt_trace_borrow_class(bt_trace *trace);
-
-extern bt_trace *bt_trace_create(bt_trace_class *trace_class);
-
-extern bt_trace_status bt_trace_set_name(bt_trace *trace,
-               const char *name);
-
-extern bt_stream *bt_trace_borrow_stream_by_index(bt_trace *trace,
-               uint64_t index);
-
-extern bt_stream *bt_trace_borrow_stream_by_id(bt_trace *trace,
-               uint64_t id);
+%include <babeltrace2/trace-ir/trace-const.h>
+%include <babeltrace2/trace-ir/trace.h>
 
 %{
 static void
index 71061ffacccb30fddf49c18bd33992e7d58769a7..a4fdbba7e18aeba12cf16fed74962f1bff184e52 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From trace-class-const.h */
-
-typedef enum bt_trace_class_status {
-       BT_TRACE_CLASS_STATUS_OK = 0,
-       BT_TRACE_CLASS_STATUS_NOMEM = -12,
-} bt_trace_class_status;
-
-typedef void (* bt_trace_class_destruction_listener_func)(
-               const bt_trace_class *trace_class, void *data);
-
-extern bt_bool bt_trace_class_assigns_automatic_stream_class_id(
-               const bt_trace_class *trace_class);
-
-extern const char *bt_trace_class_get_name(
-               const bt_trace_class *trace_class);
-
-extern bt_uuid bt_trace_class_get_uuid(
-               const bt_trace_class *trace_class);
-
-extern uint64_t bt_trace_class_get_environment_entry_count(
-               const bt_trace_class *trace_class);
-
-extern void bt_trace_class_borrow_environment_entry_by_index_const(
-               const bt_trace_class *trace_class, uint64_t index,
-               const char **OUT, const bt_value **OUT);
-
-extern const bt_value *
-bt_trace_class_borrow_environment_entry_value_by_name_const(
-               const bt_trace_class *trace_class, const char *name);
-
-extern uint64_t bt_trace_class_get_stream_class_count(
-               const bt_trace_class *trace_class);
-
-extern const bt_stream_class *
-bt_trace_class_borrow_stream_class_by_index_const(
-               const bt_trace_class *trace_class, uint64_t index);
-
-extern const bt_stream_class *bt_trace_class_borrow_stream_class_by_id_const(
-               const bt_trace_class *trace_class, uint64_t id);
-
-extern bt_trace_class_status bt_trace_class_add_destruction_listener(
-        const bt_trace_class *trace_class,
-        bt_trace_class_destruction_listener_func listener,
-        void *data, uint64_t *listener_id);
-
-extern bt_trace_class_status bt_trace_class_remove_destruction_listener(
-        const bt_trace_class *trace_class, uint64_t listener_id);
-
-extern void bt_trace_class_get_ref(const bt_trace_class *trace_class);
-
-extern void bt_trace_class_put_ref(const bt_trace_class *trace_class);
-
-/* From trace-class.h */
-
-extern bt_trace_class *bt_trace_class_create(bt_self_component *self_comp);
-
-extern void bt_trace_class_set_assigns_automatic_stream_class_id(
-               bt_trace_class *trace_class, bt_bool value);
-
-extern bt_trace_class_status bt_trace_class_set_name(
-               bt_trace_class *trace_class, const char *name);
-
-extern void bt_trace_class_set_uuid(bt_trace_class *trace_class,
-               bt_uuid uuid);
-
-extern bt_trace_class_status bt_trace_class_set_environment_entry_integer(
-               bt_trace_class *trace_class,
-               const char *name, int64_t value);
-
-extern bt_trace_class_status bt_trace_class_set_environment_entry_string(
-               bt_trace_class *trace_class,
-               const char *name, const char *value);
-
-extern bt_stream_class *bt_trace_class_borrow_stream_class_by_index(
-               bt_trace_class *trace_class, uint64_t index);
-
-extern bt_stream_class *bt_trace_class_borrow_stream_class_by_id(
-               bt_trace_class *trace_class, uint64_t id);
+%include <babeltrace2/trace-ir/trace-class-const.h>
+%include <babeltrace2/trace-ir/trace-class.h>
 
 /* Helper functions for Python */
 %{
index 1ecd21e36b52b2784513933a8ed3e094b152bb0d..8072614d4f7f756a4ae724df11bff65f576953b8 100644 (file)
  * THE SOFTWARE.
  */
 
-/* From value-const.h */
-
-typedef enum bt_value_status {
-       /// Operation canceled.
-       BT_VALUE_STATUS_CANCELED        = 125,
-
-       /// Cannot allocate memory.
-       BT_VALUE_STATUS_NOMEM           = -12,
-
-       /// Okay, no error.
-       BT_VALUE_STATUS_OK              = 0,
-} bt_value_status;
-
-typedef enum bt_value_type {
-       /// Null value object.
-       BT_VALUE_TYPE_NULL              = 0,
-
-       /// Boolean value object (holds #BT_TRUE or #BT_FALSE).
-       BT_VALUE_TYPE_BOOL              = 1,
-
-       /// Unsigned integer value object (holds an unsigned 64-bit integer raw value).
-       BT_VALUE_TYPE_UNSIGNED_INTEGER  = 2,
-
-       /// Signed integer value object (holds a signed 64-bit integer raw value).
-       BT_VALUE_TYPE_SIGNED_INTEGER    = 3,
-
-       /// Floating point number value object (holds a \c double raw value).
-       BT_VALUE_TYPE_REAL              = 4,
-
-       /// String value object.
-       BT_VALUE_TYPE_STRING            = 5,
-
-       /// Array value object.
-       BT_VALUE_TYPE_ARRAY             = 6,
-
-       /// Map value object.
-       BT_VALUE_TYPE_MAP               = 7,
-} bt_value_type;
-
-extern bt_value_type bt_value_get_type(const bt_value *object);
-
-extern bt_value_status bt_value_copy(const bt_value *object,
-               bt_value **copy);
-
-extern bt_bool bt_value_compare(const bt_value *object_a,
-               const bt_value *object_b);
-
-extern bt_bool bt_value_bool_get(const bt_value *bool_obj);
-
-extern uint64_t bt_value_unsigned_integer_get(const bt_value *integer_obj);
-
-extern int64_t bt_value_signed_integer_get(const bt_value *integer_obj);
-
-extern double bt_value_real_get(const bt_value *real_obj);
-
-extern const char *bt_value_string_get(const bt_value *string_obj);
-
-extern uint64_t bt_value_array_get_size(const bt_value *array_obj);
-
-extern const bt_value *bt_value_array_borrow_element_by_index_const(
-               const bt_value *array_obj, uint64_t index);
-
-extern uint64_t bt_value_map_get_size(const bt_value *map_obj);
-
-extern const bt_value *bt_value_map_borrow_entry_value_const(
-               const bt_value *map_obj, const char *key);
-
-typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
-               const bt_value *object, void *data);
-
-extern bt_value_status bt_value_map_foreach_entry_const(
-               const bt_value *map_obj,
-               bt_value_map_foreach_entry_const_func func, void *data);
-
-extern bt_bool bt_value_map_has_entry(const bt_value *map_obj,
-               const char *key);
-
-extern bt_value_status bt_value_map_extend(
-               const bt_value *base_map_obj,
-               const bt_value *extension_map_obj,
-               bt_value **extended_map_obj);
-
-extern void bt_value_get_ref(const bt_value *value);
-
-extern void bt_value_put_ref(const bt_value *value);
-
-/* From value.h */
-
-extern bt_value *const bt_value_null;
-
-extern bt_value *bt_value_bool_create(void);
-
-extern bt_value *bt_value_bool_create_init(bt_bool val);
-
-extern void bt_value_bool_set(bt_value *bool_obj, bt_bool val);
-
-extern bt_value *bt_value_unsigned_integer_create(void);
-
-extern bt_value *bt_value_unsigned_integer_create_init(uint64_t val);
-
-extern void bt_value_unsigned_integer_set(bt_value *integer_obj, uint64_t val);
-
-extern bt_value *bt_value_signed_integer_create(void);
-
-extern bt_value *bt_value_signed_integer_create_init(int64_t val);
-
-extern void bt_value_signed_integer_set(bt_value *integer_obj, int64_t val);
-
-extern bt_value *bt_value_real_create(void);
-
-extern bt_value *bt_value_real_create_init(double val);
-
-extern void bt_value_real_set(bt_value *real_obj, double val);
-
-extern bt_value *bt_value_string_create(void);
-
-extern bt_value *bt_value_string_create_init(const char *val);
-
-extern bt_value_status bt_value_string_set(bt_value *string_obj,
-               const char *val);
-
-extern bt_value *bt_value_array_create(void);
-
-extern bt_value *bt_value_array_borrow_element_by_index(
-               bt_value *array_obj, uint64_t index);
-
-extern bt_value_status bt_value_array_append_element(
-               bt_value *array_obj,
-               bt_value *element_obj);
-
-extern bt_value_status bt_value_array_append_bool_element(
-               bt_value *array_obj, bt_bool val);
-
-extern bt_value_status bt_value_array_append_unsigned_integer_element(
-               bt_value *array_obj, uint64_t val);
-
-extern bt_value_status bt_value_array_append_signed_integer_element(
-               bt_value *array_obj, int64_t val);
-
-extern bt_value_status bt_value_array_append_real_element(
-               bt_value *array_obj, double val);
-
-extern bt_value_status bt_value_array_append_string_element(
-               bt_value *array_obj, const char *val);
-
-extern bt_value_status bt_value_array_append_empty_array_element(
-               bt_value *array_obj);
-
-extern bt_value_status bt_value_array_append_empty_map_element(
-               bt_value *array_obj);
-
-extern bt_value_status bt_value_array_set_element_by_index(
-               bt_value *array_obj, uint64_t index,
-               bt_value *element_obj);
-
-extern bt_value *bt_value_map_create(void);
-
-extern bt_value *bt_value_map_borrow_entry_value(
-               bt_value *map_obj, const char *key);
-
-typedef bt_bool (* bt_value_map_foreach_entry_func)(const char *key,
-               bt_value *object, void *data);
-
-extern bt_value_status bt_value_map_foreach_entry(
-               bt_value *map_obj,
-               bt_value_map_foreach_entry_func func, void *data);
-
-extern bt_value_status bt_value_map_insert_entry(
-               bt_value *map_obj, const char *key,
-               bt_value *element_obj);
-
-extern bt_value_status bt_value_map_insert_bool_entry(
-               bt_value *map_obj, const char *key, bt_bool val);
-
-extern bt_value_status bt_value_map_insert_unsigned_integer_entry(
-               bt_value *map_obj, const char *key, uint64_t val);
-
-extern bt_value_status bt_value_map_insert_signed_integer_entry(
-               bt_value *map_obj, const char *key, int64_t val);
-
-extern bt_value_status bt_value_map_insert_real_entry(
-               bt_value *map_obj, const char *key, double val);
-
-extern bt_value_status bt_value_map_insert_string_entry(
-               bt_value *map_obj, const char *key,
-               const char *val);
-
-extern bt_value_status bt_value_map_insert_empty_array_entry(
-               bt_value *map_obj, const char *key);
-
-extern bt_value_status bt_value_map_insert_empty_map_entry(
-               bt_value *map_obj, const char *key);
+%include <babeltrace2/value-const.h>
+%include <babeltrace2/value.h>
 
 %{
 struct bt_value_map_get_keys_data {
index bc1a735f2a20184127781b4179c46ce48c2f56bb..78398605fc67488d4d04b0e4dc85bd0bb4b20191 100644 (file)
@@ -39,7 +39,8 @@ def main():
                         sources=['bt2/native_bt.i', 'bt2/logging.c'],
                         libraries=['babeltrace2', 'glib-2.0'],
                         extra_objects=['@top_builddir@/src/logging/.libs/libbabeltrace2-logging.a',
-                            '@top_builddir@/src/common/.libs/libbabeltrace2-common.a'],)
+                            '@top_builddir@/src/common/.libs/libbabeltrace2-common.a'],
+                        swig_opts=['-I@top_srcdir@/include'])
 
     dist = setup(name='bt2',
             version='@PACKAGE_VERSION@',
This page took 0.059267 seconds and 4 git commands to generate.