|
@@ -473,7 +473,7 @@ static void python_process_general_event(struct perf_sample *sample,
|
|
|
struct thread *thread,
|
|
|
struct addr_location *al)
|
|
|
{
|
|
|
- PyObject *handler, *retval, *t, *dict, *callchain;
|
|
|
+ PyObject *handler, *retval, *t, *dict, *callchain, *dict_sample;
|
|
|
static char handler_name[64];
|
|
|
unsigned n = 0;
|
|
|
|
|
@@ -489,6 +489,10 @@ static void python_process_general_event(struct perf_sample *sample,
|
|
|
if (!dict)
|
|
|
Py_FatalError("couldn't create Python dictionary");
|
|
|
|
|
|
+ dict_sample = PyDict_New();
|
|
|
+ if (!dict_sample)
|
|
|
+ Py_FatalError("couldn't create Python dictionary");
|
|
|
+
|
|
|
snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
|
|
|
|
|
|
handler = PyDict_GetItemString(main_dict, handler_name);
|
|
@@ -498,8 +502,21 @@ static void python_process_general_event(struct perf_sample *sample,
|
|
|
pydict_set_item_string_decref(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
|
|
|
pydict_set_item_string_decref(dict, "attr", PyString_FromStringAndSize(
|
|
|
(const char *)&evsel->attr, sizeof(evsel->attr)));
|
|
|
- pydict_set_item_string_decref(dict, "sample", PyString_FromStringAndSize(
|
|
|
- (const char *)sample, sizeof(*sample)));
|
|
|
+
|
|
|
+ pydict_set_item_string_decref(dict_sample, "pid",
|
|
|
+ PyInt_FromLong(sample->pid));
|
|
|
+ pydict_set_item_string_decref(dict_sample, "tid",
|
|
|
+ PyInt_FromLong(sample->tid));
|
|
|
+ pydict_set_item_string_decref(dict_sample, "cpu",
|
|
|
+ PyInt_FromLong(sample->cpu));
|
|
|
+ pydict_set_item_string_decref(dict_sample, "ip",
|
|
|
+ PyLong_FromUnsignedLongLong(sample->ip));
|
|
|
+ pydict_set_item_string_decref(dict_sample, "time",
|
|
|
+ PyLong_FromUnsignedLongLong(sample->time));
|
|
|
+ pydict_set_item_string_decref(dict_sample, "period",
|
|
|
+ PyLong_FromUnsignedLongLong(sample->period));
|
|
|
+ pydict_set_item_string_decref(dict, "sample", dict_sample);
|
|
|
+
|
|
|
pydict_set_item_string_decref(dict, "raw_buf", PyString_FromStringAndSize(
|
|
|
(const char *)sample->raw_data, sample->raw_size));
|
|
|
pydict_set_item_string_decref(dict, "comm",
|