Cleanup ev_epoll_linux_test and add some log statements in

ev_epoll_linux.c

src/core/lib/iomgr/ev_epoll_linux.c

@@ -2125,14 +2125,17 @@ static bool is_epoll_available() {
 }
 
 /* This is mainly for testing purposes. Checks to see if environment variable
- * GRPC_MAX_POLLERS_PER_PI is set and if so, assigns that value to the */
+ * GRPC_MAX_POLLERS_PER_PI is set and if so, assigns that value to
+ * g_max_pollers_per_pi (any negative value is considered INT_MAX) */
 static void set_max_pollers_per_island() {
   char *s = gpr_getenv("GRPC_MAX_POLLERS_PER_PI");
   if (s) {
-    int max_pollers = (int)strtol(s, NULL, 10);
-    if (max_pollers > 0) {
-      g_max_pollers_per_pi = max_pollers;
+    g_max_pollers_per_pi = (int)strtol(s, NULL, 10);
+    if (g_max_pollers_per_pi < 0) {
+      g_max_pollers_per_pi = INT_MAX;
     }
+  } else {
+    g_max_pollers_per_pi = INT_MAX;
   }
 
   gpr_log(GPR_INFO, "Max number of pollers per polling island: %d",

test/core/iomgr/ev_epoll_linux_test.c

@@ -38,10 +38,7 @@
 #include "src/core/lib/iomgr/ev_posix.h"
 
 #include <errno.h>
-#include <signal.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/time.h>
 #include <unistd.h>
 
 #include <grpc/support/alloc.h>
@@ -330,7 +327,7 @@ static __thread int thread_wakeups = 0;
 
 static void test_threading_loop(void *arg) {
   threading_shared *shared = arg;
-  while (thread_wakeups < 20000) {
+  while (thread_wakeups < 1000000) {
     grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
     grpc_pollset_worker *worker;
     gpr_mu_lock(shared->mu);
@@ -363,7 +360,7 @@ static void test_threading(void) {
   shared.pollset = gpr_zalloc(grpc_pollset_size());
   grpc_pollset_init(shared.pollset, &shared.mu);
 
-  gpr_thd_id thds[20];
+  gpr_thd_id thds[10];
   for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) {
     gpr_thd_options opt = gpr_thd_options_default();
     gpr_thd_options_set_joinable(&opt);
@@ -402,46 +399,6 @@ static void test_threading(void) {
   gpr_free(shared.pollset);
 }
 
-/* Convert milliseconds into 'struct timespec' struct. millis == -1 is
- *  * considered as an infinity-time in future */
-static struct timespec millis_to_timespec(int millis) {
-  struct timespec linux_ts;
-  gpr_timespec gpr_ts;
-
-  if (millis == -1) {
-    gpr_ts = gpr_inf_future(GPR_TIMESPAN);
-  } else {
-    gpr_ts = gpr_time_from_millis(millis, GPR_TIMESPAN);
-  }
-
-  linux_ts.tv_sec = (time_t)gpr_ts.tv_sec;
-  linux_ts.tv_nsec = gpr_ts.tv_nsec;
-  return linux_ts;
-}
-
-/* TODO (sreek) - Remove this test before merging. This is written just to
- * understand the functionality of sigtimedwait and serves no other purpose */
-void test_sigwait() {
-  sigset_t wakeup_sig_set;
-  sigemptyset(&wakeup_sig_set);
-  sigaddset(&wakeup_sig_set, SIGRTMIN + 6);
-  int timeout_ms[] = {10, 100};
-
-  for (size_t i = 0; i < GPR_ARRAY_SIZE(timeout_ms); i++) {
-    struct timespec sigwait_timeout = millis_to_timespec(timeout_ms[i]);
-    gpr_log(GPR_ERROR, "sigwait_timeout: %ld, %ld", sigwait_timeout.tv_sec,
-            sigwait_timeout.tv_nsec);
-
-    gpr_log(GPR_ERROR, "Waiting for %d ms...", timeout_ms[i]);
-    gpr_timespec bef = gpr_now(GPR_CLOCK_REALTIME);
-    sigtimedwait(&wakeup_sig_set, NULL, &sigwait_timeout);
-    gpr_timespec af = gpr_now(GPR_CLOCK_REALTIME);
-
-    gpr_log(GPR_ERROR, "Bef: %ld, %d", bef.tv_sec, bef.tv_nsec);
-    gpr_log(GPR_ERROR, "Aft: %ld, %d", af.tv_sec, af.tv_nsec);
-  }
-}
-
 int main(int argc, char **argv) {
   const char *poll_strategy = NULL;
   grpc_test_init(argc, argv);
@@ -452,7 +409,6 @@ int main(int argc, char **argv) {
     test_add_fd_to_pollset();
     test_pollset_queue_merge_items();
     test_threading();
-    test_sigwait();
   } else {
     gpr_log(GPR_INFO,
             "Skipping the test. The test is only relevant for 'epoll' "