From fd5f1e554d830de7b968707efaa99c4075aeb35c Mon Sep 17 00:00:00 2001 From: thenecromancer Date: Mon, 1 Feb 2010 10:23:18 +0100 Subject: Use recursive thread mutex for SQL transaction queue --HG-- branch : trunk --- src/shared/Database/SqlOperations.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/shared/Database/SqlOperations.cpp') diff --git a/src/shared/Database/SqlOperations.cpp b/src/shared/Database/SqlOperations.cpp index 793fabecde7..d657c667913 100644 --- a/src/shared/Database/SqlOperations.cpp +++ b/src/shared/Database/SqlOperations.cpp @@ -33,22 +33,17 @@ void SqlStatement::Execute(Database *db) void SqlTransaction::Execute(Database *db) { - if(m_queue.empty()) - return; + const char *sql; db->DirectExecute("START TRANSACTION"); - while(!m_queue.empty()) + while(m_queue.next(sql)) { - char const *sql = m_queue.front(); - m_queue.pop(); - if(!db->DirectExecute(sql)) { free((void*)const_cast(sql)); db->DirectExecute("ROLLBACK"); - while(!m_queue.empty()) + while(m_queue.next(sql)) { - free((void*)const_cast(m_queue.front())); - m_queue.pop(); + free((void*)const_cast(sql)); } return; } -- cgit v1.2.3