zeroc-ice · externl · Aug 1, 2024 · Jul 19, 2024 · Jul 19, 2024 · Jul 22, 2024
diff --git a/Package.resolved b/Package.resolved
@@ -6,16 +6,7 @@
       "location" : "https://github.com/zeroc-ice/mcpp.git",
       "state" : {
         "branch" : "master",
-        "revision" : "bfd4b159d9428c983e2abb48c8d344003a019caf"
-      }
-    },
-    {
-      "identity" : "promisekit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/mxcl/PromiseKit.git",
-      "state" : {
-        "revision" : "6fcc08077124e9747f1ec7bd8bb78f5caffe5a79",
-        "version" : "8.1.2"
+        "revision" : "406c5e05578438c5df4c62cb9f33038f093c700f"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -40,35 +40,34 @@ let package = Package(
         .plugin(name: "CompileSlice", targets: ["CompileSlice"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "8.1.2"),
         .package(url: "https://github.com/zeroc-ice/mcpp.git", branch: "master"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"),
     ],
     targets: [
         .target(
             name: "Ice",
-            dependencies: ["IceImpl", "PromiseKit"],
+            dependencies: ["IceImpl"],
             path: "swift/src/Ice",
             resources: [.process("slice-plugin.json")],
             plugins: [.plugin(name: "CompileSlice")]
         ),
         .target(
             name: "Glacier2",
-            dependencies: ["Ice", "PromiseKit"],
+            dependencies: ["Ice"],
             path: "swift/src/Glacier2",
             resources: [.process("slice-plugin.json")],
             plugins: [.plugin(name: "CompileSlice")]
         ),
         .target(
             name: "IceGrid",
-            dependencies: ["Ice", "Glacier2", "PromiseKit"],
+            dependencies: ["Ice", "Glacier2"],
             path: "swift/src/IceGrid",
             resources: [.process("slice-plugin.json")],
             plugins: [.plugin(name: "CompileSlice")]
         ),
         .target(
             name: "IceStorm",
-            dependencies: ["Ice", "PromiseKit"],
+            dependencies: ["Ice"],
             path: "swift/src/IceStorm",
             resources: [.process("slice-plugin.json")],
             plugins: [.plugin(name: "CompileSlice")]

diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
@@ -17,10 +17,6 @@
 #include "Proxy.h"
 #include "SSL/ServerAuthenticationOptions.h"
 
-#ifdef __APPLE__
-#    include <dispatch/dispatch.h>
-#endif
-
 namespace Ice
 {
     class LocatorPrx;
@@ -382,24 +378,6 @@ namespace Ice
          */
         FacetMap findAllAdminFacets();
 
-#ifdef __APPLE__
-        /**
-         * Returns the client dispatch queue, if any.
-         * @return The dispatch queue associated wih this Communicator's
-         * client thread pool, or nullptr if none is configured.
-         * @remarks This operation is only available on Apple platforms.
-         */
-        dispatch_queue_t getClientDispatchQueue() const;
-
-        /**
-         * Returns the server dispatch queue
-         * @return The dispatch queue associated wih the Communicator's
-         * server thread pool, or nullptr if none is configured.
-         * @remarks This operation is only available on Apple platforms.
-         */
-        dispatch_queue_t getServerDispatchQueue() const;
-#endif
-
         void postToClientThreadPool(std::function<void()> call);
 
     private:

diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
@@ -290,15 +290,6 @@ namespace Ice
          */
         std::function<void()> threadStop;
 
-#ifdef __APPLE__
-        /**
-         * Whether or not to use a dispatch queue for ThreadPool execution. If true, each {@link ThreadPool} will
-         * create and use a dispatch queue for executing tasks. The default is false. Both this and {@link executor}
-         * cannot be set at the same time. Only available on Apple platforms.
-         */
-        bool useDispatchQueueExecutor = false;
-#endif
-
         /**
          * You can control which thread receives operation dispatches and async invocation
          * callbacks by supplying an executor.

diff --git a/cpp/include/Ice/ObjectAdapter.h b/cpp/include/Ice/ObjectAdapter.h
@@ -13,10 +13,6 @@
 #include "ProxyFunctions.h"
 #include "ServantLocator.h"
 
-#ifdef __APPLE__
-#    include <dispatch/dispatch.h>
-#endif
-
 #include <memory>
 #include <optional>
 
@@ -477,15 +473,6 @@ namespace Ice
          */
         virtual void setPublishedEndpoints(const EndpointSeq& newEndpoints) = 0;
 
-#ifdef __APPLE__
-        /**
-         * Get the dispatch queue used by this object adapter's thread pool, if any.
-         * @return The dispatch queue, or nullptr if none is configured.
-         * @remarks This operation is only available on Apple platforms.
-         */
-        virtual dispatch_queue_t getDispatchQueue() const = 0;
-#endif
-
     protected:
         virtual ObjectPrx _add(const ObjectPtr& servant, const Identity& id) = 0;
         virtual ObjectPrx _addFacet(const ObjectPtr& servant, const Identity& id, const std::string& facet) = 0;

diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -30,25 +30,15 @@ namespace
             copy(p, p + sizeof(std::int32_t), os->b.begin() + pos);
         }
     }
-
-    bool initHasExecutor(const InitializationData& initData)
-    {
-#ifdef __APPLE__
-        if (initData.useDispatchQueueExecutor)
-        {
-            return true;
-        }
-#endif
-        return initData.executor != nullptr;
-    }
 }
 
 CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter)
     : RequestHandler(ref),
       _adapter(dynamic_pointer_cast<ObjectAdapterI>(adapter)),
-      _hasExecutor(initHasExecutor(_reference->getInstance()->initializationData())),
-      _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance.
-      _traceLevels(_reference->getInstance()->traceLevels()),          // Cached for better performance.
+      _hasExecutor(
+          _reference->getInstance()->initializationData().executor != nullptr), // Cached for better performance.
+      _logger(_reference->getInstance()->initializationData().logger),          // Cached for better performance.
+      _traceLevels(_reference->getInstance()->traceLevels()),                   // Cached for better performance.
       _requestId(0)
 {
 }

diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -51,7 +51,6 @@ namespace IceInternal
         void dispatchException(std::int32_t, std::exception_ptr);
 
         const std::shared_ptr<Ice::ObjectAdapterI> _adapter;
-        // The application configured a custom executor or a dispatch queue executor in InitializationData
         const bool _hasExecutor;
         const Ice::LoggerPtr _logger;
         const TraceLevelsPtr _traceLevels;

diff --git a/cpp/src/Ice/Communicator.cpp b/cpp/src/Ice/Communicator.cpp
@@ -211,21 +211,6 @@ Ice::Communicator::getValueFactoryManager() const noexcept
     return _instance->initializationData().valueFactoryManager;
 }
 
-#ifdef __APPLE__
-dispatch_queue_t
-Ice::Communicator::getClientDispatchQueue() const
-{
-    return _instance->clientThreadPool()->getDispatchQueue();
-}
-
-dispatch_queue_t
-Ice::Communicator::getServerDispatchQueue() const
-{
-    return _instance->serverThreadPool()->getDispatchQueue();
-}
-
-#endif
-
 void
 Ice::Communicator::postToClientThreadPool(function<void()> call)
 {

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
@@ -126,17 +126,6 @@ namespace
         }
         return os.str();
     }
-
-    bool initHasExecutor(const InitializationData& initData)
-    {
-#ifdef __APPLE__
-        if (initData.useDispatchQueueExecutor)
-        {
-            return true;
-        }
-#endif
-        return initData.executor != nullptr;
-    }
 }
 
 ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection, const InstancePtr& instance)
@@ -1792,10 +1781,10 @@ Ice::ConnectionI::ConnectionI(
       _connector(connector),
       _endpoint(endpoint),
       _adapter(adapter),
-      _hasExecutor(initHasExecutor(_instance->initializationData())), // Cached for better performance.
-      _logger(_instance->initializationData().logger),                // Cached for better performance.
-      _traceLevels(_instance->traceLevels()),                         // Cached for better performance.
-      _timer(_instance->timer()),                                     // Cached for better performance.
+      _hasExecutor(_instance->initializationData().executor != nullptr), // Cached for better performance.
+      _logger(_instance->initializationData().logger),                   // Cached for better performance.
+      _traceLevels(_instance->traceLevels()),                            // Cached for better performance.
+      _timer(_instance->timer()),                                        // Cached for better performance.
       _connectTimeout(options.connectTimeout),
       _closeTimeout(options.closeTimeout), // not used for datagram connections
       // suppress inactivity timeout for datagram connections

diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
@@ -334,7 +334,6 @@ namespace Ice
 
         ObjectAdapterIPtr _adapter;
 
-        // The application configured a custom executor or a dispatch queue executor in InitializationData
         const bool _hasExecutor;
 
         const LoggerPtr _logger;

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -686,18 +686,6 @@ Ice::ObjectAdapterI::setPublishedEndpoints(const EndpointSeq& newEndpoints)
     }
 }
 
-#ifdef __APPLE__
-dispatch_queue_t
-Ice::ObjectAdapterI::getDispatchQueue() const
-{
-    lock_guard lock(_mutex);
-
-    checkForDeactivation();
-
-    return getThreadPool()->getDispatchQueue();
-}
-#endif
-
 bool
 Ice::ObjectAdapterI::isLocal(const ReferencePtr& ref) const
 {

diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
@@ -21,10 +21,6 @@
 #include "ServantManagerF.h"
 #include "ThreadPoolF.h"
 
-#ifdef __APPLE__
-#    include <dispatch/dispatch.h>
-#endif
-
 #include <list>
 #include <mutex>
 #include <optional>
@@ -87,10 +83,6 @@ namespace Ice
         EndpointSeq getPublishedEndpoints() const noexcept;
         void setPublishedEndpoints(const EndpointSeq&) final;
 
-#ifdef __APPLE__
-        dispatch_queue_t getDispatchQueue() const final;
-#endif
-
         bool isLocal(const IceInternal::ReferencePtr&) const;
 
         void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&, CompressBatch);

diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
@@ -30,40 +30,6 @@ namespace
     class ThreadPoolDestroyedException
     {
     };
-
-#ifdef __APPLE__
-    string prefixToDispatchQueueLabel(string_view prefix)
-    {
-        if (prefix == "Ice.ThreadPool.Client")
-        {
-            return "com.zeroc.ice.client";
-        }
-
-        if (prefix == "Ice.ThreadPool.Server")
-        {
-            return "com.zeroc.ice.server";
-        }
-
-        string::size_type end = prefix.find_last_of(".ThreadPool");
-        if (end == string::npos)
-        {
-            end = prefix.size();
-        }
-
-        return "com.zeroc.ice.oa." + string{prefix.substr(0, end)};
-    }
-
-    dispatch_queue_t initDispatchQueue(const InitializationData& initData, string_view prefix)
-    {
-        if (initData.useDispatchQueueExecutor)
-        {
-            return dispatch_queue_create(
-                prefixToDispatchQueueLabel(prefix).c_str(),
-                DISPATCH_QUEUE_CONCURRENT_WITH_AUTORELEASE_POOL);
-        }
-        return nullptr;
-    }
-#endif
 }
 
 IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(ThreadPool& threadPool)
@@ -182,9 +148,6 @@ IceInternal::ThreadPool::create(const InstancePtr& instance, const string& prefi
 
 IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& prefix, int timeout)
     : _instance(instance),
-#ifdef __APPLE__
-      _dispatchQueue(initDispatchQueue(instance->initializationData(), prefix)),
-#endif
       _executor(_instance->initializationData().executor),
       _destroyed(false),
       _prefix(prefix),
@@ -207,22 +170,6 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
 #endif
       _promote(true)
 {
-#ifdef __APPLE__
-    if (_dispatchQueue && _executor)
-    {
-        throw InitializationException{__FILE__, __LINE__, "cannot use both dispatch queues and custom executors"};
-    }
-
-    if (_dispatchQueue)
-    {
-        _executor = [dispatchQueue = _dispatchQueue](function<void()> call, const Ice::ConnectionPtr&)
-        {
-            dispatch_sync(dispatchQueue, ^{
-              call();
-            });
-        };
-    }
-#endif
 }
 
 void
@@ -365,16 +312,7 @@ IceInternal::ThreadPool::initialize()
     }
 }
 
-IceInternal::ThreadPool::~ThreadPool()
-{
-    assert(_destroyed);
-#ifdef __APPLE__
-    if (_dispatchQueue)
-    {
-        dispatch_release(_dispatchQueue);
-    }
-#endif
-}
+IceInternal::ThreadPool::~ThreadPool() { assert(_destroyed); }
 
 void
 IceInternal::ThreadPool::destroy()
@@ -577,14 +515,6 @@ IceInternal::ThreadPool::prefix() const
     return _prefix;
 }
 
-#ifdef __APPLE__
-dispatch_queue_t
-IceInternal::ThreadPool::getDispatchQueue() const noexcept
-{
-    return _dispatchQueue;
-}
-#endif
-
 void
 IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 {