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

net: move common sock_group code out of posix_sock functions

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

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

75
lib/net/sock.c
View File

@ -439,31 +439,15 @@ spdk_posix_sock_group_create(void)
} }
sock_group->fd = fd; sock_group->fd = fd;
TAILQ_INIT(&sock_group->socks);
return sock_group; return sock_group;
} }
static int static int
spdk_posix_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, spdk_posix_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock)
spdk_sock_cb cb_fn, void *cb_arg)
{ {
int rc; int rc;
if (cb_fn == NULL) {
errno = EINVAL;
return -1;
}
if (sock->cb_fn != NULL) {
/*
* This sock is already part of a sock_group. Currently we don't
* support this.
*/
errno = EBUSY;
return -1;
}
#if defined(__linux__) #if defined(__linux__)
struct epoll_event event; struct epoll_event event;
@ -479,12 +463,6 @@ spdk_posix_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *
rc = kevent(group->fd, &event, 1, NULL, 0, &ts); rc = kevent(group->fd, &event, 1, NULL, 0, &ts);
#endif #endif
if (rc == 0) {
TAILQ_INSERT_TAIL(&group->socks, sock, link);
sock->cb_fn = cb_fn;
sock->cb_arg = cb_arg;
}
return rc; return rc;
} }
@ -509,12 +487,6 @@ spdk_posix_sock_group_remove_sock(struct spdk_sock_group *group, struct spdk_soc
errno = event.data; errno = event.data;
} }
#endif #endif
if (rc == 0) {
TAILQ_REMOVE(&group->socks, sock, link);
sock->cb_fn = NULL;
sock->cb_arg = NULL;
}
return rc; return rc;
} }
@ -667,20 +639,59 @@ spdk_sock_is_ipv4(struct spdk_sock *sock)
struct spdk_sock_group * struct spdk_sock_group *
spdk_sock_group_create(void) spdk_sock_group_create(void)
{ {
return spdk_posix_sock_group_create(); struct spdk_sock_group *group;
group = spdk_posix_sock_group_create();
if (group != NULL) {
TAILQ_INIT(&group->socks);
}
return group;
} }
int int
spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock,
spdk_sock_cb cb_fn, void *cb_arg) spdk_sock_cb cb_fn, void *cb_arg)
{ {
return spdk_posix_sock_group_add_sock(group, sock, cb_fn, cb_arg); int rc;
if (cb_fn == NULL) {
errno = EINVAL;
return -1;
}
if (sock->cb_fn != NULL) {
/*
* This sock is already part of a sock_group. Currently we don't
* support this.
*/
errno = EBUSY;
return -1;
}
rc = spdk_posix_sock_group_add_sock(group, sock);
if (rc == 0) {
TAILQ_INSERT_TAIL(&group->socks, sock, link);
sock->cb_fn = cb_fn;
sock->cb_arg = cb_arg;
}
return rc;
} }
int int
spdk_sock_group_remove_sock(struct spdk_sock_group *group, struct spdk_sock *sock) spdk_sock_group_remove_sock(struct spdk_sock_group *group, struct spdk_sock *sock)
{ {
return spdk_posix_sock_group_remove_sock(group, sock); int rc;
rc = spdk_posix_sock_group_remove_sock(group, sock);
if (rc == 0) {
TAILQ_REMOVE(&group->socks, sock, link);
sock->cb_fn = NULL;
sock->cb_arg = NULL;
}
return rc;
} }
int int