Merge branch 'master' of https://github.com/grpc/grpc into tracing++

Lot's of manual work to make this merge work

1 files changed, 167 insertions, 0 deletions

diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
new file mode 100644
index 0000000000..4d92cc658a
--- /dev/null
+++ b/test/core/iomgr/timer_list_test.cc
@@ -0,0 +1,167 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "src/core/lib/iomgr/port.h"
+
+// This test only works with the generic timer implementation
+#ifdef GRPC_TIMER_USE_GENERIC
+
+#include "src/core/lib/iomgr/timer.h"
+
+#include <string.h>
+
+#include <grpc/support/log.h>
+#include "src/core/lib/debug/trace.h"
+#include "test/core/util/test_config.h"
+
+#define MAX_CB 30
+
+grpc_core::TraceFlag grpc_timer_trace;
+grpc_core::TraceFlag grpc_timer_check_trace;
+
+static int cb_called[MAX_CB][2];
+
+static void cb(grpc_exec_ctx* exec_ctx, void* arg, grpc_error* error) {
+  cb_called[(intptr_t)arg][error == GRPC_ERROR_NONE]++;
+}
+
+static void add_test(void) {
+  int i;
+  grpc_timer timers[20];
+  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+
+  gpr_log(GPR_INFO, "add_test");
+
+  grpc_timer_list_init(&exec_ctx);
+  grpc_timer_trace.value = 1;
+  grpc_timer_check_trace.value = 1;
+  memset(cb_called, 0, sizeof(cb_called));
+
+  grpc_millis start = grpc_exec_ctx_now(&exec_ctx);
+
+  /* 10 ms timers.  will expire in the current epoch */
+  for (i = 0; i < 10; i++) {
+    grpc_timer_init(
+        &exec_ctx, &timers[i], start + 10,
+        GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx));
+  }
+
+  /* 1010 ms timers.  will expire in the next epoch */
+  for (i = 10; i < 20; i++) {
+    grpc_timer_init(
+        &exec_ctx, &timers[i], start + 1010,
+        GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)i, grpc_schedule_on_exec_ctx));
+  }
+
+  /* collect timers.  Only the first batch should be ready. */
+  exec_ctx.now = start + 500;
+  GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED);
+  grpc_exec_ctx_finish(&exec_ctx);
+  for (i = 0; i < 20; i++) {
+    GPR_ASSERT(cb_called[i][1] == (i < 10));
+    GPR_ASSERT(cb_called[i][0] == 0);
+  }
+
+  exec_ctx.now = start + 600;
+  GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) ==
+             GRPC_TIMERS_CHECKED_AND_EMPTY);
+  grpc_exec_ctx_finish(&exec_ctx);
+  for (i = 0; i < 30; i++) {
+    GPR_ASSERT(cb_called[i][1] == (i < 10));
+    GPR_ASSERT(cb_called[i][0] == 0);
+  }
+
+  /* collect the rest of the timers */
+  exec_ctx.now = start + 1500;
+  GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED);
+  grpc_exec_ctx_finish(&exec_ctx);
+  for (i = 0; i < 30; i++) {
+    GPR_ASSERT(cb_called[i][1] == (i < 20));
+    GPR_ASSERT(cb_called[i][0] == 0);
+  }
+
+  exec_ctx.now = start + 1600;
+  GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) ==
+             GRPC_TIMERS_CHECKED_AND_EMPTY);
+  for (i = 0; i < 30; i++) {
+    GPR_ASSERT(cb_called[i][1] == (i < 20));
+    GPR_ASSERT(cb_called[i][0] == 0);
+  }
+
+  grpc_timer_list_shutdown(&exec_ctx);
+  grpc_exec_ctx_finish(&exec_ctx);
+}
+
+/* Cleaning up a list with pending timers. */
+void destruction_test(void) {
+  grpc_timer timers[5];
+  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+
+  gpr_log(GPR_INFO, "destruction_test");
+
+  exec_ctx.now_is_valid = true;
+  exec_ctx.now = 0;
+  grpc_timer_list_init(&exec_ctx);
+  grpc_timer_trace.value = 1;
+  grpc_timer_check_trace.value = 1;
+  memset(cb_called, 0, sizeof(cb_called));
+
+  grpc_timer_init(
+      &exec_ctx, &timers[0], 100,
+      GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)0, grpc_schedule_on_exec_ctx));
+  grpc_timer_init(
+      &exec_ctx, &timers[1], 3,
+      GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)1, grpc_schedule_on_exec_ctx));
+  grpc_timer_init(
+      &exec_ctx, &timers[2], 100,
+      GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)2, grpc_schedule_on_exec_ctx));
+  grpc_timer_init(
+      &exec_ctx, &timers[3], 3,
+      GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)3, grpc_schedule_on_exec_ctx));
+  grpc_timer_init(
+      &exec_ctx, &timers[4], 1,
+      GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx));
+  exec_ctx.now = 2;
+  GPR_ASSERT(grpc_timer_check(&exec_ctx, NULL) == GRPC_TIMERS_FIRED);
+  grpc_exec_ctx_finish(&exec_ctx);
+  GPR_ASSERT(1 == cb_called[4][1]);
+  grpc_timer_cancel(&exec_ctx, &timers[0]);
+  grpc_timer_cancel(&exec_ctx, &timers[3]);
+  grpc_exec_ctx_finish(&exec_ctx);
+  GPR_ASSERT(1 == cb_called[0][0]);
+  GPR_ASSERT(1 == cb_called[3][0]);
+
+  grpc_timer_list_shutdown(&exec_ctx);
+  grpc_exec_ctx_finish(&exec_ctx);
+  GPR_ASSERT(1 == cb_called[1][0]);
+  GPR_ASSERT(1 == cb_called[2][0]);
+}
+
+int main(int argc, char** argv) {
+  grpc_test_init(argc, argv);
+  gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
+  add_test();
+  destruction_test();
+  return 0;
+}
+
+#else /* GRPC_TIMER_USE_GENERIC */
+
+int main(int argc, char** argv) { return 1; }
+
+#endif /* GRPC_TIMER_USE_GENERIC */