diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2018-02-22 16:39:01 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2018-03-12 11:10:20 +0000 |
| commit | e42860ae836dc6f768eff2d51223c47103d2dc3b (patch) | |
| tree | a05a6bee2fff8f97a0c13e127e7051777f240ecd /scripts | |
| parent | be0aa7ac8990c7d62f2d41a66e8c50784e7ee9ac (diff) | |
simpletrace: fix timestamp argument type
The timestamp argument to a trace event method is documented as follows:
The method can also take a timestamp argument before the trace event
arguments:
def runstate_set(self, timestamp, new_state):
...
Timestamps have the uint64_t type and are in nanoseconds.
In reality methods with a timestamp argument actually receive a tuple
like (123456789,) as the timestamp argument. This is due to a bug in
simpletrace.py.
This patch unpacks the tuple so that methods receive the correct
timestamp argument type.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20180222163901.14095-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/simpletrace.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index a3a6315055..be3d1affaf 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -199,7 +199,7 @@ def process(events, log, analyzer, read_header=True): fn_argcount = len(inspect.getargspec(fn)[0]) - 1 if fn_argcount == event_argcount + 1: # Include timestamp as first argument - return lambda _, rec: fn(*((rec[1:2],) + rec[3:3 + event_argcount])) + return lambda _, rec: fn(*(rec[1:2] + rec[3:3 + event_argcount])) elif fn_argcount == event_argcount + 2: # Include timestamp and pid return lambda _, rec: fn(*rec[1:3 + event_argcount]) |