| From d005efe18db0b4a123dd92ea8e77e27aee8f99fd Mon Sep 17 00:00:00 2001 |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| Date: Tue, 11 Sep 2018 14:45:04 +0300 |
| Subject: perf script python: Fix export-to-sqlite.py sample columns |
| |
| From: Adrian Hunter <adrian.hunter@intel.com> |
| |
| commit d005efe18db0b4a123dd92ea8e77e27aee8f99fd upstream. |
| |
| With the "branches" export option, not all sample columns are exported. |
| However the unwanted columns are not at the end of the tuple, as assumed |
| by the code. Fix by taking the first 15 and last 3 values, instead of |
| the first 18. |
| |
| Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: stable@vger.kernel.org |
| Link: http://lkml.kernel.org/r/20180911114504.28516-3-adrian.hunter@intel.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/scripts/python/export-to-sqlite.py | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/tools/perf/scripts/python/export-to-sqlite.py |
| +++ b/tools/perf/scripts/python/export-to-sqlite.py |
| @@ -440,7 +440,11 @@ def branch_type_table(*x): |
| |
| def sample_table(*x): |
| if branches: |
| - bind_exec(sample_query, 18, x) |
| + for xx in x[0:15]: |
| + sample_query.addBindValue(str(xx)) |
| + for xx in x[19:22]: |
| + sample_query.addBindValue(str(xx)) |
| + do_query_(sample_query) |
| else: |
| bind_exec(sample_query, 22, x) |
| |
