Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Request.hpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Request.hpp (revision 878) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Request.hpp (revision 3331) @@ -50,4 +50,5 @@ /// @{ public: + virtual unsigned int getRequestId() const = 0; /// @} Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.hpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.hpp (revision 3246) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.hpp (revision 3331) @@ -73,4 +73,5 @@ virtual void stop(); virtual void registerDefaultScriptEngine(pScriptEngine_type _pEngine); + virtual pScriptEngine_type getDefaultScriptEngine(); virtual void installProtocols(pConfig_type _pProtocolsConfig); virtual void installProtocol(pProtocolService_type _pProtocolService, const std::string& _protocolName); Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.cpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.cpp (revision 3246) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.cpp (revision 3331) @@ -49,4 +49,7 @@ #include +#include +#include + //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ namespace Zen { @@ -270,4 +273,11 @@ m_pScriptEngine = _pEngine; +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +ApplicationServer::pScriptEngine_type +ApplicationServer::getDefaultScriptEngine() +{ + return m_pScriptEngine; } @@ -743,4 +753,12 @@ ResourceLocation* pDestination = dynamic_cast(_pRequest->getDestinationLocation().get()); + // TODO: If _pRequest destination is not this server then the request is destined for + // another destination and it should be sent instead of dispatched. + std::cout << "Sending a request to " + << _pRequest->getDestinationEndpoint()->getAddress().toString() + << "/" + << pDestination->toString() + << std::endl; + if (pDestination != NULL) { Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_ApplicationServer.hpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_ApplicationServer.hpp (revision 3311) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_ApplicationServer.hpp (revision 3331) @@ -108,4 +108,7 @@ virtual void registerDefaultScriptEngine(pScriptEngine_type _pEngine) = 0; + /// Get the default script engine. + virtual pScriptEngine_type getDefaultScriptEngine() = 0; + /// Install multiple protocol services using the provided configuration. /// The provided configuration should have zero or more entries which Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/scriptable_generic_service.hpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/scriptable_generic_service.hpp (revision 3331) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/scriptable_generic_service.hpp (revision 3331) @@ -0,0 +1,385 @@ +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +// Zen Enterprise Framework +// +// Copyright (C) 2001 - 2010 Tony Richards +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would be +// appreciated but is not required. +// 2. Altered source versions must be plainly marked as such, and must not be +// misrepresented as being the original software. +// 3. This notice may not be removed or altered from any source distribution. +// +// Tony Richards trichards@indiezen.com +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +#ifndef ZEN_APPSERVER_SCRIPTABLE_GENERIC_SERVICE_HPP_INCLUDED +#define ZEN_APPSERVER_SCRIPTABLE_GENERIC_SERVICE_HPP_INCLUDED + +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include + +#include + +#include + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +namespace Zen { + namespace Threading { + class ThreadPool; + } // namespace Threading +namespace Enterprise { +namespace AppServer { +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +namespace detail { +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +; + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +/// Handler Base. +/// Used to make the destructor visible. +struct handler_base +: public I_ResponseHandler +{ + virtual ~handler_base() + { + } +}; + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +struct response_handler +: public handler_base +{ + typedef typename Request_type::pRequest_type pRequest_type; + typedef boost::function Function_type; + + virtual void handleResponse(pResponse_type _pResponse) + { + // Use the function to dispatch the handler. + m_function(_pResponse, *m_pRequest, m_payload); + } + + response_handler(pRequest_type _pRequest, Payload_type _payload, Function_type _function) + : m_function(_function) + , m_pRequest(_pRequest) + , m_payload(_payload) + { + } + + virtual ~response_handler() + { + } + +public: + + Function_type m_function; + pRequest_type m_pRequest; + Payload_type m_payload; +}; // struct response_handler + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +} // namespace detail +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ + +template +class create_request +{ + /// @name Types + /// @{ +public: + typedef Zen::Memory::managed_ptr pEndpoint_type; + typedef typename Request_type::pRequest_type pRequest_type; + /// @} + +public: + inline + Request_type* operator->() + { + return m_pRawRequest; + } + + /// @name 'Structors + /// @{ +public: + inline + create_request(pEndpoint_type _pEndpoint, Payload_type _payload) + : m_payload(_payload) + , m_pRequest(Request_type::create(pEndpoint_type(), _pEndpoint)) + { + m_pRawRequest = dynamic_cast(m_pRequest.get()); + } + /// @} + + /// @name Member Variables + /// @{ +public: + Payload_type m_payload; + Request_type* m_pRawRequest; + pRequest_type m_pRequest; + /// @} +}; + +template +class scriptable_generic_service +: public BaseClass_type +, public Zen::Scripting::I_ScriptableService +, public Zen::Memory::managed_self_ref +{ + /// @name Types + /// @{ +public: + typedef Class_type* pScriptObject_type; + typedef Zen::Scripting::ObjectReference ScriptObjectReference_type; + typedef ScriptObjectReference_type ScriptWrapper_type; + typedef ScriptWrapper_type* pScriptWrapper_type; + + typedef Zen::Memory::managed_ptr pEndpoint_type; + typedef I_ApplicationServer::pResponseHandler_type pResponseHandler_type; + typedef I_ApplicationServer::pRequest_type pRequest_type; + typedef I_ApplicationServer::pResponse_type pResponse_type; + typedef I_ApplicationServer::pMessage_type pMessage_type; + + typedef Memory::managed_ptr pResponseHandler_type; + typedef std::map ResponseHandlers_type; + /// @} + + /// @name I_StartupShutdownParticipant implementation + /// @{ +public: + virtual void setConfiguration(const Zen::Plugins::I_ConfigurationElement& _config); + virtual Zen::Threading::I_Condition* prepareToStart(Zen::Threading::ThreadPool& _threadPool); + virtual void start(); + virtual Zen::Threading::I_Condition* prepareToStop(); + virtual void stop(); + /// @} + + /// @name I_RequestHandler implementation + /// @{ +public: + virtual void handleRequest(pRequest_type _pRequest, pResponseHandler_type _pResponseHandler); + /// @} + + /// @name I_ApplicationService implementation + /// @{ +public: + virtual I_ApplicationServer& getApplicationServer(); + virtual void handleMessage(pMessage_type _pMessage); + /// @} + + /// @name Implementation + /// @{ +public: + template + void send(create_request& _request, boost::function _function); + /// @} + + /// @name 'Structors + /// @{ +protected: + scriptable_generic_service(Zen::Enterprise::AppServer::I_ApplicationServer& _appServer); + virtual ~scriptable_generic_service(); + /// @} + + /// @name Member Variables + /// @{ +private: + I_ApplicationServer& m_appServer; + + /// Map from getRequestId() to the response handler. + ResponseHandlers_type m_responseHandlers; + + /// Mutex to guard m_responseHandlers. + Zen::Threading::I_Mutex* m_pHandlersMutex; + +protected: + /// Thread Pool from the application server. + /// Use this if you need a thread instead of spawning one yourself. + Zen::Threading::ThreadPool* m_pThreadPool; + /// @} +}; // template scriptable_generic_service + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +scriptable_generic_service::scriptable_generic_service(Zen::Enterprise::AppServer::I_ApplicationServer& _appServer) +: m_appServer(_appServer) +, m_pHandlersMutex(Zen::Threading::MutexFactory::create()) +{ +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +scriptable_generic_service::~scriptable_generic_service() +{ + Zen::Threading::MutexFactory::destroy(m_pHandlersMutex); +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +void +scriptable_generic_service::setConfiguration(const Zen::Plugins::I_ConfigurationElement& _config) +{ +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +Zen::Threading::I_Condition* +scriptable_generic_service::prepareToStart(Zen::Threading::ThreadPool& _threadPool) +{ + m_pThreadPool = &_threadPool; + + // Ready to go, so don't bother returning a condition variable + return NULL; +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +void +scriptable_generic_service::start() +{ +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +Zen::Threading::I_Condition* +scriptable_generic_service::prepareToStop() +{ + return NULL; +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +void +scriptable_generic_service::stop() +{ +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +I_ApplicationServer& +scriptable_generic_service::getApplicationServer() +{ + return m_appServer; +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +void +scriptable_generic_service::handleMessage(pMessage_type _pMessage) +{ + // Check to see if it's a response + Zen::Memory::managed_ptr pResponse( + _pMessage.as >()); + + // If it is, handle it. + if(pResponse.isValid()) + { + pResponseHandler_type pHandler; + + // Find the handler + { + Zen::Threading::CriticalSection guard(m_pHandlersMutex); + ResponseHandlers_type::iterator iter = m_responseHandlers.find(pResponse->getRequestMessageId()); + + if(iter != m_responseHandlers.end()) + { + pHandler = iter->second; + + m_responseHandlers.erase(iter); + } + } + + // If the handler was found, use it. + if (pHandler.isValid()) + { + // Dispatch the response + pHandler->handleResponse(pResponse); + } + else + { + // Probably a duplicate response... just ignore it + // Or maybe it was a message that timed out? + } + } +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +inline void destroyHandler(Memory::managed_weak_ptr _pHandler) +{ + delete dynamic_cast(_pHandler.get()); +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +template +inline +void +scriptable_generic_service::send(create_request& _request, boost::function _function) +{ + detail::response_handler* pRawHandler = new detail::response_handler(_request.m_pRequest, _request.m_payload, _function); + + Memory::managed_ptr pHandler(pRawHandler, destroyHandler); + + { + Zen::Threading::CriticalSection guard(m_pHandlersMutex); + m_responseHandlers[_request.m_pRawRequest->getRequestId()] = pHandler; + } + + getApplicationServer().handleRequest(_request.m_pRequest, pHandler); +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +template +inline +void +scriptable_generic_service::handleRequest(pRequest_type _pRequest, pResponseHandler_type _pResponseHandler) +{ + ResponseHandlers_type::iterator iter = m_responseHandlers.find(_pRequest->getRequestId()); + if(iter == m_responseHandlers.end()) + { + m_responseHandlers[_pRequest->getRequestId()] = _pResponseHandler; + } + + _pRequest->getDestinationEndpoint()->getProtocolAdapter().lock()->sendTo( + _pRequest, + _pRequest->getDestinationEndpoint() + ); +} + +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ +} // namespace AppServer +} // namespace Enterprise +} // namespace Zen +//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~ + +#endif // ZEN_APPSERVER_SCRIPTABLE_GENERIC_SERVICE_HPP_INCLUDED Index: Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Response.hpp =================================================================== --- Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Response.hpp (revision 1493) +++ Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_Response.hpp (revision 3331) @@ -50,4 +50,6 @@ /// @{ public: + /// Get the message Id associated with the request + virtual unsigned int getRequestMessageId() const = 0; /// @}