scsi: zfcp: Trace when request remove fails after qdio send fails

[linux.git] / tools / perf / util / scripting-engines / trace-event-python.c

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index adba01b7d9dd9401fc78935c8bbf9daacea187ce..e930f5f1f36d2831860d142143e4fc802bc3e46d 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -30,6 +30,7 @@
 #include <linux/bitmap.h>
 #include <linux/compiler.h>
 #include <linux/time64.h>
+#include <traceevent/event-parse.h>
 
 #include "../build-id.h"
 #include "../counts.h"
@@ -52,6 +53,7 @@
 #include "print_binary.h"
 #include "stat.h"
 #include "mem-events.h"
+#include "util/perf_regs.h"
 
 #if PY_MAJOR_VERSION < 3
 #define _PyUnicode_FromString(arg) \
@@ -131,7 +133,7 @@ static void handler_call_die(const char *handler_name)
 }
 
 /*
- * Insert val into into the dictionary and decrement the reference counter.
+ * Insert val into the dictionary and decrement the reference counter.
  * This is necessary for dictionaries since PyDict_SetItemString() does not
  * steal a reference, as opposed to PyTuple_SetItem().
  */
@@ -642,15 +644,19 @@ exit:
        return pylist;
 }
 
-static PyObject *get_sample_value_as_tuple(struct sample_read_value *value)
+static PyObject *get_sample_value_as_tuple(struct sample_read_value *value,
+                                          u64 read_format)
 {
        PyObject *t;
 
-       t = PyTuple_New(2);
+       t = PyTuple_New(3);
        if (!t)
                Py_FatalError("couldn't create Python tuple");
        PyTuple_SetItem(t, 0, PyLong_FromUnsignedLongLong(value->id));
        PyTuple_SetItem(t, 1, PyLong_FromUnsignedLongLong(value->value));
+       if (read_format & PERF_FORMAT_LOST)
+               PyTuple_SetItem(t, 2, PyLong_FromUnsignedLongLong(value->lost));
+
        return t;
 }
 
@@ -681,12 +687,17 @@ static void set_sample_read_in_dict(PyObject *dict_sample,
                Py_FatalError("couldn't create Python list");
 
        if (read_format & PERF_FORMAT_GROUP) {
-               for (i = 0; i < sample->read.group.nr; i++) {
-                       PyObject *t = get_sample_value_as_tuple(&sample->read.group.values[i]);
+               struct sample_read_value *v = sample->read.group.values;
+
+               i = 0;
+               sample_read_group__for_each(v, sample->read.group.nr, read_format) {
+                       PyObject *t = get_sample_value_as_tuple(v, read_format);
                        PyList_SET_ITEM(values, i, t);
+                       i++;
                }
        } else {
-               PyObject *t = get_sample_value_as_tuple(&sample->read.one);
+               PyObject *t = get_sample_value_as_tuple(&sample->read.one,
+                                                       read_format);
                PyList_SET_ITEM(values, 0, t);
        }
        pydict_set_item_string_decref(dict_sample, "values", values);
@@ -861,6 +872,13 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
        brstacksym = python_process_brstacksym(sample, al->thread);
        pydict_set_item_string_decref(dict, "brstacksym", brstacksym);
 
+       if (sample->machine_pid) {
+               pydict_set_item_string_decref(dict_sample, "machine_pid",
+                               _PyLong_FromLong(sample->machine_pid));
+               pydict_set_item_string_decref(dict_sample, "vcpu",
+                               _PyLong_FromLong(sample->vcpu));
+       }
+
        pydict_set_item_string_decref(dict_sample, "cpumode",
                        _PyLong_FromLong((unsigned long)sample->cpumode));
 
@@ -917,7 +935,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
 
        sprintf(handler_name, "%s__%s", event->system, event->name);
 
-       if (!test_and_set_bit(event->id, events_defined))
+       if (!__test_and_set_bit(event->id, events_defined))
                define_event_symbols(event, handler_name, event->print_fmt.args);
 
        handler = get_handler(handler_name);
@@ -976,8 +994,10 @@ static void python_process_tracepoint(struct perf_sample *sample,
                                offset  = val;
                                len     = offset >> 16;
                                offset &= 0xffff;
+#ifdef HAVE_LIBTRACEEVENT_TEP_FIELD_IS_RELATIVE
                                if (field->flags & TEP_FIELD_IS_RELATIVE)
                                        offset += field->offset + field->size;
+#endif
                        }
                        if (field->flags & TEP_FIELD_IS_STRING &&
                            is_printable_array(data + offset, len)) {
@@ -1509,7 +1529,7 @@ static void python_do_process_switch(union perf_event *event,
                np_tid = event->context_switch.next_prev_tid;
        }
 
-       t = tuple_new(9);
+       t = tuple_new(11);
        if (!t)
                return;
 
@@ -1522,6 +1542,8 @@ static void python_do_process_switch(union perf_event *event,
        tuple_set_s32(t, 6, machine->pid);
        tuple_set_bool(t, 7, out);
        tuple_set_bool(t, 8, out_preempt);
+       tuple_set_s32(t, 9, sample->machine_pid);
+       tuple_set_s32(t, 10, sample->vcpu);
 
        call_object(handler, t, handler_name);
 
@@ -1559,7 +1581,7 @@ static void python_process_auxtrace_error(struct perf_session *session __maybe_u
                msg = (const char *)&e->time;
        }
 
-       t = tuple_new(9);
+       t = tuple_new(11);
 
        tuple_set_u32(t, 0, e->type);
        tuple_set_u32(t, 1, e->code);
@@ -1570,6 +1592,8 @@ static void python_process_auxtrace_error(struct perf_session *session __maybe_u
        tuple_set_u64(t, 6, tm);
        tuple_set_string(t, 7, msg);
        tuple_set_u32(t, 8, cpumode);
+       tuple_set_s32(t, 9, e->machine_pid);
+       tuple_set_s32(t, 10, e->vcpu);
 
        call_object(handler, t, handler_name);
 
@@ -1633,13 +1657,7 @@ static void python_process_stat(struct perf_stat_config *config,
        struct perf_cpu_map *cpus = counter->core.cpus;
        int cpu, thread;
 
-       if (config->aggr_mode == AGGR_GLOBAL) {
-               process_stat(counter, (struct perf_cpu){ .cpu = -1 }, -1, tstamp,
-                            &counter->counts->aggr);
-               return;
-       }
-
-       for (thread = 0; thread < threads->nr; thread++) {
+       for (thread = 0; thread < perf_thread_map__nr(threads); thread++) {
                for (cpu = 0; cpu < perf_cpu_map__nr(cpus); cpu++) {
                        process_stat(counter, perf_cpu_map__cpu(cpus, cpu),
                                     perf_thread_map__pid(threads, thread), tstamp,