diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 10:22:51 +0300 |
| commit | 9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a (patch) | |
| tree | 602da9e86cd3dfc4fae846dceb6fba87aa7ca30b /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | fd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff) | |
| parent | c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff) | |
| download | linux-9fe64e15148d1ff81fa0bcb5fd58531e3ae2aa3a.tar.xz | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 089438da1f7f..783326cfbaa6 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -236,6 +236,7 @@ static void define_event_symbols(struct event_format *event, cur_field_name); break; case PRINT_HEX: + case PRINT_HEX_STR: define_event_symbols(event, ev_name, args->hex.field); define_event_symbols(event, ev_name, args->hex.size); break; @@ -368,10 +369,10 @@ static PyObject *python_process_callchain(struct perf_sample *sample, if (node->map) { struct map *map = node->map; const char *dsoname = "[unknown]"; - if (map && map->dso && (map->dso->name || map->dso->long_name)) { + if (map && map->dso) { if (symbol_conf.show_kernel_path && map->dso->long_name) dsoname = map->dso->long_name; - else if (map->dso->name) + else dsoname = map->dso->name; } pydict_set_item_string_decref(pyelem, "dso", |