From 7c0f140bb063e587baa4ca58aa0a2c77eff6a91f Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 26 May 2010 19:19:06 +0200 Subject: Use ´manual´ ACE_Thread_Mutex objects in SQLTransaction class instead of using ACE_Based::LockedQueue. This will either result in a crash fix caused by underlying operations of ACE_Based::LockedQueue, or at least give us a clearer view at where the crash is coming from. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : trunk --- src/shared/Database/SqlOperations.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/shared/Database/SqlOperations.h') diff --git a/src/shared/Database/SqlOperations.h b/src/shared/Database/SqlOperations.h index dcdada9cb59..f2e09c0c921 100644 --- a/src/shared/Database/SqlOperations.h +++ b/src/shared/Database/SqlOperations.h @@ -57,12 +57,19 @@ class SqlStatement : public SqlOperation class SqlTransaction : public SqlOperation { - typedef ACE_Based::LockedQueue LockedQueue; private: - LockedQueue m_queue; + std::queue m_queue; + ACE_Thread_Mutex m_Mutex; public: SqlTransaction() {} - void DelayExecute(const char *sql) { m_queue.add(strdup(sql)); } + void DelayExecute(const char *sql) + { + m_Mutex.acquire(); + char* _sql = strdup(sql); + if (_sql) + m_queue.push(_sql); + m_Mutex.release(); + } void Execute(Database *db); }; -- cgit v1.2.3