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: kernel test robot <rong.a.chen@intel.com> Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Namhyung 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
59b4412f27
commit
ab4c1f9f68
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user