X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mssql.cpp;h=725a647c00593376ce5081b36e01432a57296b54;hb=acccaa39641500b8a691db4136e6571102a438ed;hp=97213039663fa1dc7f9426c9d1b69acfcc61cf54;hpb=1d12db188a7bf836e7bbec0f15de018daa9d4c6e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp index 972130396..725a647c0 100644 --- a/src/modules/extra/m_mssql.cpp +++ b/src/modules/extra/m_mssql.cpp @@ -1,100 +1,71 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2008-2009 Dennis Friis + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008-2009 Craig Edwards + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include #include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "m_sqlv2.h" -/* $ModDesc: MsSQL provider */ +/* $CompileFlags: exec("grep VERSION_NO /usr/include/tdsver.h 2>/dev/null | perl -e 'print "-D_TDSVER=".((<> =~ /freetds v(\d+\.\d+)/i) ? $1*100 : 0);'") */ /* $LinkerFlags: -ltds */ -/* $ModDep: m_sqlv2.h */ class SQLConn; class MsSQLResult; -class ResultNotifier; +class ModuleMsSQL; typedef std::map ConnMap; -typedef std::deque paramlist; typedef std::deque ResultQueue; -ResultNotifier* resultnotify = NULL; -ResultNotifier* resultdispatch = NULL; -int QueueFD = -1; - -class ResultNotifier : public BufferedSocket +unsigned long count(const char * const str, char a) { - Module* mod; - insp_sockaddr sock_us; - socklen_t uslen; - - public: - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m) -#else - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m) -#endif - { - uslen = sizeof(sock_us); - if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) - { - throw ModuleException("Could not create random listening port on localhost"); - } - } - - ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) + unsigned long n = 0; + for (const char *p = str; *p; ++p) { + if (*p == '?') + ++n; } + return n; +} - /* 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 - } - - virtual int OnIncomingConnection(int newsock, char* ip) - { - resultdispatch = new ResultNotifier(Instance, mod, newsock, ip); - return true; - } - - virtual bool OnDataReady() - { - char data = 0; - if (Instance->SE->Recv(this, &data, 1, 0) > 0) - { - Dispatch(); - return true; - } - return false; - } +ConnMap connections; +Mutex* ResultsMutex; +Mutex* LoggingMutex; - void Dispatch(); +class QueryThread : public SocketThread +{ + private: + ModuleMsSQL* const Parent; + public: + QueryThread(ModuleMsSQL* mod) : Parent(mod) { } + ~QueryThread() { } + void Run(); + void OnNotify(); }; - class MsSQLResult : public SQLresult { - private: + private: int currentrow; int rows; int cols; @@ -106,16 +77,12 @@ class MsSQLResult : public SQLresult SQLfieldList* fieldlist; SQLfieldMap* fieldmap; - public: + public: MsSQLResult(Module* self, Module* to, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) { } - ~MsSQLResult() - { - } - void AddRow(int colsnum, char **dat, char **colname) { colnames.clear(); @@ -135,17 +102,17 @@ class MsSQLResult : public SQLresult rows++; } - virtual int Rows() + int Rows() { return rows; } - virtual int Cols() + int Cols() { return cols; } - virtual std::string ColName(int column) + std::string ColName(int column) { if (column < (int)colnames.size()) { @@ -158,7 +125,7 @@ class MsSQLResult : public SQLresult return ""; } - virtual int ColNum(const std::string &column) + int ColNum(const std::string &column) { for (unsigned int i = 0; i < colnames.size(); i++) { @@ -169,7 +136,7 @@ class MsSQLResult : public SQLresult return 0; } - virtual SQLfield GetValue(int row, int column) + SQLfield GetValue(int row, int column) { if ((row >= 0) && (row < rows) && (column >= 0) && (column < Cols())) { @@ -182,7 +149,7 @@ class MsSQLResult : public SQLresult return SQLfield("",true); } - virtual SQLfieldList& GetRow() + SQLfieldList& GetRow() { if (currentrow < rows) return fieldlists[currentrow]; @@ -190,7 +157,7 @@ class MsSQLResult : public SQLresult return emptyfieldlist; } - virtual SQLfieldMap& GetRowMap() + SQLfieldMap& GetRowMap() { /* In an effort to reduce overhead we don't actually allocate the map * until the first time it's needed...so... @@ -216,7 +183,7 @@ class MsSQLResult : public SQLresult return *fieldmap; } - virtual SQLfieldList* GetRowPtr() + SQLfieldList* GetRowPtr() { fieldlist = new SQLfieldList(); @@ -231,7 +198,7 @@ class MsSQLResult : public SQLresult return fieldlist; } - virtual SQLfieldMap* GetRowMapPtr() + SQLfieldMap* GetRowMapPtr() { fieldmap = new SQLfieldMap(); @@ -247,33 +214,32 @@ class MsSQLResult : public SQLresult return fieldmap; } - virtual void Free(SQLfieldMap* fm) + void Free(SQLfieldMap* fm) { delete fm; } - virtual void Free(SQLfieldList* fl) + void Free(SQLfieldList* fl) { delete fl; } - - }; class SQLConn : public classbase { - private: + private: ResultQueue results; - InspIRCd* Instance; Module* mod; SQLhost host; TDSLOGIN* login; TDSSOCKET* sock; TDSCONTEXT* context; - public: - SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi) - : Instance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL) + public: + QueryQueue queue; + + SQLConn(Module* m, const SQLhost& hi) + : mod(m), host(hi), login(NULL), sock(NULL), context(NULL) { if (OpenDB()) { @@ -282,19 +248,25 @@ class SQLConn : public classbase { if (tds_process_simple_query(sock) != TDS_SUCCEED) { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } else { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } else { - Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Could not connect to DB with id: " + host.id); + LoggingMutex->Unlock(); CloseDB(); } } @@ -304,11 +276,11 @@ class SQLConn : public classbase CloseDB(); } - SQLerror Query(SQLrequest &req) + SQLerror Query(SQLrequest* req) { if (!sock) - return SQLerror(BAD_CONN, "Socket was NULL, check if SQL server is running."); - + return SQLerror(SQL_BAD_CONN, "Socket was NULL, check if SQL server is running."); + /* Pointer to the buffer we screw around with substitution in */ char* query; @@ -316,36 +288,78 @@ class SQLConn : public classbase char* queryend; /* Total length of the unescaped parameters */ - unsigned long paramlen; + unsigned long maxparamlen, paramcount; - /* Total length of query, used for binary-safety in mysql_real_query */ - unsigned long querylength = 0; + /* The length of the longest parameter */ + maxparamlen = 0; - paramlen = 0; - for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) + 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 */ - query = new char[req.query.q.length() + (paramlen*2) + 1]; + + query = new char[req->query.q.length() + (maxparamlen*paramcount*2) + 1]; queryend = query; - for(unsigned long i = 0; i < req.query.q.length(); i++) + for(unsigned long i = 0; i < req->query.q.length(); i++) { - if(req.query.q[i] == '?') + if(req->query.q[i] == '?') { - if(req.query.p.size()) + /* We found a place to substitute..what fun. + * use mssql calls to escape and write the + * escaped string onto the end of our query buffer, + * then we "just" need to make sure queryend is + * pointing at the right place. + */ + + /* 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) { /* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :] */ - char* escaped = new char[(req.query.p.front().length() * 2) + 1]; + char* escaped = new char[(paramscopy[paramnum].length() * 2) + 1]; char* escend = escaped; - for (std::string::iterator p = req.query.p.front().begin(); p < req.query.p.front().end(); p++) + for (std::string::iterator p = paramscopy[paramnum].begin(); p < paramscopy[paramnum].end(); p++) { if (*p == '\'') { @@ -357,50 +371,77 @@ class SQLConn : public classbase escend++; } *escend = 0; - + for (char* n = escaped; *n; n++) { *queryend = *n; queryend++; } delete[] escaped; - req.query.p.pop_front(); + } + else if (req->query.p.size()) + { + /* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :] + */ + char* escaped = new char[(req->query.p.front().length() * 2) + 1]; + char* escend = escaped; + for (std::string::iterator p = req->query.p.front().begin(); p < req->query.p.front().end(); p++) + { + if (*p == '\'') + { + *escend = *p; + escend++; + *escend = *p; + } + *escend = *p; + escend++; + } + *escend = 0; + + for (char* n = escaped; *n; n++) + { + *queryend = *n; + queryend++; + } + delete[] escaped; + req->query.p.pop_front(); } else break; } else { - *queryend = req.query.q[i]; + *queryend = req->query.q[i]; queryend++; } - querylength++; } *queryend = 0; - req.query.q = query; + req->query.q = query; - MsSQLResult* res = new MsSQLResult(mod, req.GetSource(), req.id); + MsSQLResult* res = new MsSQLResult((Module*)mod, req->source, req->id); res->dbid = host.id; - res->query = req.query.q; + res->query = req->query.q; - char* msquery = strdup(req.query.q.data()); - Instance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery); + char* msquery = strdup(req->query.q.data()); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "doing Query: %s",msquery); + LoggingMutex->Unlock(); if (tds_submit_query(sock, msquery) != TDS_SUCCEED) { - std::string error("failed to execute: "+std::string(req.query.q.data())); + std::string error("failed to execute: "+std::string(req->query.q.data())); delete[] query; delete res; free(msquery); - return SQLerror(QSEND_FAIL, error); + return SQLerror(SQL_QSEND_FAIL, error); } delete[] query; free(msquery); - + int tds_res; while (tds_process_tokens(sock, &tds_res, NULL, TDS_TOKEN_RESULTS) == TDS_SUCCEED) { - //Instance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res); - //Instance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected); + //ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "<******> result type: %d", tds_res); + //ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "AFFECTED ROWS: %d", sock->rows_affected); switch (tds_res) { case TDS_ROWFMT_RESULT: @@ -426,8 +467,8 @@ class SQLConn : public classbase if (sock->res_info->row_count > 0) { int cols = sock->res_info->num_cols; - char** name = new char*[MAXBUF]; - char** data = new char*[MAXBUF]; + char** name = new char*[512]; + char** data = new char*[512]; for (int j=0; jcurrent_results->columns[j]; @@ -438,7 +479,11 @@ class SQLConn : public classbase unsigned char* src; CONV_RESULT dres; ctype = tds_get_conversion_type(col->column_type, col->column_size); - src = &(sock->current_results->current_row[col->column_offset]); +#if _TDSVER >= 82 + src = col->column_data; +#else + src = &(sock->current_results->current_row[col->column_offset]); +#endif srclen = col->column_cur_size; tds_convert(sock->tds_ctx, ctype, (TDS_CHAR *) src, srclen, SYBCHAR, &dres); data[j] = (char*)dres.ib; @@ -450,24 +495,29 @@ class SQLConn : public classbase default: break; - } + } } + ResultsMutex->Lock(); results.push_back(res); - SendNotify(); + ResultsMutex->Unlock(); return SQLerror(); } static int HandleMessage(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage) { SQLConn* sc = (SQLConn*)pContext->parent; - sc->Instance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Unlock(); return 0; } static int HandleError(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage) { SQLConn* sc = (SQLConn*)pContext->parent; - sc->Instance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message); + LoggingMutex->Unlock(); return 0; } @@ -545,7 +595,8 @@ class SQLConn : public classbase while (results.size()) { MsSQLResult* res = results[0]; - if (res->GetDest()) + ResultsMutex->Lock(); + if (res->dest) { res->Send(); } @@ -558,6 +609,7 @@ class SQLConn : public classbase delete res; } results.pop_front(); + ResultsMutex->Unlock(); } } @@ -571,38 +623,10 @@ class SQLConn : public classbase } } - void SendNotify() + void DoLeadingQuery() { - if (QueueFD < 0) - { - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - return; - } - - insp_sockaddr addr; - -#ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(resultnotify->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(resultnotify->GetPort()); -#endif - - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return; - } - } - char id = 0; - send(QueueFD, &id, 1, 0); + SQLrequest* req = queue.front(); + req->error = Query(req); } }; @@ -610,58 +634,38 @@ class SQLConn : public classbase class ModuleMsSQL : public Module { - private: - ConnMap connections; + private: unsigned long currid; + QueryThread* queryDispatcher; + ServiceProvider sqlserv; - public: - ModuleMsSQL(InspIRCd* Me) - : Module::Module(Me), currid(0) + public: + ModuleMsSQL() + : currid(0), sqlserv(this, "SQL/mssql", SERVICE_DATA) { - ServerInstance->Modules->UseInterface("SQLutils"); - - if (!ServerInstance->Modules->PublishFeature("SQL", this)) - { - throw ModuleException("m_mssql: Unable to publish feature 'SQL'"); - } - - resultnotify = new ResultNotifier(ServerInstance, this); + LoggingMutex = new Mutex(); + ResultsMutex = new Mutex(); + queryDispatcher = new QueryThread(this); + } + void init() CXX11_OVERRIDE + { ReadConf(); - ServerInstance->Modules->PublishInterface("SQL", this); - Implementation eventlist[] = { I_OnRequest, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Threads.Start(queryDispatcher); } - virtual ~ModuleMsSQL() + ~ModuleMsSQL() { + queryDispatcher->join(); + delete queryDispatcher; ClearQueue(); ClearAllConnections(); - ServerInstance->SE->DelFd(resultnotify); - resultnotify->Close(); - ServerInstance->BufferedSocketCull(); - - if (QueueFD >= 0) - { - shutdown(QueueFD, 2); - close(QueueFD); - } - - if (resultdispatch) - { - ServerInstance->SE->DelFd(resultdispatch); - resultdispatch->Close(); - ServerInstance->BufferedSocketCull(); - } - - ServerInstance->Modules->UnpublishInterface("SQL", this); - ServerInstance->Modules->UnpublishFeature("SQL"); - ServerInstance->Modules->DoneWithInterface("SQLutils"); + delete LoggingMutex; + delete ResultsMutex; } - void SendQueue() { for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) @@ -690,37 +694,39 @@ class ModuleMsSQL : public Module bool HostInConf(const SQLhost &h) { - ConfigReader conf(ServerInstance); - for(int i = 0; i < conf.Enumerate("database"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("database"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { + ConfigTag* tag = i->second; SQLhost host; - host.id = conf.ReadValue("database", "id", i); - host.host = conf.ReadValue("database", "hostname", i); - host.port = conf.ReadInteger("database", "port", "1433", i, true); - host.name = conf.ReadValue("database", "name", i); - host.user = conf.ReadValue("database", "username", i); - host.pass = conf.ReadValue("database", "password", i); + host.id = tag->getString("id"); + host.host = tag->getString("hostname"); + host.port = tag->getInt("port", 1433); + host.name = tag->getString("name"); + host.user = tag->getString("username"); + host.pass = tag->getString("password"); if (h == host) return true; } return false; } - + void ReadConf() { ClearOldConnections(); - ConfigReader conf(ServerInstance); - for(int i = 0; i < conf.Enumerate("database"); i++) + ConfigTagList tags = ServerInstance->Config->ConfTags("database"); + for (ConfigIter i = tags.first; i != tags.second; ++i) { + ConfigTag* tag = i->second; SQLhost host; - host.id = conf.ReadValue("database", "id", i); - host.host = conf.ReadValue("database", "hostname", i); - host.port = conf.ReadInteger("database", "port", "1433", i, true); - host.name = conf.ReadValue("database", "name", i); - host.user = conf.ReadValue("database", "username", i); - host.pass = conf.ReadValue("database", "password", i); + host.id = tag->getString("id"); + host.host = tag->getString("hostname"); + host.port = tag->getInt("port", 1433); + host.name = tag->getString("name"); + host.user = tag->getString("username"); + host.pass = tag->getString("password"); if (HasHost(host)) continue; @@ -733,13 +739,15 @@ class ModuleMsSQL : public Module { if (HasHost(hi)) { - ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); + LoggingMutex->Lock(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); + LoggingMutex->Unlock(); return; } SQLConn* newconn; - newconn = new SQLConn(ServerInstance, this, hi); + newconn = new SQLConn(this, hi); connections.insert(std::make_pair(hi.id, newconn)); } @@ -761,38 +769,39 @@ class ModuleMsSQL : public Module void ClearAllConnections() { - ConnMap::iterator i; - while ((i = connections.begin()) != connections.end()) - { - connections.erase(i); + for(ConnMap::iterator i = connections.begin(); i != connections.end(); ++i) delete i->second; - } + connections.clear(); } - virtual void OnRehash(User* user, const std::string ¶meter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { + queryDispatcher->LockQueue(); ReadConf(); + queryDispatcher->UnlockQueueWakeup(); } - virtual const char* OnRequest(Request* request) + void OnRequest(Request& request) CXX11_OVERRIDE { - if(strcmp(SQLREQID, request->GetId()) == 0) + if(strcmp(SQLREQID, request.id) == 0) { - SQLrequest* req = (SQLrequest*)request; + SQLrequest* req = (SQLrequest*)&request; + + queryDispatcher->LockQueue(); + ConnMap::iterator iter; + if((iter = connections.find(req->dbid)) != connections.end()) { req->id = NewID(); - req->error = iter->second->Query(*req); - return SQLSUCCESS; + iter->second->queue.push(new SQLrequest(*req)); } else { - req->error.Id(BAD_DBID); - return NULL; + req->error.Id(SQL_BAD_DBID); } + queryDispatcher->UnlockQueueWakeup(); } - return NULL; } unsigned long NewID() @@ -803,16 +812,46 @@ class ModuleMsSQL : public Module return ++currid; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("MsSQL provider", VF_VENDOR); } }; -void ResultNotifier::Dispatch() +void QueryThread::OnNotify() { - ((ModuleMsSQL*)mod)->SendQueue(); + Parent->SendQueue(); +} + +void QueryThread::Run() +{ + this->LockQueue(); + while (this->GetExitFlag() == false) + { + SQLConn* conn = NULL; + for (ConnMap::iterator i = connections.begin(); i != connections.end(); i++) + { + if (i->second->queue.totalsize()) + { + conn = i->second; + break; + } + } + if (conn) + { + this->UnlockQueue(); + conn->DoLeadingQuery(); + this->NotifyParent(); + this->LockQueue(); + conn->queue.pop(); + } + else + { + this->WaitForQueue(); + } + } + this->UnlockQueue(); } MODULE_INIT(ModuleMsSQL)