Commit b5727270 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 96f3eda6 d0d0313c

tools/lib/traceevent/event-parse.c

+20 −3
Original line number Diff line number Diff line
@@ -3847,7 +3847,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, 
	struct format_field *field;

	struct printk_map *printk;

	long long val, fval;

	unsigned long addr;

	unsigned long long addr;

	char *str;

	unsigned char *hex;

	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) &&

		    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 */

			printk = find_printk(pevent, addr);

			if (printk)

				trace_seq_puts(s, printk->printk);

			else

				trace_seq_printf(s, "%lx", addr);

				trace_seq_printf(s, "%llx", addr);

			break;

		}

		str = malloc(len + 1);

tools/perf/util/session.c

+4 −1
Original line number Diff line number Diff line
@@ -1565,7 +1565,10 @@ static int __perf_session__process_events(struct perf_session *session, 
	file_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;



	ui_progress__init(&prog, file_size, "Processing events...");