Changeset 3336

Timestamp:

01/30/10 15:53:00 (7 weeks ago)

Author:

mgray

Message:

Implemented getDatabaseConnection() in ApplicationServer?.

Location:

Enterprise/branches/0075_TR_SCRIPTING/AppServer

Files:

• I_ApplicationServer.hpp (modified) (4 diffs)
• src/ApplicationServer.cpp (modified) (6 diffs)
• src/ApplicationServer.hpp (modified) (6 diffs)

Enterprise/branches/0075_TR_SCRIPTING/AppServer/I_ApplicationServer.hpp

@@ -34 +34 @@
 #include <Zen/Core/Plugins/I_Configuration.hpp>
 #include <Zen/Core/Threading/I_Condition.hpp>
+#include <Zen/Core/Threading/I_Thread.hpp>
 #include <Zen/Core/Scripting/I_ScriptEngine.hpp>
 
@@ -40 +41 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 namespace Zen {
+    namespace Database {
+        class I_DatabaseConnection;
+    }   // namespace Database
 namespace Enterprise {
 namespace AppServer {
@@ -79 +83 @@
     typedef Memory::managed_ptr<I_MessageRegistry>          pMessageRegistry_type;
 
+    typedef Memory::managed_ptr<Database::I_DatabaseConnection> pDatabaseConnection_type;
+
     typedef Zen::Plugins::I_ConfigurationElement::const_ptr_type    pConfig_type;
 
@@ -169 +175 @@
     /// @see I_SessionEvent
     virtual void handleSessionEvent(pSessionEvent_type _pSessionEvent) = 0;
+
+    /// Get the database connection for the current thread.
+    virtual pDatabaseConnection_type getDatabaseConnection(const std::string& _database, Zen::Threading::I_Thread::ThreadId& _threadId) = 0;
     /// @}
 

Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.cpp

@@ -3 +3 @@
 //
 // Copyright (C) 2001 - 2010 Tony Richards
-// Copyright (C) 2008 - 2009 Matthew Alan Gray
+// Copyright (C) 2008 - 2010 Matthew Alan Gray
 // Copyright (C)        2009 Joshua Cassity
 //
@@ -46 +46 @@
 
 #include <Zen/Core/Threading/MutexFactory.hpp>
+#include <Zen/Core/Threading/I_Mutex.hpp>
+#include <Zen/Core/Threading/CriticalSection.hpp>
 
 #include <Zen/Core/Scripting/I_ScriptableService.hpp>
@@ -51 +53 @@
 #include <Zen/Enterprise/Networking/I_Endpoint.hpp>
 #include <Zen/Enterprise/Networking/I_Address.hpp>
+
+#include <Zen/Enterprise/Database/I_DatabaseManager.hpp>
+#include <Zen/Enterprise/Database/I_DatabaseService.hpp>
+#include <Zen/Enterprise/Database/I_DatabaseConnection.hpp>
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
@@ -80 +86 @@
 ,   m_pApplicationGuard(Threading::MutexFactory::create())
 ,   m_pMessageRegistry_type(new NumericTypeMessageRegistry(), &destroy)
+,   m_databaseConnectionsMap()
 {
 }
@@ -808 +815 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+ApplicationServer::pDatabaseConnection_type
+ApplicationServer::getDatabaseConnection(const std::string& _database,
+                                         Zen::Threading::I_Thread::ThreadId& _threadId)
+{
+    /// Do we need to guard this?
+
+    DatabaseConnectionsMap_type::iterator iter = m_databaseConnectionsMap.find(_database);
+    if( iter != m_databaseConnectionsMap.end() )
+    {
+        return iter->second.getConnection(_threadId);
+    }
+    else
+    {
+        return pDatabaseConnection_type();
+        // TODO Error?
+    }
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 void
 ApplicationServer::handleInstallProtocol(pProtocolService_type _pProtocolService, const std::string& _protocolName)
@@ -862 +888 @@
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+ApplicationServer::DatabaseConnections::DatabaseConnections(pDatabaseService_type _pService,
+                                                            config_type _connectionConfig)
+:   m_pDatabaseService(_pService)
+,   m_connectionConfig(_connectionConfig)
+,   m_databaseConnections()
+,   m_databaseConnectionsMutex(Zen::Threading::MutexFactory::create())
+{
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+ApplicationServer::DatabaseConnections::~DatabaseConnections()
+{
+    Zen::Threading::MutexFactory::destroy(m_databaseConnectionsMutex);
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
+ApplicationServer::DatabaseConnections::pDatabaseConnection_type
+ApplicationServer::DatabaseConnections::getConnection(Zen::Threading::I_Thread::ThreadId& _threadId)
+{
+    Zen::Threading::CriticalSection guard(m_databaseConnectionsMutex);
+
+    DatabaseConnections_type::iterator iter = m_databaseConnections.find(_threadId);
+    if( iter != m_databaseConnections.end() )
+    {
+        return iter->second;
+    }
+    else
+    {
+        pDatabaseConnection_type pDatabaseConnection = m_pDatabaseService->connect(_threadId.toString(), m_connectionConfig);
+        m_databaseConnections[_threadId] = pDatabaseConnection;
+        return pDatabaseConnection;
+    }
+}
+
+//-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 }   // namespace AppServer
 }   // namespace Enterprise

Enterprise/branches/0075_TR_SCRIPTING/AppServer/src/ApplicationServer.hpp

@@ -3 +3 @@
 //
 // Copyright (C) 2001 - 2010 Tony Richards
-// Copyright (C) 2008 - 2009 Matthew Alan Gray
+// Copyright (C) 2008 - 2010 Matthew Alan Gray
 // Copyright (C)        2009 Joshua Cassity
 //
@@ -31 +31 @@
 #include "../I_ApplicationServer.hpp"
 
+#include <Zen/Core/Threading/I_Thread.hpp>
 #include <Zen/Core/Threading/ThreadPool.hpp>
 
@@ -40 +41 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 namespace Zen {
+    namespace Database {
+        class I_DatabaseService;
+        class I_DatabaseConnection;
+    }   // namespace Database
 namespace Enterprise {
 namespace AppServer {
@@ -86 +91 @@
     virtual void handleRequest(pRequest_type _pRequest, pResponseHandler_type _pResponseHandler);
     virtual void handleSessionEvent(pSessionEvent_type _pSessionEvent);
+    virtual pDatabaseConnection_type getDatabaseConnection(const std::string& _database, Zen::Threading::I_Thread::ThreadId& _threadId);
     /// @}
 
@@ -108 +114 @@
 
     Threading::ThreadPool& getSharedThreadPool() { return m_sharedThreadPool; }
+    /// @}
+
+    /// @name Inner classes
+    /// @{
+private:
+    class DatabaseConnections
+    {
+        /// @name Types
+        /// @{
+    public:
+        typedef Zen::Memory::managed_ptr<Zen::Database::I_DatabaseService>              pDatabaseService_type;
+        typedef std::map<std::string,std::string>                                       config_type;
+        typedef Zen::Memory::managed_ptr<Zen::Database::I_DatabaseConnection>           pDatabaseConnection_type;
+        typedef std::map<Zen::Threading::I_Thread::ThreadId,pDatabaseConnection_type>   DatabaseConnections_type;
+        /// @}
+
+        /// @name DatabaseConnections implementation
+        /// @{
+    public:
+        pDatabaseConnection_type getConnection(Zen::Threading::I_Thread::ThreadId& _threadId);
+        /// @}
+
+        /// @name 'Structors
+        /// @{
+                 DatabaseConnections(pDatabaseService_type _pService, config_type _connectionConfig);
+                ~DatabaseConnections();
+        /// @}
+
+        /// @name Member Variables
+        /// @{
+    private:
+        pDatabaseService_type           m_pDatabaseService;
+        config_type                     m_connectionConfig;
+        DatabaseConnections_type        m_databaseConnections;
+        Zen::Threading::I_Mutex*        m_databaseConnectionsMutex;
+        /// @}
+
+    };  // class DatabaseConnections
     /// @}
 
@@ -156 +200 @@
 
     pMessageRegistry_type       m_pMessageRegistry_type;
+
+    typedef std::map<std::string, DatabaseConnections>  DatabaseConnectionsMap_type;
+    DatabaseConnectionsMap_type m_databaseConnectionsMap;
     /// @}