p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'perf/urgent' into perf/core to pick up fixes before pulling new changes 

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-09-23 09:42:11 +02:00
parent 96f3eda67f d0d0313c2a
commit b5727270ec
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/lib/traceevent/event-parse.c
View File

@ -3847,7 +3847,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
struct format_field *field; struct format_field *field;
struct printk_map *printk; struct printk_map *printk;
long long val, fval; long long val, fval;
unsigned long addr; unsigned long long addr;
char *str; char *str;
unsigned char *hex; unsigned char *hex;
int print; int print;
@ -3880,13 +3880,30 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
*/ */
if (!(field->flags & FIELD_IS_ARRAY) && if (!(field->flags & FIELD_IS_ARRAY) &&
field->size == pevent->long_size) { field->size == pevent->long_size) {
addr = *(unsigned long *)(data + field->offset);
/* Handle heterogeneous recording and processing
* architectures
*
* CASE I:
* Traces recorded on 32-bit devices (32-bit
* addressing) and processed on 64-bit devices:
* In this case, only 32 bits should be read.
*
* CASE II:
* Traces recorded on 64 bit devices and processed
* on 32-bit devices:
* In this case, 64 bits must be read.
*/
addr = (pevent->long_size == 8) ?
*(unsigned long long *)(data + field->offset) :
(unsigned long long)*(unsigned int *)(data + field->offset);
/* Check if it matches a print format */ /* Check if it matches a print format */
printk = find_printk(pevent, addr); printk = find_printk(pevent, addr);
if (printk) if (printk)
trace_seq_puts(s, printk->printk); trace_seq_puts(s, printk->printk);
else else
trace_seq_printf(s, "%lx", addr); trace_seq_printf(s, "%llx", addr);
break; break;
} }
str = malloc(len + 1); str = malloc(len + 1);

5
tools/perf/util/session.c
View File

@ -1565,7 +1565,10 @@ static int __perf_session__process_events(struct perf_session *session,
file_offset = page_offset; file_offset = page_offset;
head = data_offset - page_offset; head = data_offset - page_offset;
if (data_size && (data_offset + data_size < file_size)) if (data_size == 0)
goto out;
if (data_offset + data_size < file_size)
file_size = data_offset + data_size; file_size = data_offset + data_size;
ui_progress__init(&prog, file_size, "Processing events..."); ui_progress__init(&prog, file_size, "Processing events...");