Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make grpc_tcp_listener private. #4680

Merged
merged 14 commits into from
Jan 25, 2016
Merged

Make grpc_tcp_listener private. #4680

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa6b606
Make grpc_tcp_listener private.
daniel-j-born Jan 9, 2016
5d81d15
Code review follow-up.
daniel-j-born Jan 13, 2016
03c8a9b
Put the fd_index in the same order as the sibling list.
daniel-j-born Jan 13, 2016
725ee28
Extend Copyrights to 2016
daniel-j-born Jan 13, 2016
50ef304
Fix windows compilation errors
daniel-j-born Jan 13, 2016
601acad
Test a server with multiple ports
daniel-j-born Jan 14, 2016
a78ca38
clang reformat.
daniel-j-born Jan 14, 2016
d890a21
Fix port allocation in test.
daniel-j-born Jan 14, 2016
b13a69d
tcp_server_posix_test fixes.
daniel-j-born Jan 15, 2016
9c12bc2
Add shutdown_starting callbacks to tcp_server.
daniel-j-born Jan 14, 2016
36b2410
clang reformat
daniel-j-born Jan 16, 2016
beeb4c2
Merge branch 'master' into tcp_listener
daniel-j-born Jan 20, 2016
38abdbd
Merge branch 'tcp_listener' into tcp_server_shutdown
daniel-j-born Jan 20, 2016
25fe36a
Revert run_tests.py to master.
daniel-j-born Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix port allocation in test.
  • Loading branch information
@daniel-j-born
daniel-j-born committed Jan 14, 2016
commit d890a217da23eb141f38ba1c15e404d634a7bcb1
30 changes: 5 additions & 25 deletions test/core/iomgr/tcp_server_posix_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <grpc/support/log.h>
#include <grpc/support/sync.h>
#include <grpc/support/time.h>
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"

#include <errno.h>
Expand Down Expand Up @@ -151,37 +152,16 @@ static void tcp_connect(grpc_exec_ctx *exec_ctx, const struct sockaddr *remote,
gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset));
}

/* grpc_tcp_server_add_port() will not pick a second port randomly. We must find
one by binding one randomly, closing the socket, and returning the port
number. This might fail because of races. */
static int unused_port() {
int s = socket(AF_INET, SOCK_STREAM, 0);
struct sockaddr_storage addr;
socklen_t addr_len = sizeof(addr);
GPR_ASSERT(s >= 0);
memset(&addr, 0, sizeof(addr));
addr.ss_family = AF_INET;
if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
gpr_log(GPR_ERROR, "bind: %s", strerror(errno));
abort();
}
GPR_ASSERT(getsockname(s, (struct sockaddr *)&addr, &addr_len) == 0);
GPR_ASSERT(addr_len <= sizeof(addr));
close(s);
return ntohs(((struct sockaddr_in *)&addr)->sin_port);
}

/* Tests a tcp server with multiple ports. TODO(daniel-j-born): Multiple fds for
the same port should be tested. */
static void test_connect(unsigned n) {
static void test_connect(int svr1_port, unsigned n) {
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
struct sockaddr_storage addr;
struct sockaddr_storage addr1;
socklen_t addr_len = sizeof(addr);
unsigned svr_fd_count;
int svr_port;
unsigned svr1_fd_count;
int svr1_port;
grpc_tcp_server *s = grpc_tcp_server_create(NULL);
grpc_pollset *pollsets[1];
unsigned i;
Expand All @@ -192,7 +172,6 @@ static void test_connect(unsigned n) {
addr.ss_family = addr1.ss_family = AF_INET;
svr_port = grpc_tcp_server_add_port(s, (struct sockaddr *)&addr, addr_len);
GPR_ASSERT(svr_port > 0);
svr1_port = unused_port();
grpc_sockaddr_set_port((struct sockaddr *)&addr1, svr1_port);
GPR_ASSERT(grpc_tcp_server_add_port(s, (struct sockaddr *)&addr1, addr_len) ==
svr1_port);
Expand Down Expand Up @@ -265,6 +244,7 @@ static void destroy_pollset(grpc_exec_ctx *exec_ctx, void *p, int success) {
int main(int argc, char **argv) {
grpc_closure destroyed;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
int svr1_port = grpc_pick_unused_port_or_die();
grpc_test_init(argc, argv);
grpc_iomgr_init();
grpc_pollset_init(&g_pollset);
Expand All @@ -273,8 +253,8 @@ int main(int argc, char **argv) {
test_no_op_with_start();
test_no_op_with_port();
test_no_op_with_port_and_start();
test_connect(1);
test_connect(10);
test_connect(svr1_port, 1);
test_connect(svr1_port, 10);

grpc_closure_init(&destroyed, destroy_pollset, &g_pollset);
grpc_pollset_shutdown(&exec_ctx, &g_pollset, &destroyed);
Expand Down