Move ExecCtx to grpc_core namespace. Make exec_ctx a private static in ExecCtx and some minor changes

1 files changed, 5 insertions, 5 deletions

diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc
index a1add4a303..9c74b5d1c3 100644
--- a/src/core/lib/iomgr/iomgr.cc
+++ b/src/core/lib/iomgr/iomgr.cc
@@ -49,7 +49,7 @@ void grpc_iomgr_init() {
   g_shutdown = 0;
   gpr_mu_init(&g_mu);
   gpr_cv_init(&g_rcv);
-  ExecCtx::GlobalInit();
+  grpc_core::ExecCtx::GlobalInit();
   grpc_executor_init();
   grpc_timer_list_init();
   g_root_object.next = g_root_object.prev = &g_root_object;
@@ -98,10 +98,10 @@ void grpc_iomgr_shutdown() {
       }
       last_warning_time = gpr_now(GPR_CLOCK_REALTIME);
     }
-    ExecCtx::Get()->SetNow(GRPC_MILLIS_INF_FUTURE);
+    grpc_core::ExecCtx::Get()->SetNowIomgrShutdown();
     if (grpc_timer_check(NULL) == GRPC_TIMERS_FIRED) {
       gpr_mu_unlock(&g_mu);
-      ExecCtx::Get()->Flush();
+      grpc_core::ExecCtx::Get()->Flush();
       grpc_iomgr_platform_flush();
       gpr_mu_lock(&g_mu);
       continue;
@@ -136,14 +136,14 @@ void grpc_iomgr_shutdown() {
   gpr_mu_unlock(&g_mu);
 
   grpc_timer_list_shutdown();
-  ExecCtx::Get()->Flush();
+  grpc_core::ExecCtx::Get()->Flush();
 
   /* ensure all threads have left g_mu */
   gpr_mu_lock(&g_mu);
   gpr_mu_unlock(&g_mu);
 
   grpc_iomgr_platform_shutdown();
-  ExecCtx::GlobalShutdown();
+  grpc_core::ExecCtx::GlobalShutdown();
   grpc_network_status_shutdown();
   gpr_mu_destroy(&g_mu);
   gpr_cv_destroy(&g_rcv);