diff options
Diffstat (limited to 'test/core/surface')
-rw-r--r-- | test/core/surface/completion_queue_benchmark.c | 168 | ||||
-rw-r--r-- | test/core/surface/completion_queue_test.c | 72 | ||||
-rw-r--r-- | test/core/surface/lame_client_test.c | 2 |
3 files changed, 25 insertions, 217 deletions
diff --git a/test/core/surface/completion_queue_benchmark.c b/test/core/surface/completion_queue_benchmark.c deleted file mode 100644 index 81ebe15415..0000000000 --- a/test/core/surface/completion_queue_benchmark.c +++ /dev/null @@ -1,168 +0,0 @@ -/* - * - * 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. - * - */ - -#include "src/core/surface/completion_queue.h" - -#include <math.h> -#include <stdio.h> - -#include <grpc/support/alloc.h> -#include <grpc/support/log.h> -#include <grpc/support/thd.h> -#include <grpc/support/time.h> - -typedef struct test_thread_options { - gpr_event on_started; - gpr_event *start; - gpr_event on_finished; - grpc_completion_queue *cc; - int iterations; -} test_thread_options; - -static void producer_thread(void *arg) { - test_thread_options *opt = arg; - int i; - - gpr_event_set(&opt->on_started, (void *)(gpr_intptr) 1); - GPR_ASSERT(gpr_event_wait(opt->start, gpr_inf_future)); - - for (i = 0; i < opt->iterations; i++) { - grpc_cq_begin_op(opt->cc, NULL, GRPC_WRITE_ACCEPTED); - grpc_cq_end_write_accepted(opt->cc, (void *)(gpr_intptr) 1, NULL, NULL, - NULL, GRPC_OP_OK); - } - - gpr_event_set(&opt->on_finished, (void *)(gpr_intptr) 1); -} - -static void consumer_thread(void *arg) { - test_thread_options *opt = arg; - grpc_event *ev; - - gpr_event_set(&opt->on_started, (void *)(gpr_intptr) 1); - GPR_ASSERT(gpr_event_wait(opt->start, gpr_inf_future)); - - for (;;) { - ev = grpc_completion_queue_next(opt->cc, gpr_inf_future); - switch (ev->type) { - case GRPC_WRITE_ACCEPTED: - break; - case GRPC_QUEUE_SHUTDOWN: - gpr_event_set(&opt->on_finished, (void *)(gpr_intptr) 1); - return; - default: - gpr_log(GPR_ERROR, "Invalid event received: %d", ev->type); - abort(); - } - grpc_event_finish(ev); - } -} - -double ops_per_second(int consumers, int producers, int iterations) { - test_thread_options *options = - gpr_malloc((producers + consumers) * sizeof(test_thread_options)); - gpr_event start = GPR_EVENT_INIT; - grpc_completion_queue *cc = grpc_completion_queue_create(); - int i; - gpr_timespec t_start, t_end, t_delta; - - /* start all threads: they will wait for phase1 */ - for (i = 0; i < producers + consumers; i++) { - gpr_thd_id id; - gpr_event_init(&options[i].on_started); - gpr_event_init(&options[i].on_finished); - options[i].start = &start; - options[i].cc = cc; - options[i].iterations = iterations; - GPR_ASSERT(gpr_thd_new(&id, - i < producers ? producer_thread : consumer_thread, - options + i, NULL)); - gpr_event_wait(&options[i].on_started, gpr_inf_future); - } - - /* start the benchmark */ - t_start = gpr_now(); - gpr_event_set(&start, (void *)(gpr_intptr) 1); - - /* wait for producers to finish */ - for (i = 0; i < producers; i++) { - GPR_ASSERT(gpr_event_wait(&options[i].on_finished, gpr_inf_future)); - } - - /* in parallel, we shutdown the completion channel - all events should still - be consumed */ - grpc_completion_queue_shutdown(cc); - - /* join all threads */ - for (i = producers; i < producers + consumers; i++) { - GPR_ASSERT(gpr_event_wait(&options[i].on_finished, gpr_inf_future)); - } - t_end = gpr_now(); - - /* destroy the completion channel */ - grpc_completion_queue_destroy(cc); - - gpr_free(options); - - t_delta = gpr_time_sub(t_end, t_start); - return (t_delta.tv_sec + 1e-9 * t_delta.tv_nsec) / (producers * iterations); -} - -double ops_per_second_top(int consumers, int producers) { - return ops_per_second(consumers, producers, 1000000 / producers); -} - -int main(void) { - const int counts[] = {1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 40, 64}; - const int ncounts = sizeof(counts) / sizeof(*counts); - int i, j; - - printf("\"\","); - for (i = 0; i < ncounts; i++) { - int producers = counts[i]; - printf("%d%s", producers, i == ncounts - 1 ? "\n" : ","); - } - - for (j = 0; j < ncounts; j++) { - int consumers = counts[j]; - printf("%d,", consumers); - for (i = 0; i < ncounts; i++) { - int producers = counts[i]; - printf("%f%s", ops_per_second_top(consumers, producers), - i == ncounts - 1 ? "\n" : ","); - fflush(stdout); - } - } - - return 0; -} diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 29fb7a99a5..3e84eaf54c 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -43,10 +43,6 @@ #define LOG_TEST() gpr_log(GPR_INFO, "%s", __FUNCTION__) -static void increment_int_on_finish(void *user_data, grpc_op_error error) { - ++*(int *)user_data; -} - static void *create_test_tag(void) { static gpr_intptr i = 0; return (void *)(++i); @@ -54,12 +50,10 @@ static void *create_test_tag(void) { /* helper for tests to shutdown correctly and tersely */ static void shutdown_and_destroy(grpc_completion_queue *cc) { - grpc_event *ev; + grpc_event ev; grpc_completion_queue_shutdown(cc); ev = grpc_completion_queue_next(cc, gpr_inf_past); - GPR_ASSERT(ev != NULL); - GPR_ASSERT(ev->type == GRPC_QUEUE_SHUTDOWN); - grpc_event_finish(ev); + GPR_ASSERT(ev.type == GRPC_QUEUE_SHUTDOWN); grpc_completion_queue_destroy(cc); } @@ -75,42 +69,36 @@ static void test_wait_empty(void) { LOG_TEST(); cc = grpc_completion_queue_create(); - GPR_ASSERT(grpc_completion_queue_next(cc, gpr_now()) == NULL); + GPR_ASSERT(grpc_completion_queue_next(cc, gpr_now()).type == + GRPC_QUEUE_TIMEOUT); shutdown_and_destroy(cc); } static void test_cq_end_op(void) { - grpc_event *ev; + grpc_event ev; grpc_completion_queue *cc; - int on_finish_called = 0; void *tag = create_test_tag(); LOG_TEST(); cc = grpc_completion_queue_create(); - grpc_cq_begin_op(cc, NULL, GRPC_OP_COMPLETE); - grpc_cq_end_op(cc, tag, NULL, increment_int_on_finish, &on_finish_called, - GRPC_OP_OK); + grpc_cq_begin_op(cc, NULL); + grpc_cq_end_op(cc, tag, NULL, 1); ev = grpc_completion_queue_next(cc, gpr_inf_past); - GPR_ASSERT(ev != NULL); - GPR_ASSERT(ev->type == GRPC_OP_COMPLETE); - GPR_ASSERT(ev->tag == tag); - GPR_ASSERT(ev->data.op_complete == GRPC_OP_OK); - GPR_ASSERT(on_finish_called == 0); - grpc_event_finish(ev); - GPR_ASSERT(on_finish_called == 1); + GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); + GPR_ASSERT(ev.tag == tag); + GPR_ASSERT(ev.success); shutdown_and_destroy(cc); } static void test_pluck(void) { - grpc_event *ev; + grpc_event ev; grpc_completion_queue *cc; void *tags[128]; unsigned i, j; - int on_finish_called = 0; LOG_TEST(); @@ -124,34 +112,26 @@ static void test_pluck(void) { cc = grpc_completion_queue_create(); for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - grpc_cq_begin_op(cc, NULL, GRPC_OP_COMPLETE); - grpc_cq_end_op(cc, tags[i], NULL, increment_int_on_finish, - &on_finish_called, GRPC_OP_OK); + grpc_cq_begin_op(cc, NULL); + grpc_cq_end_op(cc, tags[i], NULL, 1); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { ev = grpc_completion_queue_pluck(cc, tags[i], gpr_inf_past); - GPR_ASSERT(ev->tag == tags[i]); - grpc_event_finish(ev); + GPR_ASSERT(ev.tag == tags[i]); } - GPR_ASSERT(on_finish_called == GPR_ARRAY_SIZE(tags)); - for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { - grpc_cq_begin_op(cc, NULL, GRPC_OP_COMPLETE); - grpc_cq_end_op(cc, tags[i], NULL, increment_int_on_finish, - &on_finish_called, GRPC_OP_OK); + grpc_cq_begin_op(cc, NULL); + grpc_cq_end_op(cc, tags[i], NULL, 1); } for (i = 0; i < GPR_ARRAY_SIZE(tags); i++) { ev = grpc_completion_queue_pluck(cc, tags[GPR_ARRAY_SIZE(tags) - i - 1], gpr_inf_past); - GPR_ASSERT(ev->tag == tags[GPR_ARRAY_SIZE(tags) - i - 1]); - grpc_event_finish(ev); + GPR_ASSERT(ev.tag == tags[GPR_ARRAY_SIZE(tags) - i - 1]); } - GPR_ASSERT(on_finish_called == 2 * GPR_ARRAY_SIZE(tags)); - shutdown_and_destroy(cc); } @@ -182,7 +162,7 @@ static void producer_thread(void *arg) { gpr_log(GPR_INFO, "producer %d phase 1", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_begin_op(opt->cc, NULL, GRPC_OP_COMPLETE); + grpc_cq_begin_op(opt->cc, NULL); } gpr_log(GPR_INFO, "producer %d phase 1 done", opt->id); @@ -191,8 +171,7 @@ static void producer_thread(void *arg) { gpr_log(GPR_INFO, "producer %d phase 2", opt->id); for (i = 0; i < TEST_THREAD_EVENTS; i++) { - grpc_cq_end_op(opt->cc, (void *)(gpr_intptr)1, NULL, NULL, NULL, - GRPC_OP_OK); + grpc_cq_end_op(opt->cc, (void *)(gpr_intptr)1, NULL, 1); opt->events_triggered++; } @@ -202,7 +181,7 @@ static void producer_thread(void *arg) { static void consumer_thread(void *arg) { test_thread_options *opt = arg; - grpc_event *ev; + grpc_event ev; gpr_log(GPR_INFO, "consumer %d started", opt->id); gpr_event_set(&opt->on_started, (void *)(gpr_intptr) 1); @@ -217,20 +196,17 @@ static void consumer_thread(void *arg) { gpr_log(GPR_INFO, "consumer %d phase 2", opt->id); for (;;) { ev = grpc_completion_queue_next(opt->cc, ten_seconds_time()); - GPR_ASSERT(ev); - switch (ev->type) { + switch (ev.type) { case GRPC_OP_COMPLETE: - GPR_ASSERT(ev->data.op_complete == GRPC_OP_OK); + GPR_ASSERT(ev.success); opt->events_triggered++; - grpc_event_finish(ev); break; case GRPC_QUEUE_SHUTDOWN: gpr_log(GPR_INFO, "consumer %d phase 2 done", opt->id); gpr_event_set(&opt->on_finished, (void *)(gpr_intptr) 1); - grpc_event_finish(ev); return; - default: - gpr_log(GPR_ERROR, "Invalid event received: %d", ev->type); + case GRPC_QUEUE_TIMEOUT: + gpr_log(GPR_ERROR, "Invalid timeout received"); abort(); } } diff --git a/test/core/surface/lame_client_test.c b/test/core/surface/lame_client_test.c index 05e8f95d71..34d37f0f3c 100644 --- a/test/core/surface/lame_client_test.c +++ b/test/core/surface/lame_client_test.c @@ -79,7 +79,7 @@ int main(int argc, char **argv) { grpc_call_start_batch(call, ops, op - ops, tag(1))); /* the call should immediately fail */ - cq_expect_completion(cqv, tag(1), GRPC_OP_OK); + cq_expect_completion(cqv, tag(1), 1); cq_verify(cqv); grpc_call_destroy(call); |