X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=023ead94be6dfef950b6542fd4113b28ae3c6093;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=7e24202679ac772ac0414ef0c6a350b90b29ae6f;hpb=014502d9513517841389a59ae98ac0c705d158b5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 7e2420267..023ead94b 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -16,9 +16,6 @@ #include "inspircd.h" #include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "m_sqlv2.h" #ifdef WINDOWS @@ -63,19 +60,27 @@ * 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 MySQLListener; - +class DispatcherThread; typedef std::map ConnMap; -static MySQLListener *MessagePipe = NULL; -int QueueFD = -1; +typedef std::deque ResultQueue; + +unsigned long count(const char * const str, char a) +{ + unsigned long n = 0; + for (const char *p = str; *p; ++p) + { + if (*p == '?') + ++n; + } + return n; +} -class DispatcherThread; /** MySQL module * */ @@ -84,31 +89,26 @@ class ModuleSQL : public Module public: ConfigReader *Conf; - InspIRCd* PublicServerInstance; int currid; bool rehashing; DispatcherThread* Dispatcher; - Mutex* QueueMutex; - Mutex* ResultsMutex; - Mutex* LoggingMutex; - Mutex* ConnMutex; + Mutex ResultsMutex; + Mutex LoggingMutex; + Mutex ConnMutex; - ModuleSQL(InspIRCd* Me); + ModuleSQL(); ~ModuleSQL(); unsigned long NewID(); const char* OnRequest(Request* request); - void OnRehash(User* user, const std::string ¶meter); + void OnRehash(User* user); Version GetVersion(); }; - #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 #define mysql_field_count mysql_num_fields #endif -typedef std::deque ResultQueue; - /** Represents a mysql result set */ class MySQLresult : public SQLresult @@ -165,6 +165,7 @@ class MySQLresult : public SQLresult rows++; } mysql_free_result(res); + res = NULL; } } @@ -291,23 +292,19 @@ class MySQLresult : public SQLresult } }; -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; + MYSQL_ROW *row; SQLhost host; std::map thisrow; bool Enabled; ModuleSQL* Parent; + std::string initquery; public: @@ -315,7 +312,7 @@ class SQLConnection : public classbase ResultQueue rq; // This constructor creates an SQLConnection object with the given credentials, but does not connect yet. - SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : host(hi), Enabled(false), Parent(Creator) + SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator) { } @@ -329,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.host.c_str(), host.user.c_str(), host.pass.c_str(), host.name.c_str(), host.port, 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() @@ -339,6 +336,9 @@ 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(); @@ -349,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) + 1]; + 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 @@ -384,9 +389,44 @@ 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')) { - unsigned long len = mysql_real_escape_string(&connection, queryend, req.query.p.front().c_str(), req.query.p.front().length()); + 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()); queryend += len; req.query.p.pop_front(); @@ -399,64 +439,57 @@ class SQLConnection : public classbase *queryend = req.query.q[i]; queryend++; } - querylength++; } *queryend = 0; - Parent->QueueMutex->Lock(); req.query.q = query; - Parent->QueueMutex->Unlock(); - 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); + 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! */ - Parent->ResultsMutex->Lock(); + Parent->ResultsMutex.Lock(); rq.push_back(r); - Parent->ResultsMutex->Unlock(); + Parent->ResultsMutex.Unlock(); } 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)); + 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; - Parent->ResultsMutex->Lock(); + Parent->ResultsMutex.Lock(); rq.push_back(r); - Parent->ResultsMutex->Unlock(); + 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 - */ - delete[] query; - - NotifyMainThread(this); } 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; @@ -464,7 +497,7 @@ class SQLConnection : public classbase std::string GetError() { - return mysql_error(&connection); + return mysql_error(connection); } const std::string& GetID() @@ -477,6 +510,11 @@ class SQLConnection : public classbase return host.host; } + void setInitialQuery(std::string init) + { + initquery = init; + } + void SetEnable(bool Enable) { Enabled = Enable; @@ -489,7 +527,7 @@ class SQLConnection : public classbase void Close() { - mysql_close(&connection); + mysql_close(connection); } const SQLhost& GetConfHost() @@ -554,7 +592,7 @@ void ClearAllConnections() } } -void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent) +void ConnectDatabases(ModuleSQL* Parent) { for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { @@ -565,17 +603,17 @@ void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent) if (!i->second->Connect()) { /* XXX: MUTEX */ - Parent->LoggingMutex->Lock(); + 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(); + Parent->LoggingMutex.Unlock(); } } } -void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent) +void LoadDatabases(ConfigReader* conf, ModuleSQL* Parent) { - Parent->ConnMutex->Lock(); + Parent->ConnMutex.Lock(); ClearOldConnections(conf); for (int j =0; j < conf->Enumerate("database"); j++) { @@ -587,6 +625,7 @@ void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Pare 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; @@ -595,10 +634,12 @@ void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Pare { SQLConnection* ThisSQL = new SQLConnection(host, Parent); Connections[host.id] = ThisSQL; + + ThisSQL->setInitialQuery(initquery); } } - ConnectDatabases(ServerInstance, Parent); - Parent->ConnMutex->Unlock(); + ConnectDatabases(Parent); + Parent->ConnMutex.Unlock(); } char FindCharId(const std::string &id) @@ -625,167 +666,34 @@ ConnMap::iterator GetCharId(char id) return Connections.end(); } -void NotifyMainThread(SQLConnection* connection_with_new_result) -{ - /* 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. - * - * NOTE: We only send a single char down the connection, this - * way we know it wont get a partial read at the other end if - * the system is especially congested (see bug #263). - * The function FindCharId translates a connection name into a - * one character id, and GetCharId translates a character id - * back into an iterator. - */ - char id = FindCharId(connection_with_new_result->GetID()); - send(QueueFD, &id, 1, 0); -} - class ModuleSQL; -class DispatcherThread : public Thread +class DispatcherThread : public SocketThread { private: ModuleSQL* Parent; - InspIRCd* ServerInstance; public: - DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : Thread(), Parent(CreatorModule), ServerInstance(Instance) { } + DispatcherThread(ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule),{ } ~DispatcherThread() { } virtual void Run(); + virtual void OnNotify(); }; -/** Used by m_mysql to notify one thread when the other has a result - */ -class Notifier : public BufferedSocket -{ - ModuleSQL* Parent; - - public: - Notifier(ModuleSQL* P, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), Parent(P) { } - - virtual bool OnDataReady() - { - char data = 0; - /* NOTE: Only a single character is read so we know we - * cant get a partial read. (We've been told that theres - * data waiting, so we wont ever get EAGAIN) - * The function GetCharId translates a single character - * back into an iterator. - */ - - if (Instance->SE->Recv(this, &data, 1, 0) > 0) - { - Parent->ConnMutex->Lock(); - ConnMap::iterator iter = GetCharId(data); - if (iter != Connections.end()) - { - /* Lock the mutex, send back the data */ - Parent->ResultsMutex->Lock(); - ResultQueue::iterator n = iter->second->rq.begin(); - (*n)->Send(); - delete (*n); - iter->second->rq.pop_front(); - Parent->ResultsMutex->Unlock(); - Parent->ConnMutex->Unlock(); - return true; - } - /* No error, but unknown id */ - Parent->ConnMutex->Unlock(); - return true; - } - - /* Erk, error on descriptor! */ - return false; - } -}; - -/** Spawn sockets from a listener - */ -class MySQLListener : public ListenSocketBase -{ - ModuleSQL* Parent; - insp_sockaddr sock_us; - socklen_t uslen; - FileReader* index; - - public: - MySQLListener(ModuleSQL* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P) - { - uslen = sizeof(sock_us); - if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) - { - throw ModuleException("Could not getsockname() to find out port number for ITC port"); - } - } - - virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) - { - new Notifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck - } - - /* Using getsockname and ntohs, we can determine which port number we were allocated */ - int GetPort() - { -#ifdef IPV6 - return ntohs(sock_us.sin6_port); -#else - return ntohs(sock_us.sin_port); -#endif - } -}; - -ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false) +ModuleSQL::ModuleSQL() : rehashing(false) { ServerInstance->Modules->UseInterface("SQLutils"); - Conf = new ConfigReader(ServerInstance); + Conf = new ConfigReader; PublicServerInstance = ServerInstance; currid = 0; - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - MessagePipe = new MySQLListener(this, ServerInstance, 0, "::1"); -#else - MessagePipe = new MySQLListener(this, ServerInstance, 0, "127.0.0.1"); -#endif - - LoggingMutex = ServerInstance->Mutexes->CreateMutex(); - ConnMutex = ServerInstance->Mutexes->CreateMutex(); - - if (MessagePipe->GetFd() == -1) - { - delete ConnMutex; - ServerInstance->Modules->DoneWithInterface("SQLutils"); - throw ModuleException("m_mysql: unable to create ITC pipe"); - } - else - { - LoggingMutex->Lock(); - ServerInstance->Logs->Log("m_mysql", DEBUG, "MySQL: Interthread comms port is %d", MessagePipe->GetPort()); - LoggingMutex->Unlock(); - } - - Dispatcher = new DispatcherThread(ServerInstance, this); - ServerInstance->Threads->Create(Dispatcher); - - ResultsMutex = ServerInstance->Mutexes->CreateMutex(); - QueueMutex = ServerInstance->Mutexes->CreateMutex(); + Dispatcher = new DispatcherThread(this); + ServerInstance->Threads->Start(Dispatcher); if (!ServerInstance->Modules->PublishFeature("SQL", this)) { - /* Tell worker thread to exit NOW, - * Automatically joins */ + Dispatcher->join(); delete Dispatcher; - delete LoggingMutex; - delete ResultsMutex; - delete QueueMutex; - delete ConnMutex; ServerInstance->Modules->DoneWithInterface("SQLutils"); throw ModuleException("m_mysql: Unable to publish feature 'SQL'"); } @@ -803,10 +711,6 @@ ModuleSQL::~ModuleSQL() ServerInstance->Modules->UnpublishInterface("SQL", this); ServerInstance->Modules->UnpublishFeature("SQL"); ServerInstance->Modules->DoneWithInterface("SQLutils"); - delete LoggingMutex; - delete ResultsMutex; - delete QueueMutex; - delete ConnMutex; } unsigned long ModuleSQL::NewID() @@ -822,14 +726,12 @@ const char* ModuleSQL::OnRequest(Request* request) { SQLrequest* req = (SQLrequest*)request; - /* XXX: Lock */ - QueueMutex->Lock(); - ConnMap::iterator iter; const char* returnval = NULL; - ConnMutex->Lock(); + Dispatcher->LockQueue(); + ConnMutex.Lock(); if((iter = Connections.find(req->dbid)) != Connections.end()) { req->id = NewID(); @@ -841,8 +743,11 @@ const char* ModuleSQL::OnRequest(Request* request) req->error.Id(SQL_BAD_DBID); } - ConnMutex->Unlock(); - QueueMutex->Unlock(); + ConnMutex.Unlock(); + Dispatcher->UnlockQueueWakeup(); + /* Yes, it's possible this will generate a spurious wakeup. + * That's fine, it'll just get ignored. + */ return returnval; } @@ -850,64 +755,35 @@ const char* ModuleSQL::OnRequest(Request* request) return NULL; } -void ModuleSQL::OnRehash(User* user, const std::string ¶meter) +void ModuleSQL::OnRehash(User* user) { + Dispatcher->LockQueue(); rehashing = true; + Dispatcher->UnlockQueueWakeup(); } Version ModuleSQL::GetVersion() { - return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); + return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } void DispatcherThread::Run() { LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); - /* Connect back to the Notifier */ - - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) - { - /* crap, we're out of sockets... */ - return; - } - - 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; - } + SQLConnection* conn = NULL; - while (this->GetExitFlag() == false) + this->LockQueue(); + while (!this->GetExitFlag()) { if (Parent->rehashing) { - /* XXX: Lock */ - Parent->QueueMutex->Lock(); Parent->rehashing = false; LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent); - Parent->QueueMutex->Unlock(); - /* XXX: Unlock */ } - SQLConnection* conn = NULL; - /* XXX: Lock here for safety */ - Parent->QueueMutex->Lock(); - Parent->ConnMutex->Lock(); + conn = NULL; + Parent->ConnMutex.Lock(); for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { if (i->second->queue.totalsize()) @@ -916,25 +792,59 @@ void DispatcherThread::Run() break; } } - Parent->ConnMutex->Unlock(); - Parent->QueueMutex->Unlock(); - /* XXX: Unlock */ + Parent->ConnMutex.Unlock(); - /* Theres an item! */ if (conn) { + /* There's an item! */ + this->UnlockQueue(); conn->DoLeadingQuery(); - - /* XXX: Lock */ - Parent->QueueMutex->Lock(); + this->NotifyParent(); + this->LockQueue(); conn->queue.pop(); - Parent->QueueMutex->Unlock(); - /* XXX: Unlock */ } + else + { + /* We know the queue is empty, we can safely hang this thread until + * something happens + */ + this->WaitForQueue(); + } + } + this->UnlockQueue(); +} - usleep(1000); +void DispatcherThread::OnNotify() +{ + SQLConnection* conn; + while (1) + { + 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(); } } MODULE_INIT(ModuleSQL) -