Removed space from dir name to fix clang_format_code

gRPC-Core.podspec

@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '10.0'
   s.watchos.deployment_target = '4.0'
-  
+
   s.requires_arc = false
 
   name = 'grpc'

src/core/lib/gpr/env_linux.cc

@@ -38,19 +38,20 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 
-static const char* gpr_getenv_silent(const char* name, char** dst) {
+char* gpr_getenv(const char* name) {
-  const char* insecure_func_used = nullptr;
   char* result = nullptr;
 #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
   typedef char* (*getenv_type)(const char*);
-  static getenv_type getenv_func = NULL;
+  static getenv_type getenv_func = nullptr;
   /* Check to see which getenv variant is supported (go from most
    * to least secure) */
-  const char* names[] = {"secure_getenv", "__secure_getenv", "getenv"};
+  if (getenv_func == nullptr) {
-  for (size_t i = 0; getenv_func == NULL && i < GPR_ARRAY_SIZE(names); i++) {
+    const char* names[] = {"secure_getenv", "__secure_getenv", "getenv"};
-    getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]);
+    for (size_t i = 0; i < GPR_ARRAY_SIZE(names); i++) {
-    if (getenv_func != NULL && strstr(names[i], "secure") == NULL) {
+      getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]);
-      insecure_func_used = names[i];
+      if (getenv_func != nullptr) {
+        break;
+      }
     }
   }
   result = getenv_func(name);
@@ -58,20 +59,8 @@ static const char* gpr_getenv_silent(const char* name, char** dst) {
   result = secure_getenv(name);
 #else
   result = getenv(name);
-  insecure_func_used = "getenv";
 #endif
-  *dst = result == nullptr ? result : gpr_strdup(result);
+  return result == nullptr ? result : gpr_strdup(result);
-  return insecure_func_used;
-}
-
-char* gpr_getenv(const char* name) {
-  char* result = nullptr;
-  const char* insecure_func_used = gpr_getenv_silent(name, &result);
-  if (insecure_func_used != nullptr) {
-    gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
-            insecure_func_used);
-  }
-  return result;
 }
 
 void gpr_setenv(const char* name, const char* value) {

src/core/lib/gpr/env_posix.cc

@@ -29,11 +29,6 @@
 #include <grpc/support/string_util.h>
 #include "src/core/lib/gpr/string.h"
 
-const char* gpr_getenv_silent(const char* name, char** dst) {
-  *dst = gpr_getenv(name);
-  return nullptr;
-}
-
 char* gpr_getenv(const char* name) {
   char* result = getenv(name);
   return result == nullptr ? result : gpr_strdup(result);

src/core/lib/iomgr/combiner.cc

@@ -233,11 +233,11 @@ bool grpc_combiner_continue_exec_ctx() {
   // offload only if all the following conditions are true:
   // 1. the combiner is contended and has more than one closure to execute
   // 2. the current execution context needs to finish as soon as possible
-  // 3. the DEFAULT executor is threaded
+  // 3. the current thread is not a worker for any background poller
-  // 4. the current thread is not a worker for any background poller
+  // 4. the DEFAULT executor is threaded
   if (contended && grpc_core::ExecCtx::Get()->IsReadyToFinish() &&
-      grpc_core::Executor::IsThreadedDefault() &&
+      !grpc_iomgr_is_any_background_poller_thread() &&
-      !grpc_iomgr_is_any_background_poller_thread()) {
+      grpc_core::Executor::IsThreadedDefault()) {
     GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0);
     // this execution context wants to move on: schedule remaining work to be
     // picked up on the executor

src/core/lib/surface/completion_queue.cc

@@ -857,17 +857,20 @@ static void cq_end_op_for_callback(
   }
 
   auto* functor = static_cast<grpc_experimental_completion_queue_functor*>(tag);
-  if (internal) {
+  if (internal || grpc_iomgr_is_any_background_poller_thread()) {
     grpc_core::ApplicationCallbackExecCtx::Enqueue(functor,
                                                    (error == GRPC_ERROR_NONE));
     GRPC_ERROR_UNREF(error);
-  } else {
+    return;
-    GRPC_CLOSURE_SCHED(
-        GRPC_CLOSURE_CREATE(
-            functor_callback, functor,
-            grpc_core::Executor::Scheduler(grpc_core::ExecutorJobType::SHORT)),
-        error);
   }
+
+  // Schedule the callback on a closure if not internal or triggered
+  // from a background poller thread.
+  GRPC_CLOSURE_SCHED(
+      GRPC_CLOSURE_CREATE(
+          functor_callback, functor,
+          grpc_core::Executor::Scheduler(grpc_core::ExecutorJobType::SHORT)),
+      error);
 }
 
 void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error,
@@ -1352,6 +1355,13 @@ static void cq_finish_shutdown_callback(grpc_completion_queue* cq) {
   GPR_ASSERT(cqd->shutdown_called);
 
   cq->poller_vtable->shutdown(POLLSET_FROM_CQ(cq), &cq->pollset_shutdown_done);
+  if (grpc_iomgr_is_any_background_poller_thread()) {
+    grpc_core::ApplicationCallbackExecCtx::Enqueue(callback, true);
+    return;
+  }
+
+  // Schedule the callback on a closure if not internal or triggered
+  // from a background poller thread.
   GRPC_CLOSURE_SCHED(
       GRPC_CLOSURE_CREATE(
           functor_callback, callback,

src/core/lib/surface/server.cc

@@ -711,8 +711,10 @@ static void maybe_finish_shutdown(grpc_server* server) {
     return;
   }
 
+  gpr_mu_lock(&server->mu_call);
   kill_pending_work_locked(
       server, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
+  gpr_mu_unlock(&server->mu_call);
 
   if (server->root_channel_data.next != &server->root_channel_data ||
       server->listeners_destroyed < num_listeners(server)) {

src/objective-c/examples/watchOS-sample/watchOS-sample.xcodeproj/project.pbxproj

@@ -148,7 +148,7 @@
 			children = (
 				ABB17D5622D93BAB00C26D6E /* watchOS-sample */,
 				ABB17D6E22D93BAC00C26D6E /* watchOS-sample WatchKit App */,
-				ABB17D7D22D93BAC00C26D6E /* watchOS-sample WatchKit Extension */,
+				ABB17D7D22D93BAC00C26D6E /* watchOS-sample-WatchKit-Extension */,
 				ABB17D5522D93BAB00C26D6E /* Products */,
 				2C4A0708747AAA7298F757DA /* Pods */,
 				589283F4A582EEF2434E0220 /* Frameworks */,
@@ -191,7 +191,7 @@
 			path = "watchOS-sample WatchKit App";
 			sourceTree = "<group>";
 		};
-		ABB17D7D22D93BAC00C26D6E /* watchOS-sample WatchKit Extension */ = {
+		ABB17D7D22D93BAC00C26D6E /* watchOS-sample-WatchKit-Extension */ = {
 			isa = PBXGroup;
 			children = (
 				ABB17D7E22D93BAC00C26D6E /* InterfaceController.h */,
@@ -201,7 +201,7 @@
 				ABB17D8422D93BAD00C26D6E /* Assets.xcassets */,
 				ABB17D8622D93BAD00C26D6E /* Info.plist */,
 			);
-			path = "watchOS-sample WatchKit Extension";
+			path = "watchOS-sample-WatchKit-Extension";
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -598,7 +598,7 @@
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6T98ZJNPG5;
-				INFOPLIST_FILE = "watchOS-sample WatchKit Extension/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/watchOS-sample-WatchKit-Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -620,7 +620,7 @@
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 6T98ZJNPG5;
-				INFOPLIST_FILE = "watchOS-sample WatchKit Extension/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/watchOS-sample-WatchKit-Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

templates/gRPC-Core.podspec.template

@@ -94,7 +94,7 @@
     s.ios.deployment_target = '7.0'
     s.osx.deployment_target = '10.9'
     s.tvos.deployment_target = '10.0'
-    s.watchos.deployment_target = '4.0'    
+    s.watchos.deployment_target = '4.0'
 
     s.requires_arc = false
 

templates/gRPC-ProtoRPC.podspec.template

@@ -38,6 +38,7 @@
     s.ios.deployment_target = '7.0'
     s.osx.deployment_target = '10.9'
     s.tvos.deployment_target = '10.0'
+    s.watchos.deployment_target = '4.0'
 
     name = 'ProtoRPC'
     s.module_name = name

templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template

@@ -108,6 +108,7 @@
     s.ios.deployment_target = '7.0'
     s.osx.deployment_target = '10.9'
     s.tvos.deployment_target = '10.0'
+    s.watchos.deployment_target = '4.0'
     # Restrict the gRPC runtime version to the one supported by this plugin.
     s.dependency 'gRPC-ProtoRPC', v
 

templates/src/objective-c/BoringSSL-GRPC.podspec.template

@@ -87,6 +87,7 @@
     s.ios.deployment_target = '7.0'
     s.osx.deployment_target = '10.7'
     s.tvos.deployment_target = '10.0'
+    s.watchos.deployment_target = '4.0'
 
     name = 'openssl_grpc'