mirror of https://github.com/grpc/grpc.git
Merge pull request #18298 from yashykt/deletepollcv
Nuking the poll-cv polling enginepull/18151/head
Jan Tattermusch
6 years ago
committed by
GitHub
commit
7f87087354
31 changed files with 38 additions and 1189 deletions
@ -1,107 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
|
||||
#ifdef GRPC_POSIX_WAKEUP_FD |
||||
|
||||
#include "src/core/lib/iomgr/wakeup_fd_cv.h" |
||||
|
||||
#include <errno.h> |
||||
#include <string.h> |
||||
|
||||
#include <grpc/support/alloc.h> |
||||
#include <grpc/support/log.h> |
||||
#include <grpc/support/sync.h> |
||||
#include <grpc/support/time.h> |
||||
|
||||
#include "src/core/lib/gpr/useful.h" |
||||
#include "src/core/lib/gprpp/thd.h" |
||||
|
||||
#define MAX_TABLE_RESIZE 256 |
||||
|
||||
extern grpc_cv_fd_table g_cvfds; |
||||
|
||||
static grpc_error* cv_fd_init(grpc_wakeup_fd* fd_info) { |
||||
unsigned int i, newsize; |
||||
int idx; |
||||
gpr_mu_lock(&g_cvfds.mu); |
||||
if (!g_cvfds.free_fds) { |
||||
newsize = GPR_MIN(g_cvfds.size * 2, g_cvfds.size + MAX_TABLE_RESIZE); |
||||
g_cvfds.cvfds = static_cast<grpc_fd_node*>( |
||||
gpr_realloc(g_cvfds.cvfds, sizeof(grpc_fd_node) * newsize)); |
||||
for (i = g_cvfds.size; i < newsize; i++) { |
||||
g_cvfds.cvfds[i].is_set = 0; |
||||
g_cvfds.cvfds[i].cvs = nullptr; |
||||
g_cvfds.cvfds[i].next_free = g_cvfds.free_fds; |
||||
g_cvfds.free_fds = &g_cvfds.cvfds[i]; |
||||
} |
||||
g_cvfds.size = newsize; |
||||
} |
||||
|
||||
idx = static_cast<int>(g_cvfds.free_fds - g_cvfds.cvfds); |
||||
g_cvfds.free_fds = g_cvfds.free_fds->next_free; |
||||
g_cvfds.cvfds[idx].cvs = nullptr; |
||||
g_cvfds.cvfds[idx].is_set = 0; |
||||
fd_info->read_fd = GRPC_IDX_TO_FD(idx); |
||||
fd_info->write_fd = -1; |
||||
gpr_mu_unlock(&g_cvfds.mu); |
||||
return GRPC_ERROR_NONE; |
||||
} |
||||
|
||||
static grpc_error* cv_fd_wakeup(grpc_wakeup_fd* fd_info) { |
||||
grpc_cv_node* cvn; |
||||
gpr_mu_lock(&g_cvfds.mu); |
||||
g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)].is_set = 1; |
||||
cvn = g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)].cvs; |
||||
while (cvn) { |
||||
gpr_cv_signal(cvn->cv); |
||||
cvn = cvn->next; |
||||
} |
||||
gpr_mu_unlock(&g_cvfds.mu); |
||||
return GRPC_ERROR_NONE; |
||||
} |
||||
|
||||
static grpc_error* cv_fd_consume(grpc_wakeup_fd* fd_info) { |
||||
gpr_mu_lock(&g_cvfds.mu); |
||||
g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)].is_set = 0; |
||||
gpr_mu_unlock(&g_cvfds.mu); |
||||
return GRPC_ERROR_NONE; |
||||
} |
||||
|
||||
static void cv_fd_destroy(grpc_wakeup_fd* fd_info) { |
||||
if (fd_info->read_fd == 0) { |
||||
return; |
||||
} |
||||
gpr_mu_lock(&g_cvfds.mu); |
||||
// Assert that there are no active pollers
|
||||
GPR_ASSERT(!g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)].cvs); |
||||
g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)].next_free = g_cvfds.free_fds; |
||||
g_cvfds.free_fds = &g_cvfds.cvfds[GRPC_FD_TO_IDX(fd_info->read_fd)]; |
||||
gpr_mu_unlock(&g_cvfds.mu); |
||||
} |
||||
|
||||
static int cv_check_availability(void) { return 1; } |
||||
|
||||
const grpc_wakeup_fd_vtable grpc_cv_wakeup_fd_vtable = { |
||||
cv_fd_init, cv_fd_consume, cv_fd_wakeup, cv_fd_destroy, |
||||
cv_check_availability}; |
||||
|
||||
#endif /* GRPC_POSIX_WAKUP_FD */ |
||||
@ -1,69 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
/*
|
||||
* wakeup_fd_cv uses condition variables to implement wakeup fds. |
||||
* |
||||
* It is intended for use only in cases when eventfd() and pipe() are not |
||||
* available. It can only be used with the "poll" engine. |
||||
* |
||||
* Implementation: |
||||
* A global table of cv wakeup fds is mantained. A cv wakeup fd is a negative |
||||
* file descriptor. poll() is then run in a background thread with only the |
||||
* real socket fds while we wait on a condition variable trigged by either the |
||||
* poll() completion or a wakeup_fd() call. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef GRPC_CORE_LIB_IOMGR_WAKEUP_FD_CV_H |
||||
#define GRPC_CORE_LIB_IOMGR_WAKEUP_FD_CV_H |
||||
|
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include <grpc/support/sync.h> |
||||
|
||||
#include "src/core/lib/iomgr/ev_posix.h" |
||||
|
||||
#define GRPC_FD_TO_IDX(fd) (-(fd)-1) |
||||
#define GRPC_IDX_TO_FD(idx) (-(idx)-1) |
||||
|
||||
typedef struct grpc_cv_node { |
||||
gpr_cv* cv; |
||||
struct grpc_cv_node* next; |
||||
struct grpc_cv_node* prev; |
||||
} grpc_cv_node; |
||||
|
||||
typedef struct grpc_fd_node { |
||||
int is_set; |
||||
grpc_cv_node* cvs; |
||||
struct grpc_fd_node* next_free; |
||||
} grpc_fd_node; |
||||
|
||||
typedef struct grpc_cv_fd_table { |
||||
gpr_mu mu; |
||||
gpr_refcount pollcount; |
||||
gpr_cv shutdown_cv; |
||||
grpc_fd_node* cvfds; |
||||
grpc_fd_node* free_fds; |
||||
unsigned int size; |
||||
grpc_poll_function_type poll; |
||||
} grpc_cv_fd_table; |
||||
|
||||
extern const grpc_wakeup_fd_vtable grpc_cv_wakeup_fd_vtable; |
||||
|
||||
#endif /* GRPC_CORE_LIB_IOMGR_WAKEUP_FD_CV_H */ |
||||
@ -1,243 +0,0 @@ |
||||
/*
|
||||
* |
||||
* Copyright 2016 gRPC authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
* |
||||
*/ |
||||
|
||||
#include "src/core/lib/iomgr/port.h" |
||||
|
||||
#ifdef GRPC_POSIX_SOCKET |
||||
|
||||
#include <pthread.h> |
||||
|
||||
#include <grpc/support/log.h> |
||||
#include <grpc/support/time.h> |
||||
|
||||
#include "src/core/lib/gpr/env.h" |
||||
#include "src/core/lib/gprpp/thd.h" |
||||
#include "src/core/lib/iomgr/ev_posix.h" |
||||
#include "src/core/lib/iomgr/iomgr_posix.h" |
||||
|
||||
typedef struct poll_args { |
||||
struct pollfd* fds; |
||||
nfds_t nfds; |
||||
int timeout; |
||||
int result; |
||||
} poll_args; |
||||
|
||||
gpr_cv poll_cv; |
||||
gpr_mu poll_mu; |
||||
static int socket_event = 0; |
||||
|
||||
// Trigger a "socket" POLLIN in mock_poll()
|
||||
void trigger_socket_event() { |
||||
gpr_mu_lock(&poll_mu); |
||||
socket_event = 1; |
||||
gpr_cv_broadcast(&poll_cv); |
||||
gpr_mu_unlock(&poll_mu); |
||||
} |
||||
|
||||
void reset_socket_event() { |
||||
gpr_mu_lock(&poll_mu); |
||||
socket_event = 0; |
||||
gpr_mu_unlock(&poll_mu); |
||||
} |
||||
|
||||
// Mocks posix poll() function
|
||||
int mock_poll(struct pollfd* fds, nfds_t nfds, int timeout) { |
||||
int res = 0; |
||||
gpr_timespec poll_time; |
||||
gpr_mu_lock(&poll_mu); |
||||
GPR_ASSERT(nfds == 3); |
||||
GPR_ASSERT(fds[0].fd == 20); |
||||
GPR_ASSERT(fds[1].fd == 30); |
||||
GPR_ASSERT(fds[2].fd == 50); |
||||
GPR_ASSERT(fds[0].events == (POLLIN | POLLHUP)); |
||||
GPR_ASSERT(fds[1].events == (POLLIN | POLLHUP)); |
||||
GPR_ASSERT(fds[2].events == POLLIN); |
||||
|
||||
if (timeout < 0) { |
||||
poll_time = gpr_inf_future(GPR_CLOCK_REALTIME); |
||||
} else { |
||||
poll_time = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), |
||||
gpr_time_from_millis(timeout, GPR_TIMESPAN)); |
||||
} |
||||
|
||||
if (socket_event || !gpr_cv_wait(&poll_cv, &poll_mu, poll_time)) { |
||||
fds[0].revents = POLLIN; |
||||
res = 1; |
||||
} |
||||
gpr_mu_unlock(&poll_mu); |
||||
return res; |
||||
} |
||||
|
||||
void background_poll(void* args) { |
||||
poll_args* pargs = static_cast<poll_args*>(args); |
||||
pargs->result = grpc_poll_function(pargs->fds, pargs->nfds, pargs->timeout); |
||||
} |
||||
|
||||
void test_many_fds(void) { |
||||
int i; |
||||
grpc_wakeup_fd fd[1000]; |
||||
for (i = 0; i < 1000; i++) { |
||||
GPR_ASSERT(grpc_wakeup_fd_init(&fd[i]) == GRPC_ERROR_NONE); |
||||
} |
||||
for (i = 0; i < 1000; i++) { |
||||
grpc_wakeup_fd_destroy(&fd[i]); |
||||
} |
||||
} |
||||
|
||||
void test_poll_cv_trigger(void) { |
||||
grpc_wakeup_fd cvfd1, cvfd2, cvfd3; |
||||
struct pollfd pfds[6]; |
||||
poll_args pargs; |
||||
|
||||
GPR_ASSERT(grpc_wakeup_fd_init(&cvfd1) == GRPC_ERROR_NONE); |
||||
GPR_ASSERT(grpc_wakeup_fd_init(&cvfd2) == GRPC_ERROR_NONE); |
||||
GPR_ASSERT(grpc_wakeup_fd_init(&cvfd3) == GRPC_ERROR_NONE); |
||||
GPR_ASSERT(cvfd1.read_fd < 0); |
||||
GPR_ASSERT(cvfd2.read_fd < 0); |
||||
GPR_ASSERT(cvfd3.read_fd < 0); |
||||
GPR_ASSERT(cvfd1.read_fd != cvfd2.read_fd); |
||||
GPR_ASSERT(cvfd2.read_fd != cvfd3.read_fd); |
||||
GPR_ASSERT(cvfd1.read_fd != cvfd3.read_fd); |
||||
|
||||
pfds[0].fd = cvfd1.read_fd; |
||||
pfds[1].fd = cvfd2.read_fd; |
||||
pfds[2].fd = 20; |
||||
pfds[3].fd = 30; |
||||
pfds[4].fd = cvfd3.read_fd; |
||||
pfds[5].fd = 50; |
||||
|
||||
pfds[0].events = 0; |
||||
pfds[1].events = POLLIN; |
||||
pfds[2].events = POLLIN | POLLHUP; |
||||
pfds[3].events = POLLIN | POLLHUP; |
||||
pfds[4].events = POLLIN; |
||||
pfds[5].events = POLLIN; |
||||
|
||||
pargs.fds = pfds; |
||||
pargs.nfds = 6; |
||||
pargs.timeout = 1000; |
||||
pargs.result = -2; |
||||
|
||||
{ |
||||
grpc_core::Thread thd("grpc_background_poll", &background_poll, &pargs); |
||||
thd.Start(); |
||||
// Wakeup wakeup_fd not listening for events
|
||||
GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd1) == GRPC_ERROR_NONE); |
||||
thd.Join(); |
||||
GPR_ASSERT(pargs.result == 0); |
||||
GPR_ASSERT(pfds[0].revents == 0); |
||||
GPR_ASSERT(pfds[1].revents == 0); |
||||
GPR_ASSERT(pfds[2].revents == 0); |
||||
GPR_ASSERT(pfds[3].revents == 0); |
||||
GPR_ASSERT(pfds[4].revents == 0); |
||||
GPR_ASSERT(pfds[5].revents == 0); |
||||
} |
||||
|
||||
{ |
||||
// Pollin on socket fd
|
||||
pargs.timeout = -1; |
||||
pargs.result = -2; |
||||
grpc_core::Thread thd("grpc_background_poll", &background_poll, &pargs); |
||||
thd.Start(); |
||||
trigger_socket_event(); |
||||
thd.Join(); |
||||
GPR_ASSERT(pargs.result == 1); |
||||
GPR_ASSERT(pfds[0].revents == 0); |
||||
GPR_ASSERT(pfds[1].revents == 0); |
||||
GPR_ASSERT(pfds[2].revents == POLLIN); |
||||
GPR_ASSERT(pfds[3].revents == 0); |
||||
GPR_ASSERT(pfds[4].revents == 0); |
||||
GPR_ASSERT(pfds[5].revents == 0); |
||||
} |
||||
|
||||
{ |
||||
// Pollin on wakeup fd
|
||||
reset_socket_event(); |
||||
pargs.result = -2; |
||||
grpc_core::Thread thd("grpc_background_poll", &background_poll, &pargs); |
||||
thd.Start(); |
||||
GPR_ASSERT(grpc_wakeup_fd_wakeup(&cvfd2) == GRPC_ERROR_NONE); |
||||
thd.Join(); |
||||
|
||||
GPR_ASSERT(pargs.result == 1); |
||||
GPR_ASSERT(pfds[0].revents == 0); |
||||
GPR_ASSERT(pfds[1].revents == POLLIN); |
||||
GPR_ASSERT(pfds[2].revents == 0); |
||||
GPR_ASSERT(pfds[3].revents == 0); |
||||
GPR_ASSERT(pfds[4].revents == 0); |
||||
GPR_ASSERT(pfds[5].revents == 0); |
||||
} |
||||
|
||||
{ |
||||
// Pollin on wakeupfd before poll()
|
||||
pargs.result = -2; |
||||
grpc_core::Thread thd("grpc_background_poll", &background_poll, &pargs); |
||||
thd.Start(); |
||||
thd.Join(); |
||||
|
||||
GPR_ASSERT(pargs.result == 1); |
||||
GPR_ASSERT(pfds[0].revents == 0); |
||||
GPR_ASSERT(pfds[1].revents == POLLIN); |
||||
GPR_ASSERT(pfds[2].revents == 0); |
||||
GPR_ASSERT(pfds[3].revents == 0); |
||||
GPR_ASSERT(pfds[4].revents == 0); |
||||
GPR_ASSERT(pfds[5].revents == 0); |
||||
} |
||||
|
||||
{ |
||||
// No Events
|
||||
pargs.result = -2; |
||||
pargs.timeout = 1000; |
||||
reset_socket_event(); |
||||
GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd1) == GRPC_ERROR_NONE); |
||||
GPR_ASSERT(grpc_wakeup_fd_consume_wakeup(&cvfd2) == GRPC_ERROR_NONE); |
||||
grpc_core::Thread thd("grpc_background_poll", &background_poll, &pargs); |
||||
thd.Start(); |
||||
thd.Join(); |
||||
|
||||
GPR_ASSERT(pargs.result == 0); |
||||
GPR_ASSERT(pfds[0].revents == 0); |
||||
GPR_ASSERT(pfds[1].revents == 0); |
||||
GPR_ASSERT(pfds[2].revents == 0); |
||||
GPR_ASSERT(pfds[3].revents == 0); |
||||
GPR_ASSERT(pfds[4].revents == 0); |
||||
GPR_ASSERT(pfds[5].revents == 0); |
||||
} |
||||
} |
||||
|
||||
int main(int argc, char** argv) { |
||||
gpr_setenv("GRPC_POLL_STRATEGY", "poll-cv"); |
||||
grpc_poll_function = &mock_poll; |
||||
gpr_mu_init(&poll_mu); |
||||
gpr_cv_init(&poll_cv); |
||||
grpc_determine_iomgr_platform(); |
||||
grpc_iomgr_platform_init(); |
||||
test_many_fds(); |
||||
grpc_iomgr_platform_shutdown(); |
||||
|
||||
grpc_iomgr_platform_init(); |
||||
test_poll_cv_trigger(); |
||||
grpc_iomgr_platform_shutdown(); |
||||
return 0; |
||||
} |
||||
|
||||
#else /* GRPC_POSIX_SOCKET */ |
||||
|
||||
int main(int argc, char** argv) { return 1; } |
||||
|
||||
#endif /* GRPC_POSIX_SOCKET */ |
||||
Loading…
Reference in new issue