Commit d5bc056e authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Remove redundant validation from propagate_maps() 



The validation checks that the values that were just assigned, got
assigned i.e. the error can't ever happen.  Subsequent patches will call
this code in places where errors are not being returned.  Changing those
code paths to return this non-existent error is counter-productive, so
just remove it.

That in turn results in perf_evlist__set_maps not needing to return an
error, but callers aren't checking it either, so remove that too.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Link: http://lkml.kernel.org/r/1441699142-18905-4-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/evlist.c

+8 −13
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, 
	return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false);

}



static int perf_evlist__propagate_maps(struct perf_evlist *evlist,

static void perf_evlist__propagate_maps(struct perf_evlist *evlist,

					bool has_user_cpus)

{

	struct perf_evsel *evsel;
@@ -1119,13 +1119,7 @@ static int perf_evlist__propagate_maps(struct perf_evlist *evlist, 
		}



		evsel->threads = thread_map__get(evlist->threads);



		if ((evlist->cpus && !evsel->cpus) ||

		    (evlist->threads && !evsel->threads))

			return -ENOMEM;

	}



	return 0;

}



int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
@@ -1144,7 +1138,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) 
	if (evlist->cpus == NULL)

		goto out_delete_threads;



	return perf_evlist__propagate_maps(evlist, !!target->cpu_list);

	perf_evlist__propagate_maps(evlist, !!target->cpu_list);



	return 0;



out_delete_threads:

	thread_map__put(evlist->threads);
@@ -1152,8 +1148,7 @@ out_delete_threads: 
	return -1;

}



int perf_evlist__set_maps(struct perf_evlist *evlist,

			  struct cpu_map *cpus,

void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,

			   struct thread_map *threads)

{

	cpu_map__put(evlist->cpus);
@@ -1162,7 +1157,7 @@ int perf_evlist__set_maps(struct perf_evlist *evlist, 
	thread_map__put(evlist->threads);

	evlist->threads = threads;



	return perf_evlist__propagate_maps(evlist, false);

	perf_evlist__propagate_maps(evlist, false);

}



int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **err_evsel)

tools/perf/util/evlist.h

+2 −3
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ int perf_evlist__enable_event_idx(struct perf_evlist *evlist, 
void perf_evlist__set_selected(struct perf_evlist *evlist,

			       struct perf_evsel *evsel);



int perf_evlist__set_maps(struct perf_evlist *evlist,

			  struct cpu_map *cpus,

void perf_evlist__set_maps(struct perf_evlist *evlist, struct cpu_map *cpus,

			   struct thread_map *threads);

int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target);

int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **err_evsel);

CRA Git | Maintained and supported by SUSTech CRA and CCSE