Commit feff0b61 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Change evlist->ctl_fd to use fdarray_flag__non_perf_event 



Patch "perf record: Fix way of handling non-perf-event pollfds" added a
generic way to handle non-perf-event file descriptors like evlist->ctl_fd.
Use it instead of handling evlist->ctl_fd separately.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220824072814.16422-4-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a032ad87

tools/perf/builtin-record.c

+1 −14
Original line number Diff line number Diff line
@@ -1198,18 +1198,7 @@ static int record__alloc_thread_data(struct record *rec, struct evlist *evlist) 
			if (ret < 0)

				goto out_free;



			if (evlist->ctl_fd.pos == -1)

				continue;

			ret = fdarray__dup_entry_from(&thread_data[t].pollfd, evlist->ctl_fd.pos,

						      &evlist->core.pollfd);

			if (ret < 0) {

				pr_err("Failed to duplicate descriptor in main thread pollfd\n");

				goto out_free;

			}

			thread_data[t].ctlfd_pos = ret;

			pr_debug2("thread_data[%p]: pollfd[%d] <- ctl_fd=%d\n",

				 thread_data, thread_data[t].ctlfd_pos,

				 evlist->core.pollfd.entries[evlist->ctl_fd.pos].fd);

			thread_data[t].ctlfd_pos = -1; /* Not used */

		}

	}
@@ -2614,8 +2603,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) 
			err = record__update_evlist_pollfd_from_thread(rec, rec->evlist, thread);

			if (err)

				goto out_child;

			evlist__ctlfd_update(rec->evlist,

				&thread->pollfd.entries[thread->ctlfd_pos]);

		}



		if (evlist__ctlfd_process(rec->evlist, &cmd) > 0) {

tools/perf/util/evlist.c

+2 −17
Original line number Diff line number Diff line
@@ -1898,7 +1898,8 @@ int evlist__initialize_ctlfd(struct evlist *evlist, int fd, int ack) 
	}



	evlist->ctl_fd.pos = perf_evlist__add_pollfd(&evlist->core, fd, NULL, POLLIN,

						     fdarray_flag__nonfilterable);

						     fdarray_flag__nonfilterable |

						     fdarray_flag__non_perf_event);

	if (evlist->ctl_fd.pos < 0) {

		evlist->ctl_fd.pos = -1;

		pr_err("Failed to add ctl fd entry: %m\n");
@@ -2148,22 +2149,6 @@ int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd) 
	return err;

}



int evlist__ctlfd_update(struct evlist *evlist, struct pollfd *update)

{

	int ctlfd_pos = evlist->ctl_fd.pos;

	struct pollfd *entries = evlist->core.pollfd.entries;



	if (!evlist__ctlfd_initialized(evlist))

		return 0;



	if (entries[ctlfd_pos].fd != update->fd ||

	    entries[ctlfd_pos].events != update->events)

		return -1;



	entries[ctlfd_pos].revents = update->revents;

	return 0;

}



struct evsel *evlist__find_evsel(struct evlist *evlist, int idx)

{

	struct evsel *evsel;

tools/perf/util/evlist.h

+0 −1
Original line number Diff line number Diff line
@@ -418,7 +418,6 @@ void evlist__close_control(int ctl_fd, int ctl_fd_ack, bool *ctl_fd_close); 
int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);

int evlist__finalize_ctlfd(struct evlist *evlist);

bool evlist__ctlfd_initialized(struct evlist *evlist);

int evlist__ctlfd_update(struct evlist *evlist, struct pollfd *update);

int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd);

int evlist__ctlfd_ack(struct evlist *evlist);