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

Commit 592d5a6b authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

tools lib api fs: Move tracing_path interface into api/fs/tracing_path.c 



Moving tracing_path interface into api/fs/tracing_path.c out of util.c.
It seems generic enough to be used by others, and I couldn't think of
better place.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Reviewed-by: default avatarMatt Fleming <matt.fleming@intel.com>
Reviewed-by: default avatarRaphael Beamonte <raphael.beamonte@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1441180605-24737-5-git-send-email-jolsa@kernel.org


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

tools/lib/api/fs/Build

+1 −0
Original line number Diff line number Diff line 
libapi-y += fs.o

libapi-y += tracing_path.o

libapi-y += debugfs.o

libapi-y += findfs.o

libapi-y += tracefs.o

tools/lib/api/fs/tracing_path.c

0 → 100644
+83 −0
Original line number Diff line number Diff line 
#ifndef _GNU_SOURCE

# define _GNU_SOURCE

#endif



#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include "debugfs.h"

#include "tracefs.h"



#include "tracing_path.h"





char tracing_path[PATH_MAX + 1]        = "/sys/kernel/debug/tracing";

char tracing_events_path[PATH_MAX + 1] = "/sys/kernel/debug/tracing/events";





static void __tracing_path_set(const char *tracing, const char *mountpoint)

{

	snprintf(tracing_path, sizeof(tracing_path), "%s/%s",

		 mountpoint, tracing);

	snprintf(tracing_events_path, sizeof(tracing_events_path), "%s/%s%s",

		 mountpoint, tracing, "events");

}



static const char *tracing_path_tracefs_mount(void)

{

	const char *mnt;



	mnt = tracefs_mount(NULL);

	if (!mnt)

		return NULL;



	__tracing_path_set("", mnt);



	return mnt;

}



static const char *tracing_path_debugfs_mount(void)

{

	const char *mnt;



	mnt = debugfs_mount(NULL);

	if (!mnt)

		return NULL;



	__tracing_path_set("tracing/", mnt);



	return mnt;

}



const char *tracing_path_mount(void)

{

	const char *mnt;



	mnt = tracing_path_tracefs_mount();

	if (mnt)

		return mnt;



	mnt = tracing_path_debugfs_mount();



	return mnt;

}



void tracing_path_set(const char *mntpt)

{

	__tracing_path_set("tracing/", mntpt);

}



char *get_tracing_file(const char *name)

{

	char *file;



	if (asprintf(&file, "%s/%s", tracing_path, name) < 0)

		return NULL;



	return file;

}



void put_tracing_file(char *file)

{

	free(file);

}

tools/lib/api/fs/tracing_path.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef __API_FS_TRACING_PATH_H

#define __API_FS_TRACING_PATH_H



extern char tracing_path[];

extern char tracing_events_path[];



void tracing_path_set(const char *mountpoint);

const char *tracing_path_mount(void);



char *get_tracing_file(const char *name);

void put_tracing_file(char *file);



#endif /* __API_FS_TRACING_PATH_H */

tools/perf/perf.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include "util/parse-events.h"

#include "util/parse-options.h"

#include "util/debug.h"

#include <api/fs/debugfs.h>

#include <api/fs/tracing_path.h>

#include <pthread.h>



const char perf_usage_string[] =

tools/perf/util/parse-events.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "cache.h"

#include "header.h"

#include "debug.h"

#include <api/fs/debugfs.h>

#include <api/fs/tracing_path.h>

#include "parse-events-bison.h"

#define YY_EXTRA_TYPE int

#include "parse-events-flex.h"