X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=3718eecf85284768a0cd08b36cdb7e1f4742cb3f;hb=7d93921aabd9c608821baec8a871aff844dfae49;hp=4f2f9046789d777c3e3a1eb02204ce61ad4933c7;hpb=31b232eec07d0b85ce2cc7c4ebc5d5387f781dcb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 4f2f90467..3718eecf8 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -2,11 +2,11 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -16,12 +16,12 @@ #include "inspircd.h" #include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "m_sqlv2.h" +#ifdef WINDOWS +#pragma comment(lib, "mysqlclient.lib") +#endif + /* VERSION 2 API: With nonblocking (threaded) requests */ /* $ModDesc: SQL Service Provider module for all other m_sql* modules */ @@ -35,7 +35,7 @@ * that instead, you should thread your program. This is what i've done here to allow for * asyncronous SQL requests via mysql. The way this works is as follows: * - * The module spawns a thread via pthreads, and performs its mysql queries in this thread, + * The module spawns a thread via class Thread, and performs its mysql queries in this thread, * using a queue with priorities. There is a mutex on either end which prevents two threads * adjusting the queue at the same time, and crashing the ircd. Every 50 milliseconds, the * worker thread wakes up, and checks if there is a request at the head of its queue. @@ -60,34 +60,55 @@ * corruption, and worse, so DONT think about it until the day comes when InspIRCd is 100% * gauranteed threadsafe!) * - * For a diagram of this system please see http://www.inspircd.org/wiki/Mysql2 + * For a diagram of this system please see http://wiki.inspircd.org/Mysql2 */ class SQLConnection; -class Notifier; - +class DispatcherThread; typedef std::map ConnMap; -bool giveup = false; -bool threadfinished = false; -static Module* SQLModule = NULL; -static Notifier* MessagePipe = NULL; -int QueueFD = -1; +typedef std::deque ResultQueue; +unsigned long count(const char * const str, char a) +{ + unsigned long n = 0; + for (const char *p = str; *p; ++p) + { + if (*p == '?') + ++n; + } + return n; +} -#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 -#define mysql_field_count mysql_num_fields -#endif -typedef std::deque ResultQueue; +/** MySQL module + * */ +class ModuleSQL : public Module +{ + public: -/* A mutex to wrap around queue accesses */ -pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER; + ConfigReader *Conf; + InspIRCd* PublicServerInstance; + int currid; + bool rehashing; + DispatcherThread* Dispatcher; + Mutex ResultsMutex; + Mutex LoggingMutex; + Mutex ConnMutex; + + ModuleSQL(InspIRCd* Me); + ~ModuleSQL(); + unsigned long NewID(); + const char* OnRequest(Request* request); + void OnRehash(User* user); + Version GetVersion(); +}; -pthread_mutex_t results_mutex = PTHREAD_MUTEX_INITIALIZER; -pthread_mutex_t logging_mutex = PTHREAD_MUTEX_INITIALIZER; +#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 +#define mysql_field_count mysql_num_fields +#endif /** Represents a mysql result set */ @@ -145,6 +166,7 @@ class MySQLresult : public SQLresult rows++; } mysql_free_result(res); + res = NULL; } } @@ -271,22 +293,19 @@ class MySQLresult : public SQLresult } }; -class SQLConnection; - -void NotifyMainThread(SQLConnection* connection_with_new_result); - /** Represents a connection to a mysql database */ class SQLConnection : public classbase { protected: - - MYSQL connection; + MYSQL *connection; MYSQL_RES *res; - MYSQL_ROW row; + MYSQL_ROW *row; SQLhost host; std::map thisrow; bool Enabled; + ModuleSQL* Parent; + std::string initquery; public: @@ -294,7 +313,7 @@ class SQLConnection : public classbase ResultQueue rq; // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. - SQLConnection(const SQLhost &hi) : host(hi), Enabled(false) + SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator) { } @@ -308,9 +327,9 @@ class SQLConnection : public classbase bool Connect() { unsigned int timeout = 1; - mysql_init(&connection); - mysql_options(&connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout); - return mysql_real_connect(&connection, host.host.c_str(), host.user.c_str(), host.pass.c_str(), host.name.c_str(), host.port, NULL, 0); + connection = mysql_init(connection); + mysql_options(connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout); + return mysql_real_connect(connection, host.host.c_str(), host.user.c_str(), host.pass.c_str(), host.name.c_str(), host.port, NULL, 0); } void DoLeadingQuery() @@ -318,6 +337,9 @@ class SQLConnection : public classbase if (!CheckConnection()) return; + if( !initquery.empty() ) + mysql_query(connection,initquery.c_str()); + /* Parse the command string and dispatch it to mysql */ SQLrequest& req = queue.front(); @@ -328,25 +350,30 @@ class SQLConnection : public classbase char* queryend; /* Total length of the unescaped parameters */ - unsigned long paramlen; - - /* Total length of query, used for binary-safety in mysql_real_query */ - unsigned long querylength = 0; + unsigned long maxparamlen, paramcount; - paramlen = 0; + /* The length of the longest parameter */ + maxparamlen = 0; for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) { - paramlen += i->size(); + if (i->size() > maxparamlen) + maxparamlen = i->size(); } + /* How many params are there in the query? */ + paramcount = count(req.query.q.c_str(), '?'); + + /* This stores copy of params to be inserted with using numbered params 1;3B*/ + ParamL paramscopy(req.query.p); + /* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be. - * sizeofquery + (totalparamlength*2) + 1 + * sizeofquery + (maxtotalparamlength*2) + 1 * * The +1 is for null-terminating the string for mysql_real_escape_string */ - query = new char[req.query.q.length() + (paramlen*2) + 1]; + query = new char[req.query.q.length() + (maxparamlen*paramcount*2) + 1]; queryend = query; /* Okay, now we have a buffer large enough we need to start copying the query into it and escaping and substituting @@ -363,9 +390,44 @@ class SQLConnection : public classbase * then we "just" need to make sure queryend is * pointing at the right place. */ - if(req.query.p.size()) + + /* Is it numbered parameter? + */ + + bool numbered; + numbered = false; + + /* Numbered parameter number :| + */ + unsigned int paramnum; + paramnum = 0; + + /* Let's check if it's a numbered param. And also calculate it's number. + */ + + while ((i < req.query.q.length() - 1) && (req.query.q[i+1] >= '0') && (req.query.q[i+1] <= '9')) + { + numbered = true; + ++i; + paramnum = paramnum * 10 + req.query.q[i] - '0'; + } + + if (paramnum > paramscopy.size() - 1) + { + /* index is out of range! + */ + numbered = false; + } + + if (numbered) + { + unsigned long len = mysql_real_escape_string(connection, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length()); + + queryend += len; + } + else if (req.query.p.size()) { - unsigned long len = mysql_real_escape_string(&connection, queryend, req.query.p.front().c_str(), req.query.p.front().length()); + unsigned long len = mysql_real_escape_string(connection, queryend, req.query.p.front().c_str(), req.query.p.front().length()); queryend += len; req.query.p.pop_front(); @@ -378,64 +440,57 @@ class SQLConnection : public classbase *queryend = req.query.q[i]; queryend++; } - querylength++; } *queryend = 0; - pthread_mutex_lock(&queue_mutex); req.query.q = query; - pthread_mutex_unlock(&queue_mutex); - if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length())) + if (!mysql_real_query(connection, req.query.q.data(), req.query.q.length())) { /* Successfull query */ - res = mysql_use_result(&connection); - unsigned long rows = mysql_affected_rows(&connection); - MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), res, rows, req.id); + res = mysql_use_result(connection); + unsigned long rows = mysql_affected_rows(connection); + MySQLresult* r = new MySQLresult(Parent, req.GetSource(), res, rows, req.id); r->dbid = this->GetID(); r->query = req.query.q; /* Put this new result onto the results queue. * XXX: Remember to mutex the queue! */ - pthread_mutex_lock(&results_mutex); + Parent->ResultsMutex.Lock(); rq.push_back(r); - pthread_mutex_unlock(&results_mutex); + Parent->ResultsMutex.Unlock(); } else { /* XXX: See /usr/include/mysql/mysqld_error.h for a list of * possible error numbers and error messages */ - SQLerror e(QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection)); - MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), e, req.id); + SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + std::string(": ") + mysql_error(connection)); + MySQLresult* r = new MySQLresult(Parent, req.GetSource(), e, req.id); r->dbid = this->GetID(); r->query = req.query.q; - pthread_mutex_lock(&results_mutex); + Parent->ResultsMutex.Lock(); rq.push_back(r); - pthread_mutex_unlock(&results_mutex); + Parent->ResultsMutex.Unlock(); } - /* Now signal the main thread that we've got a result to process. - * Pass them this connection id as what to examine - */ - delete[] query; - - NotifyMainThread(this); } bool ConnectionLost() { - if (&connection) { - return (mysql_ping(&connection) != 0); + if (&connection) + { + return (mysql_ping(connection) != 0); } else return false; } bool CheckConnection() { - if (ConnectionLost()) { + if (ConnectionLost()) + { return Connect(); } else return true; @@ -443,7 +498,7 @@ class SQLConnection : public classbase std::string GetError() { - return mysql_error(&connection); + return mysql_error(connection); } const std::string& GetID() @@ -456,6 +511,11 @@ class SQLConnection : public classbase return host.host; } + void setInitialQuery(std::string init) + { + initquery = init; + } + void SetEnable(bool Enable) { Enabled = Enable; @@ -468,7 +528,7 @@ class SQLConnection : public classbase void Close() { - mysql_close(&connection); + mysql_close(connection); } const SQLhost& GetConfHost() @@ -533,7 +593,7 @@ void ClearAllConnections() } } -void ConnectDatabases(InspIRCd* ServerInstance) +void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent) { for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { @@ -544,16 +604,17 @@ void ConnectDatabases(InspIRCd* ServerInstance) if (!i->second->Connect()) { /* XXX: MUTEX */ - pthread_mutex_lock(&logging_mutex); + Parent->LoggingMutex.Lock(); ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError()); i->second->SetEnable(false); - pthread_mutex_unlock(&logging_mutex); + Parent->LoggingMutex.Unlock(); } } } -void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance) +void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent) { + Parent->ConnMutex.Lock(); ClearOldConnections(conf); for (int j =0; j < conf->Enumerate("database"); j++) { @@ -565,17 +626,21 @@ void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance) host.user = conf->ReadValue("database", "username", j); host.pass = conf->ReadValue("database", "password", j); host.ssl = conf->ReadFlag("database", "ssl", j); + std::string initquery = conf->ReadValue("database", "initialquery", j); if (HasHost(host)) continue; if (!host.id.empty() && !host.host.empty() && !host.name.empty() && !host.user.empty() && !host.pass.empty()) { - SQLConnection* ThisSQL = new SQLConnection(host); + SQLConnection* ThisSQL = new SQLConnection(host, Parent); Connections[host.id] = ThisSQL; + + ThisSQL->setInitialQuery(initquery); } } - ConnectDatabases(ServerInstance); + ConnectDatabases(ServerInstance, Parent); + Parent->ConnMutex.Unlock(); } char FindCharId(const std::string &id) @@ -602,278 +667,125 @@ ConnMap::iterator GetCharId(char id) return Connections.end(); } -void NotifyMainThread(SQLConnection* connection_with_new_result) -{ - /* Here we write() to the socket the main thread has open - * and we connect()ed back to before our thread became active. - * The main thread is using a nonblocking socket tied into - * the socket engine, so they wont block and they'll receive - * nearly instant notification. Because we're in a seperate - * thread, we can just use standard connect(), and we can - * block if we like. We just send the connection id of the - * connection back. - * - * NOTE: We only send a single char down the connection, this - * way we know it wont get a partial read at the other end if - * the system is especially congested (see bug #263). - * The function FindCharId translates a connection name into a - * one character id, and GetCharId translates a character id - * back into an iterator. - */ - char id = FindCharId(connection_with_new_result->GetID()); - send(QueueFD, &id, 1, 0); -} - -void* DispatcherThread(void* arg); +class ModuleSQL; -/** Used by m_mysql to notify one thread when the other has a result - */ -class Notifier : public BufferedSocket +class DispatcherThread : public SocketThread { - insp_sockaddr sock_us; - socklen_t uslen; - - + private: + ModuleSQL* Parent; + InspIRCd* ServerInstance; public: + DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule), ServerInstance(Instance) { } + ~DispatcherThread() { } + virtual void Run(); + virtual void OnNotify(); +}; - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - Notifier(InspIRCd* SI) : BufferedSocket(SI, "::1", 0, true, 3000) -#else - Notifier(InspIRCd* SI) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000) -#endif - { - uslen = sizeof(sock_us); - if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) - { - throw ModuleException("Could not create random listening port on localhost"); - } - } +ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false) +{ + ServerInstance->Modules->UseInterface("SQLutils"); - Notifier(InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip) - { - } + Conf = new ConfigReader(ServerInstance); + PublicServerInstance = ServerInstance; + currid = 0; - /* Using getsockname and ntohs, we can determine which port number we were allocated */ - int GetPort() - { -#ifdef IPV6 - return ntohs(sock_us.sin6_port); -#else - return ntohs(sock_us.sin_port); -#endif - } + Dispatcher = new DispatcherThread(ServerInstance, this); + ServerInstance->Threads->Start(Dispatcher); - virtual int OnIncomingConnection(int newsock, char* ip) + if (!ServerInstance->Modules->PublishFeature("SQL", this)) { - Notifier* n = new Notifier(this->Instance, newsock, ip); - n = n; /* Stop bitching at me, GCC */ - return true; + Dispatcher->join(); + delete Dispatcher; + ServerInstance->Modules->DoneWithInterface("SQLutils"); + throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); } - virtual bool OnDataReady() - { - char data = 0; - /* NOTE: Only a single character is read so we know we - * cant get a partial read. (We've been told that theres - * data waiting, so we wont ever get EAGAIN) - * The function GetCharId translates a single character - * back into an iterator. - */ - if (Instance->SE->Recv(this, &data, 1, 0) > 0) - { - ConnMap::iterator iter = GetCharId(data); - if (iter != Connections.end()) - { - /* Lock the mutex, send back the data */ - pthread_mutex_lock(&results_mutex); - ResultQueue::iterator n = iter->second->rq.begin(); - (*n)->Send(); - delete (*n); - iter->second->rq.pop_front(); - pthread_mutex_unlock(&results_mutex); - return true; - } - /* No error, but unknown id */ - return true; - } - - /* Erk, error on descriptor! */ - return false; - } -}; + ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnRehash, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 2); +} -/** MySQL module - */ -class ModuleSQL : public Module +ModuleSQL::~ModuleSQL() { - public: + delete Dispatcher; + ClearAllConnections(); + delete Conf; + ServerInstance->Modules->UnpublishInterface("SQL", this); + ServerInstance->Modules->UnpublishFeature("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); +} - ConfigReader *Conf; - InspIRCd* PublicServerInstance; - pthread_t Dispatcher; - int currid; - bool rehashing; +unsigned long ModuleSQL::NewID() +{ + if (currid+1 == 0) + currid++; + return ++currid; +} - ModuleSQL(InspIRCd* Me) - : Module::Module(Me), rehashing(false) +const char* ModuleSQL::OnRequest(Request* request) +{ + if(strcmp(SQLREQID, request->GetId()) == 0) { - ServerInstance->Modules->UseInterface("SQLutils"); + SQLrequest* req = (SQLrequest*)request; - Conf = new ConfigReader(ServerInstance); - PublicServerInstance = ServerInstance; - currid = 0; - SQLModule = this; + ConnMap::iterator iter; - MessagePipe = new Notifier(ServerInstance); + const char* returnval = NULL; - pthread_attr_t attribs; - pthread_attr_init(&attribs); - pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE); - if (pthread_create(&this->Dispatcher, &attribs, DispatcherThread, (void *)this) != 0) + Dispatcher->LockQueue(); + ConnMutex.Lock(); + if((iter = Connections.find(req->dbid)) != Connections.end()) { - throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno))); + req->id = NewID(); + iter->second->queue.push(*req); + returnval = SQLSUCCESS; } - pthread_attr_destroy(&attribs); - - if (!ServerInstance->Modules->PublishFeature("SQL", this)) - { - /* Tell worker thread to exit NOW */ - int rc; - void *status; - giveup = true; - rc = pthread_join(Dispatcher, &status); - if (rc) - { - ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc); - } - throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); - } - - ServerInstance->Modules->PublishInterface("SQL", this); - Implementation eventlist[] = { I_OnRehash, I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 2); - } - - virtual ~ModuleSQL() - { - int rc; - void *status; - giveup = true; - rc = pthread_join(Dispatcher, &status); - if (rc) + else { - ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc); + req->error.Id(SQL_BAD_DBID); } - ClearAllConnections(); - delete Conf; - ServerInstance->Modules->UnpublishInterface("SQL", this); - ServerInstance->Modules->UnpublishFeature("SQL"); - ServerInstance->Modules->DoneWithInterface("SQLutils"); - } - - - - unsigned long NewID() - { - if (currid+1 == 0) - currid++; - return ++currid; - } - - virtual const char* OnRequest(Request* request) - { - if(strcmp(SQLREQID, request->GetId()) == 0) - { - SQLrequest* req = (SQLrequest*)request; - - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); - - ConnMap::iterator iter; - - const char* returnval = NULL; - - if((iter = Connections.find(req->dbid)) != Connections.end()) - { - req->id = NewID(); - iter->second->queue.push(*req); - returnval = SQLSUCCESS; - } - else - { - req->error.Id(BAD_DBID); - } - - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ - return returnval; - } - - return NULL; - } - - virtual void OnRehash(User* user, const std::string ¶meter) - { - rehashing = true; - } + ConnMutex.Unlock(); + Dispatcher->UnlockQueueWakeup(); + /* Yes, it's possible this will generate a spurious wakeup. + * That's fine, it'll just get ignored. + */ - virtual Version GetVersion() - { - return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); + return returnval; } -}; + return NULL; +} -void* DispatcherThread(void* arg) +void ModuleSQL::OnRehash(User* user) { - ModuleSQL* thismodule = (ModuleSQL*)arg; - LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance); - - /* Connect back to the Notifier */ - - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - return NULL; - } + Dispatcher->LockQueue(); + rehashing = true; + Dispatcher->UnlockQueueWakeup(); +} - insp_sockaddr addr; +Version ModuleSQL::GetVersion() +{ + return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); +} -#ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(MessagePipe->GetPort()); -#else - insp_inaddr ia; - insp_aton("127.0.0.1", &ia); - addr.sin_family = AF_FAMILY; - addr.sin_addr = ia; - addr.sin_port = htons(MessagePipe->GetPort()); -#endif +void DispatcherThread::Run() +{ + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return NULL; - } + SQLConnection* conn = NULL; - while (!giveup) + this->LockQueue(); + while (!this->GetExitFlag()) { - if (thismodule->rehashing) + if (Parent->rehashing) { - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); - thismodule->rehashing = false; - LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance); - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + Parent->rehashing = false; + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); } - SQLConnection* conn = NULL; - /* XXX: Lock here for safety */ - pthread_mutex_lock(&queue_mutex); + conn = NULL; + Parent->ConnMutex.Lock(); for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { if (i->second->queue.totalsize()) @@ -882,25 +794,59 @@ void* DispatcherThread(void* arg) break; } } - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + Parent->ConnMutex.Unlock(); - /* Theres an item! */ if (conn) { + /* There's an item! */ + this->UnlockQueue(); conn->DoLeadingQuery(); - - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); + this->NotifyParent(); + this->LockQueue(); conn->queue.pop(); - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ } - - usleep(1000); + else + { + /* We know the queue is empty, we can safely hang this thread until + * something happens + */ + this->WaitForQueue(); + } } + this->UnlockQueue(); +} + +void DispatcherThread::OnNotify() +{ + SQLConnection* conn; + while (1) + { + conn = NULL; + Parent->ConnMutex.Lock(); + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++) + { + if (!iter->second->rq.empty()) + { + conn = iter->second; + break; + } + } + Parent->ConnMutex.Unlock(); + + if (!conn) + break; + + Parent->ResultsMutex.Lock(); + ResultQueue::iterator n = conn->rq.begin(); + Parent->ResultsMutex.Unlock(); - pthread_exit((void *) 0); + (*n)->Send(); + delete (*n); + + Parent->ResultsMutex.Lock(); + conn->rq.pop_front(); + Parent->ResultsMutex.Unlock(); + } } MODULE_INIT(ModuleSQL)