[lttng-dev] [PATCH lttng-tools 1/4] Extras: Added lttng.pyc to the clean section of the Python binding makefile.

[lttng-dev] [PATCH lttng-tools 1/4] Extras: Added lttng.pyc to the clean section of the Python binding makefile.

[Jérémie Galarneau]

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

diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am
index a3557b8..d592ded 100644
--- a/extras/bindings/swig/python/Makefile.am
+++ b/extras/bindings/swig/python/Makefile.am
@@ -24,4 +24,4 @@ lttng_wrap.c: lttng.i
 	sed -i "s/md = d/d/g" lttng_wrap.c
 	sed -i "s/(void)public_symbol;/(void)public_symbol;\n  md = d;/g" lttng_wrap.c
 
-CLEANFILES = lttng.i lttng.py lttng_wrap.c
+CLEANFILES = lttng.i lttng.py lttng_wrap.c lttng.pyc
-- 
1.8.1

[lttng-dev] [PATCH lttng-tools 2/4] Extras: Fix the undefined reference to md build error.

[Jérémie Galarneau]

Removed scripted modifications to lttng_wrap.c during Python binding generation.

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 extras/bindings/swig/python/Makefile.am | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am
index d592ded..c6a6901 100644
--- a/extras/bindings/swig/python/Makefile.am
+++ b/extras/bindings/swig/python/Makefile.am
@@ -17,11 +17,7 @@ _lttng_la_LDFLAGS = -module
 _lttng_la_LIBADD = 	$(top_srcdir)/src/lib/lttng-ctl/liblttng-ctl.la 		\
 			$(top_srcdir)/src/common/sessiond-comm/libsessiond-comm.la
 
-# SWIG 'warning md variable unused' fixed after SWIG build:
 lttng_wrap.c: lttng.i
 	$(SWIG) -python -I. -I$(top_srcdir)/src/common/sessiond-comm lttng.i
-	sed -i "s/PyObject \*m, \*d, \*md;/PyObject \*m, \*d;\n#if defined(SWIGPYTHON_BUILTIN)\nPyObject *md;\n#endif/g" lttng_wrap.c
-	sed -i "s/md = d/d/g" lttng_wrap.c
-	sed -i "s/(void)public_symbol;/(void)public_symbol;\n  md = d;/g" lttng_wrap.c
 
 CLEANFILES = lttng.i lttng.py lttng_wrap.c lttng.pyc
-- 
1.8.1

[lttng-dev] [PATCH lttng-tools 3/4] Extras: Redefined PyInt_AsSsize_T to PyLong_AsSsize_t.

[Jérémie Galarneau]

Python 3 merges PyInt and PyLong types. This fixes the
undefined symbol error encountered when using the bindings
with Python 3.

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

diff --git a/extras/bindings/swig/python/lttng.i.in b/extras/bindings/swig/python/lttng.i.in
index 0d6d1e9..244bc22 100644
--- a/extras/bindings/swig/python/lttng.i.in
+++ b/extras/bindings/swig/python/lttng.i.in
@@ -15,6 +15,14 @@ multiple concurrent processes and threads. Tracing across multiple systems is al
 #include <lttng/lttng.h>
 %}
 
+%{
+#if PY_MAJOR_VERSION >= 3
+// The PyInt and PyLong types were unified as of Python 3
+// This makes the typemap code useable with both Python 2 and 3.
+#define PyInt_AsSsize_t PyLong_AsSsize_t
+#endif
+%}
+
 typedef unsigned int uint32_t;
 typedef int int32_t;
 typedef unsigned long long uint64_t;
-- 
1.8.1

[lttng-dev] [PATCH lttng-tools 4/4] Extras: Fixed inconsistent use of space and tabs in lttng.i.in.

[Jérémie Galarneau]

Python 3 does not allow mixing spaces and tabs. This eliminates
the error encountered when importing the lttng module in a
Python 3 interpreter.

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 extras/bindings/swig/python/lttng.i.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/bindings/swig/python/lttng.i.in b/extras/bindings/swig/python/lttng.i.in
index 244bc22..c947ce3 100644
--- a/extras/bindings/swig/python/lttng.i.in
+++ b/extras/bindings/swig/python/lttng.i.in
@@ -715,7 +715,7 @@ def calibrate(handle, calibrate):
 
 %pythoncode %{
 class Handle:
-        """
+	"""
 	Manages a handle.
 	Takes two arguments: (str session_name, Domain domain)
 	"""
-- 
1.8.1

[lttng-dev] [PATCH lttng-tools 1/4] Extras: Added lttng.pyc to the clean section of the Python binding makefile.

[David Goulet]

All four patches have been merged!

Thanks!
David

J?r?mie Galarneau:
> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  extras/bindings/swig/python/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am
> index a3557b8..d592ded 100644
> --- a/extras/bindings/swig/python/Makefile.am
> +++ b/extras/bindings/swig/python/Makefile.am
> @@ -24,4 +24,4 @@ lttng_wrap.c: lttng.i
>  	sed -i "s/md = d/d/g" lttng_wrap.c
>  	sed -i "s/(void)public_symbol;/(void)public_symbol;\n  md = d;/g" lttng_wrap.c
>  
> -CLEANFILES = lttng.i lttng.py lttng_wrap.c
> +CLEANFILES = lttng.i lttng.py lttng_wrap.c lttng.pyc