1 files changed, 12 insertions, 9 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 33a414bbba3e..81f39cab3aaa 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,23 @@ 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));
+                                if ((long long)val >= LONG_MIN &&
+                                    (long long)val <= LONG_MAX)
+                                        obj = PyInt_FromLong(val);
+                                else
+                                        obj = PyLong_FromLongLong(val);
                         } else {
-                                PyTuple_SetItem(t, n++, PyInt_FromLong(val));
+                                if (val <= LONG_MAX)
+                                        obj = PyInt_FromLong(val);
+                                else
+                                        obj = PyLong_FromUnsignedLongLong(val);
                         }
                 }
+                PyTuple_SetItem(t, n++, obj);
         }
 
         if (_PyTuple_Resize(&t, n) == -1)
@@ -367,8 +374,6 @@ static int python_start_script(const char *script, int argc, const char **argv)
         }
 
         free(command_line);
-        fprintf(stderr, "perf trace started with Python script %s\n\n",
-                script);
 
         return err;
 error:
@@ -400,8 +405,6 @@ out:
         Py_XDECREF(main_module);
         Py_Finalize();
 
-        fprintf(stderr, "\nperf trace Python script stopped\n");
-
         return err;
 }