* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include <stdio.h>
-#include <string>
-#include <mysql.h>
-#include <pthread.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/* Stop mysql wanting to use long long */
+#define NO_CLIENT_LONG_LONG
+
#include "inspircd.h"
+#include <mysql.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` rpath("mysql_config --libs_r") */
+/* $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.
* 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 Notifier;
-
+class DispatcherThread;
typedef std::map<std::string, SQLConnection*> 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<SQLresult*> ResultQueue;
-/** Represents a mysql query queue
- */
-class QueryQueue : public classbase
+unsigned long count(const char * const str, char a)
{
-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)
- {
- 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()
+ unsigned long n = 0;
+ for (const char *p = str; *p; ++p)
{
- 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());
+ if (*p == '?')
+ ++n;
}
+ return n;
+}
- int totalsize()
- {
- return priority.size() + normal.size();
- }
- void PurgeModule(Module* mod)
- {
- DoPurgeModule(mod, priority);
- DoPurgeModule(mod, normal);
- }
+/** MySQL module
+ * */
+class ModuleSQL : public Module
+{
+ public:
-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);
- }
- }
- }
- }
+ ConfigReader *Conf;
+ int currid;
+ bool rehashing;
+ DispatcherThread* Dispatcher;
+ Mutex ResultsMutex;
+ Mutex LoggingMutex;
+ Mutex ConnMutex;
+
+ ModuleSQL();
+ ~ModuleSQL();
+ unsigned long NewID();
+ const char* OnRequest(Request* request);
+ void OnRehash(User* user);
+ Version GetVersion();
};
-/* A mutex to wrap around queue accesses */
-pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t results_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-pthread_mutex_t logging_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
{
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.
*/
std::string b = (row[field_count] ? row[field_count] : "");
SQLfield sqlf(b, !row[field_count]);
colnames.push_back(a);
- fieldlists[n].push_back(sqlf);
+ fieldlists[n].push_back(sqlf);
field_count++;
}
n++;
rows++;
}
mysql_free_result(res);
+ res = NULL;
}
}
- 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;
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++)
}
};
-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<std::string,std::string> thisrow;
bool Enabled;
+ ModuleSQL* Parent;
+ std::string initquery;
public:
ResultQueue rq;
// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
- SQLConnection(const SQLhost &hi) : host(hi), Enabled(false)
+ SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator)
{
}
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()
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();
char* queryend;
/* Total length of the unescaped parameters */
- unsigned long paramlen;
+ unsigned long maxparamlen, paramcount;
- /* Total length of query, used for binary-safety in mysql_real_query */
- unsigned long querylength = 0;
-
- 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
* 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'))
+ {
+ 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());
+ 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();
*queryend = req.query.q[i];
queryend++;
}
- querylength++;
}
*queryend = 0;
- pthread_mutex_lock(&queue_mutex);
req.query.q = query;
- pthread_mutex_unlock(&queue_mutex);
- 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);
- MySQLresult* r = new MySQLresult(SQLModule, req.GetSource(), res, rows, req.id);
+ 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!
*/
- 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 */
- 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);
}
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;
std::string GetError()
{
- return mysql_error(&connection);
+ return mysql_error(connection);
}
const std::string& GetID()
return host.host;
}
+ void setInitialQuery(std::string init)
+ {
+ initquery = init;
+ }
+
void SetEnable(bool Enable)
{
Enabled = Enable;
void Close()
{
- mysql_close(&connection);
+ mysql_close(connection);
}
const SQLhost& GetConfHost()
{
if (!HostInConf(conf, i->second->GetConfHost()))
{
- DELETE(i->second);
+ delete i->second;
safei = i;
--i;
Connections.erase(safei);
while ((i = Connections.begin()) != Connections.end())
{
Connections.erase(i);
- DELETE(i->second);
+ delete i->second;
}
}
-void ConnectDatabases(InspIRCd* ServerInstance)
+void ConnectDatabases(ModuleSQL* Parent)
{
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
if (!i->second->Connect())
{
/* XXX: MUTEX */
- pthread_mutex_lock(&logging_mutex);
- ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+ 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);
- pthread_mutex_unlock(&logging_mutex);
+ Parent->LoggingMutex.Unlock();
}
}
}
-void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance)
+void LoadDatabases(ConfigReader* conf, ModuleSQL* Parent)
{
+ Parent->ConnMutex.Lock();
ClearOldConnections(conf);
for (int j =0; j < conf->Enumerate("database"); j++)
{
host.user = conf->ReadValue("database", "username", j);
host.pass = conf->ReadValue("database", "password", j);
host.ssl = conf->ReadFlag("database", "ssl", j);
+ std::string initquery = conf->ReadValue("database", "initialquery", j);
if (HasHost(host))
continue;
if (!host.id.empty() && !host.host.empty() && !host.name.empty() && !host.user.empty() && !host.pass.empty())
{
- SQLConnection* ThisSQL = new SQLConnection(host);
+ SQLConnection* ThisSQL = new SQLConnection(host, Parent);
Connections[host.id] = ThisSQL;
+
+ ThisSQL->setInitialQuery(initquery);
}
}
- ConnectDatabases(ServerInstance);
-}
-
-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.
- */
- send(QueueFD, connection_with_new_result->GetID().c_str(), connection_with_new_result->GetID().length()+1, 0);
+ ConnectDatabases(Parent);
+ Parent->ConnMutex.Unlock();
}
-void* DispatcherThread(void* arg);
-
-/** Used by m_mysql to notify one thread when the other has a result
- */
-class Notifier : public InspSocket
+char FindCharId(const std::string &id)
{
- 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
+ char i = 1;
+ for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i)
{
- uslen = sizeof(sock_us);
- if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+ if (iter->first == id)
{
- throw ModuleException("Could not create random listening port on localhost");
+ return i;
}
}
+ return 0;
+}
- Notifier(InspIRCd* SI, int newfd, char* ip) : InspSocket(SI, newfd, ip)
- {
- Instance->Log(DEBUG,"Constructor of new socket");
- }
-
- /* 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
- }
-
- virtual int OnIncomingConnection(int newsock, char* ip)
+ConnMap::iterator GetCharId(char id)
+{
+ char i = 1;
+ for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i)
{
- 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;
+ if (i == id)
+ return iter;
}
+ return Connections.end();
+}
- virtual bool OnDataReady()
- {
- Instance->Log(DEBUG,"Inbound data!");
- char* data = this->Read();
- ConnMap::iterator iter;
+class ModuleSQL;
- if (data && *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())
- {
- 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;
- }
- }
-
- return false;
- }
+class DispatcherThread : public SocketThread
+{
+ private:
+ ModuleSQL* Parent;
+ public:
+ DispatcherThread(ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule),{ }
+ ~DispatcherThread() { }
+ virtual void Run();
+ virtual void OnNotify();
};
-/** MySQL module
- */
-class ModuleSQL : public Module
+ModuleSQL::ModuleSQL() : rehashing(false)
{
- public:
-
- ConfigReader *Conf;
- InspIRCd* PublicServerInstance;
- pthread_t Dispatcher;
- int currid;
- bool rehashing;
-
- ModuleSQL(InspIRCd* Me)
- : Module::Module(Me), rehashing(false)
- {
- ServerInstance->UseInterface("SQLutils");
-
- 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)));
- }
+ ServerInstance->Modules->UseInterface("SQLutils");
- if (!ServerInstance->PublishFeature("SQL", this))
- {
- /* Tell worker thread to exit NOW */
- giveup = true;
- throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
- }
+ Conf = new ConfigReader;
+ PublicServerInstance = ServerInstance;
+ currid = 0;
- ServerInstance->PublishInterface("SQL", this);
- }
+ Dispatcher = new DispatcherThread(this);
+ ServerInstance->Threads->Start(Dispatcher);
- virtual ~ModuleSQL()
+ if (!ServerInstance->Modules->PublishFeature("SQL", this))
{
- giveup = true;
- ClearAllConnections();
- DELETE(Conf);
- ServerInstance->UnpublishInterface("SQL", this);
- ServerInstance->UnpublishFeature("SQL");
- ServerInstance->DoneWithInterface("SQLutils");
+ Dispatcher->join();
+ delete Dispatcher;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
}
+ ServerInstance->Modules->PublishInterface("SQL", this);
+ Implementation eventlist[] = { I_OnRehash, I_OnRequest };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
+}
- void Implements(char* List)
- {
- List[I_OnRehash] = List[I_OnRequest] = 1;
- }
+ModuleSQL::~ModuleSQL()
+{
+ delete Dispatcher;
+ ClearAllConnections();
+ delete Conf;
+ ServerInstance->Modules->UnpublishInterface("SQL", this);
+ ServerInstance->Modules->UnpublishFeature("SQL");
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+}
- unsigned long NewID()
- {
- if (currid+1 == 0)
- currid++;
- return ++currid;
- }
+unsigned long ModuleSQL::NewID()
+{
+ if (currid+1 == 0)
+ currid++;
+ return ++currid;
+}
- char* OnRequest(Request* request)
+const char* ModuleSQL::OnRequest(Request* request)
+{
+ if(strcmp(SQLREQID, request->GetId()) == 0)
{
- if(strcmp(SQLREQID, request->GetId()) == 0)
- {
- SQLrequest* req = (SQLrequest*)request;
-
- /* XXX: Lock */
- pthread_mutex_lock(&queue_mutex);
+ SQLrequest* req = (SQLrequest*)request;
- 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())
- {
- req->id = NewID();
- iter->second->queue.push(*req);
- returnval = SQLSUCCESS;
- }
- else
- {
- req->error.Id(BAD_DBID);
- }
+ ConnMap::iterator iter;
- pthread_mutex_unlock(&queue_mutex);
- /* XXX: Unlock */
+ const char* returnval = NULL;
- return returnval;
+ Dispatcher->LockQueue();
+ ConnMutex.Lock();
+ if((iter = Connections.find(req->dbid)) != Connections.end())
+ {
+ req->id = NewID();
+ iter->second->queue.push(*req);
+ returnval = SQLSUCCESS;
+ }
+ else
+ {
+ req->error.Id(SQL_BAD_DBID);
}
- ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+ ConnMutex.Unlock();
+ Dispatcher->UnlockQueueWakeup();
+ /* Yes, it's possible this will generate a spurious wakeup.
+ * That's fine, it'll just get ignored.
+ */
- return NULL;
+ return returnval;
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
- {
- rehashing = true;
- }
-
- virtual Version GetVersion()
- {
- return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
- }
-
-};
+ return NULL;
+}
-void* DispatcherThread(void* arg)
+void ModuleSQL::OnRehash(User* user)
{
- 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;
- }
+ Dispatcher->LockQueue();
+ rehashing = true;
+ Dispatcher->UnlockQueueWakeup();
+}
- insp_sockaddr addr;
+Version ModuleSQL::GetVersion()
+{
+ return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+}
-#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
+void DispatcherThread::Run()
+{
+ LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
- if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1)
- {
- /* wtf, we cant connect to it, but we just created it! */
- return NULL;
- }
+ SQLConnection* conn = NULL;
- while (!giveup)
+ this->LockQueue();
+ while (!this->GetExitFlag())
{
- if (thismodule->rehashing)
+ if (Parent->rehashing)
{
- /* XXX: Lock */
- pthread_mutex_lock(&queue_mutex);
- thismodule->rehashing = false;
- LoadDatabases(thismodule->Conf, thismodule->PublicServerInstance);
- pthread_mutex_unlock(&queue_mutex);
- /* XXX: Unlock */
+ Parent->rehashing = false;
+ LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
}
- SQLConnection* conn = NULL;
- /* XXX: Lock here for safety */
- pthread_mutex_lock(&queue_mutex);
+ conn = NULL;
+ Parent->ConnMutex.Lock();
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
if (i->second->queue.totalsize())
break;
}
}
- pthread_mutex_unlock(&queue_mutex);
- /* XXX: Unlock */
+ Parent->ConnMutex.Unlock();
- /* Theres an item! */
if (conn)
{
+ /* There's an item! */
+ this->UnlockQueue();
conn->DoLeadingQuery();
-
- /* XXX: Lock */
- pthread_mutex_lock(&queue_mutex);
+ this->NotifyParent();
+ this->LockQueue();
conn->queue.pop();
- pthread_mutex_unlock(&queue_mutex);
- /* XXX: Unlock */
}
-
- usleep(50);
+ else
+ {
+ /* We know the queue is empty, we can safely hang this thread until
+ * something happens
+ */
+ this->WaitForQueue();
+ }
}
-
- 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()
- {
- }
-
- ~ModuleSQLFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
+ SQLConnection* conn;
+ while (1)
{
- return new ModuleSQL(Me);
- }
-
-};
+ 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;
-extern "C" void * init_module( void )
-{
- return new ModuleSQLFactory;
+ 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)
projects / user / henk / code / inspircd.git / blobdiff