perf tools: Move path related functions to util/path.h

Disentangling util.h header mess a bit more.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-aj6je8ly377i4upedmjzdsq6@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2017-04-18 11:33:48 -03:00
parent b0742e90f5
commit 9a3993d408
15 changed files with 52 additions and 28 deletions

View File

@ -24,6 +24,7 @@
#include "util/evlist.h"
#include <subcmd/exec-cmd.h>
#include "util/machine.h"
#include "util/path.h"
#include "util/session.h"
#include "util/thread.h"
#include <subcmd/parse-options.h>

View File

@ -12,6 +12,7 @@
#include "thread_map.h"
#include "symbol.h"
#include "thread.h"
#include "util.h"
#define THREADS 4

View File

@ -3,8 +3,12 @@
/* For the CPU_* macros */
#include <pthread.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <api/fs/fs.h>
#include <linux/err.h>
#include <api/fs/tracing_path.h>
#include "evsel.h"
#include "tests.h"
#include "thread_map.h"

View File

@ -2,6 +2,9 @@
#include <inttypes.h>
#include <api/fs/tracing_path.h>
#include <linux/err.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "thread_map.h"
#include "evsel.h"
#include "debug.h"

View File

@ -4,6 +4,7 @@
#include "../util/cache.h"
#include "../util/debug.h"
#include "../util/hist.h"
#include "../util/util.h"
pthread_mutex_t ui__lock = PTHREAD_MUTEX_INITIALIZER;
void *perf_gtk_handle;

View File

@ -18,6 +18,7 @@
#include "tool.h"
#include "header.h"
#include "vdso.h"
#include "path.h"
#include "probe-file.h"
#include "strlist.h"

View File

@ -2,6 +2,7 @@
#include <stdlib.h>
#include "evsel.h"
#include "counts.h"
#include "util.h"
struct perf_counts *perf_counts__new(int ncpus, int nthreads)
{

View File

@ -3,6 +3,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <errno.h>
#include "path.h"
#include "symbol.h"
#include "dso.h"
#include "machine.h"

View File

@ -11,8 +11,13 @@
* which is what it's designed for.
*/
#include "cache.h"
#include "util.h"
#include "path.h"
#include <linux/kernel.h>
#include <limits.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
static char bad_path[] = "/bad-path/";
/*
@ -50,3 +55,24 @@ char *mkpath(const char *fmt, ...)
return bad_path;
return cleanup_path(pathname);
}
int path__join(char *bf, size_t size, const char *path1, const char *path2)
{
return scnprintf(bf, size, "%s%s%s", path1, path1[0] ? "/" : "", path2);
}
int path__join3(char *bf, size_t size, const char *path1, const char *path2, const char *path3)
{
return scnprintf(bf, size, "%s%s%s%s%s", path1, path1[0] ? "/" : "",
path2, path2[0] ? "/" : "", path3);
}
bool is_regular_file(const char *file)
{
struct stat st;
if (stat(file, &st))
return false;
return S_ISREG(st.st_mode);
}

9
tools/perf/util/path.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef _PERF_PATH_H
#define _PERF_PATH_H
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);
#endif /* _PERF_PATH_H */

View File

@ -19,6 +19,7 @@
#include "strlist.h"
#include "intlist.h"
#include "header.h"
#include "path.h"
#include "sane_ctype.h"
#include <elf.h>

View File

@ -13,7 +13,7 @@
#include <libgen.h>
#include "build-id.h"
#include "event.h"
#include "util.h"
#include "path.h"
#ifdef HAVE_LIBELF_SUPPORT
#include <libelf.h>

View File

@ -12,6 +12,7 @@
#include "event.h"
#include "perf_regs.h"
#include "callchain.h"
#include "util.h"
static char *debuginfo_path;

View File

@ -713,16 +713,6 @@ out:
return tip;
}
bool is_regular_file(const char *file)
{
struct stat st;
if (stat(file, &st))
return false;
return S_ISREG(st.st_mode);
}
int fetch_current_timestamp(char *buf, size_t sz)
{
struct timeval tv;

View File

@ -120,21 +120,6 @@ struct parse_tag {
unsigned long parse_tag_value(const char *str, struct parse_tag *tags);
static inline int path__join(char *bf, size_t size,
const char *path1, const char *path2)
{
return scnprintf(bf, size, "%s%s%s", path1, path1[0] ? "/" : "", path2);
}
static inline int path__join3(char *bf, size_t size,
const char *path1, const char *path2,
const char *path3)
{
return scnprintf(bf, size, "%s%s%s%s%s",
path1, path1[0] ? "/" : "",
path2, path2[0] ? "/" : "", path3);
}
int perf_event_paranoid(void);
void mem_bswap_64(void *src, int byte_size);
@ -162,7 +147,6 @@ int fetch_kernel_version(unsigned int *puint,
#define KVER_PARAM(x) KVER_VERSION(x), KVER_PATCHLEVEL(x), KVER_SUBLEVEL(x)
const char *perf_tip(const char *dirpath);
bool is_regular_file(const char *file);
int fetch_current_timestamp(char *buf, size_t sz);
#ifndef HAVE_SCHED_GETCPU_SUPPORT