* [PATCH v2] trace-cmd: make python work again
@ 2019-01-23 13:26 Johannes Berg
2019-01-24 0:27 ` Steven Rostedt
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2019-01-23 13:26 UTC (permalink / raw)
To: linux-trace-devel; +Cc: Steven Rostedt, Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
Code reshuffling/renaming wasn't complete in ctracecmd.i:
* it needs to %include "trace-seq.h" so that we
can access those functions from python
* it needs to use tep_* instead of pevent_* everywhere,
even function calls done as parameters to functions,
I guess some sort of automatic conversion missed those
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
python/ctracecmd.i | 1 +
python/event-viewer.py | 4 ++--
python/tracecmd.py | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/python/ctracecmd.i b/python/ctracecmd.i
index b18cba9b3b5f..55fd8755c237 100644
--- a/python/ctracecmd.i
+++ b/python/ctracecmd.i
@@ -239,4 +239,5 @@ static int python_callback(struct trace_seq *s,
#define __thread
%include "trace-cmd.h"
+%include "trace-seq.h"
%include "event-parse.h"
diff --git a/python/event-viewer.py b/python/event-viewer.py
index 3a082b81fc3d..c7c50d16df14 100755
--- a/python/event-viewer.py
+++ b/python/event-viewer.py
@@ -68,8 +68,8 @@ class EventStore(gtk.GenericTreeModel):
for cpu in range(0, trace.cpus):
rec = tracecmd_read_data(self.trace._handle, cpu)
while rec:
- offset = pevent_record_offset_get(rec)
- ts = pevent_record_ts_get(rec)
+ offset = tep_record_offset_get(rec)
+ ts = tep_record_ts_get(rec)
self.refs.append(self.EventRef(index, ts, offset, cpu))
index = index + 1
rec = tracecmd_read_data(self.trace._handle, cpu)
diff --git a/python/tracecmd.py b/python/tracecmd.py
index f551a1489e25..f4f241e22580 100644
--- a/python/tracecmd.py
+++ b/python/tracecmd.py
@@ -84,7 +84,7 @@ class Event(object, DictMixin):
@cached_property
def cpu(self):
- return pevent_record_cpu_get(self._record)
+ return tep_record_cpu_get(self._record)
@cached_property
def name(self):
@@ -96,7 +96,7 @@ class Event(object, DictMixin):
@cached_property
def ts(self):
- return pevent_record_ts_get(self._record)
+ return tep_record_ts_get(self._record)
@cached_property
def type(self):
@@ -106,7 +106,7 @@ class Event(object, DictMixin):
f = tep_find_any_field(self._format, name)
if f is None:
return None
- ret, val = tep_read_number_field(f, pevent_record_data_get(self._record))
+ ret, val = tep_read_number_field(f, tep_record_data_get(self._record))
if ret:
return None
return val
@@ -142,7 +142,7 @@ class Field(object):
def __long__(self):
ret, val = tep_read_number_field(self._field,
- pevent_record_data_get(self._record))
+ tep_record_data_get(self._record))
if ret:
raise FieldError("Not a number field")
return val
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] trace-cmd: make python work again
2019-01-23 13:26 [PATCH v2] trace-cmd: make python work again Johannes Berg
@ 2019-01-24 0:27 ` Steven Rostedt
0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2019-01-24 0:27 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-trace-devel, Johannes Berg
On Wed, 23 Jan 2019 14:26:27 +0100
Johannes Berg <johannes@sipsolutions.net> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Code reshuffling/renaming wasn't complete in ctracecmd.i:
> * it needs to %include "trace-seq.h" so that we
> can access those functions from python
> * it needs to use tep_* instead of pevent_* everywhere,
> even function calls done as parameters to functions,
> I guess some sort of automatic conversion missed those
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
Applied.
Thanks Johannes!
-- Steve
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-24 0:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-23 13:26 [PATCH v2] trace-cmd: make python work again Johannes Berg
2019-01-24 0:27 ` Steven Rostedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).