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

Commit 167aedc4 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf util: Move debugfs/tracing helper functions to util.c 



Since they're generic helpers move them to util.c so that they can be
used by others.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1372230862-15861-2-git-send-email-namhyung@kernel.org


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

tools/perf/util/trace-event-info.c

+0 −59
Original line number Original line Diff line number Diff line
@@ -46,65 +46,6 @@ 
static int output_fd;

static int output_fd;









static const char *find_debugfs(void)

{

	const char *path = perf_debugfs_mount(NULL);



	if (!path)

		pr_debug("Your kernel does not support the debugfs filesystem");



	return path;

}



/*

 * Finds the path to the debugfs/tracing

 * Allocates the string and stores it.

 */

static const char *find_tracing_dir(void)

{

	static char *tracing;

	static int tracing_found;

	const char *debugfs;



	if (tracing_found)

		return tracing;



	debugfs = find_debugfs();

	if (!debugfs)

		return NULL;



	tracing = malloc(strlen(debugfs) + 9);

	if (!tracing)

		return NULL;



	sprintf(tracing, "%s/tracing", debugfs);



	tracing_found = 1;

	return tracing;

}



static char *get_tracing_file(const char *name)

{

	const char *tracing;

	char *file;



	tracing = find_tracing_dir();

	if (!tracing)

		return NULL;



	file = malloc(strlen(tracing) + strlen(name) + 2);

	if (!file)

		return NULL;



	sprintf(file, "%s/%s", tracing, name);

	return file;

}



static void put_tracing_file(char *file)

{

	free(file);

}



int bigendian(void)

int bigendian(void)

{

{

	unsigned char str[] = { 0x1, 0x2, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0};

	unsigned char str[] = { 0x1, 0x2, 0x3, 0x4, 0x0, 0x0, 0x0, 0x0};

tools/perf/util/util.c

+59 −0
Original line number Original line Diff line number Diff line
@@ -269,3 +269,62 @@ void perf_debugfs_set_path(const char *mntpt) 
	snprintf(debugfs_mountpoint, strlen(debugfs_mountpoint), "%s", mntpt);

	snprintf(debugfs_mountpoint, strlen(debugfs_mountpoint), "%s", mntpt);

	set_tracing_events_path(mntpt);

	set_tracing_events_path(mntpt);

}

}



static const char *find_debugfs(void)

{

	const char *path = perf_debugfs_mount(NULL);



	if (!path)

		fprintf(stderr, "Your kernel does not support the debugfs filesystem");



	return path;

}



/*

 * Finds the path to the debugfs/tracing

 * Allocates the string and stores it.

 */

const char *find_tracing_dir(void)

{

	static char *tracing;

	static int tracing_found;

	const char *debugfs;



	if (tracing_found)

		return tracing;



	debugfs = find_debugfs();

	if (!debugfs)

		return NULL;



	tracing = malloc(strlen(debugfs) + 9);

	if (!tracing)

		return NULL;



	sprintf(tracing, "%s/tracing", debugfs);



	tracing_found = 1;

	return tracing;

}



char *get_tracing_file(const char *name)

{

	const char *tracing;

	char *file;



	tracing = find_tracing_dir();

	if (!tracing)

		return NULL;



	file = malloc(strlen(tracing) + strlen(name) + 2);

	if (!file)

		return NULL;



	sprintf(file, "%s/%s", tracing, name);

	return file;

}



void put_tracing_file(char *file)

{

	free(file);

}

tools/perf/util/util.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,9 @@ extern char buildid_dir[]; 
extern char tracing_events_path[];

extern char tracing_events_path[];

extern void perf_debugfs_set_path(const char *mountpoint);

extern void perf_debugfs_set_path(const char *mountpoint);

const char *perf_debugfs_mount(const char *mountpoint);

const char *perf_debugfs_mount(const char *mountpoint);

const char *find_tracing_dir(void);

char *get_tracing_file(const char *name);

void put_tracing_file(char *file);





/* On most systems <limits.h> would have given us this, but

/* On most systems <limits.h> would have given us this, but

 * not on some systems (e.g. GNU/Hurd).

 * not on some systems (e.g. GNU/Hurd).