[lttng-dev] [PATCH babeltrace 1/2] Add missing shebangs to Python examples.

[lttng-dev] [PATCH babeltrace 1/2] Add missing shebangs to Python examples.

[Jérémie Galarneau]

Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
---
 bindings/python/examples/babeltrace_and_lttng.py | 1 +
 bindings/python/examples/eventcount.py           | 1 +
 bindings/python/examples/eventcountlist.py       | 1 +
 bindings/python/examples/events_per_cpu.py       | 1 +
 bindings/python/examples/example-api-test.py     | 1 +
 bindings/python/examples/histogram.py            | 1 +
 bindings/python/examples/sched_switch.py         | 1 +
 bindings/python/examples/softirqtimes.py         | 1 +
 bindings/python/examples/syscalls_by_pid.py      | 1 +
 9 files changed, 9 insertions(+)
 mode change 100644 => 100755 bindings/python/examples/babeltrace_and_lttng.py
 mode change 100644 => 100755 bindings/python/examples/eventcount.py
 mode change 100644 => 100755 bindings/python/examples/eventcountlist.py
 mode change 100644 => 100755 bindings/python/examples/events_per_cpu.py
 mode change 100644 => 100755 bindings/python/examples/example-api-test.py
 mode change 100644 => 100755 bindings/python/examples/histogram.py
 mode change 100644 => 100755 bindings/python/examples/sched_switch.py
 mode change 100644 => 100755 bindings/python/examples/softirqtimes.py
 mode change 100644 => 100755 bindings/python/examples/syscalls_by_pid.py

diff --git a/bindings/python/examples/babeltrace_and_lttng.py b/bindings/python/examples/babeltrace_and_lttng.py
old mode 100644
new mode 100755
index cb44796..5ab358c
--- a/bindings/python/examples/babeltrace_and_lttng.py
+++ b/bindings/python/examples/babeltrace_and_lttng.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # babeltrace_and_lttng.py
 # 
 # Babeltrace and LTTng example script
diff --git a/bindings/python/examples/eventcount.py b/bindings/python/examples/eventcount.py
old mode 100644
new mode 100755
index 5e96a43..0cc9e19
--- a/bindings/python/examples/eventcount.py
+++ b/bindings/python/examples/eventcount.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # eventcount.py
 # 
 # Babeltrace event count example script
diff --git a/bindings/python/examples/eventcountlist.py b/bindings/python/examples/eventcountlist.py
old mode 100644
new mode 100755
index 945a960..eb413a8
--- a/bindings/python/examples/eventcountlist.py
+++ b/bindings/python/examples/eventcountlist.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # eventcountlist.py
 # 
 # Babeltrace event count list example script
diff --git a/bindings/python/examples/events_per_cpu.py b/bindings/python/examples/events_per_cpu.py
old mode 100644
new mode 100755
index be497ec..7e871d1
--- a/bindings/python/examples/events_per_cpu.py
+++ b/bindings/python/examples/events_per_cpu.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # events_per_cpu.py
 # 
 # Babeltrace events per cpu example script
diff --git a/bindings/python/examples/example-api-test.py b/bindings/python/examples/example-api-test.py
old mode 100644
new mode 100755
index 104f2d5..37e9f4b
--- a/bindings/python/examples/example-api-test.py
+++ b/bindings/python/examples/example-api-test.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # example_api_test.py
 # 
 # Babeltrace example script based on the Babeltrace API test script
diff --git a/bindings/python/examples/histogram.py b/bindings/python/examples/histogram.py
old mode 100644
new mode 100755
index 44616a6..533abeb
--- a/bindings/python/examples/histogram.py
+++ b/bindings/python/examples/histogram.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # histogram.py
 # 
 # Babeltrace histogram example script
diff --git a/bindings/python/examples/sched_switch.py b/bindings/python/examples/sched_switch.py
old mode 100644
new mode 100755
index 7ae834b..cee882f
--- a/bindings/python/examples/sched_switch.py
+++ b/bindings/python/examples/sched_switch.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # sched_switch.py
 # 
 # Babeltrace example script with sched_switch events
diff --git a/bindings/python/examples/softirqtimes.py b/bindings/python/examples/softirqtimes.py
old mode 100644
new mode 100755
index 903bf3e..8e465d2
--- a/bindings/python/examples/softirqtimes.py
+++ b/bindings/python/examples/softirqtimes.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # softirqtimes.py
 # 
 # Babeltrace time of softirqs example script
diff --git a/bindings/python/examples/syscalls_by_pid.py b/bindings/python/examples/syscalls_by_pid.py
old mode 100644
new mode 100755
index 3ae342e..30ece11
--- a/bindings/python/examples/syscalls_by_pid.py
+++ b/bindings/python/examples/syscalls_by_pid.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # syscall_by_pid.py
 # 
 # Babeltrace syscall by pid example script
-- 
1.8.1.1

[lttng-dev] [PATCH babeltrace 2/2] Fix: Unified types expected by the Definition Python interface.

[Jérémie Galarneau]

This change makes the Python iterator test case execute successfully.

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

diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
index dd49ba5..a5426c8 100644
--- a/bindings/python/babeltrace.i.in
+++ b/bindings/python/babeltrace.i.in
@@ -553,8 +553,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 		const struct 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 declaration *def);
+%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct definition *field);
+%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct declaration *field);
 %rename("_bt_ctf_get_int_signedness") bt_ctf_get_int_signedness(
 		const struct declaration *field);
 %rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct declaration *field);
@@ -572,6 +572,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
 		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 definition *field);
 
 const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
 		enum bt_ctf_scope scope);
@@ -584,8 +586,8 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
 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 declaration *def);
+const char *bt_ctf_field_name(const struct definition *field);
+enum ctf_type_id bt_ctf_field_type(const struct declaration *field);
 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);
@@ -599,6 +601,7 @@ char *bt_ctf_get_string(const struct 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 declaration *bt_ctf_get_decl_from_def(const struct definition *field);
 
 %pythoncode%{
 
@@ -839,25 +842,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):
 			"""
@@ -871,14 +874,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):
 			"""
-- 
1.8.1.1

[lttng-dev] [PATCH babeltrace 2/2] Fix: Unified types expected by the Definition Python interface.

[Mathieu Desnoyers]

* J?r?mie Galarneau (jeremie.galarneau at efficios.com) wrote:
> This change makes the Python iterator test case execute successfully.

merged, thanks!

Mathieu

> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  bindings/python/babeltrace.i.in | 23 +++++++++++++----------
>  1 file changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/bindings/python/babeltrace.i.in b/bindings/python/babeltrace.i.in
> index dd49ba5..a5426c8 100644
> --- a/bindings/python/babeltrace.i.in
> +++ b/bindings/python/babeltrace.i.in
> @@ -553,8 +553,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
>  		const struct 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 declaration *def);
> +%rename("_bt_ctf_field_name") bt_ctf_field_name(const struct definition *field);
> +%rename("_bt_ctf_field_type") bt_ctf_field_type(const struct declaration *field);
>  %rename("_bt_ctf_get_int_signedness") bt_ctf_get_int_signedness(
>  		const struct declaration *field);
>  %rename("_bt_ctf_get_int_base") bt_ctf_get_int_base(const struct declaration *field);
> @@ -572,6 +572,8 @@ struct bt_ctf_event *bt_ctf_iter_read_event(struct bt_ctf_iter *iter);
>  		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 definition *field);
>  
>  const struct definition *bt_ctf_get_top_level_scope(const struct bt_ctf_event *ctf_event,
>  		enum bt_ctf_scope scope);
> @@ -584,8 +586,8 @@ const struct definition *bt_ctf_get_field(const struct bt_ctf_event *ctf_event,
>  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 declaration *def);
> +const char *bt_ctf_field_name(const struct definition *field);
> +enum ctf_type_id bt_ctf_field_type(const struct declaration *field);
>  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);
> @@ -599,6 +601,7 @@ char *bt_ctf_get_string(const struct 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 declaration *bt_ctf_get_decl_from_def(const struct definition *field);
>  
>  %pythoncode%{
>  
> @@ -839,25 +842,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):
>  			"""
> @@ -871,14 +874,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):
>  			"""
> -- 
> 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

[lttng-dev] [PATCH babeltrace 1/2] Add missing shebangs to Python examples.

[Mathieu Desnoyers]

* J?r?mie Galarneau (jeremie.galarneau at efficios.com) wrote:
> 
> Signed-off-by: J?r?mie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  bindings/python/examples/babeltrace_and_lttng.py | 1 +
>  bindings/python/examples/eventcount.py           | 1 +
>  bindings/python/examples/eventcountlist.py       | 1 +
>  bindings/python/examples/events_per_cpu.py       | 1 +
>  bindings/python/examples/example-api-test.py     | 1 +
>  bindings/python/examples/histogram.py            | 1 +
>  bindings/python/examples/sched_switch.py         | 1 +
>  bindings/python/examples/softirqtimes.py         | 1 +
>  bindings/python/examples/syscalls_by_pid.py      | 1 +
>  9 files changed, 9 insertions(+)
>  mode change 100644 => 100755 bindings/python/examples/babeltrace_and_lttng.py
>  mode change 100644 => 100755 bindings/python/examples/eventcount.py
>  mode change 100644 => 100755 bindings/python/examples/eventcountlist.py
>  mode change 100644 => 100755 bindings/python/examples/events_per_cpu.py
>  mode change 100644 => 100755 bindings/python/examples/example-api-test.py
>  mode change 100644 => 100755 bindings/python/examples/histogram.py
>  mode change 100644 => 100755 bindings/python/examples/sched_switch.py
>  mode change 100644 => 100755 bindings/python/examples/softirqtimes.py
>  mode change 100644 => 100755 bindings/python/examples/syscalls_by_pid.py
> 
> diff --git a/bindings/python/examples/babeltrace_and_lttng.py b/bindings/python/examples/babeltrace_and_lttng.py
> old mode 100644
> new mode 100755
> index cb44796..5ab358c
> --- a/bindings/python/examples/babeltrace_and_lttng.py
> +++ b/bindings/python/examples/babeltrace_and_lttng.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python

Please compare with other lttng projects (see tools tests), where I
think we use "env" and then python. So I'm not sure which roule we want
to go, but I think this has to do with Debian not having the same
symlinks that other distros wrt python 2 and 3.

Thanks,

Mathieu

>  # babeltrace_and_lttng.py
>  # 
>  # Babeltrace and LTTng example script
> diff --git a/bindings/python/examples/eventcount.py b/bindings/python/examples/eventcount.py
> old mode 100644
> new mode 100755
> index 5e96a43..0cc9e19
> --- a/bindings/python/examples/eventcount.py
> +++ b/bindings/python/examples/eventcount.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # eventcount.py
>  # 
>  # Babeltrace event count example script
> diff --git a/bindings/python/examples/eventcountlist.py b/bindings/python/examples/eventcountlist.py
> old mode 100644
> new mode 100755
> index 945a960..eb413a8
> --- a/bindings/python/examples/eventcountlist.py
> +++ b/bindings/python/examples/eventcountlist.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # eventcountlist.py
>  # 
>  # Babeltrace event count list example script
> diff --git a/bindings/python/examples/events_per_cpu.py b/bindings/python/examples/events_per_cpu.py
> old mode 100644
> new mode 100755
> index be497ec..7e871d1
> --- a/bindings/python/examples/events_per_cpu.py
> +++ b/bindings/python/examples/events_per_cpu.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # events_per_cpu.py
>  # 
>  # Babeltrace events per cpu example script
> diff --git a/bindings/python/examples/example-api-test.py b/bindings/python/examples/example-api-test.py
> old mode 100644
> new mode 100755
> index 104f2d5..37e9f4b
> --- a/bindings/python/examples/example-api-test.py
> +++ b/bindings/python/examples/example-api-test.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # example_api_test.py
>  # 
>  # Babeltrace example script based on the Babeltrace API test script
> diff --git a/bindings/python/examples/histogram.py b/bindings/python/examples/histogram.py
> old mode 100644
> new mode 100755
> index 44616a6..533abeb
> --- a/bindings/python/examples/histogram.py
> +++ b/bindings/python/examples/histogram.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # histogram.py
>  # 
>  # Babeltrace histogram example script
> diff --git a/bindings/python/examples/sched_switch.py b/bindings/python/examples/sched_switch.py
> old mode 100644
> new mode 100755
> index 7ae834b..cee882f
> --- a/bindings/python/examples/sched_switch.py
> +++ b/bindings/python/examples/sched_switch.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # sched_switch.py
>  # 
>  # Babeltrace example script with sched_switch events
> diff --git a/bindings/python/examples/softirqtimes.py b/bindings/python/examples/softirqtimes.py
> old mode 100644
> new mode 100755
> index 903bf3e..8e465d2
> --- a/bindings/python/examples/softirqtimes.py
> +++ b/bindings/python/examples/softirqtimes.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # softirqtimes.py
>  # 
>  # Babeltrace time of softirqs example script
> diff --git a/bindings/python/examples/syscalls_by_pid.py b/bindings/python/examples/syscalls_by_pid.py
> old mode 100644
> new mode 100755
> index 3ae342e..30ece11
> --- a/bindings/python/examples/syscalls_by_pid.py
> +++ b/bindings/python/examples/syscalls_by_pid.py
> @@ -1,3 +1,4 @@
> +#!/usr/bin/python
>  # syscall_by_pid.py
>  # 
>  # Babeltrace syscall by pid example script
> -- 
> 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

[lttng-dev] [PATCH babeltrace 1/2] Add missing shebangs to Python examples.

[Christian Babeux]

> Please compare with other lttng projects (see tools tests), where I
> think we use "env" and then python. So I'm not sure which roule we want
> to go, but I think this has to do with Debian not having the same
> symlinks that other distros wrt python 2 and 3.

I would recommend using "#!/usr/bin/env python" so it will default to
the Python interpreter available on the machine. Take note that we
might have issues with Python 3 interpreters if the scripts are not
fully compliant.

Thanks,

Christian

[lttng-dev] [PATCH babeltrace 1/2] Add missing shebangs to Python examples.

[Jérémie Galarneau]

Looks like this patch will require more work since it was decided we
only want to explicitly support Python3. I'll have to look into the
examples and see what can be ported and fixed. I'll also work on
having a more comprehensive test suite in preparation for an eventual
merge into master.

However, please note that the second patch from this series - [PATCH
babeltrace 2/2] Fix: Unified types expected by the Definition Python
interface. - will remain unchanged and should be pulled as it fixes a
bug that prevented the Python iterator tests from passing.

Regards,
J?r?mie

On Wed, Jan 23, 2013 at 5:21 PM, J?r?mie Galarneau
<jeremie.galarneau at gmail.com> wrote:
>> I would recommend using "#!/usr/bin/env python" so it will default to
>> the Python interpreter available on the machine. Take note that we
>> might have issues with Python 3 interpreters if the scripts are not
>> fully compliant.
>
> It does seem like some of the example scripts are not Python 3
> compatible. However, forcing the use of Python 2 on distros wich use
> Python 3 as the default interpreter is far from ideal... I'll see if I
> can make them version agnostic before resubmitting.
>
> Thanks,
> J?r?mie