Skip to content
Snippets Groups Projects
Commit 31c489c9 authored by Craig Tiller's avatar Craig Tiller
Browse files

Fix test for multiple reads

Previously this test assumed all bytes would be read in one request.

Also update test to use grpc_init() so that we can enable tracing.
parent 884f4dad
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <unistd.h> #include <unistd.h>
#include <grpc/grpc.h>
#include <grpc/support/alloc.h> #include <grpc/support/alloc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
...@@ -140,11 +141,12 @@ static void read_cb(void *user_data, gpr_slice *slices, size_t nslices, ...@@ -140,11 +141,12 @@ static void read_cb(void *user_data, gpr_slice *slices, size_t nslices,
grpc_endpoint_cb_status error) { grpc_endpoint_cb_status error) {
struct read_socket_state *state = (struct read_socket_state *)user_data; struct read_socket_state *state = (struct read_socket_state *)user_data;
ssize_t read_bytes; ssize_t read_bytes;
int current_data = 0; int current_data;
GPR_ASSERT(error == GRPC_ENDPOINT_CB_OK); GPR_ASSERT(error == GRPC_ENDPOINT_CB_OK);
gpr_mu_lock(&state->mu); gpr_mu_lock(&state->mu);
current_data = state->read_bytes % 256;
read_bytes = count_and_unref_slices(slices, nslices, &current_data); read_bytes = count_and_unref_slices(slices, nslices, &current_data);
state->read_bytes += read_bytes; state->read_bytes += read_bytes;
gpr_log(GPR_INFO, "Read %d bytes of %d", read_bytes, gpr_log(GPR_INFO, "Read %d bytes of %d", read_bytes,
...@@ -483,10 +485,10 @@ static grpc_endpoint_test_config configs[] = { ...@@ -483,10 +485,10 @@ static grpc_endpoint_test_config configs[] = {
int main(int argc, char **argv) { int main(int argc, char **argv) {
grpc_test_init(argc, argv); grpc_test_init(argc, argv);
grpc_iomgr_init(); grpc_init();
run_tests(); run_tests();
grpc_endpoint_tests(configs[0]); grpc_endpoint_tests(configs[0]);
grpc_iomgr_shutdown(); grpc_shutdown();
return 0; return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment