X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=bindings%2Fpython%2Fbabeltrace.i.in;h=dd2daccd25f7298a2a1b55ece6d96f9bda47a3d0;hp=b693f0210fda02d8e11e3044a41f9fe0b634b524;hb=cc26a15ac355d886bb507955fdaec9b218024713;hpb=ef42f9eb514872c428122b3d0e04e1126f8d8f55 diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in index b693f021..dd2daccd 100644 --- a/bindings/python/babeltrace.i.in +++ b/bindings/python/babeltrace.i.in @@ -45,7 +45,6 @@ trace to it." #include #include #include -#include #include #include #include "python-complements.h" @@ -63,8 +62,8 @@ typedef int bt_intern_str; %rename("_bt_context_create") bt_context_create(void); %rename("_bt_context_add_trace") bt_context_add_trace( struct bt_context *ctx, const char *path, const char *format, - void (*packet_seek)(struct stream_pos *pos, size_t index, int whence), - struct mmap_stream_list *stream_list, FILE *metadata); + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), + struct bt_mmap_stream_list *stream_list, FILE *metadata); %rename("_bt_context_remove_trace") bt_context_remove_trace( struct bt_context *ctx, int trace_id); %rename("_bt_context_get") bt_context_get(struct bt_context *ctx); @@ -74,8 +73,8 @@ typedef int bt_intern_str; struct bt_context *bt_context_create(void); int bt_context_add_trace(struct bt_context *ctx, const char *path, const char *format, - void (*packet_seek)(struct stream_pos *pos, size_t index, int whence), - struct mmap_stream_list *stream_list, FILE *metadata); + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), + struct bt_mmap_stream_list *stream_list, FILE *metadata); void bt_context_remove_trace(struct bt_context *ctx, int trace_id); void bt_context_get(struct bt_context *ctx); void bt_context_put(struct bt_context *ctx); @@ -189,13 +188,12 @@ class Context: %rename("lookup_format") bt_lookup_format(bt_intern_str qname); %rename("_bt_print_format_list") bt_fprintf_format_list(FILE *fp); %rename("register_format") bt_register_format(struct format *format); +%rename("unregister_format") bt_unregister_format(struct bt_format *format); extern struct format *bt_lookup_format(bt_intern_str qname); extern void bt_fprintf_format_list(FILE *fp); -extern int bt_register_format(struct format *format); - -void format_init(void); -void format_finalize(void); +extern int bt_register_format(struct bt_format *format); +extern void bt_unregister_format(struct bt_format *format); %pythoncode %{ @@ -455,8 +453,6 @@ void bt_trace_handle_destroy(struct bt_trace_handle *bt); struct bt_context *ctx, int handle_id, enum bt_clock_type type); %rename("_bt_trace_handle_get_timestamp_end") bt_trace_handle_get_timestamp_end( struct bt_context *ctx, int handle_id, enum bt_clock_type type); -%rename("_bt_trace_handle_get_id") bt_trace_handle_get_id(struct bt_trace_handle *th); -int bt_trace_handle_get_id(struct bt_trace_handle *th); const char *bt_trace_handle_get_path(struct bt_context *ctx, int handle_id); uint64_t bt_trace_handle_get_timestamp_begin(struct bt_context *ctx, int handle_id, enum bt_clock_type type); @@ -553,55 +549,58 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter); const struct bt_ctf_event *ctf_event); %rename("_bt_ctf_get_field") bt_ctf_get_field(const struct bt_ctf_event *ctf_event, - const struct definition *scope, const char *field); + const struct bt_definition *scope, const char *field); %rename("_bt_ctf_get_index") bt_ctf_get_index(const struct bt_ctf_event *ctf_event, - const struct definition *field, unsigned int index); -%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct definition *def); -%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct definition *def); + const struct bt_definition *field, unsigned int index); +%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct bt_definition *field); +%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct bt_declaration *field); %rename("_bt_ctf_get_int_signedness") bt_ctf_get_int_signedness( - const struct definition *field); -%rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct definition *field); + const struct bt_declaration *field); +%rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct bt_declaration *field); %rename("_bt_ctf_get_int_byte_order") bt_ctf_get_int_byte_order( - const struct definition *field); -%rename("_bt_ctf_get_int_len") bt_ctf_get_int_len(const struct definition *field); -%rename("_bt_ctf_get_encoding") bt_ctf_get_encoding(const struct definition *field); -%rename("_bt_ctf_get_array_len") bt_ctf_get_array_len(const struct definition *field); -%rename("_bt_ctf_get_uint64") bt_ctf_get_uint64(const struct definition *field); -%rename("_bt_ctf_get_int64") bt_ctf_get_int64(const struct definition *field); -%rename("_bt_ctf_get_char_array") bt_ctf_get_char_array(const struct definition *field); -%rename("_bt_ctf_get_string") bt_ctf_get_string(const struct definition *field); + const struct bt_declaration *field); +%rename("_bt_ctf_get_int_len") bt_ctf_get_int_len(const struct bt_declaration *field); +%rename("_bt_ctf_get_encoding") bt_ctf_get_encoding(const struct bt_declaration *field); +%rename("_bt_ctf_get_array_len") bt_ctf_get_array_len(const struct bt_declaration *field); +%rename("_bt_ctf_get_uint64") bt_ctf_get_uint64(const struct bt_definition *field); +%rename("_bt_ctf_get_int64") bt_ctf_get_int64(const struct bt_definition *field); +%rename("_bt_ctf_get_char_array") bt_ctf_get_char_array(const struct bt_definition *field); +%rename("_bt_ctf_get_string") bt_ctf_get_string(const struct bt_definition *field); %rename("_bt_ctf_field_get_error") bt_ctf_field_get_error(void); %rename("_bt_ctf_get_decl_event_name") bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event); %rename("_bt_ctf_get_decl_field_name") bt_ctf_get_decl_field_name( const struct bt_ctf_field_decl *field); +%rename("_bt_ctf_get_decl_from_def") bt_ctf_get_decl_from_def( + const struct bt_definition *field); -const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event, +const struct bt_definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event, enum bt_ctf_scope scope); const char *bt_ctf_event_name(const struct bt_ctf_event *ctf_event); uint64_t bt_ctf_get_timestamp(const struct bt_ctf_event *ctf_event); uint64_t bt_ctf_get_cycles(const struct bt_ctf_event *ctf_event); -const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event, - const struct definition *scope, +const struct bt_definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event, + const struct bt_definition *scope, const char *field); -const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event, - const struct definition *field, +const struct bt_definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event, + const struct bt_definition *field, unsigned int index); -const char *bt_ctf_field_name(const struct definition *def); -enum ctf_type_id bt_ctf_field_type(const struct definition *def); -int bt_ctf_get_int_signedness(const struct definition *field); -int bt_ctf_get_int_base(const struct definition *field); -int bt_ctf_get_int_byte_order(const struct definition *field); -ssize_t bt_ctf_get_int_len(const struct definition *field); -enum ctf_string_encoding bt_ctf_get_encoding(const struct definition *field); -int bt_ctf_get_array_len(const struct definition *field); -uint64_t bt_ctf_get_uint64(const struct definition *field); -int64_t bt_ctf_get_int64(const struct definition *field); -char *bt_ctf_get_char_array(const struct definition *field); -char *bt_ctf_get_string(const struct definition *field); +const char *bt_ctf_field_name(const struct bt_definition *field); +enum ctf_type_id bt_ctf_field_type(const struct bt_declaration *field); +int bt_ctf_get_int_signedness(const struct bt_declaration *field); +int bt_ctf_get_int_base(const struct bt_declaration *field); +int bt_ctf_get_int_byte_order(const struct bt_declaration *field); +ssize_t bt_ctf_get_int_len(const struct bt_declaration *field); +enum ctf_string_encoding bt_ctf_get_encoding(const struct bt_declaration *field); +int bt_ctf_get_array_len(const struct bt_declaration *field); +uint64_t bt_ctf_get_uint64(const struct bt_definition *field); +int64_t bt_ctf_get_int64(const struct bt_definition *field); +char *bt_ctf_get_char_array(const struct bt_definition *field); +char *bt_ctf_get_string(const struct bt_definition *field); int bt_ctf_field_get_error(void); const char *bt_ctf_get_decl_event_name(const struct bt_ctf_event_decl *event); const char *bt_ctf_get_decl_field_name(const struct bt_ctf_field_decl *field); +const struct bt_declaration *bt_ctf_get_decl_from_def(const struct bt_definition *field); %pythoncode%{ @@ -842,25 +841,25 @@ class ctf: def field_type(self): """Return the type of a field or -1 if unknown.""" - return _bt_ctf_field_type(self._d) + return _bt_ctf_field_type(_bt_ctf_get_decl_from_def(self._d)) def get_int_signedness(self): """ Return the signedness of an integer: 0 if unsigned; 1 if signed; -1 on error. """ - return _bt_ctf_get_int_signedness(self._d) + return _bt_ctf_get_int_signedness(_bt_ctf_get_decl_from_def(self._d)) def get_int_base(self): """Return the base of an int or a negative value on error.""" - return _bt_ctf_get_int_base(self._d) + return _bt_ctf_get_int_base(_bt_ctf_get_decl_from_def(self._d)) def get_int_byte_order(self): """ Return the byte order of an int or a negative value on error. """ - return _bt_ctf_get_int_byte_order(self._d) + return _bt_ctf_get_int_byte_order(_bt_ctf_get_decl_from_def(self._d)) def get_int_len(self): """ @@ -874,14 +873,14 @@ class ctf: Return the encoding of an int or a string. Return a negative value on error. """ - return _bt_ctf_get_encoding(self._d) + return _bt_ctf_get_encoding(_bt_ctf_get_decl_from_def(self._d)) def get_array_len(self): """ Return the len of an array or a negative value on error. """ - return _bt_ctf_get_array_len(self._d) + return _bt_ctf_get_array_len(_bt_ctf_get_decl_from_def(self._d)) def get_uint64(self): """