* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
+/* Stop mysql wanting to use long long */
+#define NO_CLIENT_LONG_LONG
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
#include <mysql.h>
-#include <pthread.h>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
-#include "inspircd.h"
#include "m_sqlv2.h"
+#ifdef WINDOWS
+#pragma comment(lib, "mysqlclient.lib")
+#endif
+
/* VERSION 2 API: With nonblocking (threaded) requests */
/* $ModDesc: SQL Service Provider module for all other m_sql* modules */
-/* $CompileFlags: `mysql_config --include` */
-/* $LinkerFlags: `mysql_config --libs_r` `perl extra/mysql_rpath.pl` */
+/* $CompileFlags: exec("mysql_config --include") */
+/* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
+/* $ModDep: m_sqlv2.h */
/* THE NONBLOCKING MYSQL API!
- *
+ *
* MySQL provides no nonblocking (asyncronous) API of its own, and its developers recommend
* that instead, you should thread your program. This is what i've done here to allow for
* asyncronous SQL requests via mysql. The way this works is as follows:
*
- * The module spawns a thread via pthreads, and performs its mysql queries in this thread,
+ * The module spawns a thread via class Thread, and performs its mysql queries in this thread,
* using a queue with priorities. There is a mutex on either end which prevents two threads
* adjusting the queue at the same time, and crashing the ircd. Every 50 milliseconds, the
* worker thread wakes up, and checks if there is a request at the head of its queue.
class SQLConnection;
-class Notifier;
+class MySQLListener;
typedef std::map<std::string, SQLConnection*> ConnMap;
-bool giveup = false;
-static Module* SQLModule = NULL;
-static Notifier* MessagePipe = NULL;
+static MySQLListener *MessagePipe = NULL;
int QueueFD = -1;
+class DispatcherThread;
-#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224
-#define mysql_field_count mysql_num_fields
-#endif
-
-typedef std::deque<SQLresult*> ResultQueue;
-
-class QueryQueue : public classbase
+/** MySQL module
+ * */
+class ModuleSQL : public Module
{
-private:
- typedef std::deque<SQLrequest> ReqDeque;
-
- ReqDeque priority; /* The priority queue */
- ReqDeque normal; /* The 'normal' queue */
- enum { PRI, NOR, NON } which; /* Which queue the currently active element is at the front of */
-
-public:
- QueryQueue()
- : which(NON)
- {
- }
-
- void push(const SQLrequest &q)
- {
- log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.q.c_str());
-
- if(q.pri)
- priority.push_back(q);
- else
- normal.push_back(q);
- }
-
- void pop()
- {
- if((which == PRI) && priority.size())
- {
- priority.pop_front();
- }
- else if((which == NOR) && normal.size())
- {
- normal.pop_front();
- }
-
- /* Reset this */
- which = NON;
-
- /* Silently do nothing if there was no element to pop() */
- }
-
- SQLrequest& front()
- {
- switch(which)
- {
- case PRI:
- return priority.front();
- case NOR:
- return normal.front();
- default:
- if(priority.size())
- {
- which = PRI;
- return priority.front();
- }
-
- if(normal.size())
- {
- which = NOR;
- return normal.front();
- }
-
- /* This will probably result in a segfault,
- * but the caller should have checked totalsize()
- * first so..meh - moron :p
- */
-
- return priority.front();
- }
- }
-
- std::pair<int, int> size()
- {
- return std::make_pair(priority.size(), normal.size());
- }
+ public:
- int totalsize()
- {
- return priority.size() + normal.size();
- }
+ ConfigReader *Conf;
+ InspIRCd* PublicServerInstance;
+ int currid;
+ bool rehashing;
+ DispatcherThread* Dispatcher;
+ Mutex* QueueMutex;
+ Mutex* ResultsMutex;
+ Mutex* LoggingMutex;
+ Mutex* ConnMutex;
+
+ ModuleSQL(InspIRCd* Me);
+ ~ModuleSQL();
+ unsigned long NewID();
+ const char* OnRequest(Request* request);
+ void OnRehash(User* user, const std::string ¶meter);
+ Version GetVersion();
+};
- void PurgeModule(Module* mod)
- {
- DoPurgeModule(mod, priority);
- DoPurgeModule(mod, normal);
- }
-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);
- }
- }
- }
- }
-};
-/* A mutex to wrap around queue accesses */
-pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER;
+#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224
+#define mysql_field_count mysql_num_fields
+#endif
-pthread_mutex_t results_mutex = PTHREAD_MUTEX_INITIALIZER;
+typedef std::deque<SQLresult*> ResultQueue;
+/** Represents a mysql result set
+ */
class MySQLresult : public SQLresult
{
int currentrow;
- //std::vector<std::map<std::string,std::string> > results;
std::vector<std::string> colnames;
std::vector<SQLfieldList> fieldlists;
SQLfieldMap* fieldmap;
int rows;
public:
- MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int id) : SQLresult(self, to, id), currentrow(0), fieldmap(NULL)
+ MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL)
{
/* A number of affected rows from from mysql_affected_rows.
*/
- log(DEBUG,"Created new MySQLresult of non-error type");
fieldlists.clear();
rows = 0;
if (affected_rows >= 1)
std::string b = (row[field_count] ? row[field_count] : "");
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);
+ fieldlists[n].push_back(sqlf);
field_count++;
}
n++;
}
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)
+ MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0)
{
rows = 0;
error = e;
- log(DEBUG,"Created new MySQLresult of error type");
}
~MySQLresult()
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 */
virtual SQLfieldList& GetRow()
{
if (currentrow < rows)
- return fieldlists[currentrow];
+ return fieldlists[currentrow++];
else
return emptyfieldlist;
}
virtual SQLfieldMap* GetRowMapPtr()
{
fieldmap = new SQLfieldMap();
-
+
if (currentrow < rows)
{
for (int i = 0; i < Cols(); i++)
void NotifyMainThread(SQLConnection* connection_with_new_result);
+/** Represents a connection to a mysql database
+ */
class SQLConnection : public classbase
{
protected:
MYSQL connection;
MYSQL_RES *res;
MYSQL_ROW row;
- std::string host;
- std::string user;
- std::string pass;
- std::string db;
+ SQLhost host;
std::map<std::string,std::string> thisrow;
bool Enabled;
- std::string id;
+ ModuleSQL* Parent;
public:
QueryQueue queue;
ResultQueue rq;
- // This constructor creates an SQLConnection object with the given credentials, and creates the underlying
- // MYSQL struct, but does not connect yet.
- SQLConnection(std::string thishost, std::string thisuser, std::string thispass, std::string thisdb, const std::string &myid)
+ // This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
+ SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : host(hi), Enabled(false), Parent(Creator)
+ {
+ }
+
+ ~SQLConnection()
{
- this->Enabled = true;
- this->host = thishost;
- this->user = thisuser;
- this->pass = thispass;
- this->db = thisdb;
- this->id = myid;
+ Close();
}
// This method connects to the database using the credentials supplied to the constructor, and returns
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);
+ 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()
/* 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;
* The +1 is for null-terminating the string for mysql_real_escape_string
*/
- query = new char[req.query.q.length() + (paramlen*2)];
+ query = new char[req.query.q.length() + (paramlen*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
req.query.p.pop_front();
}
else
- {
- log(DEBUG, "Found a substitution location but no parameter to substitute :|");
break;
- }
}
else
{
*queryend = 0;
- log(DEBUG, "Attempting to dispatch query: %s", query);
-
- pthread_mutex_lock(&queue_mutex);
+ Parent->QueueMutex->Lock();
req.query.q = query;
- pthread_mutex_unlock(&queue_mutex);
-
- log(DEBUG,"REQUEST ID: %d",req.id);
+ Parent->QueueMutex->Unlock();
if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length()))
{
/* Successfull query */
res = mysql_use_result(&connection);
unsigned long rows = mysql_affected_rows(&connection);
- MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), res, rows, req.id);
+ MySQLresult* r = new MySQLresult(Parent, req.GetSource(), res, rows, req.id);
r->dbid = this->GetID();
r->query = req.query.q;
/* Put this new result onto the results queue.
* XXX: Remember to mutex the queue!
*/
- pthread_mutex_lock(&results_mutex);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- pthread_mutex_unlock(&results_mutex);
+ Parent->ResultsMutex->Unlock();
}
else
{
/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
* possible error numbers and error messages */
- log(DEBUG,"SQL ERROR: %s",mysql_error(&connection));
- SQLerror e(QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection));
- MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), e, req.id);
+ SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection));
+ MySQLresult* r = new MySQLresult(Parent, req.GetSource(), e, req.id);
r->dbid = this->GetID();
r->query = req.query.q;
- pthread_mutex_lock(&results_mutex);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- pthread_mutex_unlock(&results_mutex);
+ Parent->ResultsMutex->Unlock();
}
/* Now signal the main thread that we've got a result to process.
* Pass them this connection id as what to examine
*/
+ delete[] query;
+
NotifyMainThread(this);
}
const std::string& GetID()
{
- return id;
+ return host.id;
}
std::string GetHost()
{
- return host;
+ return host.host;
}
void SetEnable(bool Enable)
return Enabled;
}
+ void Close()
+ {
+ mysql_close(&connection);
+ }
+
+ const SQLhost& GetConfHost()
+ {
+ return host;
+ }
+
};
ConnMap Connections;
-void ConnectDatabases(InspIRCd* ServerInstance)
+bool HasHost(const SQLhost &host)
{
- for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
+ for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++)
{
- i->second->SetEnable(true);
- if (i->second->Connect())
+ if (host == iter->second->GetConfHost())
+ return true;
+ }
+ return false;
+}
+
+bool HostInConf(ConfigReader* conf, const SQLhost &h)
+{
+ for(int i = 0; i < conf->Enumerate("database"); i++)
+ {
+ SQLhost host;
+ host.id = conf->ReadValue("database", "id", i);
+ host.host = conf->ReadValue("database", "hostname", i);
+ host.port = conf->ReadInteger("database", "port", i, true);
+ host.name = conf->ReadValue("database", "name", i);
+ host.user = conf->ReadValue("database", "username", i);
+ host.pass = conf->ReadValue("database", "password", i);
+ host.ssl = conf->ReadFlag("database", "ssl", i);
+ if (h == host)
+ return true;
+ }
+ return false;
+}
+
+void ClearOldConnections(ConfigReader* conf)
+{
+ ConnMap::iterator i,safei;
+ for (i = Connections.begin(); i != Connections.end(); i++)
+ {
+ if (!HostInConf(conf, i->second->GetConfHost()))
{
- log(DEFAULT,"SQL: Successfully connected database "+i->second->GetHost());
+ delete i->second;
+ safei = i;
+ --i;
+ Connections.erase(safei);
}
- else
+ }
+}
+
+void ClearAllConnections()
+{
+ ConnMap::iterator i;
+ while ((i = Connections.begin()) != Connections.end())
+ {
+ Connections.erase(i);
+ delete i->second;
+ }
+}
+
+void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent)
+{
+ for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
+ {
+ if (i->second->IsEnabled())
+ continue;
+
+ i->second->SetEnable(true);
+ if (!i->second->Connect())
{
- log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+ /* 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();
}
}
}
+void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent)
+{
+ Parent->ConnMutex->Lock();
+ ClearOldConnections(conf);
+ for (int j =0; j < conf->Enumerate("database"); j++)
+ {
+ SQLhost host;
+ host.id = conf->ReadValue("database", "id", j);
+ host.host = conf->ReadValue("database", "hostname", j);
+ host.port = conf->ReadInteger("database", "port", j, true);
+ host.name = conf->ReadValue("database", "name", j);
+ host.user = conf->ReadValue("database", "username", j);
+ host.pass = conf->ReadValue("database", "password", j);
+ host.ssl = conf->ReadFlag("database", "ssl", j);
+
+ if (HasHost(host))
+ continue;
+
+ if (!host.id.empty() && !host.host.empty() && !host.name.empty() && !host.user.empty() && !host.pass.empty())
+ {
+ SQLConnection* ThisSQL = new SQLConnection(host, Parent);
+ Connections[host.id] = ThisSQL;
+ }
+ }
+ ConnectDatabases(ServerInstance, Parent);
+ Parent->ConnMutex->Unlock();
+}
-void LoadDatabases(ConfigReader* ThisConf, InspIRCd* ServerInstance)
+char FindCharId(const std::string &id)
{
- log(DEFAULT,"SQL: Loading database settings");
- Connections.clear();
- log(DEBUG,"Cleared connections");
- for (int j =0; j < ThisConf->Enumerate("database"); j++)
- {
- std::string db = ThisConf->ReadValue("database","name",j);
- std::string user = ThisConf->ReadValue("database","username",j);
- std::string pass = ThisConf->ReadValue("database","password",j);
- std::string host = ThisConf->ReadValue("database","hostname",j);
- std::string id = ThisConf->ReadValue("database","id",j);
- log(DEBUG,"Read database settings");
- if ((db != "") && (host != "") && (user != "") && (id != "") && (pass != ""))
+ char i = 1;
+ for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i)
+ {
+ if (iter->first == id)
{
- SQLConnection* ThisSQL = new SQLConnection(host,user,pass,db,id);
- log(DEFAULT,"Loaded database: "+ThisSQL->GetHost());
- Connections[id] = ThisSQL;
- log(DEBUG,"Pushed back connection");
+ return i;
}
}
- ConnectDatabases(ServerInstance);
+ 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();
}
void NotifyMainThread(SQLConnection* connection_with_new_result)
* 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.
*/
- 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);
+ char id = FindCharId(connection_with_new_result->GetID());
+ send(QueueFD, &id, 1, 0);
}
-void* DispatcherThread(void* arg);
+class ModuleSQL;
-class Notifier : public InspSocket
+class DispatcherThread : public Thread
{
+ private:
+ ModuleSQL* Parent;
+ InspIRCd* ServerInstance;
+ public:
+ DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : Thread(), Parent(CreatorModule), ServerInstance(Instance) { }
+ ~DispatcherThread() { }
+ virtual void Run();
+};
+
+/** 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:
-
- /* 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
+ 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 create random listening port on localhost");
+ throw ModuleException("Could not getsockname() to find out port number for ITC port");
}
}
- Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip)
+ virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
{
- log(DEBUG,"Constructor of new socket");
+ 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 */
return ntohs(sock_us.sin_port);
#endif
}
+};
- virtual int OnIncomingConnection(int newsock, char* ip)
- {
- log(DEBUG,"Inbound connection on fd %d!",newsock);
- Notifier* n = new Notifier(this->Instance, newsock, ip);
- this->Instance->AddSocket(n);
- return true;
- }
-
- virtual bool OnDataReady()
- {
- log(DEBUG,"Inbound data!");
- char* data = this->Read();
- ConnMap::iterator iter;
+ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
+{
+ ServerInstance->Modules->UseInterface("SQLutils");
- if (data && *data)
- {
- log(DEBUG,"Looking for connection %s",data);
- /* We expect to be sent a null terminated string */
- if((iter = Connections.find(data)) != Connections.end())
- {
- log(DEBUG,"Found it!");
+ Conf = new ConfigReader(ServerInstance);
+ PublicServerInstance = ServerInstance;
+ currid = 0;
- /* 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;
- }
- }
-
- return false;
- }
-};
+ /* 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
-class ModuleSQL : public Module
-{
- public:
-
- ConfigReader *Conf;
- InspIRCd* PublicServerInstance;
- pthread_t Dispatcher;
- int currid;
+ LoggingMutex = ServerInstance->Mutexes->CreateMutex();
+ ConnMutex = ServerInstance->Mutexes->CreateMutex();
- void Implements(char* List)
+ if (MessagePipe->GetFd() == -1)
{
- List[I_OnRehash] = List[I_OnRequest] = 1;
+ delete ConnMutex;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ throw ModuleException("m_mysql: unable to create ITC pipe");
}
-
- unsigned long NewID()
+ else
{
- if (currid+1 == 0)
- currid++;
- return ++currid;
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mysql", DEBUG, "MySQL: Interthread comms port is %d", MessagePipe->GetPort());
+ LoggingMutex->Unlock();
}
- char* OnRequest(Request* request)
- {
- if(strcmp(SQLREQID, request->GetId()) == 0)
- {
- SQLrequest* req = (SQLrequest*)request;
+ Dispatcher = new DispatcherThread(ServerInstance, this);
+ ServerInstance->Threads->Create(Dispatcher);
- /* XXX: Lock */
- pthread_mutex_lock(&queue_mutex);
-
- ConnMap::iterator iter;
+ ResultsMutex = ServerInstance->Mutexes->CreateMutex();
+ QueueMutex = ServerInstance->Mutexes->CreateMutex();
- char* returnval = NULL;
+ if (!ServerInstance->Modules->PublishFeature("SQL", this))
+ {
+ /* Tell worker thread to exit NOW,
+ * Automatically joins */
+ delete Dispatcher;
+ delete LoggingMutex;
+ delete ResultsMutex;
+ delete QueueMutex;
+ delete ConnMutex;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
+ }
- 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->Modules->PublishInterface("SQL", this);
+ Implementation eventlist[] = { I_OnRehash, I_OnRequest };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+}
- if((iter = Connections.find(req->dbid)) != Connections.end())
- {
- req->id = NewID();
- iter->second->queue.push(*req);
- returnval = SQLSUCCESS;
- }
- else
- {
- req->error.Id(BAD_DBID);
- }
+ModuleSQL::~ModuleSQL()
+{
+ delete Dispatcher;
+ ClearAllConnections();
+ delete Conf;
+ ServerInstance->Modules->UnpublishInterface("SQL", this);
+ ServerInstance->Modules->UnpublishFeature("SQL");
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ delete LoggingMutex;
+ delete ResultsMutex;
+ delete QueueMutex;
+ delete ConnMutex;
+}
- pthread_mutex_unlock(&queue_mutex);
- /* XXX: Unlock */
+unsigned long ModuleSQL::NewID()
+{
+ if (currid+1 == 0)
+ currid++;
+ return ++currid;
+}
- return returnval;
- }
+const char* ModuleSQL::OnRequest(Request* request)
+{
+ if(strcmp(SQLREQID, request->GetId()) == 0)
+ {
+ SQLrequest* req = (SQLrequest*)request;
- log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+ /* XXX: Lock */
+ QueueMutex->Lock();
- return NULL;
- }
+ ConnMap::iterator iter;
- ModuleSQL(InspIRCd* Me)
- : Module::Module(Me)
- {
-
- Conf = new ConfigReader(ServerInstance);
- PublicServerInstance = ServerInstance;
- currid = 0;
- SQLModule = this;
+ const char* returnval = NULL;
- MessagePipe = new Notifier(ServerInstance);
- ServerInstance->AddSocket(MessagePipe);
- log(DEBUG,"Bound notifier to 127.0.0.1:%d",MessagePipe->GetPort());
-
- pthread_attr_t attribs;
- pthread_attr_init(&attribs);
- pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED);
- if (pthread_create(&this->Dispatcher, &attribs, DispatcherThread, (void *)this) != 0)
+ ConnMutex->Lock();
+ if((iter = Connections.find(req->dbid)) != Connections.end())
{
- throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
+ req->id = NewID();
+ iter->second->queue.push(*req);
+ returnval = SQLSUCCESS;
}
- if (!ServerInstance->PublishFeature("SQL", this))
+ else
{
- /* Tell worker thread to exit NOW */
- giveup = true;
- throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
+ req->error.Id(SQL_BAD_DBID);
}
+
+ ConnMutex->Unlock();
+ QueueMutex->Unlock();
+
+ return returnval;
}
-
- 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);
- }
-
-};
-void* DispatcherThread(void* arg)
+ return NULL;
+}
+
+void ModuleSQL::OnRehash(User* user, const std::string ¶meter)
+{
+ rehashing = true;
+}
+
+Version ModuleSQL::GetVersion()
+{
+ return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+}
+
+void DispatcherThread::Run()
{
- log(DEBUG,"Starting Dispatcher thread, mysql version %d",mysql_get_client_version());
- ModuleSQL* thismodule = (ModuleSQL*)arg;
- LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance);
+ 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... */
- log(DEBUG,"QueueFD cant be created");
- return NULL;
+ return;
}
- log(DEBUG,"Initialize QueueFD to %d",QueueFD);
-
insp_sockaddr addr;
#ifdef IPV6
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;
+ return;
}
- log(DEBUG,"Connect QUEUE FD");
-
- while (!giveup)
+ while (this->GetExitFlag() == false)
{
+ 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 */
- pthread_mutex_lock(&queue_mutex);
+ Parent->QueueMutex->Lock();
+ Parent->ConnMutex->Lock();
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
if (i->second->queue.totalsize())
break;
}
}
- pthread_mutex_unlock(&queue_mutex);
+ Parent->ConnMutex->Unlock();
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
/* Theres an item! */
if (conn)
{
- log(DEBUG,"Process Leading query");
conn->DoLeadingQuery();
/* XXX: Lock */
- pthread_mutex_lock(&queue_mutex);
+ Parent->QueueMutex->Lock();
conn->queue.pop();
- pthread_mutex_unlock(&queue_mutex);
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
}
- usleep(50);
+ usleep(1000);
}
-
- return NULL;
}
+MODULE_INIT(ModuleSQL)
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSQLFactory : public ModuleFactory
-{
- public:
- ModuleSQLFactory()
- {
- }
-
- ~ModuleSQLFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleSQL(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleSQLFactory;
-}
projects / user / henk / code / inspircd.git / blobdiff