X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=eefeea74dd1bb5e639cba3320a6253fcbfa14785;hb=71c367f89f5384eb05cf191f63ed5094e90b46ad;hp=a3b247f562e86585e38799bb95cef3bc98f21ff0;hpb=3136e030975ad14a7d883bfd1f7dcfd520932a91;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index a3b247f56..41c3a2a65 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -1,44 +1,58 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2007, 2009 Dennis Friis + * Copyright (C) 2006-2009 Craig Edwards + * Copyright (C) 2008 Robin Burchell * - * --------------------------------------------------- + * 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 . */ -using namespace std; +/// $CompilerFlags: execute("mysql_config --include" "MYSQL_CXXFLAGS") +/// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient") + +/// $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 + + +// 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 -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" -#include "m_sqlv2.h" +#include +#include "modules/sql.h" -/* 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: `mysql_config --include` */ -/* $LinkerFlags: `mysql_config --libs_r` `perl extra/mysql_rpath.pl` */ +/* VERSION 3 API: With nonblocking (threaded) requests */ /* 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. @@ -62,163 +76,77 @@ using namespace std; * 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://www.inspircd.org/wiki/Mysql2 */ - class SQLConnection; -class Notifier; - - -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 MySQLresult; +class DispatcherThread; -/** Represents a mysql query queue - */ -class QueryQueue : public classbase +struct QQueueItem { -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()); - } + SQL::Query* q; + std::string query; + SQLConnection* c; + QQueueItem(SQL::Query* Q, const std::string& S, SQLConnection* C) : q(Q), query(S), c(C) {} +}; - int totalsize() - { - return priority.size() + normal.size(); - } +struct RQueueItem +{ + SQL::Query* q; + MySQLresult* r; + RQueueItem(SQL::Query* Q, MySQLresult* R) : q(Q), r(R) {} +}; - void PurgeModule(Module* mod) - { - DoPurgeModule(mod, priority); - DoPurgeModule(mod, normal); - } +typedef insp::flat_map ConnMap; +typedef std::deque QueryQueue; +typedef std::deque ResultQueue; -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); - } - } - } - } +/** MySQL module + * */ +class ModuleSQL : public Module +{ + public: + 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; }; -/* A mutex to wrap around queue accesses */ -pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER; +class DispatcherThread : public SocketThread +{ + private: + ModuleSQL* const Parent; + public: + DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { } + ~DispatcherThread() { } + void Run() CXX11_OVERRIDE; + void OnNotify() CXX11_OVERRIDE; +}; -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 +class MySQLresult : public SQL::Result { + public: + SQL::Error err; int currentrow; - //std::vector > results; - 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 id) : SQLresult(self, to, id), 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; @@ -245,10 +173,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++; @@ -259,654 +188,380 @@ class MySQLresult : public SQLresult } } - MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0) + MySQLresult(SQL::Error& e) : err(e) { - rows = 0; - error = e; - } - ~MySQLresult() - { } - virtual int Rows() + int Rows() CXX11_OVERRIDE { return rows; } - virtual int Cols() - { - return colnames.size(); - } - - virtual std::string ColName(int column) + void GetCols(std::vector& result) CXX11_OVERRIDE { - 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); - } - - virtual SQLfieldList& GetRow() - { - if (currentrow < rows) - return fieldlists[currentrow]; - else - return emptyfieldlist; + return SQL::Field(); } - virtual SQLfieldMap& GetRowMap() + bool GetRow(SQL::Row& result) CXX11_OVERRIDE { - 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; } }; -class SQLConnection; - -void NotifyMainThread(SQLConnection* connection_with_new_result); - /** 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; - std::string host; - std::string user; - std::string pass; - std::string db; - std::map thisrow; - bool Enabled; - std::string id; - public: - - QueryQueue queue; - ResultQueue rq; + reference config; + MYSQL *connection; + Mutex lock; // 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(Module* p, ConfigTag* tag) : SQL::Provider(p, "SQL/" + tag->getString("id")), + config(tag), connection(NULL) { } + ~SQLConnection() + { + Close(); + } + // This method connects to the database using the credentials supplied to the constructor, and returns // true upon success. 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); - } - - void DoLeadingQuery() - { - if (!CheckConnection()) - return; - - /* 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 paramlen; - - /* Total length of query, used for binary-safety in mysql_real_query */ - unsigned long querylength = 0; - - paramlen = 0; - - for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) - { - paramlen += i->size(); - } - - /* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be. - * sizeofquery + (totalparamlength*2) + 1 - * - * The +1 is for null-terminating the string for mysql_real_escape_string - */ - - query = new char[req.query.q.length() + (paramlen*2)]; - 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++) + connection = mysql_init(connection); + mysql_options(connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout); + std::string host = config->getString("host"); + std::string user = config->getString("user"); + std::string pass = config->getString("pass"); + std::string dbname = config->getString("name"); + unsigned int port = config->getUInt("port", 3306); + bool rv = mysql_real_connect(connection, host.c_str(), user.c_str(), pass.c_str(), dbname.c_str(), port, NULL, 0); + if (!rv) + return rv; + + // Enable character set settings + std::string charset = config->getString("charset"); + if ((!charset.empty()) && (mysql_set_character_set(connection, charset.c_str()))) + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: Could not set character set to \"%s\"", charset.c_str()); + + std::string initquery; + if (config->readString("initialquery", initquery)) { - 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. - */ - 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 - break; - } - else - { - *queryend = req.query.q[i]; - queryend++; - } - querylength++; + mysql_query(connection,initquery.c_str()); } + return true; + } - *queryend = 0; + ModuleSQL* Parent() + { + return (ModuleSQL*)(Module*)creator; + } - pthread_mutex_lock(&queue_mutex); - req.query.q = query; - pthread_mutex_unlock(&queue_mutex); + 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); - unsigned long rows = mysql_affected_rows(&connection); - MySQLresult* r = new MySQLresult(SQLModule, 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); - rq.push_back(r); - pthread_mutex_unlock(&results_mutex); + MYSQL_RES* res = mysql_use_result(connection); + unsigned long rows = mysql_affected_rows(connection); + 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(QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection)); - MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), e, req.id); - r->dbid = this->GetID(); - r->query = req.query.q; - - pthread_mutex_lock(&results_mutex); - rq.push_back(r); - pthread_mutex_unlock(&results_mutex); - } - - /* Now signal the main thread that we've got a result to process. - * Pass them this connection id as what to examine - */ - - delete[] query; - - NotifyMainThread(this); - } - - bool ConnectionLost() - { - if (&connection) { - return (mysql_ping(&connection) != 0); + SQL::Error e(SQL::QREPLY_FAIL, InspIRCd::Format("%u: %s", mysql_errno(connection), mysql_error(connection))); + return new MySQLresult(e); } - else return false; } bool CheckConnection() { - if (ConnectionLost()) { + if (!connection || mysql_ping(connection) != 0) return Connect(); - } - else return true; + return true; } std::string GetError() { - return mysql_error(&connection); - } - - const std::string& GetID() - { - return id; + return mysql_error(connection); } - std::string GetHost() + void Close() { - return host; + mysql_close(connection); } - void SetEnable(bool Enable) + void Submit(SQL::Query* q, const std::string& qs) CXX11_OVERRIDE { - Enabled = Enable; + Parent()->Dispatcher->LockQueue(); + Parent()->qq.push_back(QQueueItem(q, qs, this)); + Parent()->Dispatcher->UnlockQueueWakeup(); } - bool IsEnabled() + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamList& p) CXX11_OVERRIDE { - return Enabled; - } - -}; - -ConnMap Connections; - -void ConnectDatabases(InspIRCd* ServerInstance) -{ - for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) - { - i->second->SetEnable(true); - if (i->second->Connect()) - { - ServerInstance->Log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost()); - } - else + std::string res; + unsigned int param = 0; + for(std::string::size_type i = 0; i < q.length(); i++) { - ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError()); - i->second->SetEnable(false); + if (q[i] != '?') + res.push_back(q[i]); + else + { + if (param < p.size()) + { + std::string parm = p[param++]; + // In the worst case, each character may need to be encoded as using two bytes, + // and one byte is the terminating null + std::vector buffer(parm.length() * 2 + 1); + + // The return value of mysql_real_escape_string() is the length of the encoded string, + // not including the terminating null + unsigned long escapedsize = mysql_real_escape_string(connection, &buffer[0], parm.c_str(), parm.length()); + res.append(&buffer[0], escapedsize); + } + } } + Submit(call, res); } -} - -void LoadDatabases(ConfigReader* ThisConf, InspIRCd* ServerInstance) -{ - ServerInstance->Log(DEFAULT,"SQL: Loading database settings"); - Connections.clear(); - ServerInstance->Log(DEBUG,"Cleared connections"); - for (int j =0; j < ThisConf->Enumerate("database"); j++) + void Submit(SQL::Query* call, const std::string& q, const SQL::ParamMap& p) CXX11_OVERRIDE { - 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); - ServerInstance->Log(DEBUG,"Read database settings"); - if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != "")) + std::string res; + for(std::string::size_type i = 0; i < q.length(); i++) { - SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id); - ServerInstance->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost()); - Connections[id] = ThisSQL; - ServerInstance->Log(DEBUG,"Pushed back connection"); + 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()) + { + std::string parm = it->second; + // NOTE: See above + std::vector buffer(parm.length() * 2 + 1); + unsigned long escapedsize = mysql_escape_string(&buffer[0], parm.c_str(), parm.length()); + res.append(&buffer[0], escapedsize); + } + } } + Submit(call, res); } - ConnectDatabases(ServerInstance); -} +}; -void NotifyMainThread(SQLConnection* connection_with_new_result) +ModuleSQL::ModuleSQL() { - /* 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. - */ - send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0); + Dispatcher = NULL; } -void* DispatcherThread(void* arg); - -/** Used by m_mysql to notify one thread when the other has a result - */ -class Notifier : public InspSocket +void ModuleSQL::init() { - 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 - 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"); - } - } + Dispatcher = new DispatcherThread(this); + ServerInstance->Threads.Start(Dispatcher); +} - Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip) +ModuleSQL::~ModuleSQL() +{ + if (Dispatcher) { - Instance->Log(DEBUG,"Constructor of new socket"); + Dispatcher->join(); + Dispatcher->OnNotify(); + delete Dispatcher; } - - /* Using getsockname and ntohs, we can determine which port number we were allocated */ - int GetPort() + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { -#ifdef IPV6 - return ntohs(sock_us.sin6_port); -#else - return ntohs(sock_us.sin_port); -#endif + delete i->second; } +} - 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; +void ModuleSQL::ReadConfig(ConfigStatus& status) +{ + ConnMap conns; + ConfigTagList tags = ServerInstance->Config->ConfTags("database"); + for(ConfigIter i = tags.first; i != tags.second; i++) + { + if (!stdalgo::string::equalsci(i->second->getString("provider"), "mysql")) + continue; + std::string id = i->second->getString("id"); + ConnMap::iterator curr = connections.find(id); + if (curr == connections.end()) + { + SQLConnection* conn = new SQLConnection(this, i->second); + conns.insert(std::make_pair(id, conn)); + ServerInstance->Modules->AddService(*conn); + } + else + { + conns.insert(*curr); + connections.erase(curr); + } } - virtual bool OnDataReady() + // now clean up the deleted databases + Dispatcher->LockQueue(); + SQL::Error err(SQL::BAD_DBID); + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { - Instance->Log(DEBUG,"Inbound data!"); - char* data = this->Read(); - ConnMap::iterator iter; - - if (data && *data) + 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--) { - Instance->Log(DEBUG,"Looking for connection %s",data); - /* We expect to be sent a null terminated string */ - if((iter = Connections.find(data)) != Connections.end()) + size_t k = j - 1; + if (qq[k].c == i->second) { - Instance->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; + qq[k].q->OnError(err); + delete qq[k].q; + qq.erase(qq.begin() + k); } } - - return false; + // finally, nuke the connection + delete i->second; } -}; + Dispatcher->UnlockQueue(); + connections.swap(conns); +} -/** MySQL module - */ -class ModuleSQL : public Module +void ModuleSQL::OnUnloadModule(Module* mod) { - public: - - ConfigReader *Conf; - InspIRCd* PublicServerInstance; - pthread_t Dispatcher; - int currid; - - void Implements(char* List) + SQL::Error err(SQL::BAD_DBID); + Dispatcher->LockQueue(); + unsigned int i = qq.size(); + while (i > 0) { - List[I_OnRehash] = List[I_OnRequest] = 1; - } - - unsigned long NewID() - { - if (currid+1 == 0) - currid++; - return ++currid; - } - - char* OnRequest(Request* request) - { - if(strcmp(SQLREQID, request->GetId()) == 0) + i--; + if (qq[i].q->creator == mod) { - SQLrequest* req = (SQLrequest*)request; - - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); - - ConnMap::iterator iter; - - char* returnval = NULL; - - 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()); - - if((iter = Connections.find(req->dbid)) != Connections.end()) + if (i == 0) { - req->id = NewID(); - iter->second->queue.push(*req); - returnval = SQLSUCCESS; + // need to wait until the query is done + // (the result will be discarded) + qq[i].c->lock.Lock(); + qq[i].c->lock.Unlock(); } - else - { - req->error.Id(BAD_DBID); - } - - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ - - return returnval; + qq[i].q->OnError(err); + delete qq[i].q; + qq.erase(qq.begin() + i); } - - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - - return NULL; - } - - ModuleSQL(InspIRCd* Me) - : Module::Module(Me) - { - - 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))); - } - if (!ServerInstance->PublishFeature("SQL", this)) - { - /* Tell worker thread to exit NOW */ - giveup = true; - throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); - } - } - - 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,API_VERSION); - } - -}; + Dispatcher->UnlockQueue(); + // clean up any result queue entries + Dispatcher->OnNotify(); +} -void* DispatcherThread(void* arg) +Version ModuleSQL::GetVersion() { - ModuleSQL* thismodule = (ModuleSQL*)arg; - LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance); - - /* Connect back to the Notifier */ - - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - return NULL; - } - - insp_sockaddr addr; - -#ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(MessagePipe->GetPort()); -#else - insp_inaddr ia; - insp_aton("127.0.0.1", &ia); - addr.sin_family = AF_FAMILY; - addr.sin_addr = ia; - addr.sin_port = htons(MessagePipe->GetPort()); -#endif - - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return NULL; - } + return Version("MySQL support", VF_VENDOR); +} - while (!giveup) +void DispatcherThread::Run() +{ + this->LockQueue(); + while (!this->GetExitFlag()) { - SQLConnection* conn = NULL; - /* XXX: Lock here for safety */ - pthread_mutex_lock(&queue_mutex); - for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) + if (!Parent->qq.empty()) { - if (i->second->queue.totalsize()) + QQueueItem i = Parent->qq.front(); + i.c->lock.Lock(); + this->UnlockQueue(); + MySQLresult* res = i.c->DoBlockingQuery(i.query); + i.c->lock.Unlock(); + + /* + * At this point, the main thread could be working on: + * Rehash - delete i.c out from under us. We don't care about that. + * UnloadModule - delete i.q and the qq item. Need to avoid reporting results. + */ + + this->LockQueue(); + if (!Parent->qq.empty() && Parent->qq.front().q == i.q) + { + Parent->qq.pop_front(); + Parent->rq.push_back(RQueueItem(i.q, res)); + NotifyParent(); + } + else { - conn = i->second; - break; + // UnloadModule ate the query + delete res; } } - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ - - /* Theres an item! */ - if (conn) + else { - conn->DoLeadingQuery(); - - /* XXX: Lock */ - pthread_mutex_lock(&queue_mutex); - conn->queue.pop(); - pthread_mutex_unlock(&queue_mutex); - /* XXX: Unlock */ + /* We know the queue is empty, we can safely hang this thread until + * something happens + */ + this->WaitForQueue(); } - - usleep(50); } - - 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() + // 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++) { + MySQLresult* res = i->r; + if (res->err.code == SQL::SUCCESS) + i->q->OnResult(*res); + else + i->q->OnError(res->err); + delete i->q; + delete i->r; } - - ~ModuleSQLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQL(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleSQLFactory; + Parent->rq.clear(); + this->UnlockQueue(); } + +MODULE_INIT(ModuleSQL)