tools/perf: allow overriding sysfs and proc finding with env var
PATCH 1/1 tools/perf: allow overriding sysfs and proc finding with env var
SYSFS_PATH and PROC_PATH environment variables now let the user override the detection of sysfs and proc locations for testing purposes.
Signed-off-by Cody P Schafer <[email protected]>
--- tools/perf/util/fs.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
tools/perf/util/fs.c +36 -0
@@ -91,8 +91,44 @@ static bool fs__check_mounts(struct fs *fs)return false; } +static void mem_toupper (char *f,size_t len) +{ +while (len) { + *f =toupper (*f); + f++; + len--; + } +} + +/* +* Check for "NAME_PATH" environment variable to override fs location (for +* testing). This matches the recommendation in Documentation/sysfs-rules.txt +* for SYSFS_PATH. +*/ +static bool fs__env_override (struct fs *fs) +{ +char *override_path; +size_t name_len =strlen (fs->name); +/* name + "_PATH" + '\0' */ +char upper_name[name_len +5 +1 ]; +memcpy (upper_name, fs->name, name_len); +mem_toupper (upper_name, name_len); +strcpy (&upper_name[name_len],"_PATH" ); + + override_path =getenv (upper_name); +if (!override_path) +return false; + + fs->found = true; +strcpy (fs->path, override_path); +return true; +} +static const char *fs__get_mountpoint (struct fs *fs) { +if (fs__env_override (fs)) +return fs->path; +if (fs__check_mounts (fs))return fs->path;
Signature · 1 line
1.9.1
Quoted 2 lines · Cody P Schafer
SYSFS_PATHandPROC_PATHenvironment variables now let the user override the detection of sysfs and proc locations for testing purposes.
seems usefull, but this code was moved to tools/lib/api/fs/fs.c
please rebase to the latest Arnaldo's perf/core branch
(git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
thanks,
jirka
Quoted 34 lines
Signed-off-by Cody P Schafer <[email protected]>--- tools/perf/util/fs.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)tools/perf/util/fs.c +20
-0@@ -91,8 +91,44 @@ static bool fs__check_mounts(struct fs *fs)return false; } +static void mem_toupper (char *f,size_t len) +{ +while (len) { + *f =toupper (*f); + f++; + len--; + } +} + +/* +* Check for "NAME_PATH" environment variable to override fs location (for +* testing). This matches the recommendation in Documentation/sysfs-rules.txt +* for SYSFS_PATH. +*/ +static bool fs__env_override (struct fs *fs) +{ +char *override_path; +size_t name_len =strlen (fs->name); +/* name + "_PATH" + '\0' */ +char upper_name[name_len +5 +1 ];
tools/perf/util/fs.c static bool fs__check_mounts(struct fs *fs) · line 123
Quoted 10 lines
tools/perf/util/fs.c +10
-0+memcpy (upper_name, fs->name, name_len); +mem_toupper (upper_name, name_len); +strcpy (&upper_name[name_len],"_PATH" ); + + override_path =getenv (upper_name); +if (!override_path) +return false; + + fs->found = true; +strcpy (fs->path, override_path);
please use strncpy with size of fs->path