X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fdb%2Fsqlite3statement.cpp;h=54c26fedb9f3cf9d0afa0908c251cb77bf254301;hp=39c699f1595fd00b03008cd527066b7a7b016edf;hb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;hpb=964f55fd550fc711c0320ce6a24ad713040695d0

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