aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/core/end2end/fixtures/h2_sockpair+trace.c3
-rw-r--r--test/core/end2end/fixtures/h2_sockpair.c3
-rw-r--r--test/core/end2end/fixtures/h2_sockpair_1byte.c3
-rw-r--r--test/core/iomgr/fd_posix_test.c134
-rw-r--r--test/cpp/end2end/hybrid_end2end_test.cc2
5 files changed, 144 insertions, 1 deletions
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 87533a9b7f..b730df753c 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -50,6 +50,7 @@
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/support/env.h"
#include "src/core/lib/surface/channel.h"
+#include "src/core/lib/surface/completion_queue.h"
#include "src/core/lib/surface/server.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
@@ -60,6 +61,8 @@
static void server_setup_transport(void *ts, grpc_transport *transport) {
grpc_end2end_test_fixture *f = ts;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+ grpc_endpoint_pair *sfd = f->fixture_data;
+ grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(&exec_ctx, f->server, transport,
grpc_server_get_channel_args(f->server));
grpc_exec_ctx_finish(&exec_ctx);
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c
index f28147cf40..41fcc1d631 100644
--- a/test/core/end2end/fixtures/h2_sockpair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
@@ -49,6 +49,7 @@
#include "src/core/lib/iomgr/endpoint_pair.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/surface/channel.h"
+#include "src/core/lib/surface/completion_queue.h"
#include "src/core/lib/surface/server.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
@@ -59,6 +60,8 @@
static void server_setup_transport(void *ts, grpc_transport *transport) {
grpc_end2end_test_fixture *f = ts;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+ grpc_endpoint_pair *sfd = f->fixture_data;
+ grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(&exec_ctx, f->server, transport,
grpc_server_get_channel_args(f->server));
grpc_exec_ctx_finish(&exec_ctx);
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index 302b16b372..16ffb6ec13 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
@@ -49,6 +49,7 @@
#include "src/core/lib/iomgr/endpoint_pair.h"
#include "src/core/lib/iomgr/iomgr.h"
#include "src/core/lib/surface/channel.h"
+#include "src/core/lib/surface/completion_queue.h"
#include "src/core/lib/surface/server.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
@@ -59,6 +60,8 @@
static void server_setup_transport(void *ts, grpc_transport *transport) {
grpc_end2end_test_fixture *f = ts;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+ grpc_endpoint_pair *sfd = f->fixture_data;
+ grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(&exec_ctx, f->server, transport,
grpc_server_get_channel_args(f->server));
grpc_exec_ctx_finish(&exec_ctx);
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index f97f33712e..740bba2a1e 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -518,6 +518,138 @@ 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);
+}
+
+static void pollset_work(grpc_exec_ctx *exec_ctx, gpr_mu *pollset_mu,
+ grpc_pollset *pollset, gpr_timespec deadline) {
+ grpc_pollset_worker *worker = NULL;
+
+ /* grpc_pollset_work requires the caller to hold the pollset mutex */
+ gpr_mu_lock(pollset_mu);
+ grpc_pollset_work(exec_ctx, pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC),
+ deadline);
+ gpr_mu_unlock(pollset_mu);
+
+ grpc_exec_ctx_flush(exec_ctx);
+}
+
+/* This tests that the read_notifier_pollset field of a grpc_fd is properly
+ set when the grpc_fd becomes readable
+ - 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;
+ grpc_pollset *pollset;
+ char data;
+ ssize_t result;
+ int i;
+ read_notifier_test_fd_context fd_context;
+ grpc_closure on_read_closure;
+ grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+
+ pollset = create_grpc_pollset(&mu);
+
+ for (i = 0; i < 2; 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, em_fd[i]);
+ }
+
+ grpc_exec_ctx_flush(&exec_ctx);
+
+ /* Call grpc_pollset_work with an immediate deadline (i.e a deadline in the
+ past like gpr_inf_past(GPR_CLOCK_MONOTONIC) so that any work that needs to
+ be done as a result of adding the above file descriptors will get done */
+ pollset_work(&exec_ctx, mu, pollset, gpr_inf_past(GPR_CLOCK_MONOTONIC));
+
+ /* At this point pollset contains two fds. em_fd[0] and em_fd[1]. The
+ following loop makes each of these fds readable (one at a time) and checks
+ that the read_notifier_pollset is correctly set on those fds */
+ 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);
+
+ pollset_work(&exec_ctx, mu, pollset, gpr_inf_future(GPR_CLOCK_MONOTONIC));
+
+ 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);
+ grpc_exec_ctx_finish(&exec_ctx);
+}
+
int main(int argc, char **argv) {
grpc_closure destroyed;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
@@ -527,6 +659,8 @@ 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);
diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc
index 02043a89d3..0423448154 100644
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@@ -216,7 +216,7 @@ class HybridEnd2endTest : public ::testing::Test {
}
// Create a separate cq for each potential handler.
for (int i = 0; i < 5; i++) {
- cqs_.push_back(builder.AddCompletionQueue());
+ cqs_.push_back(builder.AddCompletionQueue(false));
}
server_ = builder.BuildAndStart();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 02:21:39 +0000