Commit 45de34bb authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf buildid: add perfconfig option to specify buildid cache dir 



This patch adds the ability to specify an alternate directory to store the
buildid cache (buildids, copy of binaries). By default, it is hardcoded to
$HOME/.debug. This directory contains immutable data. The layout of the
directory is such that no conflicts in filenames are possible. A modification
in a file, yields a different buildid and thus a different location in the
subdir hierarchy.

You may want to put the buildid cache elsewhere because of disk space
limitation or simply to share the cache between users. It is also useful for
remote collect vs. local analysis of profiles.

This patch adds a new config option to the perfconfig file.  Under the tag
'buildid', there is a dir option. For instance, if you have:

$ cat /etc/perfconfig
[buildid]
dir = /var/cache/perf-buildid

All buildids and binaries are be saved in the directory specified. The perf
record, buildid-list, buildid-cache, report, annotate, and archive commands
will it to pull information out.

The option can be set in the system-wide perfconfig file or in the
$HOME/.perfconfig file.

Cc: David S. Miller <davem@davemloft.net>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <4c055fb7.df0ce30a.5f0d.ffffae52@mx.google.com>
Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8e5564e6

tools/perf/builtin-buildid-cache.c

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ static int __cmd_buildid_cache(void) 
	struct str_node *pos;

	char debugdir[PATH_MAX];



	snprintf(debugdir, sizeof(debugdir), "%s/%s", getenv("HOME"),

		 DEBUG_CACHE_DIR);

	snprintf(debugdir, sizeof(debugdir), "%s", buildid_dir);



	if (add_name_list_str) {

		list = strlist__new(true, add_name_list_str);

tools/perf/perf-archive.sh

+15 −5
Original line number Diff line number Diff line
@@ -7,7 +7,17 @@ if [ $# -ne 0 ] ; then 
	PERF_DATA=$1

fi



DEBUGDIR=~/.debug/

#

# PERF_BUILDID_DIR environment variable set by perf

# path to buildid directory, default to $HOME/.debug

#

if [ -z $PERF_BUILDID_DIR ]; then

	PERF_BUILDID_DIR=~/.debug/

else

        # append / to make substitutions work

        PERF_BUILDID_DIR=$PERF_BUILDID_DIR/

fi



BUILDIDS=$(mktemp /tmp/perf-archive-buildids.XXXXXX)

NOBUILDID=0000000000000000000000000000000000000000
@@ -22,13 +32,13 @@ MANIFEST=$(mktemp /tmp/perf-archive-manifest.XXXXXX) 


cut -d ' ' -f 1 $BUILDIDS | \

while read build_id ; do

	linkname=$DEBUGDIR.build-id/${build_id:0:2}/${build_id:2}

	linkname=$PERF_BUILDID_DIR.build-id/${build_id:0:2}/${build_id:2}

	filename=$(readlink -f $linkname)

	echo ${linkname#$DEBUGDIR} >> $MANIFEST

	echo ${filename#$DEBUGDIR} >> $MANIFEST

	echo ${linkname#$PERF_BUILDID_DIR} >> $MANIFEST

	echo ${filename#$PERF_BUILDID_DIR} >> $MANIFEST

done



tar cfj $PERF_DATA.tar.bz2 -C $DEBUGDIR -T $MANIFEST

tar cfj $PERF_DATA.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST

rm -f $MANIFEST $BUILDIDS

echo -e "Now please run:\n"

echo -e "$ tar xvf $PERF_DATA.tar.bz2 -C ~/.debug\n"

tools/perf/perf.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ int main(int argc, const char **argv) 
	handle_options(&argv, &argc, NULL);

	commit_pager_choice();

	set_debugfs_path();

	set_buildid_dir();



	if (argc > 0) {

		if (!prefixcmp(argv[0], "--"))

			argv[0] += 2;

tools/perf/util/build-id.c

+4 −6
Original line number Diff line number Diff line
@@ -43,19 +43,17 @@ struct perf_event_ops build_id__mark_dso_hit_ops = { 
char *dso__build_id_filename(struct dso *self, char *bf, size_t size)

{

	char build_id_hex[BUILD_ID_SIZE * 2 + 1];

	const char *home;



	if (!self->has_build_id)

		return NULL;



	build_id__sprintf(self->build_id, sizeof(self->build_id), build_id_hex);

	home = getenv("HOME");

	if (bf == NULL) {

		if (asprintf(&bf, "%s/%s/.build-id/%.2s/%s", home,

			     DEBUG_CACHE_DIR, build_id_hex, build_id_hex + 2) < 0)

		if (asprintf(&bf, "%s/.build-id/%.2s/%s", buildid_dir,

			     build_id_hex, build_id_hex + 2) < 0)

			return NULL;

	} else

		snprintf(bf, size, "%s/%s/.build-id/%.2s/%s", home,

			 DEBUG_CACHE_DIR, build_id_hex, build_id_hex + 2);

		snprintf(bf, size, "%s/.build-id/%.2s/%s", buildid_dir,

			 build_id_hex, build_id_hex + 2);

	return bf;

}

tools/perf/util/cache.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ extern int perf_config(config_fn_t fn, void *); 
extern int perf_config_int(const char *, const char *);

extern int perf_config_bool(const char *, const char *);

extern int config_error_nonbool(const char *);

extern const char *perf_config_dirname(const char *, const char *);



/* pager.c */

extern void setup_pager(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE