kevin/linux
1
Fork 0
Code

perf header: Remove repipe option

Browse Source 
No longer used by `perf inject` the repipe_fd is always -1 and repipe
is always false. Remove the options and associated code knowing the
constant values of the removed variables.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20240829150154.37929-8-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2024-08-29 08:01:53 -07:00 committed by Arnaldo Carvalho de Melo
parent 89d64e7273
commit 2d57c32b32
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/util/header.c
View File

@ -4113,13 +4113,8 @@ static int perf_file_section__process(struct perf_file_section *section,
static int perf_file_header__read_pipe(struct perf_pipe_file_header *header,
struct perf_header *ph,
struct perf_data* data,
bool repipe, int repipe_fd)
struct perf_data *data)
{
struct feat_fd ff = {
.fd = repipe_fd,
.ph = ph,
};
ssize_t ret;
ret = perf_data__read(data, header, sizeof(*header));
@ -4134,19 +4129,15 @@ static int perf_file_header__read_pipe(struct perf_pipe_file_header *header,
if (ph->needs_swap)
header->size = bswap_64(header->size);
if (repipe && do_write(&ff, header, sizeof(*header)) < 0)
return -1;
return 0;
}
static int perf_header__read_pipe(struct perf_session *session, int repipe_fd)
static int perf_header__read_pipe(struct perf_session *session)
{
struct perf_header *header = &session->header;
struct perf_pipe_file_header f_header;
if (perf_file_header__read_pipe(&f_header, header, session->data,
/*repipe=*/false, repipe_fd) < 0) {
if (perf_file_header__read_pipe(&f_header, header, session->data) < 0) {
pr_debug("incompatible file format\n");
return -EINVAL;
}
@ -4246,7 +4237,7 @@ static int evlist__prepare_tracepoint_events(struct evlist *evlist, struct tep_h
}
#endif
int perf_session__read_header(struct perf_session *session, int repipe_fd)
int perf_session__read_header(struct perf_session *session)
{
struct perf_data *data = session->data;
struct perf_header *header = &session->header;
@ -4267,7 +4258,7 @@ int perf_session__read_header(struct perf_session *session, int repipe_fd)
* We can read 'pipe' data event from regular file,
* check for the pipe header regardless of source.
*/
err = perf_header__read_pipe(session, repipe_fd);
err = perf_header__read_pipe(session);
if (!err || perf_data__is_pipe(data)) {
data->is_pipe = true;
return err;

2
tools/perf/util/header.h
View File

@ -131,7 +131,7 @@ union perf_event;
extern const char perf_version_string[];
int perf_session__read_header(struct perf_session *session, int repipe_fd);
int perf_session__read_header(struct perf_session *session);
int perf_session__write_header(struct perf_session *session,
struct evlist *evlist,
int fd, bool at_exit);

6
tools/perf/util/session.c
View File

@ -45,11 +45,11 @@ static int perf_session__deliver_event(struct perf_session *session,
u64 file_offset,
const char *file_path);
static int perf_session__open(struct perf_session *session, int repipe_fd)
static int perf_session__open(struct perf_session *session)
{
struct perf_data *data = session->data;
if (perf_session__read_header(session, repipe_fd) < 0) {
if (perf_session__read_header(session) < 0) {
pr_err("incompatible file format (rerun with -v to learn more)\n");
return -1;
}
@ -162,7 +162,7 @@ struct perf_session *__perf_session__new(struct perf_data *data,
session->data = data;
if (perf_data__is_read(data)) {
ret = perf_session__open(session, /*repipe_fd=*/-1);
ret = perf_session__open(session);
if (ret < 0)
goto out_delete;