Skip to content

Commit

Permalink
issue: 1248185 Revert some vma_extra sockeXtreme names change
Browse files Browse the repository at this point in the history 
socketxtreme_get_socket_rings_fds -> get_socket_rings_fds.
socketxtreme_get_socket_rings_num -> get_socket_rings_num.
Those functions are not related only to sockeXtreme.

Signed-off-by: Rafi Wiener <[email protected]>
  • Loading branch information
@rafiw @liranoz12
rafiw authored and liranoz12 committed Dec 25, 2017
1 parent d9bf338 commit 676bcb6
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
8 changes: 4 additions & 4 deletions src/vma/sock/sock-redirect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ int vma_socketxtreme_free_vma_buff(vma_buff_t *buff)
#endif // DEFINED_SOCKETXTREME

extern "C"
int vma_socketxtreme_get_socket_rings_num(int fd)
int vma_get_socket_rings_num(int fd)
{
socket_fd_api* p_socket_object = NULL;
p_socket_object = fd_collection_get_sockfd(fd);
Expand All @@ -497,7 +497,7 @@ int vma_socketxtreme_get_socket_rings_num(int fd)


extern "C"
int vma_socketxtreme_get_socket_rings_fds(int fd, int *ring_fds, int ring_fds_sz)
int vma_get_socket_rings_fds(int fd, int *ring_fds, int ring_fds_sz)
{
int* p_rings_fds = NULL;
socket_fd_api* p_socket_object = NULL;
Expand Down Expand Up @@ -893,8 +893,8 @@ int getsockopt(int __fd, int __level, int __optname,
vma_api->add_conf_rule = vma_add_conf_rule;
vma_api->thread_offload = vma_thread_offload;

vma_api->socketxtreme_get_socket_rings_num = vma_socketxtreme_get_socket_rings_num;
vma_api->socketxtreme_get_socket_rings_fds = vma_socketxtreme_get_socket_rings_fds;
vma_api->get_socket_rings_num = vma_get_socket_rings_num;
vma_api->get_socket_rings_fds = vma_get_socket_rings_fds;
vma_api->vma_add_ring_profile = vma_add_ring_profile;
#ifdef DEFINED_SOCKETXTREME
vma_api->socketxtreme_free_vma_packets = vma_socketxtreme_free_vma_packets;
Expand Down
12 changes: 6 additions & 6 deletions src/vma/vma_extra.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ struct __attribute__ ((packed)) vma_api_t {
*
* * errno is set to: TBD...
*/
int (*socketxtreme_poll)(int fd, struct vma_completion_t* completions, unsigned int ncompletions, int flags);
int (*socketxtreme_poll)(int fd, struct vma_completion_t* completions, unsigned int ncompletions, int flags);

/**
* Returns the amount of rings that are associated with socket.
Expand All @@ -476,7 +476,7 @@ struct __attribute__ ((packed)) vma_api_t {
*
* errno is set to: EINVAL - not a VMA offloaded fd
*/
int (*socketxtreme_get_socket_rings_num)(int fd);
int (*get_socket_rings_num)(int fd);

/**
* Returns FDs of the rings that are associated with the socket.
Expand All @@ -493,7 +493,7 @@ struct __attribute__ ((packed)) vma_api_t {
*
* errno is set to: EINVAL - not a VMA offloaded fd + TBD
*/
int (*socketxtreme_get_socket_rings_fds)(int fd, int *ring_fds, int ring_fds_sz);
int (*get_socket_rings_fds)(int fd, int *ring_fds, int ring_fds_sz);

/**
* Frees packets received by socketxtreme_poll().
Expand Down Expand Up @@ -559,7 +559,7 @@ struct __attribute__ ((packed)) vma_api_t {

/**
* Get data from the MP_RQ cyclic buffer
* @param fd - the fd of the ring to query - get it using @ref socketxtreme_get_socket_rings_fds
* @param fd - the fd of the ring to query - get it using @ref get_socket_rings_fds
* @param completion results see @ref struct vma_completion_cb_t
* @param min min number of packet to return, if not available
* will return 0 packets
Expand Down Expand Up @@ -639,7 +639,7 @@ myapp_socket_main_loop()
//Get socket's ring, we skip reading the number of rings
//since connected TCP socket is associated with a single ring
if (vma_api) {
vma_api->socketxtreme_get_socket_rings_fds(fd, &ring, 1);
vma_api->get_socket_rings_fds(fd, &ring, 1);
}
else {
exit...
Expand Down Expand Up @@ -745,7 +745,7 @@ myapp_socket_main_loop()
//Get socket's ring, we skip reading the number of rings
//since connected UDP socket is associated with a single ring
if (vma_api) {
vma_api->socketxtreme_get_socket_rings_fds(fd, &ring, 1);
vma_api->get_socket_rings_fds(fd, &ring, 1);
}
else {
exit...
Expand Down
30 changes: 15 additions & 15 deletions tests/gtest/vma/vma_ring.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST_F(vma_ring, ti_1) {
int rc = EOK;
int ring_fd = UNDEFINED_VALUE;

rc = vma_api->socketxtreme_get_socket_rings_fds(0, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(0, &ring_fd, 1);
EXPECT_GE(0, rc);
EXPECT_EQ(UNDEFINED_VALUE, ring_fd);
}
Expand All @@ -59,7 +59,7 @@ TEST_F(vma_ring, ti_2) {
fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
ASSERT_LE(0, fd);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_GE(0, rc);
EXPECT_EQ(UNDEFINED_VALUE, ring_fd);

Expand All @@ -78,7 +78,7 @@ TEST_F(vma_ring, ti_3) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd);

Expand All @@ -97,7 +97,7 @@ TEST_F(vma_ring, ti_4) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd);

Expand All @@ -119,7 +119,7 @@ TEST_F(vma_ring, ti_5) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd);

Expand All @@ -134,7 +134,7 @@ TEST_F(vma_ring, ti_6) {
fd = socket(PF_INET, SOCK_STREAM, IPPROTO_IP);
ASSERT_LE(0, fd);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_GE(0, rc);
EXPECT_EQ(UNDEFINED_VALUE, ring_fd);

Expand All @@ -153,7 +153,7 @@ TEST_F(vma_ring, ti_7) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd);

Expand All @@ -175,7 +175,7 @@ TEST_F(vma_ring, ti_8) {
ASSERT_EQ(EINPROGRESS, errno);
ASSERT_EQ((-1), rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd);

Expand Down Expand Up @@ -204,7 +204,7 @@ TEST_F(vma_ring, ti_9) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd, 1);
EXPECT_GE(0, rc);
EXPECT_EQ(UNDEFINED_VALUE, ring_fd);

Expand Down Expand Up @@ -236,7 +236,7 @@ TEST_F(vma_ring, ti_10) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_bind, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_bind, 1);
EXPECT_GE(1, rc);
EXPECT_LE(0, ring_fd_bind);

Expand All @@ -251,7 +251,7 @@ TEST_F(vma_ring, ti_10) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_bind_opt, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_bind_opt, 1);
EXPECT_GE(1, rc);
EXPECT_LE(0, ring_fd_bind_opt);

Expand All @@ -262,7 +262,7 @@ TEST_F(vma_ring, ti_10) {
ASSERT_EQ(EINPROGRESS, errno);
ASSERT_EQ((-1), rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_connect, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_connect, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd_connect);

Expand Down Expand Up @@ -297,7 +297,7 @@ TEST_F(vma_ring, ti_11) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_bind_opt, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_bind_opt, 1);
EXPECT_GE(0, rc);
EXPECT_EQ(UNDEFINED_VALUE, ring_fd_bind_opt);

Expand All @@ -312,7 +312,7 @@ TEST_F(vma_ring, ti_11) {
ASSERT_EQ(EOK, errno);
ASSERT_EQ(0, rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_bind, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_bind, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd_bind);

Expand All @@ -323,7 +323,7 @@ TEST_F(vma_ring, ti_11) {
ASSERT_EQ(EINPROGRESS, errno);
ASSERT_EQ((-1), rc);

rc = vma_api->socketxtreme_get_socket_rings_fds(fd, &ring_fd_connect, 1);
rc = vma_api->get_socket_rings_fds(fd, &ring_fd_connect, 1);
EXPECT_EQ(1, rc);
EXPECT_LE(0, ring_fd_connect);

Expand Down
8 changes: 4 additions & 4 deletions tests/testbed/testbed.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ static int _udp_client_init(struct sockaddr_in *addr)
#if defined(VMA_ZCOPY_ENABLED) && (VMA_ZCOPY_ENABLED == 1)
/* Need to get ring after listen() or nonblocking connect() */
if (_vma_ring_fd < 0) {
_vma_api->socketxtreme_get_socket_rings_fds(fd, &_vma_ring_fd, 1);
_vma_api->get_socket_rings_fds(fd, &_vma_ring_fd, 1);
assert((-1) != _vma_ring_fd);
}
#endif /* VMA_ZCOPY_ENABLED */
Expand All @@ -1434,7 +1434,7 @@ static int _udp_server_init(int fd)
#if defined(VMA_ZCOPY_ENABLED) && (VMA_ZCOPY_ENABLED == 1)
/* Need to get ring after listen() or nonblocking connect() */
if (_vma_ring_fd < 0) {
_vma_api->socketxtreme_get_socket_rings_fds(fd, &_vma_ring_fd, 1);
_vma_api->get_socket_rings_fds(fd, &_vma_ring_fd, 1);
assert((-1) != _vma_ring_fd);
}
#endif /* VMA_ZCOPY_ENABLED */
Expand Down Expand Up @@ -1514,7 +1514,7 @@ static int _tcp_client_init(struct sockaddr_in *addr)
#if defined(VMA_ZCOPY_ENABLED) && (VMA_ZCOPY_ENABLED == 1)
/* Need to get ring after listen() or nonblocking connect() */
if (_vma_ring_fd < 0) {
_vma_api->socketxtreme_get_socket_rings_fds(fd, &_vma_ring_fd, 1);
_vma_api->get_socket_rings_fds(fd, &_vma_ring_fd, 1);
assert((-1) != _vma_ring_fd);
}
#endif /* VMA_ZCOPY_ENABLED */
Expand Down Expand Up @@ -1589,7 +1589,7 @@ static int _tcp_server_init(int fd)
/* Need to get ring after listen() or nonblocking connect() */
#if defined(VMA_ZCOPY_ENABLED) && (VMA_ZCOPY_ENABLED == 1)
if (_vma_ring_fd < 0) {
_vma_api->socketxtreme_get_socket_rings_fds(fd, &_vma_ring_fd, 1);
_vma_api->get_socket_rings_fds(fd, &_vma_ring_fd, 1);
assert((-1) != _vma_ring_fd);
}
#endif /* VMA_ZCOPY_ENABLED */
Expand Down

0 comments on commit 676bcb6

Please sign in to comment.