openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf utils: Move is_directory() to path.h 

So that it can be used more widely, like in the next patch, when it will
be used to fix a bug in 'perf test' handling of dirent.d_type ==
DT_UNKNOWN.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171206174535.25380-1-jolsa@kernel.org
[ Split from a larger patch, removed needless includes in path.h ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-12-06 18:45:35 +01:00 committed by Arnaldo Carvalho de Melo
parent 29734550c9
commit 06c3f2aa9f
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/perf/builtin-script.c
View File

@ -26,6 +26,7 @@
#include "util/string2.h" #include "util/string2.h"
#include "util/thread-stack.h" #include "util/thread-stack.h"
#include "util/time-utils.h" #include "util/time-utils.h"
#include "util/path.h"
#include "print_binary.h" #include "print_binary.h"
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/kernel.h> #include <linux/kernel.h>
@ -2401,19 +2402,6 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
return rc; return rc;
} }
/* Helper function for filesystems that return a dent->d_type DT_UNKNOWN */
static int is_directory(const char *base_path, const struct dirent *dent)
{
char path[PATH_MAX];
struct stat st;
sprintf(path, "%s/%s", base_path, dent->d_name);
if (stat(path, &st))
return 0;
return S_ISDIR(st.st_mode);
}
#define for_each_lang(scripts_path, scripts_dir, lang_dirent) \ #define for_each_lang(scripts_path, scripts_dir, lang_dirent) \
while ((lang_dirent = readdir(scripts_dir)) != NULL) \ while ((lang_dirent = readdir(scripts_dir)) != NULL) \
if ((lang_dirent->d_type == DT_DIR || \ if ((lang_dirent->d_type == DT_DIR || \

14
tools/perf/util/path.c
View File

@ -18,6 +18,7 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h>
#include <unistd.h> #include <unistd.h>
static char bad_path[] = "/bad-path/"; static char bad_path[] = "/bad-path/";
@ -77,3 +78,16 @@ bool is_regular_file(const char *file)
return S_ISREG(st.st_mode); return S_ISREG(st.st_mode);
} }
/* Helper function for filesystems that return a dent->d_type DT_UNKNOWN */
bool is_directory(const char *base_path, const struct dirent *dent)
{
char path[PATH_MAX];
struct stat st;
sprintf(path, "%s/%s", base_path, dent->d_name);
if (stat(path, &st))
return false;
return S_ISDIR(st.st_mode);
}

3
tools/perf/util/path.h
View File

@ -2,9 +2,12 @@
#ifndef _PERF_PATH_H #ifndef _PERF_PATH_H
#define _PERF_PATH_H #define _PERF_PATH_H
struct dirent;
int path__join(char *bf, size_t size, const char *path1, const char *path2); int path__join(char *bf, size_t size, const char *path1, const char *path2);
int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3); int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3);
bool is_regular_file(const char *file); bool is_regular_file(const char *file);
bool is_directory(const char *base_path, const struct dirent *dent);
#endif /* _PERF_PATH_H */ #endif /* _PERF_PATH_H */