perf fs: Rename NAME_find_mountpoint() to NAME__mountpoint()
Shorten it, "finding" it is an implementation detail, what callers want is the pathname, not to ask for it to _always_ do the lookup. And the existing implementation already caches it, i.e. it doesn't "finds" it on every call. 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-r24wa4bvtccg7mnkessrbbdj@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
4299a54997
commit
cf38fadade
5 changed files with 16 additions and 21 deletions
|
@ -1456,7 +1456,7 @@ static int test_pmu(void)
|
|||
int ret;
|
||||
|
||||
snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/format/",
|
||||
sysfs_find_mountpoint());
|
||||
sysfs__mountpoint());
|
||||
|
||||
ret = stat(path, &st);
|
||||
if (ret)
|
||||
|
@ -1473,7 +1473,7 @@ static int test_pmu_events(void)
|
|||
int ret;
|
||||
|
||||
snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/events/",
|
||||
sysfs_find_mountpoint());
|
||||
sysfs__mountpoint());
|
||||
|
||||
ret = stat(path, &st);
|
||||
if (ret) {
|
||||
|
|
|
@ -216,7 +216,7 @@ int cpu_map__get_socket(struct cpu_map *map, int idx)
|
|||
|
||||
cpu = map->map[idx];
|
||||
|
||||
mnt = sysfs_find_mountpoint();
|
||||
mnt = sysfs__mountpoint();
|
||||
if (!mnt)
|
||||
return -1;
|
||||
|
||||
|
@ -279,7 +279,7 @@ int cpu_map__get_core(struct cpu_map *map, int idx)
|
|||
|
||||
cpu = map->map[idx];
|
||||
|
||||
mnt = sysfs_find_mountpoint();
|
||||
mnt = sysfs__mountpoint();
|
||||
if (!mnt)
|
||||
return -1;
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ static const char *fs__get_mountpoint(struct fs *fs)
|
|||
return fs__read_mounts(fs) ? fs->path : NULL;
|
||||
}
|
||||
|
||||
static const char *fs__find_mountpoint(int idx)
|
||||
static const char *fs__mountpoint(int idx)
|
||||
{
|
||||
struct fs *fs = &fs__entries[idx];
|
||||
|
||||
|
@ -98,10 +98,10 @@ static const char *fs__find_mountpoint(int idx)
|
|||
return fs__get_mountpoint(fs);
|
||||
}
|
||||
|
||||
#define FIND_MOUNTPOINT(name, idx) \
|
||||
const char *name##_find_mountpoint(void) \
|
||||
{ \
|
||||
return fs__find_mountpoint(idx); \
|
||||
#define FS__MOUNTPOINT(name, idx) \
|
||||
const char *name##__mountpoint(void) \
|
||||
{ \
|
||||
return fs__mountpoint(idx); \
|
||||
}
|
||||
|
||||
FIND_MOUNTPOINT(sysfs, FS__SYSFS);
|
||||
FS__MOUNTPOINT(sysfs, FS__SYSFS);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef __PERF_FS
|
||||
#define __PERF_FS
|
||||
|
||||
const char *sysfs_find_mountpoint(void);
|
||||
const char *sysfs__mountpoint(void);
|
||||
|
||||
#endif /* __PERF_FS */
|
||||
|
|
|
@ -77,9 +77,8 @@ static int pmu_format(const char *name, struct list_head *format)
|
|||
{
|
||||
struct stat st;
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
const char *sysfs = sysfs__mountpoint();
|
||||
|
||||
sysfs = sysfs_find_mountpoint();
|
||||
if (!sysfs)
|
||||
return -1;
|
||||
|
||||
|
@ -166,9 +165,8 @@ static int pmu_aliases(const char *name, struct list_head *head)
|
|||
{
|
||||
struct stat st;
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
const char *sysfs = sysfs__mountpoint();
|
||||
|
||||
sysfs = sysfs_find_mountpoint();
|
||||
if (!sysfs)
|
||||
return -1;
|
||||
|
||||
|
@ -212,11 +210,10 @@ static int pmu_type(const char *name, __u32 *type)
|
|||
{
|
||||
struct stat st;
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
FILE *file;
|
||||
int ret = 0;
|
||||
const char *sysfs = sysfs__mountpoint();
|
||||
|
||||
sysfs = sysfs_find_mountpoint();
|
||||
if (!sysfs)
|
||||
return -1;
|
||||
|
||||
|
@ -241,11 +238,10 @@ static int pmu_type(const char *name, __u32 *type)
|
|||
static void pmu_read_sysfs(void)
|
||||
{
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
DIR *dir;
|
||||
struct dirent *dent;
|
||||
const char *sysfs = sysfs__mountpoint();
|
||||
|
||||
sysfs = sysfs_find_mountpoint();
|
||||
if (!sysfs)
|
||||
return;
|
||||
|
||||
|
@ -270,11 +266,10 @@ static struct cpu_map *pmu_cpumask(const char *name)
|
|||
{
|
||||
struct stat st;
|
||||
char path[PATH_MAX];
|
||||
const char *sysfs;
|
||||
FILE *file;
|
||||
struct cpu_map *cpus;
|
||||
const char *sysfs = sysfs__mountpoint();
|
||||
|
||||
sysfs = sysfs_find_mountpoint();
|
||||
if (!sysfs)
|
||||
return NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue