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

perf tools: Get rid of unused 'swapped' parameter from perf_event__synthesize_sample() 



There is never a need to synthesize a 'swapped' sample, so all callers
to perf_event__synthesize_sample() pass 'false' as the value to
'swapped'. So get rid of the unused 'swapped' parameter.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1516108492-21401-4-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-inject.c

+1 −2
Original line number Diff line number Diff line
@@ -536,8 +536,7 @@ found: 
	sample_sw.period = sample->period;

	sample_sw.time	 = sample->time;

	perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,

				      evsel->attr.read_format, &sample_sw,

				      false);

				      evsel->attr.read_format, &sample_sw);

	build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine);

	return perf_event__repipe(tool, event_sw, &sample_sw, machine);

}

tools/perf/tests/sample-parsing.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) 
	event->header.size = sz;



	err = perf_event__synthesize_sample(event, sample_type, read_format,

					    &sample, false);

					    &sample);

	if (err) {

		pr_debug("%s failed for sample_type %#"PRIx64", error %d\n",

			 "perf_event__synthesize_sample", sample_type, err);

tools/perf/util/event.h

+1 −2
Original line number Diff line number Diff line
@@ -775,8 +775,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type, 
				     u64 read_format);

int perf_event__synthesize_sample(union perf_event *event, u64 type,

				  u64 read_format,

				  const struct perf_sample *sample,

				  bool swapped);

				  const struct perf_sample *sample);



pid_t perf_event__synthesize_comm(struct perf_tool *tool,

				  union perf_event *event, pid_t pid,

tools/perf/util/evsel.c

+1 −27
Original line number Diff line number Diff line
@@ -2472,8 +2472,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type, 


int perf_event__synthesize_sample(union perf_event *event, u64 type,

				  u64 read_format,

				  const struct perf_sample *sample,

				  bool swapped)

				  const struct perf_sample *sample)

{

	u64 *array;

	size_t sz;
@@ -2498,15 +2497,6 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, 
	if (type & PERF_SAMPLE_TID) {

		u.val32[0] = sample->pid;

		u.val32[1] = sample->tid;

		if (swapped) {

			/*

			 * Inverse of what is done in perf_evsel__parse_sample

			 */

			u.val32[0] = bswap_32(u.val32[0]);

			u.val32[1] = bswap_32(u.val32[1]);

			u.val64 = bswap_64(u.val64);

		}



		*array = u.val64;

		array++;

	}
@@ -2534,13 +2524,6 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, 
	if (type & PERF_SAMPLE_CPU) {

		u.val32[0] = sample->cpu;

		u.val32[1] = 0;

		if (swapped) {

			/*

			 * Inverse of what is done in perf_evsel__parse_sample

			 */

			u.val32[0] = bswap_32(u.val32[0]);

			u.val64 = bswap_64(u.val64);

		}

		*array = u.val64;

		array++;

	}
@@ -2587,15 +2570,6 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, 


	if (type & PERF_SAMPLE_RAW) {

		u.val32[0] = sample->raw_size;

		if (WARN_ONCE(swapped,

			      "Endianness of raw data not corrected!\n")) {

			/*

			 * Inverse of what is done in perf_evsel__parse_sample

			 */

			u.val32[0] = bswap_32(u.val32[0]);

			u.val32[1] = bswap_32(u.val32[1]);

			u.val64 = bswap_64(u.val64);

		}

		*array = u.val64;

		array = (void *)array + sizeof(u32);

tools/perf/util/intel-bts.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static int intel_bts_synth_branch_sample(struct intel_bts_queue *btsq, 
		event.sample.header.size = bts->branches_event_size;

		ret = perf_event__synthesize_sample(&event,

						    bts->branches_sample_type,

						    0, &sample, false);

						    0, &sample);

		if (ret)

			return ret;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE