X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=f6546d73ec9c9b30b55ff297dece888beb90a807;hb=45805210f8c9bbce6222c50863a1671f562ccfbb;hp=cebacde276320d676540ba296cb68db18a421586;hpb=13ade6fed1248d3bc54ea573da4962d5ddd21321;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index cebacde27..f6546d73e 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -2,39 +2,43 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include +/* Stop mysql wanting to use long long */ +#define NO_CLIENT_LONG_LONG + +#include "inspircd.h" #include -#include #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.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 */ -/* $CompileFlags: `mysql_config --include` */ -/* $LinkerFlags: `mysql_config --libs_r` `perl extra/mysql_rpath.pl` */ +/* $CompileFlags: exec("mysql_config --include") */ +/* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */ /* $ModDep: m_sqlv2.h */ /* THE NONBLOCKING MYSQL API! - * + * * MySQL provides no nonblocking (asyncronous) API of its own, and its developers recommend * 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. @@ -64,145 +68,51 @@ class SQLConnection; -class Notifier; +class MySQLListener; typedef std::map ConnMap; -bool giveup = false; -static Module* SQLModule = NULL; -static Notifier* MessagePipe = NULL; +static MySQLListener *MessagePipe = NULL; int QueueFD = -1; +class DispatcherThread; -#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 -#define mysql_field_count mysql_num_fields -#endif - -typedef std::deque ResultQueue; - -/** Represents a mysql query queue - */ -class QueryQueue : public classbase +/** MySQL module + * */ +class ModuleSQL : public Module { -private: - typedef std::deque ReqDeque; - - ReqDeque priority; /* The priority queue */ - ReqDeque normal; /* The 'normal' queue */ - enum { PRI, NOR, NON } which; /* Which queue the currently active element is at the front of */ - -public: - QueryQueue() - : which(NON) - { - } - - void push(const SQLrequest &q) - { - if(q.pri) - priority.push_back(q); - else - normal.push_back(q); - } - - void pop() - { - if((which == PRI) && priority.size()) - { - priority.pop_front(); - } - else if((which == NOR) && normal.size()) - { - normal.pop_front(); - } - - /* Reset this */ - which = NON; - - /* Silently do nothing if there was no element to pop() */ - } - - SQLrequest& front() - { - switch(which) - { - case PRI: - return priority.front(); - case NOR: - return normal.front(); - default: - if(priority.size()) - { - which = PRI; - return priority.front(); - } - - if(normal.size()) - { - which = NOR; - return normal.front(); - } - - /* This will probably result in a segfault, - * but the caller should have checked totalsize() - * first so..meh - moron :p - */ - - return priority.front(); - } - } - - std::pair size() - { - return std::make_pair(priority.size(), normal.size()); - } - - int totalsize() - { - return priority.size() + normal.size(); - } - - void PurgeModule(Module* mod) - { - DoPurgeModule(mod, priority); - DoPurgeModule(mod, normal); - } + public: -private: - void DoPurgeModule(Module* mod, ReqDeque& q) - { - for(ReqDeque::iterator iter = q.begin(); iter != q.end(); iter++) - { - if(iter->GetSource() == mod) - { - if(iter->id == front().id) - { - /* It's the currently active query.. :x */ - iter->SetSource(NULL); - } - else - { - /* It hasn't been executed yet..just remove it */ - iter = q.erase(iter); - } - } - } - } + ConfigReader *Conf; + InspIRCd* PublicServerInstance; + int currid; + bool rehashing; + DispatcherThread* Dispatcher; + Mutex* QueueMutex; + Mutex* ResultsMutex; + Mutex* LoggingMutex; + + ModuleSQL(InspIRCd* Me); + ~ModuleSQL(); + unsigned long NewID(); + const char* OnRequest(Request* request); + void OnRehash(User* user, const std::string ¶meter); + Version GetVersion(); }; -/* A mutex to wrap around queue accesses */ -pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER; -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 + +typedef std::deque ResultQueue; /** Represents a mysql result set */ class MySQLresult : public SQLresult { int currentrow; - //std::vector > results; std::vector colnames; std::vector fieldlists; SQLfieldMap* fieldmap; @@ -211,7 +121,7 @@ class MySQLresult : public SQLresult int rows; public: - MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int id) : SQLresult(self, to, id), currentrow(0), fieldmap(NULL) + MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL) { /* A number of affected rows from from mysql_affected_rows. */ @@ -246,7 +156,7 @@ class MySQLresult : public SQLresult std::string b = (row[field_count] ? row[field_count] : ""); SQLfield sqlf(b, !row[field_count]); colnames.push_back(a); - fieldlists[n].push_back(sqlf); + fieldlists[n].push_back(sqlf); field_count++; } n++; @@ -257,7 +167,7 @@ class MySQLresult : public SQLresult } } - MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0) + MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0) { rows = 0; error = e; @@ -317,7 +227,7 @@ class MySQLresult : public SQLresult virtual SQLfieldList& GetRow() { if (currentrow < rows) - return fieldlists[currentrow]; + return fieldlists[currentrow++]; else return emptyfieldlist; } @@ -356,7 +266,7 @@ class MySQLresult : public SQLresult virtual SQLfieldMap* GetRowMapPtr() { fieldmap = new SQLfieldMap(); - + if (currentrow < rows) { for (int i = 0; i < Cols(); i++) @@ -393,13 +303,10 @@ class SQLConnection : public classbase MYSQL connection; MYSQL_RES *res; MYSQL_ROW row; - std::string host; - std::string user; - std::string pass; - std::string db; + SQLhost host; std::map thisrow; bool Enabled; - std::string id; + ModuleSQL* Parent; public: @@ -407,7 +314,7 @@ class SQLConnection : public classbase ResultQueue rq; // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. - SQLConnection(const std::string &thishost, const std::string &thisuser, const std::string &thispass, const std::string &thisdb, const std::string &myid) : host(thishost), user(thisuser), pass(thispass), db(thisdb), Enabled(true), id(myid) + SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : host(hi), Enabled(false), Parent(Creator) { } @@ -423,7 +330,7 @@ class SQLConnection : public classbase unsigned int timeout = 1; mysql_init(&connection); mysql_options(&connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout); - return mysql_real_connect(&connection, host.c_str(), user.c_str(), pass.c_str(), db.c_str(), 0, NULL, 0); + 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() @@ -496,37 +403,37 @@ class SQLConnection : public classbase *queryend = 0; - pthread_mutex_lock(&queue_mutex); + Parent->QueueMutex->Lock(); req.query.q = query; - pthread_mutex_unlock(&queue_mutex); + Parent->QueueMutex->Unlock(); 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); + 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. @@ -561,12 +468,12 @@ class SQLConnection : public classbase const std::string& GetID() { - return id; + return host.id; } std::string GetHost() { - return host; + return host.host; } void SetEnable(bool Enable) @@ -584,53 +491,135 @@ class SQLConnection : public classbase mysql_close(&connection); } + const SQLhost& GetConfHost() + { + return host; + } + }; ConnMap Connections; -void ConnectDatabases(InspIRCd* ServerInstance) +bool HasHost(const SQLhost &host) +{ + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++) + { + if (host == iter->second->GetConfHost()) + return true; + } + return false; +} + +bool HostInConf(ConfigReader* conf, const SQLhost &h) +{ + for(int i = 0; i < conf->Enumerate("database"); i++) + { + SQLhost host; + host.id = conf->ReadValue("database", "id", i); + host.host = conf->ReadValue("database", "hostname", i); + host.port = conf->ReadInteger("database", "port", i, true); + host.name = conf->ReadValue("database", "name", i); + host.user = conf->ReadValue("database", "username", i); + host.pass = conf->ReadValue("database", "password", i); + host.ssl = conf->ReadFlag("database", "ssl", i); + if (h == host) + return true; + } + return false; +} + +void ClearOldConnections(ConfigReader* conf) +{ + ConnMap::iterator i,safei; + for (i = Connections.begin(); i != Connections.end(); i++) + { + if (!HostInConf(conf, i->second->GetConfHost())) + { + delete i->second; + safei = i; + --i; + Connections.erase(safei); + } + } +} + +void ClearAllConnections() +{ + ConnMap::iterator i; + while ((i = Connections.begin()) != Connections.end()) + { + Connections.erase(i); + delete i->second; + } +} + +void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent) { for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { + if (i->second->IsEnabled()) + continue; + i->second->SetEnable(true); if (!i->second->Connect()) { /* XXX: MUTEX */ - pthread_mutex_lock(&logging_mutex); - ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError()); + 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 ClearDatabases() +void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent) { - ConnMap::iterator i; - while ((i = Connections.begin()) != Connections.end()) - { - Connections.erase(i); - DELETE(i->second); + ClearOldConnections(conf); + for (int j =0; j < conf->Enumerate("database"); j++) + { + SQLhost host; + host.id = conf->ReadValue("database", "id", j); + host.host = conf->ReadValue("database", "hostname", j); + host.port = conf->ReadInteger("database", "port", j, true); + host.name = conf->ReadValue("database", "name", j); + host.user = conf->ReadValue("database", "username", j); + host.pass = conf->ReadValue("database", "password", j); + host.ssl = conf->ReadFlag("database", "ssl", 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, Parent); + Connections[host.id] = ThisSQL; + } } + ConnectDatabases(ServerInstance, Parent); } -void LoadDatabases(ConfigReader* ThisConf, InspIRCd* ServerInstance) +char FindCharId(const std::string &id) { - ClearDatabases(); - for (int j =0; j < ThisConf->Enumerate("database"); j++) - { - std::string db = ThisConf->ReadValue("database","name",j); - std::string user = ThisConf->ReadValue("database","username",j); - std::string pass = ThisConf->ReadValue("database","password",j); - std::string host = ThisConf->ReadValue("database","hostname",j); - std::string id = ThisConf->ReadValue("database","id",j); - if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != "")) + char i = 1; + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i) + { + if (iter->first == id) { - SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id); - Connections[id] = ThisSQL; + return i; } } - ConnectDatabases(ServerInstance); + return 0; +} + +ConnMap::iterator GetCharId(char id) +{ + char i = 1; + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i) + { + if (i == id) + return iter; + } + return Connections.end(); } void NotifyMainThread(SQLConnection* connection_with_new_result) @@ -643,40 +632,41 @@ void NotifyMainThread(SQLConnection* connection_with_new_result) * 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. */ - send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0); + char id = FindCharId(connection_with_new_result->GetID()); + send(QueueFD, &id, 1, 0); } -void* DispatcherThread(void* arg); +class ModuleSQL; + +class DispatcherThread : public Thread +{ + private: + ModuleSQL* Parent; + InspIRCd* ServerInstance; + public: + DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : Thread(), Parent(CreatorModule), ServerInstance(Instance) { } + ~DispatcherThread() { } + virtual void Run(); +}; /** Used by m_mysql to notify one thread when the other has a result */ -class Notifier : public InspSocket +class Notifier : public BufferedSocket { insp_sockaddr sock_us; socklen_t uslen; - + ModuleSQL* Parent; public: - - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - Notifier(InspIRCd* SI) : InspSocket(SI, "::1", 0, true, 3000) -#else - Notifier(InspIRCd* SI) : InspSocket(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"); - } - } - - Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip) - { - Instance->Log(DEBUG,"Constructor of new socket"); - } + Notifier(InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip) { } /* Using getsockname and ntohs, we can determine which port number we were allocated */ int GetPort() @@ -688,167 +678,164 @@ class Notifier : public InspSocket #endif } - virtual int OnIncomingConnection(int newsock, char* ip) - { - Instance->Log(DEBUG,"Inbound connection on fd %d!",newsock); - Notifier* n = new Notifier(this->Instance, newsock, ip); - n = n; /* Stop bitching at me, GCC */ - return true; - } - virtual bool OnDataReady() { - Instance->Log(DEBUG,"Inbound data!"); - char* data = this->Read(); - ConnMap::iterator iter; - - if (data && *data) + 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) { - Instance->Log(DEBUG,"Looking for connection %s",data); - /* We expect to be sent a null terminated string */ - if((iter = Connections.find(data)) != Connections.end()) + ConnMap::iterator iter = GetCharId(data); + if (iter != Connections.end()) { - Instance->Log(DEBUG,"Found it!"); - /* Lock the mutex, send back the data */ - pthread_mutex_lock(&results_mutex); + Parent->ResultsMutex->Lock(); ResultQueue::iterator n = iter->second->rq.begin(); (*n)->Send(); + delete (*n); iter->second->rq.pop_front(); - pthread_mutex_unlock(&results_mutex); + Parent->ResultsMutex->Unlock(); return true; } + /* No error, but unknown id */ + return true; } + /* Erk, error on descriptor! */ return false; } }; -/** MySQL module +/** Spawn sockets from a listener */ -class ModuleSQL : public Module +class MySQLListener : public ListenSocketBase { - public: - - ConfigReader *Conf; - InspIRCd* PublicServerInstance; - pthread_t Dispatcher; - int currid; - - ModuleSQL(InspIRCd* Me) - : Module::Module(Me) - { - ServerInstance->UseInterface("SQLutils"); - - Conf = new ConfigReader(ServerInstance); - PublicServerInstance = ServerInstance; - currid = 0; - SQLModule = this; - - MessagePipe = new Notifier(ServerInstance); - ServerInstance->Log(DEBUG,"Bound notifier to 127.0.0.1:%d",MessagePipe->GetPort()); - - pthread_attr_t attribs; - pthread_attr_init(&attribs); - pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED); - if (pthread_create(&this->Dispatcher, &attribs, DispatcherThread, (void *)this) != 0) - { - throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno))); - } + FileReader* index; - if (!ServerInstance->PublishFeature("SQL", this)) - { - /* Tell worker thread to exit NOW */ - giveup = true; - throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); - } - - ServerInstance->PublishInterface("SQL", this); - } + public: + MySQLListener(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { } - virtual ~ModuleSQL() + virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) { - giveup = true; - ClearDatabases(); - DELETE(Conf); - ServerInstance->UnpublishInterface("SQL", this); - ServerInstance->UnpublishFeature("SQL"); - ServerInstance->DoneWithInterface("SQLutils"); + new Notifier(this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck } +}; +ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false) +{ + ServerInstance->Modules->UseInterface("SQLutils"); - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnRequest] = 1; - } + Conf = new ConfigReader(ServerInstance); + PublicServerInstance = ServerInstance; + currid = 0; - unsigned long NewID() + /* Create a socket on a random port. Let the tcp stack allocate us an available port */ +#ifdef IPV6 + MessagePipe = new MySQLListener(ServerInstance, 0, "::1"); +#else + MessagePipe = new MySQLListener(ServerInstance, 0, "127.0.0.1"); +#endif + + if (MessagePipe->GetFd()) + throw ModuleException("m_mysql: unable to create ITC pipe"); + + Dispatcher = new DispatcherThread(ServerInstance, this); + ServerInstance->Threads->Create(Dispatcher); + + LoggingMutex = ServerInstance->Mutexes->CreateMutex(); + ResultsMutex = ServerInstance->Mutexes->CreateMutex(); + QueueMutex = ServerInstance->Mutexes->CreateMutex(); + + if (!ServerInstance->Modules->PublishFeature("SQL", this)) { - if (currid+1 == 0) - currid++; - return ++currid; + /* Tell worker thread to exit NOW, + * Automatically joins */ + delete Dispatcher; + throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); } - char* OnRequest(Request* request) - { - if(strcmp(SQLREQID, request->GetId()) == 0) - { - SQLrequest* req = (SQLrequest*)request; + ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnRehash, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 2); +} - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); +ModuleSQL::~ModuleSQL() +{ + delete Dispatcher; + ClearAllConnections(); + delete Conf; + ServerInstance->Modules->UnpublishInterface("SQL", this); + ServerInstance->Modules->UnpublishFeature("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); + delete LoggingMutex; + delete ResultsMutex; + delete QueueMutex; +} - ConnMap::iterator iter; +unsigned long ModuleSQL::NewID() +{ + if (currid+1 == 0) + currid++; + return ++currid; +} - char* returnval = NULL; +const char* ModuleSQL::OnRequest(Request* request) +{ + if(strcmp(SQLREQID, request->GetId()) == 0) + { + SQLrequest* req = (SQLrequest*)request; - ServerInstance->Log(DEBUG, "Got query: '%s' with %d replacement parameters on id '%s'", req->query.q.c_str(), req->query.p.size(), req->dbid.c_str()); + /* XXX: Lock */ + QueueMutex->Lock(); - if((iter = Connections.find(req->dbid)) != Connections.end()) - { - req->id = NewID(); - iter->second->queue.push(*req); - returnval = SQLSUCCESS; - } - else - { - req->error.Id(BAD_DBID); - } + ConnMap::iterator iter; - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + const char* returnval = NULL; - return returnval; + if((iter = Connections.find(req->dbid)) != Connections.end()) + { + req->id = NewID(); + iter->second->queue.push(*req); + returnval = SQLSUCCESS; + } + else + { + req->error.Id(SQL_BAD_DBID); } - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); + QueueMutex->Unlock(); + /* XXX: Unlock */ - return NULL; + return returnval; } - virtual void OnRehash(const std::string ¶meter) - { - /* TODO: set rehash bool here, which makes the dispatcher thread rehash at next opportunity */ - } - - virtual Version GetVersion() - { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); - } - -}; + return NULL; +} -void* DispatcherThread(void* arg) +void ModuleSQL::OnRehash(User* user, const std::string ¶meter) { - ModuleSQL* thismodule = (ModuleSQL*)arg; - LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance); + rehashing = true; +} + +Version ModuleSQL::GetVersion() +{ + return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); +} + +void DispatcherThread::Run() +{ + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); /* Connect back to the Notifier */ if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) { /* crap, we're out of sockets... */ - return NULL; + return; } insp_sockaddr addr; @@ -868,14 +855,24 @@ void* DispatcherThread(void* arg) if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) { /* wtf, we cant connect to it, but we just created it! */ - return NULL; + return; } - while (!giveup) + while (this->GetExitFlag() == false) { + if (Parent->rehashing) + { + /* XXX: Lock */ + Parent->QueueMutex->Lock(); + Parent->rehashing = false; + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); + Parent->QueueMutex->Unlock(); + /* XXX: Unlock */ + } + SQLConnection* conn = NULL; /* XXX: Lock here for safety */ - pthread_mutex_lock(&queue_mutex); + Parent->QueueMutex->Lock(); for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { if (i->second->queue.totalsize()) @@ -884,7 +881,7 @@ void* DispatcherThread(void* arg) break; } } - pthread_mutex_unlock(&queue_mutex); + Parent->QueueMutex->Unlock(); /* XXX: Unlock */ /* Theres an item! */ @@ -893,41 +890,15 @@ void* DispatcherThread(void* arg) conn->DoLeadingQuery(); /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); + Parent->QueueMutex->Lock(); conn->queue.pop(); - pthread_mutex_unlock(&queue_mutex); + Parent->QueueMutex->Unlock(); /* XXX: Unlock */ } - usleep(50); + usleep(1000); } - - return NULL; } +MODULE_INIT(ModuleSQL) -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleSQLFactory : public ModuleFactory -{ - public: - ModuleSQLFactory() - { - } - - ~ModuleSQLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQL(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSQLFactory; -}