Commit 062d02a9 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf namespaces: Avoid get_current_dir_name dependency 



get_current_dir_name is a GNU extension not supported on, for example,
Android. There is only one use of it so let's just switch to getcwd to
avoid build and other complexity.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2836ed17

tools/perf/Makefile.config

+0 −4
Original line number Diff line number Diff line
@@ -417,10 +417,6 @@ ifeq ($(feature-eventfd), 1) 
  CFLAGS += -DHAVE_EVENTFD_SUPPORT

endif



ifeq ($(feature-get_current_dir_name), 1)

  CFLAGS += -DHAVE_GET_CURRENT_DIR_NAME

endif



ifeq ($(feature-gettid), 1)

  CFLAGS += -DHAVE_GETTID

endif

tools/perf/util/Build

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ perf-util-y += evsel_fprintf.o 
perf-util-y += perf_event_attr_fprintf.o

perf-util-y += evswitch.o

perf-util-y += find_bit.o

perf-util-y += get_current_dir_name.o

perf-util-y += levenshtein.o

perf-util-$(CONFIG_LIBBFD) += libbfd.o

perf-util-y += llvm.o

tools/perf/util/get_current_dir_name.c

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

// Copyright (C) 2018, 2019 Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>

//

#ifndef HAVE_GET_CURRENT_DIR_NAME

#include "get_current_dir_name.h"

#include <limits.h>

#include <string.h>

#include <unistd.h>



/* Android's 'bionic' library, for one, doesn't have this */



char *get_current_dir_name(void)

{

	char pwd[PATH_MAX];



	return getcwd(pwd, sizeof(pwd)) == NULL ? NULL : strdup(pwd);

}

#endif // HAVE_GET_CURRENT_DIR_NAME

tools/perf/util/get_current_dir_name.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

// Copyright (C) 2018, 2019 Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>

//

#ifndef __PERF_GET_CURRENT_DIR_NAME_H

#ifndef HAVE_GET_CURRENT_DIR_NAME

char *get_current_dir_name(void);

#endif // HAVE_GET_CURRENT_DIR_NAME

#endif // __PERF_GET_CURRENT_DIR_NAME_H

tools/perf/util/namespaces.c

+3 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


#include "namespaces.h"

#include "event.h"

#include "get_current_dir_name.h"

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>
@@ -293,14 +292,14 @@ void nsinfo__mountns_enter(struct nsinfo *nsi, 
	if (!nsi || !nsinfo__need_setns(nsi))

		return;



	if (snprintf(curpath, PATH_MAX, "/proc/self/ns/mnt") >= PATH_MAX)

	if (!getcwd(curpath, sizeof(curpath)))

		return;



	oldcwd = get_current_dir_name();

	oldcwd = strdup(curpath);

	if (!oldcwd)

		return;



	oldns = open(curpath, O_RDONLY);

	oldns = open("/proc/self/ns/mnt", O_RDONLY);

	if (oldns < 0)

		goto errout;