3 files changed, 39 insertions, 26 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 50771b5813ee..1f08f008d289 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -370,9 +370,9 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm)
 
 int event__process_comm(event_t *self, struct perf_session *session)
 {
-        struct thread *thread = perf_session__findnew(session, self->comm.pid);
+        struct thread *thread = perf_session__findnew(session, self->comm.tid);
 
-        dump_printf(": %s:%d\n", self->comm.comm, self->comm.pid);
+        dump_printf(": %s:%d\n", self->comm.comm, self->comm.tid);
 
         if (thread == NULL || thread__set_comm_adjust(thread, self->comm.comm)) {
                 dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");
@@ -532,16 +532,11 @@ out_problem:
 
 int event__process_task(event_t *self, struct perf_session *session)
 {
-        struct thread *thread = perf_session__findnew(session, self->fork.pid);
-        struct thread *parent = perf_session__findnew(session, self->fork.ppid);
+        struct thread *thread = perf_session__findnew(session, self->fork.tid);
+        struct thread *parent = perf_session__findnew(session, self->fork.ptid);
 
         dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid,
                     self->fork.ppid, self->fork.ptid);
-        /*
-         * A thread clone will have the same PID for both parent and child.
-         */
-        if (thread == parent)
-                return 0;
 
         if (self->header.type == PERF_RECORD_EXIT)
                 return 0;
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index cbf7eae2ce09..07f89b66b318 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -965,7 +965,7 @@ static int hist_entry__parse_objdump_line(struct hist_entry *self, FILE *file,
                  * Parse hexa addresses followed by ':'
                  */
                 line_ip = strtoull(tmp, &tmp2, 16);
-                if (*tmp2 != ':')
+                if (*tmp2 != ':' || tmp == tmp2)
                         line_ip = -1;
         }
 
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 81f39cab3aaa..33a632523743 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, *obj;
+        PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
         static char handler_name[256];
         struct format_field *field;
         unsigned long long val;
@@ -232,6 +232,14 @@ static void python_process_event(int cpu, void *data,
 
         sprintf(handler_name, "%s__%s", event->system, event->name);
 
+        handler = PyDict_GetItemString(main_dict, handler_name);
+        if (handler && !PyCallable_Check(handler))
+                handler = NULL;
+        if (!handler) {
+                dict = PyDict_New();
+                if (!dict)
+                        Py_FatalError("couldn't create Python dict");
+        }
         s = nsecs / NSECS_PER_SEC;
         ns = nsecs - s * NSECS_PER_SEC;
 
@@ -242,12 +250,20 @@ static void python_process_event(int cpu, void *data,
         PyTuple_SetItem(t, n++, PyString_FromString(handler_name));
         PyTuple_SetItem(t, n++,
                         PyCObject_FromVoidPtr(scripting_context, NULL));
-        PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
-        PyTuple_SetItem(t, n++, PyInt_FromLong(s));
-        PyTuple_SetItem(t, n++, PyInt_FromLong(ns));
-        PyTuple_SetItem(t, n++, PyInt_FromLong(pid));
-        PyTuple_SetItem(t, n++, PyString_FromString(comm));
 
+        if (handler) {
+                PyTuple_SetItem(t, n++, PyInt_FromLong(cpu));
+                PyTuple_SetItem(t, n++, PyInt_FromLong(s));
+                PyTuple_SetItem(t, n++, PyInt_FromLong(ns));
+                PyTuple_SetItem(t, n++, PyInt_FromLong(pid));
+                PyTuple_SetItem(t, n++, PyString_FromString(comm));
+        } else {
+                PyDict_SetItemString(dict, "common_cpu", PyInt_FromLong(cpu));
+                PyDict_SetItemString(dict, "common_s", PyInt_FromLong(s));
+                PyDict_SetItemString(dict, "common_ns", PyInt_FromLong(ns));
+                PyDict_SetItemString(dict, "common_pid", PyInt_FromLong(pid));
+                PyDict_SetItemString(dict, "common_comm", PyString_FromString(comm));
+        }
         for (field = event->format.fields; field; field = field->next) {
                 if (field->flags & FIELD_IS_STRING) {
                         int offset;
@@ -272,27 +288,31 @@ static void python_process_event(int cpu, void *data,
                                         obj = PyLong_FromUnsignedLongLong(val);
                         }
                 }
-                PyTuple_SetItem(t, n++, obj);
+                if (handler)
+                        PyTuple_SetItem(t, n++, obj);
+                else
+                        PyDict_SetItemString(dict, field->name, obj);
+
         }
+        if (!handler)
+                PyTuple_SetItem(t, n++, dict);
 
         if (_PyTuple_Resize(&t, n) == -1)
                 Py_FatalError("error resizing Python tuple");
 
-        handler = PyDict_GetItemString(main_dict, handler_name);
-        if (handler && PyCallable_Check(handler)) {
+        if (handler) {
                 retval = PyObject_CallObject(handler, t);
                 if (retval == NULL)
                         handler_call_die(handler_name);
         } else {
                 handler = PyDict_GetItemString(main_dict, "trace_unhandled");
                 if (handler && PyCallable_Check(handler)) {
-                        if (_PyTuple_Resize(&t, N_COMMON_FIELDS) == -1)
-                                Py_FatalError("error resizing Python tuple");
 
                         retval = PyObject_CallObject(handler, t);
                         if (retval == NULL)
                                 handler_call_die("trace_unhandled");
                 }
+                Py_DECREF(dict);
         }
 
         Py_DECREF(t);
@@ -548,12 +568,10 @@ static int python_generate_script(const char *outfile)
         }
 
         fprintf(ofp, "def trace_unhandled(event_name, context, "
-                "common_cpu, common_secs, common_nsecs,\n\t\t"
-                "common_pid, common_comm):\n");
+                "event_fields_dict):\n");
 
-        fprintf(ofp, "\t\tprint_header(event_name, common_cpu, "
-                "common_secs, common_nsecs,\n\t\tcommon_pid, "
-                "common_comm)\n\n");
+        fprintf(ofp, "\t\tprint ' '.join(['%%s=%%s'%%(k,str(v))"
+                "for k,v in sorted(event_fields_dict.items())])\n\n");
 
         fprintf(ofp, "def print_header("
                 "event_name, cpu, secs, nsecs, pid, comm):\n"