X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=e3639436bb1011a78e0e54e57fb0266b8a504d7f;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=16eba4e1f7f387858c2394800faaec4e6c7c65b3;hpb=01c5bba74187def0a737a077bd1b999a55bac075;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 16eba4e1f..023ead94b 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -2,43 +2,40 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * 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. * * --------------------------------------------------- */ -using namespace std; +/* Stop mysql wanting to use long long */ +#define NO_CLIENT_LONG_LONG -#include -#include +#include "inspircd.h" #include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.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 ../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. @@ -63,158 +60,72 @@ using namespace std; * 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; -extern InspIRCd* ServerInstance; typedef std::map ConnMap; -bool giveup = false; -static Module* SQLModule = NULL; -static Notifier* MessagePipe = NULL; -int QueueFD = -1; - - -#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 -#define mysql_field_count mysql_num_fields -#endif - typedef std::deque ResultQueue; -class QueryQueue : public classbase +unsigned long count(const char * const str, char a) { -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) - { - log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.q.c_str()); - - 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() + unsigned long n = 0; + for (const char *p = str; *p; ++p) { - return std::make_pair(priority.size(), normal.size()); + if (*p == '?') + ++n; } + return n; +} - int totalsize() - { - return priority.size() + normal.size(); - } - void PurgeModule(Module* mod) - { - DoPurgeModule(mod, priority); - DoPurgeModule(mod, normal); - } +/** MySQL module + * */ +class ModuleSQL : public Module +{ + 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; + int currid; + bool rehashing; + DispatcherThread* Dispatcher; + Mutex ResultsMutex; + Mutex LoggingMutex; + Mutex ConnMutex; + + ModuleSQL(); + ~ModuleSQL(); + unsigned long NewID(); + const char* OnRequest(Request* request); + void OnRehash(User* user); + 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; +#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 +#define mysql_field_count mysql_num_fields +#endif +/** Represents a mysql result set + */ class MySQLresult : public SQLresult { int currentrow; - //std::vector > results; std::vector colnames; std::vector fieldlists; SQLfieldMap* fieldmap; + SQLfieldMap fieldmap2; + SQLfieldList emptyfieldlist; int rows; - int cols; 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. */ - log(DEBUG,"Created new MySQLresult of non-error type"); fieldlists.clear(); rows = 0; if (affected_rows >= 1) @@ -222,7 +133,7 @@ class MySQLresult : public SQLresult rows = affected_rows; fieldlists.resize(rows); } - unsigned int field_count; + unsigned int field_count = 0; if (res) { MYSQL_ROW row; @@ -246,26 +157,22 @@ 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++; } rows++; } - cols = mysql_num_fields(res); mysql_free_result(res); + res = NULL; } - cols = field_count; - log(DEBUG, "Created new MySQL result; %d rows, %d columns", rows, cols); } - 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; - cols = 0; error = e; - log(DEBUG,"Created new MySQLresult of error type"); } ~MySQLresult() @@ -279,7 +186,7 @@ class MySQLresult : public SQLresult virtual int Cols() { - return cols; + return colnames.size(); } virtual std::string ColName(int column) @@ -308,12 +215,11 @@ class MySQLresult : public SQLresult virtual SQLfield GetValue(int row, int column) { - if ((row >= 0) && (row < rows) && (column >= 0) && (column < cols)) + if ((row >= 0) && (row < rows) && (column >= 0) && (column < Cols())) { return fieldlists[row][column]; } - log(DEBUG,"Danger will robinson, we don't have row %d, column %d!", row, column); throw SQLbadColName(); /* XXX: We never actually get here because of the throw */ @@ -322,36 +228,55 @@ class MySQLresult : public SQLresult virtual SQLfieldList& GetRow() { - return fieldlists[currentrow]; + if (currentrow < rows) + return fieldlists[currentrow++]; + else + return emptyfieldlist; } virtual SQLfieldMap& GetRowMap() { - fieldmap = new SQLfieldMap(); - - for (int i = 0; i < cols; i++) + fieldmap2.clear(); + + if (currentrow < rows) { - fieldmap->insert(std::make_pair(colnames[cols],GetValue(currentrow, i))); + for (int i = 0; i < Cols(); i++) + { + fieldmap2.insert(std::make_pair(colnames[i],GetValue(currentrow, i))); + } + currentrow++; } - currentrow++; - return *fieldmap; + return fieldmap2; } virtual SQLfieldList* GetRowPtr() { - return &fieldlists[currentrow++]; + SQLfieldList* fieldlist = new SQLfieldList(); + + if (currentrow < rows) + { + for (int i = 0; i < Rows(); i++) + { + fieldlist->push_back(fieldlists[currentrow][i]); + } + currentrow++; + } + return fieldlist; } virtual SQLfieldMap* GetRowMapPtr() { fieldmap = new SQLfieldMap(); - for (int i = 0; i < cols; i++) + if (currentrow < rows) { - fieldmap->insert(std::make_pair(colnames[cols],GetValue(currentrow, i))); + for (int i = 0; i < Cols(); i++) + { + fieldmap->insert(std::make_pair(colnames[i],GetValue(currentrow, i))); + } + currentrow++; } - currentrow++; return fieldmap; } @@ -363,48 +288,37 @@ class MySQLresult : public SQLresult virtual void Free(SQLfieldList* fl) { - /* XXX: Yes, this is SUPPOSED to do nothing, we - * dont want to free our fieldlist until we - * destruct the object. Unlike the pgsql module, - * we only have the one. - */ + delete fl; } }; -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; - std::string host; - std::string user; - std::string pass; - std::string db; + MYSQL_ROW *row; + SQLhost host; std::map thisrow; bool Enabled; - std::string id; + ModuleSQL* Parent; + std::string initquery; public: QueryQueue queue; ResultQueue rq; - // This constructor creates an SQLConnection object with the given credentials, and creates the underlying - // MYSQL struct, but does not connect yet. - SQLConnection(std::string thishost, std::string thisuser, std::string thispass, std::string thisdb, const std::string &myid) + // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. + SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator) + { + } + + ~SQLConnection() { - this->Enabled = true; - this->host = thishost; - this->user = thisuser; - this->pass = thispass; - this->db = thisdb; - this->id = myid; + Close(); } // This method connects to the database using the credentials supplied to the constructor, and returns @@ -412,9 +326,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.c_str(), user.c_str(), pass.c_str(), db.c_str(), 0, 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() @@ -422,9 +336,11 @@ 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(); - log(DEBUG,"DO QUERY: %s",req.query.q.c_str()); /* Pointer to the buffer we screw around with substitution in */ char* query; @@ -433,25 +349,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)]; + 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 @@ -468,83 +389,107 @@ 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) { - unsigned long len = mysql_real_escape_string(&connection, queryend, req.query.p.front().c_str(), req.query.p.front().length()); + /* 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()); queryend += len; req.query.p.pop_front(); } else - { - log(DEBUG, "Found a substitution location but no parameter to substitute :|"); break; - } } else { *queryend = req.query.q[i]; queryend++; } - querylength++; } *queryend = 0; - log(DEBUG, "Attempting to dispatch query: %s", query); - - 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 */ - log(DEBUG,"SQL ERROR: %s",mysql_error(&connection)); - SQLerror e((SQLerrorNum)mysql_errno(&connection), 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 - */ - - NotifyMainThread(this); + delete[] query; } 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; @@ -552,17 +497,22 @@ class SQLConnection : public classbase std::string GetError() { - return mysql_error(&connection); + return mysql_error(connection); } const std::string& GetID() { - return id; + return host.id; } std::string GetHost() { - return host; + return host.host; + } + + void setInitialQuery(std::string init) + { + initquery = init; } void SetEnable(bool Enable) @@ -575,273 +525,265 @@ class SQLConnection : public classbase return Enabled; } + void Close() + { + mysql_close(connection); + } + + const SQLhost& GetConfHost() + { + return host; + } + }; ConnMap Connections; -void ConnectDatabases(Server* Srv) +bool HasHost(const SQLhost &host) { - for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++) { - i->second->SetEnable(true); - if (i->second->Connect()) - { - Srv->Log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost()); - } - else - { - Srv->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError()); - i->second->SetEnable(false); - } + 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 LoadDatabases(ConfigReader* ThisConf, Server* Srv) +void ClearOldConnections(ConfigReader* conf) { - Srv->Log(DEFAULT,"SQL: Loading database settings"); - Connections.clear(); - Srv->Log(DEBUG,"Cleared connections"); - 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); - Srv->Log(DEBUG,"Read database settings"); - if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != "")) + ConnMap::iterator i,safei; + for (i = Connections.begin(); i != Connections.end(); i++) + { + if (!HostInConf(conf, i->second->GetConfHost())) { - SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id); - Srv->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost()); - Connections[id] = ThisSQL; - Srv->Log(DEBUG,"Pushed back connection"); + delete i->second; + safei = i; + --i; + Connections.erase(safei); } } - ConnectDatabases(Srv); } -void NotifyMainThread(SQLConnection* connection_with_new_result) +void ClearAllConnections() { - /* 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. - */ - log(DEBUG,"Notify of result on connection: %s",connection_with_new_result->GetID().c_str()); - if (send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0) < 1) // add one for null terminator - { - log(DEBUG,"Error writing to QueueFD: %s",strerror(errno)); - } - log(DEBUG,"Sent it on its way via fd=%d",QueueFD); + ConnMap::iterator i; + while ((i = Connections.begin()) != Connections.end()) + { + Connections.erase(i); + delete i->second; + } } -void* DispatcherThread(void* arg); - -class Notifier : public InspSocket +void ConnectDatabases(ModuleSQL* Parent) { - sockaddr_in sock_us; - socklen_t uslen; - Server* Srv; - - public: - - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ - Notifier(Server* S) : InspSocket("127.0.0.1", 0, true, 3000), Srv(S) + for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { - uslen = sizeof(sock_us); - if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) + if (i->second->IsEnabled()) + continue; + + i->second->SetEnable(true); + if (!i->second->Connect()) { - throw ModuleException("Could not create random listening port on localhost"); + /* XXX: 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); + Parent->LoggingMutex.Unlock(); } } +} - Notifier(int newfd, char* ip, Server* S) : InspSocket(newfd, ip), Srv(S) - { - log(DEBUG,"Constructor of new socket"); - } +void LoadDatabases(ConfigReader* conf, ModuleSQL* Parent) +{ + Parent->ConnMutex.Lock(); + 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); + 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, Parent); + Connections[host.id] = ThisSQL; - /* Using getsockname and ntohs, we can determine which port number we were allocated */ - int GetPort() - { - return ntohs(sock_us.sin_port); + ThisSQL->setInitialQuery(initquery); + } } + ConnectDatabases(Parent); + Parent->ConnMutex.Unlock(); +} - virtual int OnIncomingConnection(int newsock, char* ip) +char FindCharId(const std::string &id) +{ + char i = 1; + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i) { - log(DEBUG,"Inbound connection on fd %d!",newsock); - Notifier* n = new Notifier(newsock, ip, Srv); - Srv->AddSocket(n); - return true; + if (iter->first == id) + { + return i; + } } + return 0; +} - virtual bool OnDataReady() +ConnMap::iterator GetCharId(char id) +{ + char i = 1; + for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i) { - log(DEBUG,"Inbound data!"); - char* data = this->Read(); - ConnMap::iterator iter; + if (i == id) + return iter; + } + return Connections.end(); +} - if (data && *data) - { - log(DEBUG,"Looking for connection %s",data); - /* We expect to be sent a null terminated string */ - if((iter = Connections.find(data)) != Connections.end()) - { - log(DEBUG,"Found it!"); - - /* Lock the mutex, send back the data */ - pthread_mutex_lock(&results_mutex); - ResultQueue::iterator n = iter->second->rq.begin(); - (*n)->Send(); - iter->second->rq.pop_front(); - pthread_mutex_unlock(&results_mutex); - return true; - } - } +class ModuleSQL; - return false; - } +class DispatcherThread : public SocketThread +{ + private: + ModuleSQL* Parent; + public: + DispatcherThread(ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule),{ } + ~DispatcherThread() { } + virtual void Run(); + virtual void OnNotify(); }; -class ModuleSQL : public Module +ModuleSQL::ModuleSQL() : rehashing(false) { - public: - Server *Srv; - ConfigReader *Conf; - pthread_t Dispatcher; - int currid; + ServerInstance->Modules->UseInterface("SQLutils"); - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnRequest] = 1; - } + Conf = new ConfigReader; + PublicServerInstance = ServerInstance; + currid = 0; - unsigned long NewID() - { - if (currid+1 == 0) - currid++; - return ++currid; - } + Dispatcher = new DispatcherThread(this); + ServerInstance->Threads->Start(Dispatcher); - char* OnRequest(Request* request) + if (!ServerInstance->Modules->PublishFeature("SQL", this)) { - if(strcmp(SQLREQID, request->GetData()) == 0) - { - SQLrequest* req = (SQLrequest*)request; + Dispatcher->join(); + delete Dispatcher; + ServerInstance->Modules->DoneWithInterface("SQLutils"); + throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); + } - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); + ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnRehash, I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 2); +} - ConnMap::iterator iter; +ModuleSQL::~ModuleSQL() +{ + delete Dispatcher; + ClearAllConnections(); + delete Conf; + ServerInstance->Modules->UnpublishInterface("SQL", this); + ServerInstance->Modules->UnpublishFeature("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); +} - char* returnval = NULL; +unsigned long ModuleSQL::NewID() +{ + if (currid+1 == 0) + currid++; + return ++currid; +} - 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()); +const char* ModuleSQL::OnRequest(Request* request) +{ + if(strcmp(SQLREQID, request->GetId()) == 0) + { + SQLrequest* req = (SQLrequest*)request; - if((iter = Connections.find(req->dbid)) != Connections.end()) - { - iter->second->queue.push(*req); - req->id = NewID(); - returnval = SQLSUCCESS; - } - else - { - req->error.Id(BAD_DBID); - } + ConnMap::iterator iter; - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + const char* returnval = NULL; - return returnval; + Dispatcher->LockQueue(); + ConnMutex.Lock(); + 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); } - log(DEBUG, "Got unsupported API version string: %s", request->GetData()); + ConnMutex.Unlock(); + Dispatcher->UnlockQueueWakeup(); + /* Yes, it's possible this will generate a spurious wakeup. + * That's fine, it'll just get ignored. + */ - return NULL; + return returnval; } - ModuleSQL(Server* Me) - : Module::Module(Me) - { - Srv = Me; - Conf = new ConfigReader(); - currid = 0; - SQLModule = this; - - MessagePipe = new Notifier(Srv); - Srv->AddSocket(MessagePipe); - 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))); - } - Srv->PublishFeature("SQL", this); - Srv->PublishFeature("MySQL", this); - } - - virtual ~ModuleSQL() - { - DELETE(Conf); - } - - 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); - } - -}; + return NULL; +} -void* DispatcherThread(void* arg) +void ModuleSQL::OnRehash(User* user) { - log(DEBUG,"Starting Dispatcher thread, mysql version %d",mysql_get_client_version()); - ModuleSQL* thismodule = (ModuleSQL*)arg; - LoadDatabases(thismodule->Conf, thismodule->Srv); - - /* Connect back to the Notifier */ + Dispatcher->LockQueue(); + rehashing = true; + Dispatcher->UnlockQueueWakeup(); +} - if ((QueueFD = socket(AF_INET, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - log(DEBUG,"QueueFD cant be created"); - return NULL; - } +Version ModuleSQL::GetVersion() +{ + return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); +} - log(DEBUG,"Initialize QueueFD to %d",QueueFD); +void DispatcherThread::Run() +{ + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); - sockaddr_in addr; - in_addr ia; - inet_aton("127.0.0.1", &ia); - addr.sin_family = AF_INET; - addr.sin_addr = ia; - addr.sin_port = htons(MessagePipe->GetPort()); + SQLConnection* conn = NULL; - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) + this->LockQueue(); + while (!this->GetExitFlag()) { - /* wtf, we cant connect to it, but we just created it! */ - log(DEBUG,"QueueFD cant connect!"); - return NULL; - } - - log(DEBUG,"Connect QUEUE FD"); + if (Parent->rehashing) + { + Parent->rehashing = false; + LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); + } - while (!giveup) - { - 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()) @@ -850,52 +792,59 @@ void* DispatcherThread(void* arg) break; } } - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + Parent->ConnMutex.Unlock(); - /* Theres an item! */ if (conn) { - log(DEBUG,"Process Leading query"); + /* 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(50); + else + { + /* We know the queue is empty, we can safely hang this thread until + * something happens + */ + this->WaitForQueue(); + } } - - return NULL; + this->UnlockQueue(); } - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleSQLFactory : public ModuleFactory +void DispatcherThread::OnNotify() { - public: - ModuleSQLFactory() + SQLConnection* conn; + while (1) { - } - - ~ModuleSQLFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleSQL(Me); - } - -}; + 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; -extern "C" void * init_module( void ) -{ - return new ModuleSQLFactory; + Parent->ResultsMutex.Lock(); + ResultQueue::iterator n = conn->rq.begin(); + Parent->ResultsMutex.Unlock(); + + (*n)->Send(); + delete (*n); + + Parent->ResultsMutex.Lock(); + conn->rq.pop_front(); + Parent->ResultsMutex.Unlock(); + } } +MODULE_INIT(ModuleSQL)