Commit 06c3f2aa authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 29734550

tools/perf/builtin-script.c

+1 −13
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "util/string2.h"

#include "util/thread-stack.h"

#include "util/time-utils.h"

#include "util/path.h"

#include "print_binary.h"

#include <linux/bitmap.h>

#include <linux/kernel.h>
@@ -2401,19 +2402,6 @@ out: 
	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)		\

	while ((lang_dirent = readdir(scripts_dir)) != NULL)		\

		if ((lang_dirent->d_type == DT_DIR ||			\

tools/perf/util/path.c

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <stdio.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <dirent.h>

#include <unistd.h>



static char bad_path[] = "/bad-path/";
@@ -77,3 +78,16 @@ bool is_regular_file(const char *file) 


	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);

}

tools/perf/util/path.h

+3 −0
Original line number Diff line number Diff line
@@ -2,9 +2,12 @@ 
#ifndef _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__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3);



bool is_regular_file(const char *file);

bool is_directory(const char *base_path, const struct dirent *dent);



#endif /* _PERF_PATH_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE