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

Commit 54a3cf59 authored by Andrew Vagin's avatar Andrew Vagin Committed by Arnaldo Carvalho de Melo
Browse files

perf inject: Mark a dso if it's used 



Otherwise they will be not written in an output file.

Signed-off-by: default avatarAndrew Vagin <avagin@openvz.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1344344165-369636-5-git-send-email-avagin@openvz.org


[ committer note: Fixed up wrt changes made in the immediate previous patches ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 26a031e1

tools/perf/builtin-inject.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "util/session.h"

#include "util/session.h"

#include "util/tool.h"

#include "util/tool.h"

#include "util/debug.h"

#include "util/debug.h"

#include "util/build-id.h"





#include "util/parse-options.h"

#include "util/parse-options.h"
@@ -116,6 +117,8 @@ static int perf_event__repipe_sample(struct perf_tool *tool, 
		return f(tool, event, sample, evsel, machine);

		return f(tool, event, sample, evsel, machine);

	}

	}





	build_id__mark_dso_hit(tool, event, sample, evsel, machine);



	return perf_event__repipe_synth(tool, event, machine);

	return perf_event__repipe_synth(tool, event, machine);

}

}
@@ -310,6 +313,7 @@ static int perf_inject__sched_stat(struct perf_tool *tool, 
	sample_sw.time	 = sample->time;

	sample_sw.time	 = sample->time;

	perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,

	perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,

				      &sample_sw, false);

				      &sample_sw, false);

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

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

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

}

}
@@ -342,8 +346,7 @@ static int __cmd_inject(struct perf_inject *inject) 




	signal(SIGINT, sig_handler);

	signal(SIGINT, sig_handler);





	if (inject->build_ids) {

	if (inject->build_ids || inject->sched_stat) {

		inject->tool.sample	  = perf_event__inject_buildid;

		inject->tool.mmap	  = perf_event__repipe_mmap;

		inject->tool.mmap	  = perf_event__repipe_mmap;

		inject->tool.fork	  = perf_event__repipe_fork;

		inject->tool.fork	  = perf_event__repipe_fork;

		inject->tool.tracing_data = perf_event__repipe_tracing_data;

		inject->tool.tracing_data = perf_event__repipe_tracing_data;
@@ -353,7 +356,9 @@ static int __cmd_inject(struct perf_inject *inject) 
	if (session == NULL)

	if (session == NULL)

		return -ENOMEM;

		return -ENOMEM;





	if (inject->sched_stat) {

	if (inject->build_ids) {

		inject->tool.sample = perf_event__inject_buildid;

	} else if (inject->sched_stat) {

		struct perf_evsel *evsel;

		struct perf_evsel *evsel;





		inject->tool.ordered_samples = true;

		inject->tool.ordered_samples = true;

tools/perf/util/build-id.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "session.h"

#include "session.h"

#include "tool.h"

#include "tool.h"





static int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,

int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,

			   union perf_event *event,

			   union perf_event *event,

			   struct perf_sample *sample __maybe_unused,

			   struct perf_sample *sample __maybe_unused,

			   struct perf_evsel *evsel __maybe_unused,

			   struct perf_evsel *evsel __maybe_unused,

tools/perf/util/build-id.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -7,4 +7,8 @@ extern struct perf_tool build_id__mark_dso_hit_ops; 




char *dso__build_id_filename(struct dso *self, char *bf, size_t size);

char *dso__build_id_filename(struct dso *self, char *bf, size_t size);





int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event,

			   struct perf_sample *sample, struct perf_evsel *evsel,

			   struct machine *machine);



#endif
 
#endif