X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=ce0644e96fc3bfe9bf36ccc3d88719115aa93356;hb=5a88424dbb33ac825aa0b9b6525179329ee75519;hp=7f2b96227177b4786cacc98337e6ddd8ea94b23a;hpb=4488e477136ea3daa60a744bac272cc37a604136;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 7f2b96227..ce0644e96 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -23,7 +23,7 @@ using namespace std; #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" +#include "inspircd.h" #include "m_sqlv2.h" /* VERSION 2 API: With nonblocking (threaded) requests */ @@ -31,6 +31,7 @@ using namespace std; /* $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` */ +/* $ModDep: m_sqlv2.h */ /* THE NONBLOCKING MYSQL API! * @@ -70,7 +71,7 @@ using namespace std; class SQLConnection; class Notifier; -extern InspIRCd* ServerInstance; + typedef std::map ConnMap; bool giveup = false; static Module* SQLModule = NULL; @@ -84,6 +85,8 @@ int QueueFD = -1; typedef std::deque ResultQueue; +/** Represents a mysql query queue + */ class QueryQueue : public classbase { private: @@ -101,8 +104,6 @@ public: 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 @@ -199,6 +200,8 @@ pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t results_mutex = PTHREAD_MUTEX_INITIALIZER; +/** Represents a mysql result set + */ class MySQLresult : public SQLresult { int currentrow; @@ -215,7 +218,6 @@ class MySQLresult : public SQLresult { /* 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) @@ -248,7 +250,6 @@ class MySQLresult : public SQLresult SQLfield sqlf(b, !row[field_count]); colnames.push_back(a); fieldlists[n].push_back(sqlf); - log(DEBUG,"Inc field count to %d",field_count+1); field_count++; } n++; @@ -257,14 +258,12 @@ class MySQLresult : public SQLresult } mysql_free_result(res); } - log(DEBUG, "Created new MySQL result; %d rows, %d columns", rows, colnames.size()); } MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0) { rows = 0; error = e; - log(DEBUG,"Created new MySQLresult of error type"); } ~MySQLresult() @@ -312,7 +311,6 @@ class MySQLresult : public SQLresult 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 */ @@ -389,6 +387,8 @@ class SQLConnection; void NotifyMainThread(SQLConnection* connection_with_new_result); +/** Represents a connection to a mysql database + */ class SQLConnection : public classbase { protected: @@ -409,16 +409,9 @@ class SQLConnection : public classbase 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 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) { - this->Enabled = true; - this->host = thishost; - this->user = thisuser; - this->pass = thispass; - this->db = thisdb; - this->id = myid; } // This method connects to the database using the credentials supplied to the constructor, and returns @@ -438,7 +431,6 @@ class SQLConnection : public classbase /* 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; @@ -490,10 +482,7 @@ class SQLConnection : public classbase req.query.p.pop_front(); } else - { - log(DEBUG, "Found a substitution location but no parameter to substitute :|"); break; - } } else { @@ -505,14 +494,10 @@ class SQLConnection : public classbase *queryend = 0; - log(DEBUG, "Attempting to dispatch query: %s", query); - pthread_mutex_lock(&queue_mutex); req.query.q = query; pthread_mutex_unlock(&queue_mutex); - log(DEBUG,"REQUEST ID: %d",req.id); - if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length())) { /* Successfull query */ @@ -532,7 +517,6 @@ class SQLConnection : public classbase { /* 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(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(); @@ -547,6 +531,8 @@ class SQLConnection : public classbase * Pass them this connection id as what to examine */ + delete[] query; + NotifyMainThread(this); } @@ -595,29 +581,29 @@ class SQLConnection : public classbase ConnMap Connections; -void ConnectDatabases(Server* Srv) +void ConnectDatabases(InspIRCd* ServerInstance) { for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { i->second->SetEnable(true); if (i->second->Connect()) { - Srv->Log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost()); + ServerInstance->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()); + ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError()); i->second->SetEnable(false); } } } -void LoadDatabases(ConfigReader* ThisConf, Server* Srv) +void LoadDatabases(ConfigReader* ThisConf, InspIRCd* ServerInstance) { - Srv->Log(DEFAULT,"SQL: Loading database settings"); + ServerInstance->Log(DEFAULT,"SQL: Loading database settings"); Connections.clear(); - Srv->Log(DEBUG,"Cleared connections"); + ServerInstance->Log(DEBUG,"Cleared connections"); for (int j =0; j < ThisConf->Enumerate("database"); j++) { std::string db = ThisConf->ReadValue("database","name",j); @@ -625,16 +611,16 @@ void LoadDatabases(ConfigReader* ThisConf, Server* Srv) 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"); + ServerInstance->Log(DEBUG,"Read database settings"); if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != "")) { SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id); - Srv->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost()); + ServerInstance->Log(DEFAULT,"Loaded database: "+ThisSQL->GetHost()); Connections[id] = ThisSQL; - Srv->Log(DEBUG,"Pushed back connection"); + ServerInstance->Log(DEBUG,"Pushed back connection"); } } - ConnectDatabases(Srv); + ConnectDatabases(ServerInstance); } void NotifyMainThread(SQLConnection* connection_with_new_result) @@ -648,29 +634,26 @@ void NotifyMainThread(SQLConnection* connection_with_new_result) * 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); + send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0); } void* DispatcherThread(void* arg); +/** Used by m_mysql to notify one thread when the other has a result + */ class Notifier : public InspSocket { insp_sockaddr sock_us; socklen_t uslen; - Server* Srv; + public: /* Create a socket on a random port. Let the tcp stack allocate us an available port */ #ifdef IPV6 - Notifier(Server* S) : InspSocket("::1", 0, true, 3000), Srv(S) + Notifier(InspIRCd* SI) : InspSocket(SI, "::1", 0, true, 3000) #else - Notifier(Server* S) : InspSocket("127.0.0.1", 0, true, 3000), Srv(S) + Notifier(InspIRCd* SI) : InspSocket(SI, "127.0.0.1", 0, true, 3000) #endif { uslen = sizeof(sock_us); @@ -680,9 +663,9 @@ class Notifier : public InspSocket } } - Notifier(int newfd, char* ip, Server* S) : InspSocket(newfd, ip), Srv(S) + Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip) { - log(DEBUG,"Constructor of new socket"); + Instance->Log(DEBUG,"Constructor of new socket"); } /* Using getsockname and ntohs, we can determine which port number we were allocated */ @@ -697,25 +680,25 @@ class Notifier : public InspSocket virtual int OnIncomingConnection(int newsock, char* ip) { - log(DEBUG,"Inbound connection on fd %d!",newsock); - Notifier* n = new Notifier(newsock, ip, Srv); - Srv->AddSocket(n); + Instance->Log(DEBUG,"Inbound connection on fd %d!",newsock); + Notifier* n = new Notifier(this->Instance, newsock, ip); + n = n; /* Stop bitching at me, GCC */ return true; } virtual bool OnDataReady() { - log(DEBUG,"Inbound data!"); + Instance->Log(DEBUG,"Inbound data!"); char* data = this->Read(); ConnMap::iterator iter; if (data && *data) { - log(DEBUG,"Looking for connection %s",data); + Instance->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!"); + Instance->Log(DEBUG,"Found it!"); /* Lock the mutex, send back the data */ pthread_mutex_lock(&results_mutex); @@ -731,11 +714,14 @@ class Notifier : public InspSocket } }; +/** MySQL module + */ class ModuleSQL : public Module { public: - Server *Srv; + ConfigReader *Conf; + InspIRCd* PublicServerInstance; pthread_t Dispatcher; int currid; @@ -764,7 +750,7 @@ class ModuleSQL : public Module char* returnval = NULL; - 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()); + 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()) { @@ -783,22 +769,22 @@ class ModuleSQL : public Module return returnval; } - log(DEBUG, "Got unsupported API version string: %s", request->GetId()); + ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); return NULL; } - ModuleSQL(Server* Me) + ModuleSQL(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - Conf = new ConfigReader(); + + Conf = new ConfigReader(ServerInstance); + PublicServerInstance = ServerInstance; currid = 0; SQLModule = this; - MessagePipe = new Notifier(Srv); - Srv->AddSocket(MessagePipe); - log(DEBUG,"Bound notifier to 127.0.0.1:%d",MessagePipe->GetPort()); + 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); @@ -807,7 +793,7 @@ class ModuleSQL : public Module { throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno))); } - if (!Srv->PublishFeature("SQL", this)) + if (!ServerInstance->PublishFeature("SQL", this)) { /* Tell worker thread to exit NOW */ giveup = true; @@ -827,28 +813,24 @@ class ModuleSQL : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER); + return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); } }; void* DispatcherThread(void* arg) { - log(DEBUG,"Starting Dispatcher thread, mysql version %d",mysql_get_client_version()); ModuleSQL* thismodule = (ModuleSQL*)arg; - LoadDatabases(thismodule->Conf, thismodule->Srv); + 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... */ - log(DEBUG,"QueueFD cant be created"); return NULL; } - log(DEBUG,"Initialize QueueFD to %d",QueueFD); - insp_sockaddr addr; #ifdef IPV6 @@ -866,12 +848,9 @@ void* DispatcherThread(void* arg) if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) { /* wtf, we cant connect to it, but we just created it! */ - log(DEBUG,"QueueFD cant connect!"); return NULL; } - log(DEBUG,"Connect QUEUE FD"); - while (!giveup) { SQLConnection* conn = NULL; @@ -891,7 +870,6 @@ void* DispatcherThread(void* arg) /* Theres an item! */ if (conn) { - log(DEBUG,"Process Leading query"); conn->DoLeadingQuery(); /* XXX: Lock */ @@ -921,7 +899,7 @@ class ModuleSQLFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleSQL(Me); }