Add a epoll_test.c file to experiment. REMOVE this from the final

commit
pull/6803/head
Sree Kuchibhotla 9 years ago
parent 5098f91159
commit 8949007346
  1. 36
      Makefile
  2. 12
      build.yaml
  3. 263
      test/core/network_benchmarks/epoll_test.c
  4. 2
      test/core/network_benchmarks/low_level_ping_pong.c
  5. 16
      tools/run_tests/sources_and_headers.json
  6. 15
      tools/run_tests/tests.json

@ -903,6 +903,7 @@ dns_resolver_connectivity_test: $(BINDIR)/$(CONFIG)/dns_resolver_connectivity_te
dns_resolver_test: $(BINDIR)/$(CONFIG)/dns_resolver_test
dualstack_socket_test: $(BINDIR)/$(CONFIG)/dualstack_socket_test
endpoint_pair_test: $(BINDIR)/$(CONFIG)/endpoint_pair_test
epoll_test: $(BINDIR)/$(CONFIG)/epoll_test
fd_conservation_posix_test: $(BINDIR)/$(CONFIG)/fd_conservation_posix_test
fd_posix_test: $(BINDIR)/$(CONFIG)/fd_posix_test
fling_client: $(BINDIR)/$(CONFIG)/fling_client
@ -1234,6 +1235,7 @@ buildtests_c: privatelibs_c \
$(BINDIR)/$(CONFIG)/dns_resolver_test \
$(BINDIR)/$(CONFIG)/dualstack_socket_test \
$(BINDIR)/$(CONFIG)/endpoint_pair_test \
$(BINDIR)/$(CONFIG)/epoll_test \
$(BINDIR)/$(CONFIG)/fd_conservation_posix_test \
$(BINDIR)/$(CONFIG)/fd_posix_test \
$(BINDIR)/$(CONFIG)/fling_client \
@ -1497,6 +1499,8 @@ test_c: buildtests_c
$(Q) $(BINDIR)/$(CONFIG)/dualstack_socket_test || ( echo test dualstack_socket_test failed ; exit 1 )
$(E) "[RUN] Testing endpoint_pair_test"
$(Q) $(BINDIR)/$(CONFIG)/endpoint_pair_test || ( echo test endpoint_pair_test failed ; exit 1 )
$(E) "[RUN] Testing epoll_test"
$(Q) $(BINDIR)/$(CONFIG)/epoll_test || ( echo test epoll_test failed ; exit 1 )
$(E) "[RUN] Testing fd_conservation_posix_test"
$(Q) $(BINDIR)/$(CONFIG)/fd_conservation_posix_test || ( echo test fd_conservation_posix_test failed ; exit 1 )
$(E) "[RUN] Testing fd_posix_test"
@ -6577,6 +6581,38 @@ endif
endif
EPOLL_TEST_SRC = \
test/core/network_benchmarks/epoll_test.c \
EPOLL_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(EPOLL_TEST_SRC))))
ifeq ($(NO_SECURE),true)
# You can't build secure targets if you don't have OpenSSL.
$(BINDIR)/$(CONFIG)/epoll_test: openssl_dep_error
else
$(BINDIR)/$(CONFIG)/epoll_test: $(EPOLL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
$(Q) $(LD) $(LDFLAGS) $(EPOLL_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/epoll_test
endif
$(OBJDIR)/$(CONFIG)/test/core/network_benchmarks/epoll_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_epoll_test: $(EPOLL_TEST_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true)
ifneq ($(NO_DEPS),true)
-include $(EPOLL_TEST_OBJS:.o=.dep)
endif
endif
FD_CONSERVATION_POSIX_TEST_SRC = \
test/core/iomgr/fd_conservation_posix_test.c \

@ -1321,6 +1321,18 @@ targets:
- grpc
- gpr_test_util
- gpr
- name: epoll_test
build: test
language: c
src:
- test/core/network_benchmarks/epoll_test.c
deps:
- grpc_test_util
- grpc
- gpr_test_util
- gpr
platforms:
- linux
- name: fd_conservation_posix_test
build: test
language: c

@ -0,0 +1,263 @@
/*
*
* Copyright 2015, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
/* TODO: sreek: REMOVE THIS FILE */
#include <grpc/support/port_platform.h>
#include <errno.h>
#include <netinet/ip.h>
#include <poll.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <sys/epoll.h>
#include <sys/eventfd.h>
#include <sys/socket.h>
#include <unistd.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/thd.h>
#include <grpc/support/useful.h>
int g_signal_num = SIGUSR1;
int g_timeout_secs = 2;
int g_eventfd_create = 1;
int g_eventfd_wakeup = 0;
int g_eventfd_teardown = 0;
int g_close_epoll_fd = 1;
typedef struct thread_args {
gpr_thd_id id;
int epoll_fd;
int thread_num;
} thread_args;
static int eventfd_create() {
if (!g_eventfd_create) {
return -1;
}
int efd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
GPR_ASSERT(efd >= 0);
return efd;
}
static void eventfd_wakeup(int efd) {
if (!g_eventfd_wakeup) {
return;
}
int err;
do {
err = eventfd_write(efd, 1);
} while (err < 0 && errno == EINTR);
}
static void epoll_teardown(int epoll_fd, int fd) {
if (!g_eventfd_teardown) {
return;
}
if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, NULL) < 0) {
if (errno != ENOENT) {
gpr_log(GPR_ERROR, "epoll_ctl: %s", strerror(errno));
GPR_ASSERT(0);
}
}
}
/* Special case for epoll, where we need to create the fd ahead of time. */
static int epoll_setup(int fd) {
int epoll_fd;
struct epoll_event ev;
epoll_fd = epoll_create(1);
if (epoll_fd < 0) {
gpr_log(GPR_ERROR, "epoll_create: %s", strerror(errno));
return -1;
}
ev.events = (uint32_t)EPOLLIN;
ev.data.fd = fd;
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
if (errno != EEXIST) {
gpr_log(GPR_ERROR, "epoll_ctl: %s", strerror(errno));
return -1;
}
gpr_log(GPR_ERROR, "epoll_ctl: The fd %d already exists", fd);
}
return epoll_fd;
}
#define GRPC_EPOLL_MAX_EVENTS 1000
static void thread_main(void *args) {
int ep_rv;
struct epoll_event ep_ev[GRPC_EPOLL_MAX_EVENTS];
int fd;
int i;
int cancel;
int read;
int write;
thread_args *thd_args = args;
sigset_t new_mask;
sigset_t orig_mask;
int keep_polling = 0;
gpr_log(GPR_INFO, "Thread: %d Started", thd_args->thread_num);
do {
keep_polling = 0;
/* Mask the signal before getting the epoll_fd */
gpr_log(GPR_INFO, "Thread: %d Blocking signal: %d", thd_args->thread_num,
g_signal_num);
sigemptyset(&new_mask);
sigaddset(&new_mask, g_signal_num);
pthread_sigmask(SIG_BLOCK, &new_mask, &orig_mask);
gpr_log(GPR_INFO, "Thread: %d Waiting on epoll_wait()",
thd_args->thread_num);
ep_rv = epoll_pwait(thd_args->epoll_fd, ep_ev, GRPC_EPOLL_MAX_EVENTS,
g_timeout_secs * 5000, &orig_mask);
gpr_log(GPR_INFO, "Thread: %d out of epoll_wait. ep_rv = %d",
thd_args->thread_num, ep_rv);
if (ep_rv < 0) {
if (errno != EINTR) {
gpr_log(GPR_ERROR, "Thread: %d. epoll_wait failed with error: %d",
thd_args->thread_num, errno);
} else {
gpr_log(GPR_INFO,
"Thread: %d. epoll_wait was interrupted. Polling again >>>>>>>",
thd_args->thread_num);
keep_polling = 1;
}
} else {
if (ep_rv == 0) {
gpr_log(GPR_INFO,
"Thread: %d - epoll_wait returned 0. Most likely a timeout. "
"Polling again",
thd_args->thread_num);
keep_polling = 1;
}
for (i = 0; i < ep_rv; i++) {
fd = ep_ev[i].data.fd;
cancel = ep_ev[i].events & (EPOLLERR | EPOLLHUP);
read = ep_ev[i].events & (EPOLLIN | EPOLLPRI);
write = ep_ev[i].events & EPOLLOUT;
gpr_log(GPR_INFO,
"Thread: %d. epoll_wait returned that fd: %d has event of "
"interest. read: %d, write: %d, cancel: %d",
thd_args->thread_num, fd, read, write, cancel);
}
}
} while (keep_polling);
}
static void close_fd(int fd) {
if (!g_close_epoll_fd) {
return;
}
gpr_log(GPR_INFO, "*** Closing fd : %d ****", fd);
close(fd);
gpr_log(GPR_INFO, "*** Closed fd : %d ****", fd);
}
static void sig_handler(int sig_num) {
gpr_log(GPR_INFO, "<<<<< Received signal %d", sig_num);
}
static void set_signal_handler() {
gpr_log(GPR_INFO, "Setting signal handler");
signal(g_signal_num, sig_handler);
}
#define NUM_THREADS 2
int main(int argc, char **argv) {
int efd;
int epoll_fd;
int i;
thread_args thd_args[NUM_THREADS];
gpr_thd_options options = gpr_thd_options_default();
set_signal_handler();
gpr_log(GPR_INFO, "Starting..");
efd = eventfd_create();
gpr_log(GPR_INFO, "Created event fd: %d", efd);
epoll_fd = epoll_setup(efd);
gpr_log(GPR_INFO, "Created epoll_fd: %d", epoll_fd);
gpr_thd_options_set_joinable(&options);
for (i = 0; i < NUM_THREADS; i++) {
thd_args[i].thread_num = i;
thd_args[i].epoll_fd = epoll_fd;
gpr_log(GPR_INFO, "Starting thread: %d", i);
gpr_thd_new(&thd_args[i].id, thread_main, &thd_args[i], &options);
}
sleep((unsigned)g_timeout_secs * 2);
/* Send signals first */
for (i = 0; i < NUM_THREADS; i++) {
gpr_log(GPR_INFO, "Sending signal to thread: %d", thd_args->thread_num);
pthread_kill(thd_args[i].id, g_signal_num);
gpr_log(GPR_INFO, "Sent signal to thread: %d >>>>>> ",
thd_args->thread_num);
}
sleep((unsigned)g_timeout_secs * 2);
close_fd(epoll_fd);
sleep((unsigned)g_timeout_secs * 2);
eventfd_wakeup(efd);
epoll_teardown(epoll_fd, efd);
for (i = 0; i < NUM_THREADS; i++) {
gpr_thd_join(thd_args[i].id);
gpr_log(GPR_INFO, "Thread: %d joined", i);
}
return 0;
}

@ -44,6 +44,7 @@
#include <poll.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
#ifdef __linux__
#include <sys/epoll.h>
#endif
@ -84,6 +85,7 @@ typedef struct thread_args {
static int read_bytes(int fd, char *buf, size_t read_size, int spin) {
size_t bytes_read = 0;
ssize_t err;
do {
err = read(fd, buf + bytes_read, read_size - bytes_read);
if (err < 0) {

@ -301,6 +301,22 @@
"third_party": false,
"type": "target"
},
{
"deps": [
"gpr",
"gpr_test_util",
"grpc",
"grpc_test_util"
],
"headers": [],
"language": "c",
"name": "epoll_test",
"src": [
"test/core/network_benchmarks/epoll_test.c"
],
"third_party": false,
"type": "target"
},
{
"deps": [
"gpr",

@ -356,6 +356,21 @@
"windows"
]
},
{
"args": [],
"ci_platforms": [
"linux"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"flaky": false,
"gtest": false,
"language": "c",
"name": "epoll_test",
"platforms": [
"linux"
]
},
{
"args": [],
"ci_platforms": [

Loading…
Cancel
Save