version 0.1.3

[fms.git] / src / db / sqlite3statement.cpp

diff --git a/src/db/sqlite3statement.cpp b/src/db/sqlite3statement.cpp
index 39c699f..54c26fe 100644 (file)
--- a/src/db/sqlite3statement.cpp
+++ b/src/db/sqlite3statement.cpp
@@ -58,7 +58,8 @@ const bool Statement::Bind(const int column)
 {\r
        if(Valid() && column>=0 && column<m_parametercount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_bind_null(m_statement,column+1)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -78,7 +79,8 @@ const bool Statement::Bind(const int column, const int value)
 {\r
        if(Valid() && column>=0 && column<m_parametercount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_bind_int(m_statement,column+1,value)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -98,7 +100,8 @@ const bool Statement::Bind(const int column, const double value)
 {\r
        if(Valid() && column>=0 && column<m_parametercount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_bind_double(m_statement,column+1,value)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -122,7 +125,8 @@ const bool Statement::Bind(const int column, const std::string &value)
                strncpy(text,value.c_str(),value.size());\r
                text[value.size()]=NULL;\r
                textptrs.push_back(text);\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_bind_text(m_statement,column+1,text,value.size(),NULL)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -142,7 +146,8 @@ const bool Statement::Bind(const int column, const void *data, const int length)
 {\r
        if(Valid() && column>=0 && column<m_parametercount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_bind_blob(m_statement,column+1,data,length,NULL)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -162,7 +167,8 @@ void Statement::Finalize()
 {\r
        if(m_statement)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                m_statementcount[m_statement]--;\r
                if(m_statementcount[m_statement]<=0)\r
                {\r
@@ -186,7 +192,8 @@ Statement &Statement::operator=(const Statement &rhs)
 \r
                if(m_statement)\r
                {\r
-                       ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+                       //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+                       PThread::Guard g(DB::Instance()->m_mutex);\r
                        m_statementcount[m_statement]++;\r
                }\r
        }\r
@@ -197,7 +204,8 @@ const bool Statement::Reset()
 {\r
        if(Valid())\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_reset(m_statement)==SQLITE_OK)\r
                {\r
                        return true;\r
@@ -217,7 +225,8 @@ const bool Statement::ResultBlob(const int column, void *data, int &length)
 {\r
        if(Valid() && column>=0 && column<m_resultcolumncount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                data=(void *)sqlite3_column_blob(m_statement,column);\r
                length=sqlite3_column_bytes(m_statement,column);\r
                return true;\r
@@ -232,7 +241,8 @@ const bool Statement::ResultDouble(const int column, double &result)
 {\r
        if(Valid() && column>=0 && column<m_resultcolumncount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                result=sqlite3_column_double(m_statement,column);\r
                return true;\r
        }\r
@@ -246,7 +256,8 @@ const bool Statement::ResultInt(const int column, int &result)
 {\r
        if(Valid() && column>=0 && column<m_resultcolumncount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                result=sqlite3_column_int(m_statement,column);\r
                return true;\r
        }\r
@@ -260,7 +271,8 @@ const bool Statement::ResultNull(const int column)
 {\r
        if(Valid() && column>=0 && column<m_resultcolumncount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)\r
                {\r
                        return true;\r
@@ -280,7 +292,8 @@ const bool Statement::ResultText(const int column, std::string &result)
 {\r
        if(Valid() && column>=0 && column<m_resultcolumncount)\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                const unsigned char *cresult=sqlite3_column_text(m_statement,column);\r
                if(cresult)\r
                {\r
@@ -303,7 +316,8 @@ const bool Statement::Step(const bool saveinsertrowid)
        m_rowreturned=false;\r
        if(Valid())\r
        {\r
-               ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+               PThread::Guard g(DB::Instance()->m_mutex);\r
                int result=sqlite3_step(m_statement);\r
                if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)\r
                {\r
@@ -313,7 +327,7 @@ const bool Statement::Step(const bool saveinsertrowid)
                        }\r
                        if(saveinsertrowid)\r
                        {\r
-                               m_lastinsertrowid=sqlite3_last_insert_rowid(DB::instance()->GetDB());\r
+                               m_lastinsertrowid=sqlite3_last_insert_rowid(DB::Instance()->GetDB());\r
                        }\r
                        return true;\r
                }\r
@@ -330,7 +344,8 @@ const bool Statement::Step(const bool saveinsertrowid)
 \r
 const bool Statement::Valid()\r
 {\r
-       ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+       //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);\r
+       PThread::Guard g(DB::Instance()->m_mutex);\r
        return m_statement ? true : false ;\r
 }\r
 \r