Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'perf/urgent' into perf/core 



Merge reason: We'll be queueing dependent changes.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 984763cb a6b84574

tools/perf/builtin-probe.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include "util/probe-event.h"



#define MAX_PATH_LEN 256

#define MAX_PROBES 128



/* Session management structure */

static struct {

tools/perf/builtin-top.c

+9 −4
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static void print_sym_table(void) 
	struct sym_entry *syme, *n;

	struct rb_root tmp = RB_ROOT;

	struct rb_node *nd;

	int sym_width = 0, dso_width = 0, max_dso_width;

	int sym_width = 0, dso_width = 0, dso_short_width = 0;

	const int win_width = winsize.ws_col - 1;



	samples = userspace_samples = exact_samples = 0;
@@ -555,15 +555,20 @@ static void print_sym_table(void) 
		if (syme->map->dso->long_name_len > dso_width)

			dso_width = syme->map->dso->long_name_len;



		if (syme->map->dso->short_name_len > dso_short_width)

			dso_short_width = syme->map->dso->short_name_len;



		if (syme->name_len > sym_width)

			sym_width = syme->name_len;

	}



	printed = 0;



	max_dso_width = winsize.ws_col - sym_width - 29;

	if (dso_width > max_dso_width)

		dso_width = max_dso_width;

	if (sym_width + dso_width > winsize.ws_col - 29) {

		dso_width = dso_short_width;

		if (sym_width + dso_width > winsize.ws_col - 29)

			sym_width = winsize.ws_col - dso_width - 29;

	}

	putchar('\n');

	if (nr_counters == 1)

		printf("             samples  pcnt");

tools/perf/util/probe-event.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ void parse_perf_probe_event(const char *str, struct probe_point *pp, 


	/* Parse probe point */

	parse_perf_probe_probepoint(argv[0], pp);

	if (pp->file || pp->line)

	if (pp->file || pp->line || pp->lazy_line)

		*need_dwarf = true;



	/* Copy arguments and ensure return probe has no C argument */

tools/perf/util/probe-finder.c

+7 −11
Original line number Diff line number Diff line
@@ -333,8 +333,8 @@ static void show_location(Dwarf_Op *op, struct probe_finder *pf) 
		die("%u exceeds max register number.", regn);



	if (deref)

		ret = snprintf(pf->buf, pf->len, " %s=+%ju(%s)",

			       pf->var, (uintmax_t)offs, regs);

		ret = snprintf(pf->buf, pf->len, " %s=%+jd(%s)",

			       pf->var, (intmax_t)offs, regs);

	else

		ret = snprintf(pf->buf, pf->len, " %s=%s", pf->var, regs);

	DIE_IF(ret < 0);
@@ -352,8 +352,7 @@ static void show_variable(Dwarf_Die *vr_die, struct probe_finder *pf) 
	if (dwarf_attr(vr_die, DW_AT_location, &attr) == NULL)

		goto error;

	/* TODO: handle more than 1 exprs */

	ret = dwarf_getlocation_addr(&attr, (pf->addr - pf->cu_base),

				     &expr, &nexpr, 1);

	ret = dwarf_getlocation_addr(&attr, pf->addr, &expr, &nexpr, 1);

	if (ret <= 0 || nexpr == 0)

		goto error;
@@ -437,8 +436,7 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) 


	/* Get the frame base attribute/ops */

	dwarf_attr(sp_die, DW_AT_frame_base, &fb_attr);

	ret = dwarf_getlocation_addr(&fb_attr, (pf->addr - pf->cu_base),

				     &pf->fb_ops, &nops, 1);

	ret = dwarf_getlocation_addr(&fb_attr, pf->addr, &pf->fb_ops, &nops, 1);

	if (ret <= 0 || nops == 0)

		pf->fb_ops = NULL;
@@ -455,6 +453,9 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) 
	/* *pf->fb_ops will be cached in libdw. Don't free it. */

	pf->fb_ops = NULL;



	if (pp->found == MAX_PROBES)

		die("Too many( > %d) probe point found.\n", MAX_PROBES);



	pp->probes[pp->found] = strdup(tmp);

	pp->found++;

}
@@ -641,7 +642,6 @@ static void find_probe_point_by_func(struct probe_finder *pf) 
int find_probe_point(int fd, struct probe_point *pp)

{

	struct probe_finder pf = {.pp = pp};

	int ret;

	Dwarf_Off off, noff;

	size_t cuhl;

	Dwarf_Die *diep;
@@ -668,10 +668,6 @@ int find_probe_point(int fd, struct probe_point *pp) 
			pf.fname = NULL;



		if (!pp->file || pf.fname) {

			/* Save CU base address (for frame_base) */

			ret = dwarf_lowpc(&pf.cu_die, &pf.cu_base);

			if (ret != 0)

				pf.cu_base = 0;

			if (pp->function)

				find_probe_point_by_func(&pf);

			else if (pp->lazy_line)

tools/perf/util/probe-finder.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ struct probe_finder { 


	/* For variable searching */

	Dwarf_Op		*fb_ops;	/* Frame base attribute */

	Dwarf_Addr		cu_base;	/* Current CU base address */

	const char		*var;		/* Current variable name */

	char			*buf;		/* Current output buffer */

	int			len;		/* Length of output buffer */