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

Commit b7f294b5 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf hists browser: The dso can be obtained from popup_action->ms.map->dso 

So no need to have a 'dso' member in 'popup_action', remove it as no
code is using it, already.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-76a6s0007slug0op0wkl6o8b@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fae00650

tools/perf/ui/browsers/hists.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1430,7 +1430,6 @@ static int switch_data_file(void) 




struct popup_action {

struct popup_action {

	struct thread 		*thread;

	struct thread 		*thread;

	struct dso		*dso;

	struct map_symbol 	ms;

	struct map_symbol 	ms;

	int			socket;

	int			socket;
@@ -1565,7 +1564,6 @@ add_dso_opt(struct hist_browser *browser, struct popup_action *act, 
		return 0;

		return 0;





	act->ms.map = map;

	act->ms.map = map;

	act->dso = map->dso;

	act->fn = do_zoom_dso;

	act->fn = do_zoom_dso;

	return 1;

	return 1;

}

}
@@ -1827,7 +1825,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 




	while (1) {

	while (1) {

		struct thread *thread = NULL;

		struct thread *thread = NULL;

		struct dso *dso = NULL;

		struct map *map = NULL;

		struct map *map = NULL;

		int choice = 0;

		int choice = 0;

		int socked_id = -1;

		int socked_id = -1;
@@ -1839,8 +1836,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
		if (browser->he_selection != NULL) {

		if (browser->he_selection != NULL) {

			thread = hist_browser__selected_thread(browser);

			thread = hist_browser__selected_thread(browser);

			map = browser->selection->map;

			map = browser->selection->map;

			if (map)

				dso = map->dso;

			socked_id = browser->he_selection->socket;

			socked_id = browser->he_selection->socket;

		}

		}

		switch (key) {

		switch (key) {
@@ -1874,7 +1869,6 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, 
			hist_browser__dump(browser);

			hist_browser__dump(browser);

			continue;

			continue;

		case 'd':

		case 'd':

			actions->dso = dso;

			actions->ms.map = map;

			actions->ms.map = map;

			do_zoom_dso(browser, actions);

			do_zoom_dso(browser, actions);

			continue;

			continue;