Skip to content

Commit

Permalink
perf tools: Move get_current_dir_name() cond prototype out of util.h
Browse files Browse the repository at this point in the history
And in a separate header, so that we erode util.h a bit more.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-xpzvuu9d0gei9jl9bkzgobln@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 9, 2019
1 parent 245aec7 commit e5653eb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
6 changes: 3 additions & 3 deletions tools/perf/util/get_current_dir_name.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
// Copyright (C) 2018, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
// SPDX-License-Identifier: LGPL-2.1
// Copyright (C) 2018, 2019 Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
//
#ifndef HAVE_GET_CURRENT_DIR_NAME
#include "util.h"
#include "get_current_dir_name.h"
#include <unistd.h>
#include <stdlib.h>
#include <stdlib.h>
Expand Down
8 changes: 8 additions & 0 deletions tools/perf/util/get_current_dir_name.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// SPDX-License-Identifier: LGPL-2.1
// Copyright (C) 2018, 2019 Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
//
#ifndef __PERF_GET_CURRENT_DIR_NAME_H
#ifndef HAVE_GET_CURRENT_DIR_NAME
char *get_current_dir_name(void);
#endif // HAVE_GET_CURRENT_DIR_NAME
#endif // __PERF_GET_CURRENT_DIR_NAME_H
1 change: 1 addition & 0 deletions tools/perf/util/namespaces.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "namespaces.h"
#include "util.h"
#include "event.h"
#include "get_current_dir_name.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Expand Down
4 changes: 0 additions & 4 deletions tools/perf/util/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ int fetch_kernel_version(unsigned int *puint,

const char *perf_tip(const char *dirpath);

#ifndef HAVE_GET_CURRENT_DIR_NAME
char *get_current_dir_name(void);
#endif

#ifndef HAVE_SCHED_GETCPU_SUPPORT
int sched_getcpu(void);
#endif
Expand Down

0 comments on commit e5653eb

Please sign in to comment.