X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=377ffee7e026e10553a93da519fdc7a79828c30f;hb=d848034590bc402277da975b7efdbc78ce1722fc;hp=358f5e992b76f8dffb71f74126dcb647516ebe0a;hpb=19487dbebc520450e457472b97d9e7bcd5160c00;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 358f5e992..377ffee7e 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -1,33 +1,65 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2015 Daniel Vassdal + * Copyright (C) 2014, 2016 Adam + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2013, 2016-2020 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2005, 2008-2010 Craig Edwards * - * 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 . */ -/* Stop mysql wanting to use long long */ -#define NO_CLIENT_LONG_LONG +/// $CompilerFlags: execute("mysql_config --include" "MYSQL_CXXFLAGS") +/// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient") + +/// $PackageInfo: require_system("arch") mariadb-libs +/// $PackageInfo: require_system("centos" "6.0" "6.99") mysql-devel +/// $PackageInfo: require_system("centos" "7.0") mariadb-devel +/// $PackageInfo: require_system("darwin") mysql-connector-c +/// $PackageInfo: require_system("debian") libmysqlclient-dev +/// $PackageInfo: require_system("ubuntu") libmysqlclient-dev + +#ifdef __GNUC__ +# pragma GCC diagnostic push +#endif + +// Fix warnings about the use of `long long` on C++03. +#if defined __clang__ +# pragma clang diagnostic ignored "-Wc++11-long-long" +#elif defined __GNUC__ +# pragma GCC diagnostic ignored "-Wlong-long" +#endif #include "inspircd.h" #include -#include "m_sqlv2.h" +#include "modules/sql.h" -#ifdef WINDOWS -#pragma comment(lib, "mysqlclient.lib") +#ifdef __GNUC__ +# pragma GCC diagnostic pop #endif -/* VERSION 2 API: With nonblocking (threaded) requests */ +#ifdef _WIN32 +# pragma comment(lib, "libmysql.lib") +#endif -/* $ModDesc: SQL Service Provider module for all other m_sql* modules */ -/* $CompileFlags: exec("mysql_config --include") */ -/* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */ -/* $ModDep: m_sqlv2.h */ +/* VERSION 3 API: With nonblocking (threaded) requests */ /* THE NONBLOCKING MYSQL API! * @@ -41,7 +73,7 @@ * worker thread wakes up, and checks if there is a request at the head of its queue. * If there is, it processes this request, blocking the worker thread but leaving the ircd * thread to go about its business as usual. During this period, the ircd thread is able - * to insert futher pending requests into the queue. + * to insert further pending requests into the queue. * * Once the processing of a request is complete, it is removed from the incoming queue to * an outgoing queue, and initialized as a 'response'. The worker thread then signals the @@ -51,81 +83,103 @@ * The ircd thread then mutexes the queue once more, reads the outbound response off the head * of the queue, and sends it on its way to the original calling module. * - * XXX: You might be asking "why doesnt he just send the response from within the worker thread?" + * XXX: You might be asking "why doesnt it just send the response from within the worker thread?" * The answer to this is simple. The majority of InspIRCd, and in fact most ircd's are not * threadsafe. This module is designed to be threadsafe and is careful with its use of threads, * however, if we were to call a module's OnRequest even from within a thread which was not the * one the module was originally instantiated upon, there is a chance of all hell breaking loose * if a module is ever put in a re-enterant state (stack corruption could occur, crashes, data * 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://wiki.inspircd.org/Mysql2 + * guaranteed threadsafe!) */ - class SQLConnection; +class MySQLresult; class DispatcherThread; -typedef std::map ConnMap; -typedef std::deque ResultQueue; +struct QueryQueueItem +{ + // An SQL database which this query is executed on. + SQLConnection* connection; + + // An object which handles the result of the query. + SQL::Query* query; + + // The SQL query which is to be executed. + std::string querystr; -static unsigned long count(const char * const str, char a) + QueryQueueItem(SQL::Query* q, const std::string& s, SQLConnection* c) + : connection(c) + , query(q) + , querystr(s) + { + } +}; + +struct ResultQueueItem { - unsigned long n = 0; - for (const char *p = str; *p; ++p) + // An object which handles the result of the query. + SQL::Query* query; + + // The result returned from executing the MySQL query. + MySQLresult* result; + + ResultQueueItem(SQL::Query* q, MySQLresult* r) + : query(q) + , result(r) { - if (*p == '?') - ++n; } - return n; -} +}; +typedef insp::flat_map ConnMap; +typedef std::deque QueryQueue; +typedef std::deque ResultQueue; /** MySQL module * */ class ModuleSQL : public Module { public: - int currid; - bool rehashing; - DispatcherThread* Dispatcher; - Mutex ResultsMutex; - Mutex LoggingMutex; - Mutex ConnMutex; - - ModuleSQL(); - ~ModuleSQL(); - unsigned long NewID(); - void OnRequest(Request& request); - void OnRehash(User* user); - Version GetVersion(); + DispatcherThread* Dispatcher; + QueryQueue qq; // MUST HOLD MUTEX + ResultQueue rq; // MUST HOLD MUTEX + ConnMap connections; // main thread only + + ModuleSQL(); + void init() CXX11_OVERRIDE; + ~ModuleSQL(); + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; + void OnUnloadModule(Module* mod) CXX11_OVERRIDE; + Version GetVersion() CXX11_OVERRIDE; }; - -#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 -#define mysql_field_count mysql_num_fields -#endif +class DispatcherThread : public SocketThread +{ + private: + ModuleSQL* const Parent; + public: + DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } + ~DispatcherThread() { } + void Run() CXX11_OVERRIDE; + void OnNotify() CXX11_OVERRIDE; +}; /** Represents a mysql result set */ -class MySQLresult : public SQLresult +class MySQLresult : public SQL::Result { + public: + SQL::Error err; int currentrow; - std::vector colnames; - std::vector fieldlists; - SQLfieldMap* fieldmap; - SQLfieldMap fieldmap2; - SQLfieldList emptyfieldlist; int rows; - public: + std::vector colnames; + std::vector fieldlists; - MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL) + MySQLresult(MYSQL_RES* res, int affected_rows) + : err(SQL::SUCCESS) + , currentrow(0) + , rows(0) { - /* A number of affected rows from from mysql_affected_rows. - */ - fieldlists.clear(); - rows = 0; if (affected_rows >= 1) { rows = affected_rows; @@ -152,10 +206,11 @@ class MySQLresult : public SQLresult while (field_count < mysql_num_fields(res)) { std::string a = (fields[field_count].name ? fields[field_count].name : ""); - std::string b = (row[field_count] ? row[field_count] : ""); - SQLfield sqlf(b, !row[field_count]); + if (row[field_count]) + fieldlists[n].push_back(SQL::Field(row[field_count])); + else + fieldlists[n].push_back(SQL::Field()); colnames.push_back(a); - fieldlists[n].push_back(sqlf); field_count++; } n++; @@ -163,635 +218,378 @@ class MySQLresult : public SQLresult rows++; } mysql_free_result(res); - res = NULL; } } - MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0) + MySQLresult(SQL::Error& e) + : err(e) + , currentrow(0) + , rows(0) { - rows = 0; - error = e; - } - ~MySQLresult() - { } - virtual int Rows() + int Rows() CXX11_OVERRIDE { return rows; } - virtual int Cols() + void GetCols(std::vector& result) CXX11_OVERRIDE { - return colnames.size(); - } - - virtual std::string ColName(int column) - { - if (column < (int)colnames.size()) - { - return colnames[column]; - } - else - { - throw SQLbadColName(); - } - return ""; + result.assign(colnames.begin(), colnames.end()); } - virtual int ColNum(const std::string &column) + bool HasColumn(const std::string& column, size_t& index) CXX11_OVERRIDE { - for (unsigned int i = 0; i < colnames.size(); i++) + for (size_t i = 0; i < colnames.size(); ++i) { - if (column == colnames[i]) - return i; + if (colnames[i] == column) + { + index = i; + return true; + } } - throw SQLbadColName(); - return 0; + return false; } - virtual SQLfield GetValue(int row, int column) + SQL::Field GetValue(int row, int column) { - if ((row >= 0) && (row < rows) && (column >= 0) && (column < Cols())) + if ((row >= 0) && (row < rows) && (column >= 0) && (column < (int)fieldlists[row].size())) { return fieldlists[row][column]; } - - throw SQLbadColName(); - - /* XXX: We never actually get here because of the throw */ - return SQLfield("",true); + return SQL::Field(); } - virtual SQLfieldList& GetRow() + bool GetRow(SQL::Row& result) CXX11_OVERRIDE { - if (currentrow < rows) - return fieldlists[currentrow++]; - else - return emptyfieldlist; - } - - virtual SQLfieldMap& GetRowMap() - { - fieldmap2.clear(); - if (currentrow < rows) { - for (int i = 0; i < Cols(); i++) - { - fieldmap2.insert(std::make_pair(colnames[i],GetValue(currentrow, i))); - } - currentrow++; - } - - return fieldmap2; - } - - virtual SQLfieldList* GetRowPtr() - { - SQLfieldList* fieldlist = new SQLfieldList(); - - if (currentrow < rows) - { - for (int i = 0; i < Rows(); i++) - { - fieldlist->push_back(fieldlists[currentrow][i]); - } + result.assign(fieldlists[currentrow].begin(), fieldlists[currentrow].end()); currentrow++; + return true; } - return fieldlist; - } - - virtual SQLfieldMap* GetRowMapPtr() - { - fieldmap = new SQLfieldMap(); - - if (currentrow < rows) + else { - for (int i = 0; i < Cols(); i++) - { - fieldmap->insert(std::make_pair(colnames[i],GetValue(currentrow, i))); - } - currentrow++; + result.clear(); + return false; } - - return fieldmap; - } - - virtual void Free(SQLfieldMap* fm) - { - delete fm; - } - - virtual void Free(SQLfieldList* fl) - { - delete fl; } }; /** Represents a connection to a mysql database */ -class SQLConnection : public classbase +class SQLConnection : public SQL::Provider { - protected: - MYSQL *connection; - MYSQL_RES *res; - MYSQL_ROW *row; - SQLhost host; - std::map thisrow; - bool Enabled; - ModuleSQL* Parent; - std::string initquery; + private: + bool EscapeString(SQL::Query* query, const std::string& in, std::string& out) + { + // In the worst case each character may need to be encoded as using two bytes and one + // byte is the NUL terminator. + std::vector buffer(in.length() * 2 + 1); + + // The return value of mysql_escape_string() is either an error or the length of the + // encoded string not including the NUL terminator. + // + // Unfortunately, someone genius decided that mysql_escape_string should return an + // unsigned type even though -1 is returned on error so checking whether an error + // happened is a bit cursed. + unsigned long escapedsize = mysql_escape_string(&buffer[0], in.c_str(), in.length()); + if (escapedsize == static_cast(-1)) + { + SQL::Error err(SQL::QSEND_FAIL, InspIRCd::Format("%u: %s", mysql_errno(connection), mysql_error(connection))); + query->OnError(err); + return false; + } - public: + out.append(&buffer[0], escapedsize); + return true; + } - QueryQueue queue; - ResultQueue rq; + public: + reference config; + MYSQL *connection; + Mutex lock; // 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(Module* p, ConfigTag* tag) + : SQL::Provider(p, tag->getString("id")) + , config(tag) + , connection(NULL) { } ~SQLConnection() { - Close(); + mysql_close(connection); } // This method connects to the database using the credentials supplied to the constructor, and returns // true upon success. bool Connect() { - unsigned int timeout = 1; 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() - { - 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(); - - /* Pointer to the buffer we screw around with substitution in */ - char* query; - - /* Pointer to the current end of query, where we append new stuff */ - char* queryend; - - /* Total length of the unescaped parameters */ - unsigned long maxparamlen, paramcount; - - /* The length of the longest parameter */ - maxparamlen = 0; - - for(ParamL::iterator i = req->query.p.begin(); i != req->query.p.end(); i++) + // Set the connection timeout. + unsigned int timeout = config->getDuration("timeout", 5, 1, 30); + mysql_options(connection, MYSQL_OPT_CONNECT_TIMEOUT, &timeout); + + // Attempt to connect to the database. + const std::string host = config->getString("host"); + const std::string user = config->getString("user"); + const std::string pass = config->getString("pass"); + const std::string dbname = config->getString("name"); + unsigned int port = config->getUInt("port", 3306, 1, 65535); + if (!mysql_real_connect(connection, host.c_str(), user.c_str(), pass.c_str(), dbname.c_str(), port, NULL, CLIENT_IGNORE_SIGPIPE)) { - if (i->size() > maxparamlen) - maxparamlen = i->size(); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unable to connect to the %s MySQL server: %s", + GetId().c_str(), mysql_error(connection)); + return false; } - /* 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 + (maxtotalparamlength*2) + 1 - * - * The +1 is for null-terminating the string for mysql_real_escape_string - */ - - 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 - * the parameters into it... - */ - - for(unsigned long i = 0; i < req->query.q.length(); i++) + // Set the default character set. + const std::string charset = config->getString("charset"); + if (!charset.empty() && mysql_set_character_set(connection, charset.c_str())) { - if(req->query.q[i] == '?') - { - /* We found a place to substitute..what fun. - * use mysql 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) - { - 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()); + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Could not set character set for %s to \"%s\": %s", + GetId().c_str(), charset.c_str(), mysql_error(connection)); + return false; + } - queryend += len; - req->query.p.pop_front(); - } - else - break; - } - else - { - *queryend = req->query.q[i]; - queryend++; - } + // Execute the initial SQL query. + const std::string initialquery = config->getString("initialquery"); + if (!initialquery.empty() && mysql_real_query(connection, initialquery.data(), initialquery.length())) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Could not execute initial query \"%s\" for %s: %s", + initialquery.c_str(), name.c_str(), mysql_error(connection)); + return false; } - *queryend = 0; + return true; + } + + ModuleSQL* Parent() + { + return (ModuleSQL*)(Module*)creator; + } - req->query.q = query; + MySQLresult* DoBlockingQuery(const std::string& query) + { - if (!mysql_real_query(connection, req->query.q.data(), req->query.q.length())) + /* Parse the command string and dispatch it to mysql */ + if (CheckConnection() && !mysql_real_query(connection, query.data(), query.length())) { - /* Successfull query */ - res = mysql_use_result(connection); + /* Successful query */ + MYSQL_RES* res = mysql_use_result(connection); unsigned long rows = mysql_affected_rows(connection); - MySQLresult* r = new MySQLresult(Parent, req->source, 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! - */ - Parent->ResultsMutex.Lock(); - rq.push_back(r); - Parent->ResultsMutex.Unlock(); + return new MySQLresult(res, rows); } else { /* XXX: See /usr/include/mysql/mysqld_error.h for a list of * possible error numbers and error messages */ - SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + std::string(": ") + mysql_error(connection)); - MySQLresult* r = new MySQLresult(Parent, req->source, e, req->id); - r->dbid = this->GetID(); - r->query = req->query.q; - - Parent->ResultsMutex.Lock(); - rq.push_back(r); - Parent->ResultsMutex.Unlock(); + SQL::Error e(SQL::QREPLY_FAIL, InspIRCd::Format("%u: %s", mysql_errno(connection), mysql_error(connection))); + return new MySQLresult(e); } - - delete[] query; - } - - bool ConnectionLost() - { - if (&connection) - { - return (mysql_ping(connection) != 0); - } - else return false; } bool CheckConnection() { - if (ConnectionLost()) - { + if (!connection || mysql_ping(connection) != 0) return Connect(); - } - else return true; - } - - std::string GetError() - { - return mysql_error(connection); + return true; } - const std::string& GetID() + void Submit(SQL::Query* q, const std::string& qs) CXX11_OVERRIDE { - return host.id; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Executing MySQL query: " + qs); + Parent()->Dispatcher->LockQueue(); + Parent()->qq.push_back(QueryQueueItem(q, qs, this)); + Parent()->Dispatcher->UnlockQueueWakeup(); } - std::string GetHost() + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE { - return host.host; - } - - void setInitialQuery(std::string init) - { - initquery = init; - } - - void SetEnable(bool Enable) - { - Enabled = Enable; - } - - bool IsEnabled() - { - return Enabled; - } - - void Close() - { - mysql_close(connection); + std::string res; + unsigned int param = 0; + for(std::string::size_type i = 0; i < q.length(); i++) + { + if (q[i] != '?') + res.push_back(q[i]); + else if (param < p.size() && !EscapeString(call, p[param++], res)) + return; + } + Submit(call, res); } - const SQLhost& GetConfHost() + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE { - return host; + std::string res; + for(std::string::size_type i = 0; i < q.length(); i++) + { + if (q[i] != '$') + res.push_back(q[i]); + else + { + std::string field; + i++; + while (i < q.length() && isalnum(q[i])) + field.push_back(q[i++]); + i--; + + SQL::ParamMap::const_iterator it = p.find(field); + if (it != p.end() && !EscapeString(call, it->second, res)) + return; + } + } + Submit(call, res); } - }; -ConnMap Connections; - -bool HasHost(const SQLhost &host) +ModuleSQL::ModuleSQL() + : Dispatcher(NULL) { - for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++) - { - if (host == iter->second->GetConfHost()) - return true; - } - return false; } -bool HostInConf(const SQLhost &h) +void ModuleSQL::init() { - ConfigReader conf; - 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; + if (mysql_library_init(0, NULL, NULL)) + throw ModuleException("Unable to initialise the MySQL library!"); + + Dispatcher = new DispatcherThread(this); + ServerInstance->Threads.Start(Dispatcher); } -void ClearOldConnections() +ModuleSQL::~ModuleSQL() { - ConnMap::iterator i,safei; - for (i = Connections.begin(); i != Connections.end(); i++) + if (Dispatcher) { - if (!HostInConf(i->second->GetConfHost())) - { - delete i->second; - safei = i; - --i; - Connections.erase(safei); - } + Dispatcher->join(); + Dispatcher->OnNotify(); + delete Dispatcher; } -} -void ClearAllConnections() -{ - ConnMap::iterator i; - while ((i = Connections.begin()) != Connections.end()) + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { - Connections.erase(i); delete i->second; } + + mysql_library_end(); } -void ConnectDatabases(ModuleSQL* Parent) +void ModuleSQL::ReadConfig(ConfigStatus& status) { - for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) + ConnMap conns; + ConfigTagList tags = ServerInstance->Config->ConfTags("database"); + for(ConfigIter i = tags.first; i != tags.second; i++) { - if (i->second->IsEnabled()) + if (!stdalgo::string::equalsci(i->second->getString("module"), "mysql")) continue; - - i->second->SetEnable(true); - if (!i->second->Connect()) + std::string id = i->second->getString("id"); + ConnMap::iterator curr = connections.find(id); + if (curr == connections.end()) { - /* 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(); + SQLConnection* conn = new SQLConnection(this, i->second); + conns.insert(std::make_pair(id, conn)); + ServerInstance->Modules->AddService(*conn); } - } -} - -void LoadDatabases(ModuleSQL* Parent) -{ - ConfigReader conf; - Parent->ConnMutex.Lock(); - ClearOldConnections(); - 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()) + else { - SQLConnection* ThisSQL = new SQLConnection(host, Parent); - Connections[host.id] = ThisSQL; - - ThisSQL->setInitialQuery(initquery); + conns.insert(*curr); + connections.erase(curr); } } - ConnectDatabases(Parent); - Parent->ConnMutex.Unlock(); -} -char FindCharId(const std::string &id) -{ - char i = 1; - for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i) - { - if (iter->first == id) + // now clean up the deleted databases + Dispatcher->LockQueue(); + SQL::Error err(SQL::BAD_DBID); + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) + { + ServerInstance->Modules->DelService(*i->second); + // it might be running a query on this database. Wait for that to complete + i->second->lock.Lock(); + i->second->lock.Unlock(); + // now remove all active queries to this DB + for (size_t j = qq.size(); j > 0; j--) { - return i; + size_t k = j - 1; + if (qq[k].connection == i->second) + { + qq[k].query->OnError(err); + delete qq[k].query; + qq.erase(qq.begin() + k); + } } + // finally, nuke the connection + delete i->second; } - 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(); -} - -class ModuleSQL; - -class DispatcherThread : public SocketThread -{ - private: - ModuleSQL* const Parent; - public: - DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } - ~DispatcherThread() { } - virtual void Run(); - virtual void OnNotify(); -}; - -ModuleSQL::ModuleSQL() : rehashing(false) -{ - ServerInstance->Modules->UseInterface("SQLutils"); - - currid = 0; - - Dispatcher = new DispatcherThread(this); - ServerInstance->Threads->Start(Dispatcher); - - if (!ServerInstance->Modules->PublishFeature("SQL", this)) - { - Dispatcher->join(); - delete Dispatcher; - ServerInstance->Modules->DoneWithInterface("SQLutils"); - throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); - } - - ServerInstance->Modules->PublishInterface("SQL", this); - Implementation eventlist[] = { I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 1); + Dispatcher->UnlockQueue(); + connections.swap(conns); } -ModuleSQL::~ModuleSQL() +void ModuleSQL::OnUnloadModule(Module* mod) { - delete Dispatcher; - ClearAllConnections(); - ServerInstance->Modules->UnpublishInterface("SQL", this); - ServerInstance->Modules->UnpublishFeature("SQL"); - ServerInstance->Modules->DoneWithInterface("SQLutils"); -} - -unsigned long ModuleSQL::NewID() -{ - if (currid+1 == 0) - currid++; - return ++currid; -} - -void ModuleSQL::OnRequest(Request& request) -{ - if(strcmp(SQLREQID, request.id) == 0) + SQL::Error err(SQL::BAD_DBID); + Dispatcher->LockQueue(); + unsigned int i = qq.size(); + while (i > 0) { - SQLrequest* req = (SQLrequest*)&request; - - ConnMap::iterator iter; - - Dispatcher->LockQueue(); - ConnMutex.Lock(); - if((iter = Connections.find(req->dbid)) != Connections.end()) - { - req->id = NewID(); - iter->second->queue.push(new SQLrequest(*req)); - } - else + i--; + if (qq[i].query->creator == mod) { - req->error.Id(SQL_BAD_DBID); + if (i == 0) + { + // need to wait until the query is done + // (the result will be discarded) + qq[i].connection->lock.Lock(); + qq[i].connection->lock.Unlock(); + } + qq[i].query->OnError(err); + delete qq[i].query; + qq.erase(qq.begin() + i); } - - ConnMutex.Unlock(); - Dispatcher->UnlockQueueWakeup(); - /* Yes, it's possible this will generate a spurious wakeup. - * That's fine, it'll just get ignored. - */ } -} - -void ModuleSQL::OnRehash(User* user) -{ - Dispatcher->LockQueue(); - rehashing = true; - Dispatcher->UnlockQueueWakeup(); + Dispatcher->UnlockQueue(); + // clean up any result queue entries + Dispatcher->OnNotify(); } Version ModuleSQL::GetVersion() { - return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR); + return Version("Provides the ability for SQL modules to query a MySQL database.", VF_VENDOR); } void DispatcherThread::Run() { - LoadDatabases(Parent); - - SQLConnection* conn = NULL; - this->LockQueue(); while (!this->GetExitFlag()) { - if (Parent->rehashing) + if (!Parent->qq.empty()) { - Parent->rehashing = false; - LoadDatabases(Parent); - } + QueryQueueItem i = Parent->qq.front(); + i.connection->lock.Lock(); + this->UnlockQueue(); + MySQLresult* res = i.connection->DoBlockingQuery(i.querystr); + i.connection->lock.Unlock(); - conn = NULL; - Parent->ConnMutex.Lock(); - for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) - { - if (i->second->queue.totalsize()) - { - conn = i->second; - break; - } - } - Parent->ConnMutex.Unlock(); + /* + * At this point, the main thread could be working on: + * Rehash - delete i.connection out from under us. We don't care about that. + * UnloadModule - delete i.query and the qq item. Need to avoid reporting results. + */ - if (conn) - { - /* There's an item! */ - this->UnlockQueue(); - conn->DoLeadingQuery(); - this->NotifyParent(); this->LockQueue(); - conn->queue.pop(); + if (!Parent->qq.empty() && Parent->qq.front().query == i.query) + { + Parent->qq.pop_front(); + Parent->rq.push_back(ResultQueueItem(i.query, res)); + NotifyParent(); + } + else + { + // UnloadModule ate the query + delete res; + } } else { @@ -806,35 +604,20 @@ void DispatcherThread::Run() void DispatcherThread::OnNotify() { - SQLConnection* conn; - while (1) + // this could unlock during the dispatch, but OnResult isn't expected to take that long + this->LockQueue(); + for(ResultQueue::iterator i = Parent->rq.begin(); i != Parent->rq.end(); i++) { - 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(); - - (*n)->Send(); - delete (*n); - - Parent->ResultsMutex.Lock(); - conn->rq.pop_front(); - Parent->ResultsMutex.Unlock(); + MySQLresult* res = i->result; + if (res->err.code == SQL::SUCCESS) + i->query->OnResult(*res); + else + i->query->OnError(res->err); + delete i->query; + delete i->result; } + Parent->rq.clear(); + this->UnlockQueue(); } MODULE_INIT(ModuleSQL)