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

Commit 97119f37 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Split fd -> pathname array handling 

So that the part that grows the array as needed is untied from the code
that reads the /proc/pid/fd symlink and can be used for the vfs_getname
hook that will set the fd -> path translation too, when available.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-ydo5rumyv9hdc1vsfmqamugs@git.kernel.org


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

tools/perf/builtin-trace.c

+27 −22
Original line number Diff line number Diff line
@@ -975,30 +975,9 @@ struct trace { 
	double			runtime_ms;

};



static int thread__read_fd_path(struct thread *thread, int fd)

static int trace__set_fd_pathname(struct thread *thread, int fd, const char *pathname)

{

	struct thread_trace *ttrace = thread->priv;

	char linkname[PATH_MAX], pathname[PATH_MAX];

	struct stat st;

	int ret;



	if (thread->pid_ == thread->tid) {

		scnprintf(linkname, sizeof(linkname),

			  "/proc/%d/fd/%d", thread->pid_, fd);

	} else {

		scnprintf(linkname, sizeof(linkname),

			  "/proc/%d/task/%d/fd/%d", thread->pid_, thread->tid, fd);

	}



	if (lstat(linkname, &st) < 0 || st.st_size + 1 > (off_t)sizeof(pathname))

		return -1;



	ret = readlink(linkname, pathname, sizeof(pathname));



	if (ret < 0 || ret > st.st_size)

		return -1;



	pathname[ret] = '\0';



	if (fd > ttrace->paths.max) {

		char **npath = realloc(ttrace->paths.table, (fd + 1) * sizeof(char *));
@@ -1022,6 +1001,32 @@ static int thread__read_fd_path(struct thread *thread, int fd) 
	return ttrace->paths.table[fd] != NULL ? 0 : -1;

}



static int thread__read_fd_path(struct thread *thread, int fd)

{

	char linkname[PATH_MAX], pathname[PATH_MAX];

	struct stat st;

	int ret;



	if (thread->pid_ == thread->tid) {

		scnprintf(linkname, sizeof(linkname),

			  "/proc/%d/fd/%d", thread->pid_, fd);

	} else {

		scnprintf(linkname, sizeof(linkname),

			  "/proc/%d/task/%d/fd/%d", thread->pid_, thread->tid, fd);

	}



	if (lstat(linkname, &st) < 0 || st.st_size + 1 > (off_t)sizeof(pathname))

		return -1;



	ret = readlink(linkname, pathname, sizeof(pathname));



	if (ret < 0 || ret > st.st_size)

		return -1;



	pathname[ret] = '\0';

	return trace__set_fd_pathname(thread, fd, pathname);

}



static const char *thread__fd_path(struct thread *thread, int fd, bool live)

{

	struct thread_trace *ttrace = thread->priv;