Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
* [lttng-dev] [PATCH babeltrace 1/3] Fix: Mismatching function signatures used by python bindings
@ 2013-01-18 16:45 Jérémie Galarneau
  2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 2/3] Fix: Python 3 binding compatibility and clean intermediate files Jérémie Galarneau
  2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor Jérémie Galarneau
  0 siblings, 2 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2013-01-18 16:45 UTC (permalink / raw)



Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 bindings/python/babeltrace.i.in | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index b693f02..d45afb0 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -557,15 +557,15 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 %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);
+%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct declaration *def);
 %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 declaration *field);
+%rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct 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);
+		const struct declaration *field);
+%rename("_bt_ctf_get_int_len") bt_ctf_get_int_len(const struct declaration *field);
+%rename("_bt_ctf_get_encoding") bt_ctf_get_encoding(const struct declaration *field);
+%rename("_bt_ctf_get_array_len") bt_ctf_get_array_len(const struct declaration *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);
@@ -588,13 +588,13 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *ctf_event,
 		const struct 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);
+enum ctf_type_id bt_ctf_field_type(const struct declaration *def);
+int bt_ctf_get_int_signedness(const struct declaration *field);
+int bt_ctf_get_int_base(const struct declaration *field);
+int bt_ctf_get_int_byte_order(const struct declaration *field);
+ssize_t bt_ctf_get_int_len(const struct declaration *field);
+enum ctf_string_encoding bt_ctf_get_encoding(const struct declaration *field);
+int bt_ctf_get_array_len(const struct declaration *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);
-- 
1.8.1.1




^ permalink raw reply	[flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH babeltrace 2/3] Fix: Python 3 binding compatibility and clean intermediate files.
  2013-01-18 16:45 [lttng-dev] [PATCH babeltrace 1/3] Fix: Mismatching function signatures used by python bindings Jérémie Galarneau
@ 2013-01-18 16:45 ` Jérémie Galarneau
  2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor Jérémie Galarneau
  1 sibling, 0 replies; 4+ messages in thread
From: Jérémie Galarneau @ 2013-01-18 16:45 UTC (permalink / raw)



Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 bindings/python/Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index bf8050e..536e07f 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -23,6 +23,5 @@ _babeltrace_la_LIBADD = $(top_srcdir)/formats/ctf/libbabeltrace-ctf.la	\
 # SWIG 'warning md variable unused' fixed after SWIG build:
 babeltrace_wrap.c: babeltrace.i
 	$(SWIG) -python -Wall -I. -I$(top_srcdir)/include babeltrace.i
-	sed -i "s/PyObject \*m, \*d, \*md;/PyObject \*m, \*d;\n#if defined(SWIGPYTHON_BUILTIN)\nPyObject *md;\n#endif/g" babeltrace_wrap.c
-	sed -i "s/md = d/d/g" babeltrace_wrap.c
-	sed -i "s/(void)public_symbol;/(void)public_symbol;\n  md = d;/g" babeltrace_wrap.c
+
+CLEANFILES = babeltrace.i babeltrace.py babeltrace_wrap.c
-- 
1.8.1.1




^ permalink raw reply	[flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor.
  2013-01-18 16:45 [lttng-dev] [PATCH babeltrace 1/3] Fix: Mismatching function signatures used by python bindings Jérémie Galarneau
  2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 2/3] Fix: Python 3 binding compatibility and clean intermediate files Jérémie Galarneau
@ 2013-01-18 16:45 ` Jérémie Galarneau
  2013-01-20 17:59   ` Mathieu Desnoyers
  1 sibling, 1 reply; 4+ messages in thread
From: Jérémie Galarneau @ 2013-01-18 16:45 UTC (permalink / raw)


Resolves an undefined symbol on Python module load.

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 bindings/python/babeltrace.i.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index d45afb0..dd49ba5 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -194,9 +194,6 @@ 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);
-
 %pythoncode %{
 
 def print_format_list(babeltrace_file):
-- 
1.8.1.1




^ permalink raw reply	[flat|nested] 4+ messages in thread
* [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor.
  2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor Jérémie Galarneau
@ 2013-01-20 17:59   ` Mathieu Desnoyers
  0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Desnoyers @ 2013-01-20 17:59 UTC (permalink / raw)


* J?r?mie Galarneau (jeremie.galarneau at efficios.com) wrote:
> Resolves an undefined symbol on Python module load.

All 3 patches merged, thanks!

Mathieu

> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  bindings/python/babeltrace.i.in | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
> index d45afb0..dd49ba5 100644
> --- a/bindings/python/babeltrace.i.in
> +++ b/bindings/python/babeltrace.i.in
> @@ -194,9 +194,6 @@ 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);
> -
>  %pythoncode %{
>  
>  def print_format_list(babeltrace_file):
> -- 
> 1.8.1.1
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com



^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-20 17:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-18 16:45 [lttng-dev] [PATCH babeltrace 1/3] Fix: Mismatching function signatures used by python bindings Jérémie Galarneau
2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 2/3] Fix: Python 3 binding compatibility and clean intermediate files Jérémie Galarneau
2013-01-18 16:45 ` [lttng-dev] [PATCH babeltrace 3/3] Fix: Removed Python bindings to static constructor and destructor Jérémie Galarneau
2013-01-20 17:59   ` Mathieu Desnoyers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox