transactd 1.2.0 → 2.0.0

data/source/bzs/db/transactd/connManager.cpp

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 
@@ -23,179 +23,182 @@
 
 namespace bzs
 {
-	using namespace netsvc::server;
+using namespace netsvc::server;
 namespace db
 {
-	using namespace protocol::tdap::mysql;
-	using namespace engine::mysql;
+using namespace protocol::tdap::mysql;
+using namespace engine::mysql;
 
 namespace transactd
 {
 
 connManager::~connManager()
 {
-
-
 }
 
 const module* getMod(unsigned __int64 conid)
 {
-	for (size_t i=0;i<modules.size();i++)
-	{
-		const module* mod = dynamic_cast<module*>(modules[i]);
-		if ((unsigned __int64)mod == conid)
-			return mod;
-	}
-	return NULL;
+    for (size_t i = 0; i < modules.size(); i++)
+    {
+        const module* mod = dynamic_cast<module*>(modules[i]);
+        if ((unsigned __int64)mod == conid)
+            return mod;
+    }
+    return NULL;
 }
 
-const database* connManager::getDatabase(const module* mod, int dbid)const
+const database* connManager::getDatabase(const module* mod, int dbid) const
 {
 
-	igetDatabases* dbm = dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
-	const databases& dbs = dbm->dbs();
-	if (dbid < (int)dbs.size())
-		return dbs[dbid].get();
-	return NULL;
+    igetDatabases* dbm =
+        dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
+    const databases& dbs = dbm->dbs();
+    if (dbid < (int)dbs.size())
+        return dbs[dbid].get();
+    return NULL;
 }
 
-void connManager::getConnectionList()const
+void connManager::getConnectionList() const
 {
-	for (size_t i=0;i<modules.size();i++)
-	{
-		const module* mod = dynamic_cast<module*>(modules[i]);
-		if (mod && ((unsigned __int64)mod != m_me))
-		{
-			
-			
-			m_records.push_back(connection::record());
-			connection::record& rec = m_records[m_records.size()-1];
-			rec.conId = (unsigned __int64)mod;
-			boost::asio::ip::address adr = mod->m_endpoint.address();
-			strncpy_s(rec.name,64, adr.to_string().c_str(), 64);
-			
-		}
-	}
+    for (size_t i = 0; i < modules.size(); i++)
+    {
+        const module* mod = dynamic_cast<module*>(modules[i]);
+        if (mod && ((unsigned __int64)mod != m_me))
+        {
+
+            m_records.push_back(connection::record());
+            connection::record& rec = m_records[m_records.size() - 1];
+            rec.conId = (unsigned __int64)mod;
+            boost::asio::ip::address adr = mod->m_endpoint.address();
+            strncpy_s(rec.name, 64, adr.to_string().c_str(), 64);
+        }
+    }
 }
 
-void connManager::getDatabaseList(const module* mod)const
+void connManager::getDatabaseList(const module* mod) const
 {
-	igetDatabases* dbm = dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
-	const databases& dbs = dbm->dbs();
-	for (size_t j=0;j<dbs.size();j++)
-	{
-		
-		if (dbs[j])
-		{
-			m_records.push_back(connection::record());
-			connection::record& rec = m_records[m_records.size()-1];
-			rec.conId = (unsigned __int64)mod;
-			rec.cid = dbs[j]->clientID();
-			rec.dbid = (unsigned short)j;
-			strncpy_s(rec.name, 64, dbs[j]->name().c_str(),64);
-		}
-	}
+    igetDatabases* dbm =
+        dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
+    const databases& dbs = dbm->dbs();
+    for (size_t j = 0; j < dbs.size(); j++)
+    {
+
+        if (dbs[j])
+        {
+            m_records.push_back(connection::record());
+            connection::record& rec = m_records[m_records.size() - 1];
+            rec.conId = (unsigned __int64)mod;
+            rec.cid = dbs[j]->clientID();
+            rec.dbid = (unsigned short)j;
+            strncpy_s(rec.name, 64, dbs[j]->name().c_str(), 64);
+        }
+    }
 }
 
-const connManager::records& connManager::getRecords(unsigned __int64 conid, int dbid) const
+const connManager::records& connManager::getRecords(unsigned __int64 conid,
+                                                    int dbid) const
 {
-	boost::mutex::scoped_lock lck(modulesMutex);
-	
-	if (conid==0)
-		getConnectionList();
-	else
-	{
-		const module* mod = getMod(conid);
-		if (mod)
-		{			
-			boost::try_mutex::scoped_try_lock m(mod->mutex(), boost::try_to_lock_t());
-			if (m.owns_lock())
-			{
-				if (dbid < 0)
-					getDatabaseList(mod);
-				else
-				{
-					const database* db = getDatabase(mod, dbid);
-					if (db)
-					{
-						const std::vector<boost::shared_ptr<table> >& tables = db->tables();
-						for (size_t k=0;k<tables.size();k++)
-						{
-							const table* tb = tables[k].get();
-							if (tb)
-							{
-								m_records.push_back(connection::record());
-								connection::record& rec = m_records[m_records.size()-1];
-								rec.conId = (unsigned __int64)mod;
-								rec.cid = db->clientID();
-					
-								strncpy_s(rec.name, 64, tb->name().c_str(),64);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	return m_records;
+    boost::mutex::scoped_lock lck(modulesMutex);
+
+    if (conid == 0)
+        getConnectionList();
+    else
+    {
+        const module* mod = getMod(conid);
+        if (mod)
+        {
+            boost::try_mutex::scoped_try_lock m(mod->mutex(),
+                                                boost::try_to_lock_t());
+            if (m.owns_lock())
+            {
+                if (dbid < 0)
+                    getDatabaseList(mod);
+                else
+                {
+                    const database* db = getDatabase(mod, dbid);
+                    if (db)
+                    {
+                        const std::vector<boost::shared_ptr<table> >& tables =
+                            db->tables();
+                        for (size_t k = 0; k < tables.size(); k++)
+                        {
+                            const table* tb = tables[k].get();
+                            if (tb)
+                            {
+                                m_records.push_back(connection::record());
+                                connection::record& rec =
+                                    m_records[m_records.size() - 1];
+                                rec.conId = (unsigned __int64)mod;
+                                rec.cid = db->clientID();
+
+                                strncpy_s(rec.name, 64, tb->name().c_str(), 64);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return m_records;
 }
 
 void connManager::doDisconnect(unsigned __int64 conid)
 {
-	module* mod = const_cast<module*>(getMod(conid));
-	if (mod)
-	{
-		igetDatabases* dbm = dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
-		const databases& dbs = dbm->dbs();
-		if (dbs.size())
-			mod->disconnect();
-	}
+    module* mod = const_cast<module*>(getMod(conid));
+    if (mod)
+    {
+        igetDatabases* dbm =
+            dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
+        const databases& dbs = dbm->dbs();
+        if (dbs.size())
+            mod->disconnect();
+    }
 }
 
 void connManager::disconnect(unsigned __int64 conid)
 {
-	boost::try_mutex::scoped_lock m(modulesMutex, boost::try_to_lock_t());
-	
-	if (m.owns_lock())
-		doDisconnect(conid);
-	else 
-	{
-		for (int i=0;i<20;i++)
-		{
-			if (m.try_lock())
-				return doDisconnect(conid);	
-			Sleep(100);
-		}
-	}
+    boost::try_mutex::scoped_lock m(modulesMutex, boost::try_to_lock_t());
+
+    if (m.owns_lock())
+        doDisconnect(conid);
+    else
+    {
+        for (int i = 0; i < 20; i++)
+        {
+            if (m.try_lock())
+                return doDisconnect(conid);
+            Sleep(100);
+        }
+    }
 }
 
 void connManager::doDisconnectAll()
 {
-	for (size_t i=0;i<modules.size();i++)
-	{
-		const module* mod = dynamic_cast<module*>(modules[i]);
-		doDisconnect((unsigned __int64)mod);
-	}	
+    for (size_t i = 0; i < modules.size(); i++)
+    {
+        const module* mod = dynamic_cast<module*>(modules[i]);
+        doDisconnect((unsigned __int64)mod);
+    }
 }
 
 void connManager::disconnectAll()
 {
-	boost::try_mutex::scoped_lock m(modulesMutex, boost::try_to_lock_t());
-	
-	if (m.owns_lock())
-		doDisconnectAll();
-	else 
-	{
-		for (int i=0;i<20;i++)
-		{
-			if (m.try_lock())
-				return doDisconnectAll();;	
-			Sleep(100);
-		}
-	}
-	
+    boost::try_mutex::scoped_lock m(modulesMutex, boost::try_to_lock_t());
+
+    if (m.owns_lock())
+        doDisconnectAll();
+    else
+    {
+        for (int i = 0; i < 20; i++)
+        {
+            if (m.try_lock())
+                return doDisconnectAll();
+            ;
+            Sleep(100);
+        }
+    }
 }
 
-}//namespace transactd
-}//namespace db
-}//namespace bzs
+} // namespace transactd
+} // namespace db
+} // namespace bzs

data/source/bzs/db/transactd/connManager.h

@@ -14,19 +14,24 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "connectionRecord.h"
 #include <bzs/netsvc/server/IAppModule.h>
 
-
 namespace bzs
 {
 namespace db
 {
-	namespace engine{namespace mysql{class database;}}
+namespace engine
+{
+namespace mysql
+{
+class database;
+}
+}
 namespace transactd
 {
 
@@ -35,26 +40,28 @@ class module;
 class connManager
 {
 public:
+    typedef std::vector<connection::record> records;
 
-	typedef std::vector<connection::record> records;
 private:
-	mutable records m_records;
-	__int64 m_me;
-	void getConnectionList()const;
-	void getDatabaseList(const module* mod) const;
-	const bzs::db::engine::mysql::database* getDatabase(const module* mod, int dbid)const;
-	void doDisconnect(unsigned __int64 conid);
-	void doDisconnectAll();
+    mutable records m_records;
+    unsigned __int64 m_me;
+    void getConnectionList() const;
+    void getDatabaseList(const module* mod) const;
+    const bzs::db::engine::mysql::database* getDatabase(const module* mod,
+                                                        int dbid) const;
+    void doDisconnect(unsigned __int64 conid);
+    void doDisconnectAll();
+
 public:
-	connManager(unsigned __int64 me):m_me(me){};
-	virtual ~connManager();
-	const records& getRecords(unsigned __int64 conid, int dbid) const;
-	void disconnect(unsigned __int64 conid);
-	void disconnectAll();
+    connManager(unsigned __int64 me) : m_me(me){};
+    virtual ~connManager();
+    const records& getRecords(unsigned __int64 conid, int dbid) const;
+    void disconnect(unsigned __int64 conid);
+    void disconnectAll();
 };
 
-}//namespace transactd
-}//namespace db
-}//namespace bzs
+} // namespace transactd
+} // namespace db
+} // namespace bzs
 
-#endif//BZS_DB_TRANSACTD_CONNMANAGER_H
+#endif // BZS_DB_TRANSACTD_CONNMANAGER_H

data/source/bzs/db/transactd/connectionRecord.h

@@ -14,15 +14,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include <bzs/env/compiler.h>
 #include <bzs/env/crosscompile.h>
 
-#pragma option -a-
-pragma_pack1
+#pragma pack(push, 1)
+pragma_pack1;
 
 namespace bzs
 {
@@ -31,39 +31,39 @@ namespace db
 namespace transactd
 {
 namespace connection
-{	
-	struct record
-	{
-		record():conId(0),dbid(0),cid(0)
-		{
-			name[0] = 0x00;
-			status = 0;
-		}
-		__int64 conId;
-		unsigned int	cid;
-		unsigned short  dbid;
-		char name[64];
-		union
-		{
-			char  status;
-			struct
-			{
-				char inTransaction:1;
-				char inSnapshot   :1;
-				char openNormal   :1;
-				char openReadOnly :1;
-				char openEx       :1;
-				char dummy        :3;
-			};
-		};
-	};
+{
+struct record
+{
+    record() : conId(0), cid(0), dbid(0)
+    {
+        name[0] = 0x00;
+        status = 0;
+    }
+    __int64 conId;
+    unsigned int cid;
+    unsigned short dbid;
+    char name[64];
+    union
+    {
+        char status;
+        struct
+        {
+            char inTransaction : 1;
+            char inSnapshot : 1;
+            char openNormal : 1;
+            char openReadOnly : 1;
+            char openEx : 1;
+            char dummy : 3;
+        };
+    };
+};
+
+} // connection
+} // transactd
+} // db
+} // bzs
+
+#pragma pack(pop)
+pragma_pop;
 
-}//connection
-}//transactd
-}//db
-}//bzs
-	
-#pragma option -a
-pragma_pop
-	
-#endif //BZS_DB_TRANSACTD_CONNECTIONRECORD_H
+#endif // BZS_DB_TRANSACTD_CONNECTIONRECORD_H