add cf_engine to default event engine factory

HannahShiSFB · Jan 23, 2023 · 2a66b27 · 2a66b27
1 parent 10836be
commit 2a66b27
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/BUILD b/BUILD
@@ -70,11 +70,26 @@ config_setting(
     values = {"crosstool_top": "//external:android/crosstool"},
 )
 
+config_setting(
+    name = "macos",
+    values = {"apple_platform_type": "macos"},
+)
+
 config_setting(
     name = "ios",
     values = {"apple_platform_type": "ios"},
 )
 
+config_setting(
+    name = "tvos",
+    values = {"apple_platform_type": "tvos"},
+)
+
+config_setting(
+    name = "watchos",
+    values = {"apple_platform_type": "watchos"},
+)
+
 config_setting(
     name = "systemd",
     values = {"define": "use_systemd=true"},
@@ -144,10 +159,15 @@ config_setting(
 )
 
 config_setting(
-    name = "mac_x86_64",
+    name = "mac",
     values = {"cpu": "darwin"},
 )
 
+config_setting(
+    name = "mac_x86_64",
+    values = {"cpu": "darwin_x86_64"},
+)
+
 config_setting(
     name = "mac_arm64",
     values = {"cpu": "darwin_arm64"},

diff --git a/src/core/BUILD b/src/core/BUILD
@@ -2077,6 +2077,12 @@ grpc_cc_library(
         "//:windows": ["windows_event_engine"],
         "//:windows_msvc": ["windows_event_engine"],
         "//:windows_other": ["windows_event_engine"],
+        "//:mac": ["cf_event_engine"],
+        "//:mac_x86_64": ["cf_event_engine"],
+        "//:mac_arm64": ["cf_event_engine"],
+        "//:ios": ["cf_event_engine"],
+        "//:tvos": ["cf_event_engine"],
+        "//:watchos": ["cf_event_engine"],
         "//conditions:default": ["posix_event_engine"],
     }],
     deps = [

diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc
@@ -20,7 +20,7 @@
 
 #include <grpc/event_engine/event_engine.h>
 
-#ifdef GPR_WINDOWS
+#if defined(GPR_WINDOWS)
 #include "src/core/lib/event_engine/windows/windows_engine.h"
 
 namespace grpc_event_engine {
@@ -32,7 +32,19 @@ std::unique_ptr<EventEngine> DefaultEventEngineFactory() {
 
 }  // namespace experimental
 }  // namespace grpc_event_engine
-#else  // not GPR_WINDOWS
+#elif defined(GPR_APPLE)
+#include "src/core/lib/event_engine/cf_engine/cf_engine.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+std::unique_ptr<EventEngine> DefaultEventEngineFactory() {
+  return std::make_unique<CFEventEngine>();
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+#else
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 
 namespace grpc_event_engine {

diff --git a/test/core/event_engine/posix/BUILD b/test/core/event_engine/posix/BUILD
@@ -224,6 +224,7 @@ grpc_cc_test(
     external_deps = ["gtest"],
     language = "C++",
     tags = [
+        "no_mac",
         "no_windows",
     ],
     uses_event_engine = True,

diff --git a/test/core/event_engine/test_suite/BUILD b/test/core/event_engine/test_suite/BUILD
@@ -84,6 +84,7 @@ grpc_cc_test(
     name = "posix_event_engine_test",
     srcs = ["posix_event_engine_test.cc"],
     tags = [
+        "no_mac",
         "no_windows",
     ],
     uses_event_engine = True,