ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: make the sock_group_poll code more generic

Browse Source 
Have the main spdk_sock_group_poll_count routine
just pass an array of sock pointers to the posix
implementation function.  Then the posix implementation
can just fill out which spdk_socks have data and let
the caller do the callback routines.

This moves a fair bit of code from the posix implementation
to the common code, which will simplify the upcoming
VPP implementation.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I547821ce9875777448f433cae59e316a45c259f6

Reviewed-on: https://review.gerrithub.io/400332
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Jim Harris 2018-02-16 14:18:23 -07:00 committed by Daniel Verkamp
parent 7e5f56de06
commit 4a6fe72ec0
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/net/sock.c
View File

@ -491,24 +491,11 @@ spdk_posix_sock_group_remove_sock(struct spdk_sock_group *group, struct spdk_soc
} }
static int static int
spdk_posix_sock_group_poll_count(struct spdk_sock_group *group, int max_events) spdk_posix_sock_group_poll_count(struct spdk_sock_group *group, int max_events,
struct spdk_sock **socks)
{ {
struct spdk_sock *sock;
int num_events, i; int num_events, i;
if (max_events < 1) {
errno = -EINVAL;
return -1;
}
/*
* Only poll for up to 32 events at a time - if more events are pending,
* the next call to this function will reap them.
*/
if (max_events > MAX_EVENTS_PER_POLL) {
max_events = MAX_EVENTS_PER_POLL;
}
#if defined(__linux__) #if defined(__linux__)
struct epoll_event events[MAX_EVENTS_PER_POLL]; struct epoll_event events[MAX_EVENTS_PER_POLL];
@ -526,16 +513,13 @@ spdk_posix_sock_group_poll_count(struct spdk_sock_group *group, int max_events)
for (i = 0; i < num_events; i++) { for (i = 0; i < num_events; i++) {
#if defined(__linux__) #if defined(__linux__)
sock = events[i].data.ptr; socks[i] = events[i].data.ptr;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
sock = events[i].udata; socks[i] = events[i].udata;
#endif #endif
assert(sock->cb_fn != NULL);
sock->cb_fn(sock->cb_arg, group, sock);
} }
return 0; return num_events;
} }
static int static int
@ -703,7 +687,34 @@ spdk_sock_group_poll(struct spdk_sock_group *group)
int int
spdk_sock_group_poll_count(struct spdk_sock_group *group, int max_events) spdk_sock_group_poll_count(struct spdk_sock_group *group, int max_events)
{ {
return spdk_posix_sock_group_poll_count(group, max_events); struct spdk_sock *socks[MAX_EVENTS_PER_POLL];
int num_events, i;
if (max_events < 1) {
errno = -EINVAL;
return -1;
}
/*
* Only poll for up to 32 events at a time - if more events are pending,
* the next call to this function will reap them.
*/
if (max_events > MAX_EVENTS_PER_POLL) {
max_events = MAX_EVENTS_PER_POLL;
}
num_events = spdk_posix_sock_group_poll_count(group, max_events, socks);
if (num_events == -1) {
return -1;
}
for (i = 0; i < num_events; i++) {
struct spdk_sock *sock = socks[i];
assert(sock->cb_fn != NULL);
sock->cb_fn(sock->cb_arg, group, sock);
}
return 0;
} }
int int