Remove amd parameter from Incoming functions

cpp/include/Ice/Exception.h

@@ -79,38 +79,6 @@ namespace Ice
         virtual void _readImpl(::Ice::InputStream*) {}
         /// \endcond
     };
-
-    /**
-     * Base class for all Ice system exceptions.
-     *
-     * System exceptions are currently Ice internal, non-documented
-     * exceptions.
-     * \headerfile Ice/Ice.h
-     */
-    class ICE_API SystemException : public IceUtil::Exception
-    {
-    public:
-        /**
-         * The file and line number are required for all local exceptions.
-         * @param file The file name in which the exception was raised, typically __FILE__.
-         * @param line The line number at which the exception was raised, typically __LINE__.
-         */
-        SystemException(const char* file, int line);
-        SystemException(const SystemException&) = default;
-        virtual ~SystemException();
-
-        /**
-         * Polymorphically clones this exception.
-         * @return A shallow copy of this exception.
-         */
-        std::unique_ptr<SystemException> ice_clone() const;
-
-        /**
-         * Obtains the Slice type ID of this exception.
-         * @return The fully-scoped type ID.
-         */
-        static std::string_view ice_staticId();
-    };
 }
 
 namespace IceInternal

cpp/include/Ice/Incoming.h

@@ -43,9 +43,6 @@ namespace IceInternal
         void writeParamEncaps(const std::uint8_t*, std::int32_t, bool ok);
         void setMarshaledResult(Ice::MarshaledResult&&);
 
-        void response(bool amd);
-        void exception(std::exception_ptr, bool amd);
-
         void setFormat(Ice::FormatType format) { _format = format; }
 
         void invoke(const ServantManagerPtr&, Ice::InputStream*);
@@ -89,12 +86,15 @@ namespace IceInternal
     private:
         void setResponseSent();
 
+        void sendResponse();
+        void sendException(std::exception_ptr);
+
         void warning(const Ice::Exception&) const;
         void warning(std::exception_ptr) const;
 
-        bool servantLocatorFinished(bool amd);
+        bool servantLocatorFinished();
 
-        void handleException(std::exception_ptr, bool amd);
+        void handleException(std::exception_ptr);
 
         Ice::Current _current;
         std::shared_ptr<Ice::Object> _servant;

cpp/src/Ice/CollocatedRequestHandler.cpp

@@ -188,7 +188,7 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
 }
 
 void
-CollocatedRequestHandler::sendResponse(int32_t requestId, OutputStream* os, uint8_t, bool amd)
+CollocatedRequestHandler::sendResponse(int32_t requestId, OutputStream* os, uint8_t)
 {
     OutgoingAsyncBasePtr outAsync;
     {
@@ -222,19 +222,10 @@ CollocatedRequestHandler::sendResponse(int32_t requestId, OutputStream* os, uint
 
     if (outAsync)
     {
-        //
-        // If called from an AMD dispatch, invoke asynchronously
-        // the completion callback since this might be called from
-        // the user code.
-        //
-        if (amd)
-        {
-            outAsync->invokeResponseAsync();
-        }
-        else
-        {
-            outAsync->invokeResponse();
-        }
+        // We invoke the response using a thread-pool thread. If the invocation is a lambda async invocation, we want
+        // the callbacks to execute in a thread-pool thread - never in the application thread that sent the response
+        // via AMD.
+        outAsync->invokeResponseAsync();
     }
 
     _adapter->decDirectCount();
@@ -246,18 +237,10 @@ CollocatedRequestHandler::sendNoResponse()
     _adapter->decDirectCount();
 }
 
-bool
-CollocatedRequestHandler::systemException(int32_t requestId, exception_ptr ex, bool amd)
-{
-    handleException(requestId, ex, amd);
-    _adapter->decDirectCount();
-    return true;
-}
-
 void
-CollocatedRequestHandler::invokeException(int32_t requestId, exception_ptr ex, int /*invokeNum*/, bool amd)
+CollocatedRequestHandler::invokeException(int32_t requestId, exception_ptr ex, int /*invokeNum*/)
 {
-    handleException(requestId, ex, amd);
+    handleException(requestId, ex);
     _adapter->decDirectCount();
 }
 
@@ -338,7 +321,7 @@ CollocatedRequestHandler::invokeAll(OutputStream* os, int32_t requestId, int32_t
             }
             catch (const ObjectAdapterDeactivatedException&)
             {
-                handleException(requestId, current_exception(), false);
+                handleException(requestId, current_exception());
                 break;
             }
 
@@ -350,14 +333,14 @@ CollocatedRequestHandler::invokeAll(OutputStream* os, int32_t requestId, int32_t
     }
     catch (const LocalException&)
     {
-        invokeException(requestId, current_exception(), invokeNum, false); // Fatal invocation exception
+        invokeException(requestId, current_exception(), invokeNum); // Fatal invocation exception
     }
 
     _adapter->decDirectCount();
 }
 
 void
-CollocatedRequestHandler::handleException(int requestId, std::exception_ptr ex, bool amd)
+CollocatedRequestHandler::handleException(int requestId, std::exception_ptr ex)
 {
     if (requestId == 0)
     {
@@ -381,18 +364,9 @@ CollocatedRequestHandler::handleException(int requestId, std::exception_ptr ex,
 
     if (outAsync)
     {
-        //
-        // If called from an AMD dispatch, invoke asynchronously
-        // the completion callback since this might be called from
-        // the user code.
-        //
-        if (amd)
-        {
-            outAsync->invokeExceptionAsync();
-        }
-        else
-        {
-            outAsync->invokeException();
-        }
+        // We invoke the exception using a thread-pool thread. If the invocation is a lambda async invocation, we want
+        // the callbacks to execute in a thread-pool thread - never in the application thread that sent the exception
+        // via AMD.
+       outAsync->invokeExceptionAsync();
     }
 }

cpp/src/Ice/CollocatedRequestHandler.h

@@ -35,10 +35,9 @@ namespace IceInternal
 
         virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, std::exception_ptr);
 
-        virtual void sendResponse(std::int32_t, Ice::OutputStream*, std::uint8_t, bool);
+        virtual void sendResponse(std::int32_t, Ice::OutputStream*, std::uint8_t);
         virtual void sendNoResponse();
-        virtual bool systemException(std::int32_t, std::exception_ptr, bool);
-        virtual void invokeException(std::int32_t, std::exception_ptr, int, bool);
+        virtual void invokeException(std::int32_t, std::exception_ptr, int);
 
         virtual Ice::ConnectionIPtr getConnection();
         virtual Ice::ConnectionIPtr waitForConnection();
@@ -55,7 +54,7 @@ namespace IceInternal
         }
 
     private:
-        void handleException(std::int32_t, std::exception_ptr, bool);
+        void handleException(std::int32_t, std::exception_ptr);
 
         const std::shared_ptr<Ice::ObjectAdapterI> _adapter;
         const bool _dispatcher;

cpp/src/Ice/ConnectionI.cpp

@@ -1097,7 +1097,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, exc
 }
 
 void
-Ice::ConnectionI::sendResponse(int32_t, OutputStream* os, uint8_t compressFlag, bool /*amd*/)
+Ice::ConnectionI::sendResponse(int32_t, OutputStream* os, uint8_t compressFlag)
 {
     std::unique_lock lock(_mutex);
     assert(_state > StateNotValidated);
@@ -1169,14 +1169,8 @@ Ice::ConnectionI::sendNoResponse()
     }
 }
 
-bool
-Ice::ConnectionI::systemException(int32_t, std::exception_ptr, bool /*amd*/)
-{
-    return false; // System exceptions aren't marshalled.
-}
-
 void
-Ice::ConnectionI::invokeException(int32_t, exception_ptr ex, int invokeNum, bool /*amd*/)
+Ice::ConnectionI::invokeException(int32_t, exception_ptr ex, int invokeNum)
 {
     //
     // Fatal exception while invoking a request. Since sendResponse/sendNoResponse isn't
@@ -3395,7 +3389,7 @@ Ice::ConnectionI::invokeAll(
     }
     catch (const LocalException&)
     {
-        invokeException(requestId, current_exception(), invokeNum, false); // Fatal invocation exception
+        invokeException(requestId, current_exception(), invokeNum); // Fatal invocation exception
     }
 }
 

cpp/src/Ice/ConnectionI.h

@@ -174,10 +174,9 @@ namespace Ice
 
         virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, std::exception_ptr);
 
-        virtual void sendResponse(std::int32_t, Ice::OutputStream*, std::uint8_t, bool);
+        virtual void sendResponse(std::int32_t, Ice::OutputStream*, std::uint8_t);
         virtual void sendNoResponse();
-        virtual bool systemException(std::int32_t, std::exception_ptr, bool);
-        virtual void invokeException(std::int32_t, std::exception_ptr, int, bool);
+        virtual void invokeException(std::int32_t, std::exception_ptr, int);
 
         IceInternal::EndpointIPtr endpoint() const;
         IceInternal::ConnectorPtr connector() const;

cpp/src/Ice/Exception.cpp

@@ -132,27 +132,6 @@ Ice::LocalException::ice_staticId()
     return localException_ids[0];
 }
 
-Ice::SystemException::SystemException(const char* file, int line) : Exception(file, line) {}
-
-Ice::SystemException::~SystemException() {}
-
-unique_ptr<Ice::SystemException>
-Ice::SystemException::ice_clone() const
-{
-    return unique_ptr<SystemException>(static_cast<SystemException*>(ice_cloneImpl()));
-}
-
-namespace
-{
-    const string systemException_ids[] = {"::Ice::SystemException"};
-}
-
-std::string_view
-Ice::SystemException::ice_staticId()
-{
-    return systemException_ids[0];
-}
-
 void
 Ice::InitializationException::ice_print(ostream& out) const
 {