perf session: Make events_stats u64 to avoid overflow on 32-bit arches

Pekka Enberg reported weird percentages in perf report. It turns out we are overflowing a 32-bit variables in struct events_stats on 32-bit architectures. Before: [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10 281.96% Xorg b710a561 [.] 0x000000b710a561 140.15% Xorg [kernel] [k] __initramfs_end 51.56% metacity libgobject-2.0.so.0.2000.1 [.] 0x00000000026e46 35.12% evolution libcairo.so.2.10800.6 [.] 0x000000000203bd 33.84% metacity libpthread-2.9.so [.] 0x00000000007a3d After: [acme@ana linux-2.6-tip]$ perf report -i pekka.perf.data 2> /dev/null | head -10 30.04% Xorg b710a561 [.] 0x000000b710a561 14.93% Xorg [kernel] [k] __initramfs_end 5.49% metacity libgobject-2.0.so.0.2000.1 [.] 0x00000000026e46 3.74% evolution libcairo.so.2.10800.6 [.] 0x000000000203bd 3.61% metacity libpthread-2.9.so [.] 0x00000000007a3d

Arnaldo Carvalho de Melo committed 16 years ago

Commit b5b60fd1 parent 99e8c5a2 files · +3 −3Browse files

Unified · Split

2 files

tools/perf/builtin-report.c +1 −1
tools/perf/util/event.h +2 −2

tools/perf/builtin-report.c+1−1

@@ -224,7 +224,7 @@ static int __cmd_report(void) · 223 unmodified lines
224	224
225	225	perf_session__collapse_resort(session);
226	226	perf_session__output_resort(session, session->events_stats.total);
227		− fprintf(stdout, "# Samples: %ld\n#\n", session->events_stats.total);
	227	+ fprintf(stdout, "# Samples: %Ld\n#\n", session->events_stats.total);
228	228	perf_session__fprintf_hists(session, NULL, false, stdout);
229	229	if (sort_order == default_sort_order &&
230	230	parent_pattern == default_parent_pattern)

tools/perf/util/event.h+2−2

@@ -95,8 +95,8 @@ typedef union event_union { · 94 unmodified lines
95	95	} event_t;
96	96
97	97	struct events_stats {
98		− unsigned long total;
99		− unsigned long lost;
	98	+ u64 total;
	99	+ u64 lost;
100	100	};
101	101
102	102	void event__print_totals(void);