From: Roel Kluin <roel.kluin@gmail.com>
To: Tom Zanussi <tzanussi@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] perf/scripts: tuple was set from long in both branches in python_process_event()
Date: Mon, 22 Mar 2010 18:22:54 +0100 [thread overview]
Message-ID: <4BA7A76E.3040007@gmail.com> (raw)
Regardless of the sign, the tuple was set from a long.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
.../util/scripting-engines/trace-event-python.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
Was something like this intended?
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 33a414b..1d710b6 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -208,7 +208,7 @@ static void python_process_event(int cpu, void *data,
int size __unused,
unsigned long long nsecs, char *comm)
{
- PyObject *handler, *retval, *context, *t;
+ PyObject *handler, *retval, *context, *t, *obj;
static char handler_name[256];
struct format_field *field;
unsigned long long val;
@@ -256,16 +256,19 @@ static void python_process_event(int cpu, void *data,
offset &= 0xffff;
} else
offset = field->offset;
- PyTuple_SetItem(t, n++,
- PyString_FromString((char *)data + offset));
+ obj = PyString_FromString((char *)data + offset);
} else { /* FIELD_IS_NUMERIC */
val = read_size(data + field->offset, field->size);
if (field->flags & FIELD_IS_SIGNED) {
- PyTuple_SetItem(t, n++, PyInt_FromLong(val));
+ obj = PyInt_FromLong(val);
} else {
- PyTuple_SetItem(t, n++, PyInt_FromLong(val));
+ if (sizeof(val) > sizeof(Py_ssize_t))
+ val += 1ULL <<
+ (sizeof(Py_ssize_t) * 8);
+ obj = PyLong_FromUnsignedLongLong(val);
}
}
+ PyTuple_SetItem(t, n++, obj);
}
if (_PyTuple_Resize(&t, n) == -1)
next reply other threads:[~2010-03-22 17:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 17:22 Roel Kluin [this message]
2010-03-25 5:42 ` [PATCH] perf/scripts: tuple was set from long in both branches in python_process_event() Tom Zanussi
-- strict thread matches above, loose matches on Subject: below --
2010-04-02 4:58 Tom Zanussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BA7A76E.3040007@gmail.com \
--to=roel.kluin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tzanussi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox