From 88ef00efbe0ec62110b405e02e4bbbec59f6435b Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 17 May 2016 09:31:49 -0700
Subject: [PATCH] Remove broken test
---
src/core/lib/surface/server.c | 37 +++++----
test/core/iomgr/fd_posix_test.c | 130 --------------------------------
2 files changed, 23 insertions(+), 144 deletions(-)
diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c
index 5d2f3ee2f2..4d179d0ab1 100644
--- a/src/core/lib/surface/server.c
+++ b/src/core/lib/surface/server.c
@@ -197,6 +197,7 @@ struct grpc_server {
grpc_completion_queue **cqs;
grpc_pollset **pollsets;
size_t cq_count;
+ bool started;
/* The two following mutexes control access to server-state
mu_global controls access to non-call-related state (e.g., channel state)
@@ -369,17 +370,21 @@ static void server_delete(grpc_exec_ctx *exec_ctx, grpc_server *server) {
gpr_mu_destroy(&server->mu_call);
while ((rm = server->registered_methods) != NULL) {
server->registered_methods = rm->next;
- for (i = 0; i < server->cq_count; i++) {
- request_matcher_destroy(&rm->request_matchers[i]);
+ if (server->started) {
+ for (i = 0; i < server->cq_count; i++) {
+ request_matcher_destroy(&rm->request_matchers[i]);
+ }
+ gpr_free(rm->request_matchers);
}
- gpr_free(rm->request_matchers);
gpr_free(rm->method);
gpr_free(rm->host);
gpr_free(rm);
}
for (i = 0; i < server->cq_count; i++) {
GRPC_CQ_INTERNAL_UNREF(server->cqs[i], "server");
- request_matcher_destroy(&server->unregistered_request_matchers[i]);
+ if (server->started) {
+ request_matcher_destroy(&server->unregistered_request_matchers[i]);
+ }
}
gpr_stack_lockfree_destroy(server->request_freelist);
gpr_free(server->unregistered_request_matchers);
@@ -649,16 +654,19 @@ static int num_channels(grpc_server *server) {
static void kill_pending_work_locked(grpc_exec_ctx *exec_ctx,
grpc_server *server) {
- for (size_t i = 0; i < server->cq_count; i++) {
- request_matcher_kill_requests(exec_ctx, server,
- &server->unregistered_request_matchers[i]);
- request_matcher_zombify_all_pending_calls(
- exec_ctx, &server->unregistered_request_matchers[i]);
- for (registered_method *rm = server->registered_methods; rm;
- rm = rm->next) {
- request_matcher_kill_requests(exec_ctx, server, &rm->request_matchers[i]);
- request_matcher_zombify_all_pending_calls(exec_ctx,
- &rm->request_matchers[i]);
+ if (server->started) {
+ for (size_t i = 0; i < server->cq_count; i++) {
+ request_matcher_kill_requests(exec_ctx, server,
+ &server->unregistered_request_matchers[i]);
+ request_matcher_zombify_all_pending_calls(
+ exec_ctx, &server->unregistered_request_matchers[i]);
+ for (registered_method *rm = server->registered_methods; rm;
+ rm = rm->next) {
+ request_matcher_kill_requests(exec_ctx, server,
+ &rm->request_matchers[i]);
+ request_matcher_zombify_all_pending_calls(exec_ctx,
+ &rm->request_matchers[i]);
+ }
}
}
}
@@ -1036,6 +1044,7 @@ void grpc_server_start(grpc_server *server) {
GRPC_API_TRACE("grpc_server_start(server=%p)", 1, (server));
+ server->started = true;
server->pollsets = gpr_malloc(sizeof(grpc_pollset *) * server->cq_count);
server->unregistered_request_matchers = gpr_malloc(
sizeof(*server->unregistered_request_matchers) * server->cq_count);
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index 187720e1de..f97f33712e 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -518,134 +518,6 @@ static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, bool success) {
grpc_pollset_destroy(p);
}
-typedef struct read_notifier_test_fd_context {
- grpc_fd *fd;
- bool is_cb_called;
-} read_notifier_test_fd_context;
-
-static void read_notifier_test_callback(
- grpc_exec_ctx *exec_ctx, void *arg /* (read_notifier_test_fd_context *) */,
- bool success) {
- read_notifier_test_fd_context *fd_context = arg;
- grpc_fd *fd = fd_context->fd;
-
- /* Verify that the read notifier pollset is set */
- GPR_ASSERT(grpc_fd_get_read_notifier_pollset(exec_ctx, fd) != NULL);
- fd_context->is_cb_called = true;
-}
-
-/* sv MUST to be an array of size 2 */
-static void get_socket_pair(int sv[]) {
- int flags = 0;
- GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0);
- flags = fcntl(sv[0], F_GETFL, 0);
- GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0);
- flags = fcntl(sv[1], F_GETFL, 0);
- GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0);
-}
-
-static grpc_pollset *create_grpc_pollset(gpr_mu **mu) {
- grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
- grpc_pollset_init(pollset, mu);
- return pollset;
-}
-
-static void free_grpc_pollset(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset) {
- grpc_closure destroyed;
- grpc_closure_init(&destroyed, destroy_pollset, pollset);
- grpc_pollset_shutdown(exec_ctx, pollset, &destroyed);
- grpc_exec_ctx_flush(exec_ctx);
- gpr_free(pollset);
-}
-
-/* This tests that the read_notifier_pollset field of a grpc_fd is properly
- set when the grpc_fd becomes readable
- - This tests both basic and multi pollsets
- - The parameter register_cb_after_read_event controls whether the on-read
- callback registration (i.e the one done by grpc_fd_notify_on_read()) is
- done either before or after the fd becomes readable
- */
-static void test_grpc_fd_read_notifier_pollset(
- bool register_cb_after_read_event) {
- grpc_fd *em_fd[2];
- int sv[2][2];
- gpr_mu *mu[2];
- grpc_pollset *pollset[2];
- char data;
- ssize_t result;
- int i;
- grpc_pollset_worker *worker;
- read_notifier_test_fd_context fd_context;
- grpc_closure on_read_closure;
- grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
-
- for (i = 0; i < 2; i++) {
- pollset[i] = create_grpc_pollset(&mu[i]);
- get_socket_pair(sv[i]); /* sv[i][0] & sv[i][1] will have the socket pair */
- em_fd[i] = grpc_fd_create(sv[i][0], "test_grpc_fd_read_notifier_pollset");
- grpc_pollset_add_fd(&exec_ctx, pollset[i], em_fd[i]);
- }
-
- /* At this point pollset[0] has em_fd[0] and pollset[1] has em_fd[1] and both
- are basic pollsets. Make pollset[1] a multi-pollset by adding em_fd[0] to
- it */
- grpc_pollset_add_fd(&exec_ctx, pollset[1], em_fd[0]);
- grpc_exec_ctx_flush(&exec_ctx);
-
- /* The following tests that the read_notifier_pollset is correctly set on the
- grpc_fd structure in both basic pollset and multi pollset cases.
- pollset[0] is a basic pollset containing just em_fd[0]
- pollset[1] is a multi pollset containing em_fd[0] and em_fd[1] */
-
- for (i = 0; i < 2; i++) {
- on_read_closure.cb = read_notifier_test_callback;
- fd_context.fd = em_fd[i];
- fd_context.is_cb_called = false;
- on_read_closure.cb_arg = &fd_context;
-
- if (!register_cb_after_read_event) {
- /* Registering the callback BEFORE the fd is readable */
- grpc_fd_notify_on_read(&exec_ctx, em_fd[i], &on_read_closure);
- }
-
- data = 0;
- result = write(sv[i][1], &data, sizeof(data));
- GPR_ASSERT(result == 1);
-
- /* grpc_pollset_work requires the caller to hold the pollset mutex */
- gpr_mu_lock(mu[i]);
- worker = NULL;
- grpc_pollset_work(&exec_ctx, pollset[i], &worker,
- gpr_now(GPR_CLOCK_MONOTONIC),
- gpr_inf_future(GPR_CLOCK_MONOTONIC));
- gpr_mu_unlock(mu[i]);
- grpc_exec_ctx_flush(&exec_ctx);
-
- if (register_cb_after_read_event) {
- /* Registering the callback after the fd is readable. In this case, the
- callback should be executed right away. */
- grpc_fd_notify_on_read(&exec_ctx, em_fd[i], &on_read_closure);
- grpc_exec_ctx_flush(&exec_ctx);
- }
-
- /* The callback should have been called by now */
- GPR_ASSERT(fd_context.is_cb_called);
-
- /* Drain the socket (Not really needed for the test) */
- result = read(sv[i][0], &data, 1);
- GPR_ASSERT(result == 1);
- }
-
- /* Clean up */
- for (i = 0; i < 2; i++) {
- grpc_fd_orphan(&exec_ctx, em_fd[i], NULL, NULL, "");
- close(sv[i][1]);
- free_grpc_pollset(&exec_ctx, pollset[i]);
- }
-
- grpc_exec_ctx_finish(&exec_ctx);
-}
-
int main(int argc, char **argv) {
grpc_closure destroyed;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@@ -655,8 +527,6 @@ int main(int argc, char **argv) {
grpc_pollset_init(g_pollset, &g_mu);
test_grpc_fd();
test_grpc_fd_change();
- test_grpc_fd_read_notifier_pollset(false);
- test_grpc_fd_read_notifier_pollset(true);
grpc_closure_init(&destroyed, destroy_pollset, g_pollset);
grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed);
grpc_exec_ctx_finish(&exec_ctx);
--
GitLab