retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Removed account lock during query: this was preventing running multiple queries at a time. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6326 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2018-10-25 11:21:09 +00:00
parent 5e965dd90f
commit 06eabcb03f
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/server/mysqldb.cpp
View File

@ -84,7 +84,7 @@ private:
* Class MyAcct * Class MyAcct
* A MySQL database account * A MySQL database account
*/ */
class MyAcct : public String, public Mutex class MyAcct : public RefObject, public Mutex
{ {
friend class MyConn; friend class MyConn;
public: public:
@ -96,6 +96,8 @@ public:
void dropDb(); void dropDb();
inline bool ok() const inline bool ok() const
{ return 0 != m_connections.skipNull(); } { return 0 != m_connections.skipNull(); }
inline const char* c_str() const
{ return m_name; }
void appendQuery(DbQuery* query); void appendQuery(DbQuery* query);
@ -123,7 +125,11 @@ public:
{ return m_retryTime && m_connections.count() < (unsigned int)m_poolSize; } { return m_retryTime && m_connections.count() < (unsigned int)m_poolSize; }
inline int poolSize() inline int poolSize()
{ return m_poolSize; } { return m_poolSize; }
virtual const String& toString() const
{ return m_name; }
private: private:
String m_name;
unsigned int m_timeout; unsigned int m_timeout;
// interval at which connection initialization should be tried // interval at which connection initialization should be tried
unsigned int m_retryTime; unsigned int m_retryTime;
@ -427,8 +433,8 @@ int MyConn::queryDbInternal(DbQuery* query)
* MyAcct * MyAcct
*/ */
MyAcct::MyAcct(const NamedList* sect) MyAcct::MyAcct(const NamedList* sect)
: String(*sect), : Mutex(true,"MySQL::acct"),
Mutex(true,"MySQL::acct"), m_name(*sect),
m_poolSize(sect->getIntValue("poolsize",1,1)), m_poolSize(sect->getIntValue("poolsize",1,1)),
m_queueSem(m_poolSize,"MySQL::queue"), m_queueSem(m_poolSize,"MySQL::queue"),
m_queueMutex(false,"MySQL::queue"), m_queueMutex(false,"MySQL::queue"),
@ -668,7 +674,7 @@ void DbThread::cleanup()
} }
static MyAcct* findDb(const String& account) static inline MyAcct* findDb(const String& account)
{ {
if (account.null()) if (account.null())
return 0; return 0;
@ -676,6 +682,14 @@ static MyAcct* findDb(const String& account)
return l ? static_cast<MyAcct*>(l->get()) : 0; return l ? static_cast<MyAcct*>(l->get()) : 0;
} }
static inline bool findDb(RefPointer<MyAcct>& acct, const String& account)
{
Lock lck(s_acctMutex);
acct = findDb(account);
return acct != 0;
}
/** /**
* MyHandler * MyHandler
*/ */
@ -684,12 +698,9 @@ bool MyHandler::received(Message& msg)
const String* str = msg.getParam("account"); const String* str = msg.getParam("account");
if (TelEngine::null(str)) if (TelEngine::null(str))
return false; return false;
Lock lock(s_acctMutex); RefPointer<MyAcct> db;
MyAcct* db = findDb(*str); if (!(findDb(db,*str) && db->ok()))
if (!(db && db->ok()))
return false; return false;
Lock lo(db);
lock.drop();
str = msg.getParam("query"); str = msg.getParam("query");
if (!TelEngine::null(str)) { if (!TelEngine::null(str)) {
@ -707,6 +718,7 @@ bool MyHandler::received(Message& msg)
db->appendQuery(new DbQuery(*str,0)); db->appendQuery(new DbQuery(*str,0));
} }
msg.setParam("dbtype","mysqldb"); msg.setParam("dbtype","mysqldb");
db = 0;
return true; return true;
} }