projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.0
[fms.git]
/
src
/
db
/
sqlite3statement.cpp
diff --git
a/src/db/sqlite3statement.cpp
b/src/db/sqlite3statement.cpp
index
fea3d76
..
789afb1
100644
(file)
--- a/
src/db/sqlite3statement.cpp
+++ b/
src/db/sqlite3statement.cpp
@@
-169,8
+169,7
@@
void Statement::Finalize()
{
\r
if(m_statement)
\r
{
\r
{
\r
if(m_statement)
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- PThread::Guard g(DB::Instance()->m_mutex);
\r
+ Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
\r
m_statementcount[m_statement]--;
\r
if(m_statementcount[m_statement]<=0)
\r
{
\r
m_statementcount[m_statement]--;
\r
if(m_statementcount[m_statement]<=0)
\r
{
\r
@@
-194,8
+193,7
@@
Statement &Statement::operator=(const Statement &rhs)
\r
if(m_statement)
\r
{
\r
\r
if(m_statement)
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- PThread::Guard g(DB::Instance()->m_mutex);
\r
+ Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
\r
m_statementcount[m_statement]++;
\r
}
\r
}
\r
m_statementcount[m_statement]++;
\r
}
\r
}
\r
@@
-206,8
+204,7
@@
const bool Statement::Reset()
{
\r
if(Valid())
\r
{
\r
{
\r
if(Valid())
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- PThread::Guard g(DB::Instance()->m_mutex);
\r
+ Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
\r
if(sqlite3_reset(m_statement)==SQLITE_OK)
\r
{
\r
return true;
\r
if(sqlite3_reset(m_statement)==SQLITE_OK)
\r
{
\r
return true;
\r
@@
-227,8
+224,6
@@
const bool Statement::ResultBlob(const int column, void *data, int &length)
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- //PThread::Guard g(DB::Instance()->m_mutex);
\r
int bloblength=sqlite3_column_bytes(m_statement,column);
\r
if(bloblength>length)
\r
{
\r
int bloblength=sqlite3_column_bytes(m_statement,column);
\r
if(bloblength>length)
\r
{
\r
@@
-259,8
+254,6
@@
const bool Statement::ResultDouble(const int column, double &result)
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\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
result=sqlite3_column_double(m_statement,column);
\r
return true;
\r
}
\r
@@
-274,8
+267,6
@@
const bool Statement::ResultInt(const int column, int &result)
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\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
result=sqlite3_column_int(m_statement,column);
\r
return true;
\r
}
\r
@@
-289,8
+280,6
@@
const bool Statement::ResultNull(const int column)
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\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
if(sqlite3_column_type(m_statement,column)==SQLITE_NULL)
\r
{
\r
return true;
\r
@@
-310,8
+299,6
@@
const bool Statement::ResultText(const int column, std::string &result)
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\r
{
\r
if(Valid() && column>=0 && column<m_resultcolumncount)
\r
{
\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
const unsigned char *cresult=sqlite3_column_text(m_statement,column);
\r
if(cresult)
\r
{
\r
@@
-334,8
+321,7
@@
const bool Statement::Step(const bool saveinsertrowid)
m_rowreturned=false;
\r
if(Valid())
\r
{
\r
m_rowreturned=false;
\r
if(Valid())
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- PThread::Guard g(DB::Instance()->m_mutex);
\r
+ Poco::ScopedLock<Poco::FastMutex> 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
int result=sqlite3_step(m_statement);
\r
if(result==SQLITE_OK || result==SQLITE_ROW || result==SQLITE_DONE)
\r
{
\r
@@
-362,8
+348,7
@@
const bool Statement::Step(const bool saveinsertrowid)
\r
const bool Statement::Valid()
\r
{
\r
\r
const bool Statement::Valid()
\r
{
\r
- //ZThread::Guard<ZThread::Mutex> g(DB::instance()->m_mutex);
\r
- PThread::Guard g(DB::Instance()->m_mutex);
\r
+ Poco::ScopedLock<Poco::FastMutex> g(DB::Instance()->m_mutex);
\r
return m_statement ? true : false ;
\r
}
\r
\r
return m_statement ? true : false ;
\r
}
\r
\r