Commit ab4c1f9f authored by Alexey Budankov's avatar Alexey Budankov Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add flags to fdarray fds objects 



Store flags per struct pollfd *entries object in a bitmap of int size.

Implement fdarray_flag__nonfilterable flag to skip object from counting
by fdarray__filter().

Fixed fdarray test issue reported by kernel test robot.

Reported-by: default avatarkernel test robot <rong.a.chen@intel.com>
Signed-off-by: default avatarAlexey Budankov <alexey.budankov@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/6b7d43ff-0801-d5dd-4e90-fcd86b17c1c8@linux.intel.com


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

tools/lib/api/fd/array.c

+7 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <poll.h>

#include <stdlib.h>

#include <unistd.h>

#include <string.h>



void fdarray__init(struct fdarray *fda, int nr_autogrow)

{
@@ -19,7 +20,7 @@ void fdarray__init(struct fdarray *fda, int nr_autogrow) 


int fdarray__grow(struct fdarray *fda, int nr)

{

	void *priv;

	struct priv *priv;

	int nr_alloc = fda->nr_alloc + nr;

	size_t psize = sizeof(fda->priv[0]) * nr_alloc;

	size_t size  = sizeof(struct pollfd) * nr_alloc;
@@ -34,6 +35,9 @@ int fdarray__grow(struct fdarray *fda, int nr) 
		return -ENOMEM;

	}



	memset(&entries[fda->nr_alloc], 0, sizeof(struct pollfd) * nr);

	memset(&priv[fda->nr_alloc], 0, sizeof(fda->priv[0]) * nr);



	fda->nr_alloc = nr_alloc;

	fda->entries  = entries;

	fda->priv     = priv;
@@ -69,7 +73,7 @@ void fdarray__delete(struct fdarray *fda) 
	free(fda);

}



int fdarray__add(struct fdarray *fda, int fd, short revents)

int fdarray__add(struct fdarray *fda, int fd, short revents, enum fdarray_flags flags)

{

	int pos = fda->nr;
@@ -79,6 +83,7 @@ int fdarray__add(struct fdarray *fda, int fd, short revents) 


	fda->entries[fda->nr].fd     = fd;

	fda->entries[fda->nr].events = revents;

	fda->priv[fda->nr].flags = flags;

	fda->nr++;

	return pos;

}

tools/lib/api/fd/array.h

+12 −4
Original line number Diff line number Diff line
@@ -21,19 +21,27 @@ struct fdarray { 
	int	       nr_alloc;

	int	       nr_autogrow;

	struct pollfd *entries;

	struct priv {

		union {

			int    idx;

			void   *ptr;

		};

		unsigned int flags;

	} *priv;

};



enum fdarray_flags {

	fdarray_flag__default	    = 0x00000000,

	fdarray_flag__nonfilterable = 0x00000001

};



void fdarray__init(struct fdarray *fda, int nr_autogrow);

void fdarray__exit(struct fdarray *fda);



struct fdarray *fdarray__new(int nr_alloc, int nr_autogrow);

void fdarray__delete(struct fdarray *fda);



int fdarray__add(struct fdarray *fda, int fd, short revents);

int fdarray__add(struct fdarray *fda, int fd, short revents, enum fdarray_flags flags);

int fdarray__poll(struct fdarray *fda, int timeout);

int fdarray__filter(struct fdarray *fda, short revents,

		    void (*entry_destructor)(struct fdarray *fda, int fd, void *arg),

tools/lib/perf/evlist.c

+3 −3
Original line number Diff line number Diff line
@@ -305,9 +305,9 @@ int perf_evlist__alloc_pollfd(struct perf_evlist *evlist) 
}



int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,

			    void *ptr, short revent)

			    void *ptr, short revent, enum fdarray_flags flags)

{

	int pos = fdarray__add(&evlist->pollfd, fd, revent | POLLERR | POLLHUP);

	int pos = fdarray__add(&evlist->pollfd, fd, revent | POLLERR | POLLHUP, flags);



	if (pos >= 0) {

		evlist->pollfd.priv[pos].ptr = ptr;
@@ -488,7 +488,7 @@ mmap_per_evsel(struct perf_evlist *evlist, struct perf_evlist_mmap_ops *ops, 
		revent = !overwrite ? POLLIN : 0;



		if (!evsel->system_wide &&

		    perf_evlist__add_pollfd(evlist, fd, map, revent) < 0) {

		    perf_evlist__add_pollfd(evlist, fd, map, revent, fdarray_flag__default) < 0) {

			perf_mmap__put(map);

			return -1;

		}

tools/lib/perf/include/internal/evlist.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct perf_evlist_mmap_ops { 


int perf_evlist__alloc_pollfd(struct perf_evlist *evlist);

int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,

			    void *ptr, short revent);

			    void *ptr, short revent, enum fdarray_flags flags);



int perf_evlist__mmap_ops(struct perf_evlist *evlist,

			  struct perf_evlist_mmap_ops *ops,

tools/perf/tests/fdarray.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int test__fdarray__add(struct test *test __maybe_unused, int subtest __maybe_unu 
	}



#define FDA_ADD(_idx, _fd, _revents, _nr)				   \

	if (fdarray__add(fda, _fd, _revents) < 0) {			   \

	if (fdarray__add(fda, _fd, _revents, fdarray_flag__default) < 0) { \

		pr_debug("\n%d: fdarray__add(fda, %d, %d) failed!",	   \

			 __LINE__,_fd, _revents);			   \

		goto out_delete;					   \

CRA Git | Maintained and supported by SUSTech CRA and CCSE