-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2007, 2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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 <http://www.gnu.org/licenses/>.
*/
+
/* Stop mysql wanting to use long long */
#define NO_CLIENT_LONG_LONG
#include "inspircd.h"
#include <mysql.h>
-#include "m_sqlv2.h"
+#include "sql.h"
-#ifdef WINDOWS
-#pragma comment(lib, "mysqlclient.lib")
+#ifdef _WIN32
+# pragma comment(lib, "libmysql.lib")
#endif
-/* VERSION 2 API: With nonblocking (threaded) requests */
+/* VERSION 3 API: With nonblocking (threaded) requests */
/* $ModDesc: SQL Service Provider module for all other m_sql* modules */
/* $CompileFlags: exec("mysql_config --include") */
/* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
-/* $ModDep: m_sqlv2.h */
/* THE NONBLOCKING MYSQL API!
*
* For a diagram of this system please see http://wiki.inspircd.org/Mysql2
*/
-
class SQLConnection;
-class MySQLListener;
-
-
-typedef std::map<std::string, SQLConnection*> ConnMap;
-static MySQLListener *MessagePipe = NULL;
-int QueueFD = -1;
-
+class MySQLresult;
class DispatcherThread;
-unsigned long count(const char * const str, char a)
+struct QQueueItem
{
- unsigned long n = 0;
- for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
- {
- if (*p == '?')
- ++n;
- }
- return n;
-}
+ SQLQuery* q;
+ std::string query;
+ SQLConnection* c;
+ QQueueItem(SQLQuery* Q, const std::string& S, SQLConnection* C) : q(Q), query(S), c(C) {}
+};
+struct RQueueItem
+{
+ SQLQuery* q;
+ MySQLresult* r;
+ RQueueItem(SQLQuery* Q, MySQLresult* R) : q(Q), r(R) {}
+};
+
+typedef std::map<std::string, SQLConnection*> ConnMap;
+typedef std::deque<QQueueItem> QueryQueue;
+typedef std::deque<RQueueItem> ResultQueue;
/** MySQL module
* */
class ModuleSQL : public Module
{
public:
-
- 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();
+ DispatcherThread* Dispatcher;
+ QueryQueue qq; // MUST HOLD MUTEX
+ ResultQueue rq; // MUST HOLD MUTEX
+ ConnMap connections; // main thread only
+
+ ModuleSQL();
+ void init();
+ ~ModuleSQL();
+ void OnRehash(User* user);
+ void OnUnloadModule(Module* mod);
+ Version GetVersion();
};
-
+class DispatcherThread : public SocketThread
+{
+ private:
+ ModuleSQL* const Parent;
+ public:
+ DispatcherThread(ModuleSQL* CreatorModule) : Parent(CreatorModule) { }
+ ~DispatcherThread() { }
+ virtual void Run();
+ virtual void OnNotify();
+};
#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 result set
*/
-class MySQLresult : public SQLresult
+class MySQLresult : public SQLResult
{
+ public:
+ SQLerror err;
int currentrow;
- std::vector<std::string> colnames;
- std::vector<SQLfieldList> fieldlists;
- SQLfieldMap* fieldmap;
- SQLfieldMap fieldmap2;
- SQLfieldList emptyfieldlist;
int rows;
- public:
+ std::vector<std::string> colnames;
+ std::vector<SQLEntries> fieldlists;
- MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL)
+ MySQLresult(MYSQL_RES* res, int affected_rows) : err(SQL_NO_ERROR), 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;
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(SQLEntry(row[field_count]));
+ else
+ fieldlists[n].push_back(SQLEntry());
colnames.push_back(a);
- fieldlists[n].push_back(sqlf);
field_count++;
}
n++;
rows++;
}
mysql_free_result(res);
- res = NULL;
}
}
- MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0)
+ MySQLresult(SQLerror& e) : err(e)
{
- rows = 0;
- error = e;
+
}
~MySQLresult()
return rows;
}
- virtual int Cols()
- {
- return colnames.size();
- }
-
- virtual std::string ColName(int column)
+ virtual void GetCols(std::vector<std::string>& result)
{
- 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)
+ virtual SQLEntry GetValue(int row, int column)
{
- for (unsigned int i = 0; i < colnames.size(); i++)
- {
- if (column == colnames[i])
- return i;
- }
- throw SQLbadColName();
- return 0;
- }
-
- virtual SQLfield 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 SQLEntry();
}
- virtual SQLfieldMap& GetRowMap()
+ virtual bool GetRow(SQLEntries& result)
{
- 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 SQLProvider
{
- protected:
- MYSQL *connection;
- MYSQL_RES *res;
- MYSQL_ROW *row;
- SQLhost host;
- std::map<std::string,std::string> thisrow;
- bool Enabled;
- ModuleSQL* Parent;
-
public:
-
- QueryQueue queue;
- ResultQueue rq;
+ reference<ConfigTag> config;
+ MYSQL *connection;
+ Mutex lock;
// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
- SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator)
+ SQLConnection(Module* p, ConfigTag* tag) : SQLProvider(p, "SQL/" + tag->getString("id")),
+ config(tag), connection(NULL)
{
}
unsigned int timeout = 1;
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;
-
- /* 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 maxparamlen, paramcount;
-
- /* The length of the longest parameter */
- maxparamlen = 0;
-
- for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++)
+ std::string host = config->getString("host");
+ std::string user = config->getString("user");
+ std::string pass = config->getString("pass");
+ std::string dbname = config->getString("name");
+ int port = config->getInt("port");
+ 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;
+ std::string initquery;
+ if (config->readString("initialquery", initquery))
{
- 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 + (maxtotalparamlength*2) + 1
- *
- * The +1 is for null-terminating the string for mysql_real_escape_string
- */
-
- 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
- * the parameters into it...
- */
-
- for(unsigned long i = 0; i < req.query.q.length(); i++)
- {
- 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.
- */
-
- /* 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());
-
- queryend += len;
- req.query.p.pop_front();
- }
- else
- break;
- }
- else
- {
- *queryend = req.query.q[i];
- queryend++;
- }
+ mysql_query(connection,initquery.c_str());
}
+ return true;
+ }
- *queryend = 0;
+ ModuleSQL* Parent()
+ {
+ return (ModuleSQL*)(Module*)creator;
+ }
- Parent->QueueMutex->Lock();
- req.query.q = query;
- Parent->QueueMutex->Unlock();
+ 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);
+ MYSQL_RES* 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();
- rq.push_back(r);
- Parent->ResultsMutex->Unlock();
+ 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(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();
- rq.push_back(r);
- Parent->ResultsMutex->Unlock();
+ SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + ": " + mysql_error(connection));
+ return new MySQLresult(e);
}
-
- /* 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);
- }
- 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 host.id;
- }
-
- std::string GetHost()
- {
- return host.host;
- }
-
- void SetEnable(bool Enable)
+ void Close()
{
- Enabled = Enable;
+ mysql_close(connection);
}
- bool IsEnabled()
+ void submit(SQLQuery* q, const std::string& qs)
{
- return Enabled;
+ Parent()->Dispatcher->LockQueue();
+ Parent()->qq.push_back(QQueueItem(q, qs, this));
+ Parent()->Dispatcher->UnlockQueueWakeup();
}
- void Close()
+ void submit(SQLQuery* call, const std::string& q, const ParamL& p)
{
- mysql_close(connection);
+ std::string res;
+ unsigned int param = 0;
+ for(std::string::size_type i = 0; i < q.length(); i++)
+ {
+ 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<char> buffer(parm.length() * 2 + 1);
+
+ // The return value of mysql_escape_string() is the length of the encoded string,
+ // not including the terminating null
+ unsigned long escapedsize = mysql_escape_string(&buffer[0], parm.c_str(), parm.length());
+// mysql_real_escape_string(connection, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length());
+ res.append(&buffer[0], escapedsize);
+ }
+ }
+ }
+ submit(call, res);
}
- const SQLhost& GetConfHost()
+ void submit(SQLQuery* call, const std::string& q, const ParamM& p)
{
- return host;
+ std::string res;
+ for(std::string::size_type i = 0; i < q.length(); i++)
+ {
+ 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--;
+
+ ParamM::const_iterator it = p.find(field);
+ if (it != p.end())
+ {
+ std::string parm = it->second;
+ // NOTE: See above
+ std::vector<char> 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);
}
-
};
-ConnMap Connections;
-
-bool HasHost(const SQLhost &host)
+ModuleSQL::ModuleSQL()
{
- for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++)
- {
- if (host == iter->second->GetConfHost())
- return true;
- }
- return false;
+ Dispatcher = NULL;
}
-bool HostInConf(ConfigReader* conf, const SQLhost &h)
+void ModuleSQL::init()
{
- 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;
-}
+ Dispatcher = new DispatcherThread(this);
+ ServerInstance->Threads->Start(Dispatcher);
-void ClearOldConnections(ConfigReader* conf)
-{
- ConnMap::iterator i,safei;
- for (i = Connections.begin(); i != Connections.end(); i++)
- {
- if (!HostInConf(conf, i->second->GetConfHost()))
- {
- delete i->second;
- safei = i;
- --i;
- Connections.erase(safei);
- }
- }
+ Implementation eventlist[] = { I_OnRehash, I_OnUnloadModule };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+
+ OnRehash(NULL);
}
-void ClearAllConnections()
+ModuleSQL::~ModuleSQL()
{
- ConnMap::iterator i;
- while ((i = Connections.begin()) != Connections.end())
+ if (Dispatcher)
{
- Connections.erase(i);
- delete i->second;
+ Dispatcher->join();
+ Dispatcher->OnNotify();
+ delete Dispatcher;
}
-}
-
-void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent)
-{
- for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
+ for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
{
- if (i->second->IsEnabled())
- continue;
-
- i->second->SetEnable(true);
- if (!i->second->Connect())
- {
- /* 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();
- }
+ delete i->second;
}
}
-void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent)
+void ModuleSQL::OnRehash(User* user)
{
- Parent->ConnMutex->Lock();
- ClearOldConnections(conf);
- for (int j =0; j < conf->Enumerate("database"); j++)
+ ConnMap conns;
+ ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+ for(ConfigIter i = tags.first; i != tags.second; i++)
{
- 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))
+ if (i->second->getString("module", "mysql") != "mysql")
continue;
-
- if (!host.id.empty() && !host.host.empty() && !host.name.empty() && !host.user.empty() && !host.pass.empty())
+ std::string id = i->second->getString("id");
+ ConnMap::iterator curr = connections.find(id);
+ if (curr == connections.end())
{
- SQLConnection* ThisSQL = new SQLConnection(host, Parent);
- Connections[host.id] = ThisSQL;
+ SQLConnection* conn = new SQLConnection(this, i->second);
+ conns.insert(std::make_pair(id, conn));
+ ServerInstance->Modules->AddService(*conn);
}
- }
- ConnectDatabases(ServerInstance, Parent);
- Parent->ConnMutex->Unlock();
-}
-
-char FindCharId(const std::string &id)
-{
- char i = 1;
- for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i)
- {
- if (iter->first == id)
+ else
{
- return i;
+ conns.insert(*curr);
+ connections.erase(curr);
}
}
- return 0;
-}
-ConnMap::iterator GetCharId(char id)
-{
- char i = 1;
- for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); ++iter, ++i)
+ // now clean up the deleted databases
+ Dispatcher->LockQueue();
+ SQLerror err(SQL_BAD_DBID);
+ for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
{
- if (i == id)
- return iter;
- }
- 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
-{
- 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 (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
+ 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--)
{
- Parent->ConnMutex->Lock();
- ConnMap::iterator iter = GetCharId(data);
- Parent->ConnMutex->Unlock();
- if (iter != Connections.end())
+ size_t k = j - 1;
+ if (qq[k].c == i->second)
{
- Parent->ResultsMutex->Lock();
- ResultQueue::iterator n = iter->second->rq.begin();
- Parent->ResultsMutex->Unlock();
-
- (*n)->Send();
- delete (*n);
-
- Parent->ResultsMutex->Lock();
- iter->second->rq.pop_front();
- Parent->ResultsMutex->Unlock();
-
- return true;
+ qq[k].q->OnError(err);
+ delete qq[k].q;
+ qq.erase(qq.begin() + k);
}
- /* No error, but unknown id */
- return true;
}
-
- /* Erk, error on descriptor! */
- return false;
- }
-};
-
-/** Spawn sockets from a listener
- */
-class MySQLListener : public ListenSocketBase
-{
- ModuleSQL* Parent;
- irc::sockets::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)
- {
- // XXX unsafe casts suck
- new Notifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str());
- }
-
- /* 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)
-{
- ServerInstance->Modules->UseInterface("SQLutils");
-
- Conf = new ConfigReader(ServerInstance);
- 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->Start(Dispatcher);
-
- ResultsMutex = ServerInstance->Mutexes->CreateMutex();
- QueueMutex = ServerInstance->Mutexes->CreateMutex();
-
- 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'");
+ // finally, nuke the connection
+ delete i->second;
}
-
- ServerInstance->Modules->PublishInterface("SQL", this);
- Implementation eventlist[] = { I_OnRehash, I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Dispatcher->UnlockQueue();
+ connections.swap(conns);
}
-ModuleSQL::~ModuleSQL()
+void ModuleSQL::OnUnloadModule(Module* mod)
{
- 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;
-}
-
-unsigned long ModuleSQL::NewID()
-{
- if (currid+1 == 0)
- currid++;
- return ++currid;
-}
-
-const char* ModuleSQL::OnRequest(Request* request)
-{
- if(strcmp(SQLREQID, request->GetId()) == 0)
+ SQLerror err(SQL_BAD_DBID);
+ Dispatcher->LockQueue();
+ unsigned int i = qq.size();
+ while (i > 0)
{
- SQLrequest* req = (SQLrequest*)request;
-
- /* XXX: Lock */
- QueueMutex->Lock();
-
- ConnMap::iterator iter;
-
- const char* returnval = NULL;
-
- ConnMutex->Lock();
- if((iter = Connections.find(req->dbid)) != Connections.end())
- {
- req->id = NewID();
- iter->second->queue.push(*req);
- returnval = SQLSUCCESS;
- }
- else
+ i--;
+ if (qq[i].q->creator == mod)
{
- req->error.Id(SQL_BAD_DBID);
+ if (i == 0)
+ {
+ // need to wait until the query is done
+ // (the result will be discarded)
+ qq[i].c->lock.Lock();
+ qq[i].c->lock.Unlock();
+ }
+ qq[i].q->OnError(err);
+ delete qq[i].q;
+ qq.erase(qq.begin() + i);
}
-
- ConnMutex->Unlock();
- QueueMutex->Unlock();
-
- return returnval;
}
-
- return NULL;
-}
-
-void ModuleSQL::OnRehash(User* user, const std::string ¶meter)
-{
- rehashing = true;
+ Dispatcher->UnlockQueue();
+ // clean up any result queue entries
+ Dispatcher->OnNotify();
}
Version ModuleSQL::GetVersion()
{
- return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return Version("MySQL support", VF_VENDOR);
}
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;
- }
-
- irc::sockets::insp_sockaddr addr;
-
-#ifdef IPV6
- irc::sockets::insp_aton("::1", &addr.sin6_addr);
- addr.sin6_family = AF_FAMILY;
- addr.sin6_port = htons(MessagePipe->GetPort());
-#else
- irc::sockets::insp_inaddr ia;
- irc::sockets::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)
+ this->LockQueue();
+ while (!this->GetExitFlag())
{
- /* wtf, we cant connect to it, but we just created it! */
- return;
- }
-
- while (this->GetExitFlag() == false)
- {
- if (Parent->rehashing)
+ if (!Parent->qq.empty())
{
- /* XXX: Lock */
- Parent->QueueMutex->Lock();
- Parent->rehashing = false;
- LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
- Parent->QueueMutex->Unlock();
- /* XXX: Unlock */
- }
+ 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.
+ */
- SQLConnection* conn = NULL;
- /* XXX: Lock here for safety */
- Parent->QueueMutex->Lock();
- Parent->ConnMutex->Lock();
- for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
- {
- if (i->second->queue.totalsize())
+ this->LockQueue();
+ if (!Parent->qq.empty() && Parent->qq.front().q == i.q)
{
- conn = i->second;
- break;
+ Parent->qq.pop_front();
+ Parent->rq.push_back(RQueueItem(i.q, res));
+ NotifyParent();
+ }
+ else
+ {
+ // UnloadModule ate the query
+ delete res;
}
}
- Parent->ConnMutex->Unlock();
- Parent->QueueMutex->Unlock();
- /* XXX: Unlock */
-
- /* Theres an item! */
- if (conn)
+ else
{
- conn->DoLeadingQuery();
-
- /* XXX: Lock */
- Parent->QueueMutex->Lock();
- conn->queue.pop();
- Parent->QueueMutex->Unlock();
- /* XXX: Unlock */
+ /* We know the queue is empty, we can safely hang this thread until
+ * something happens
+ */
+ this->WaitForQueue();
}
-
- usleep(1000);
}
+ this->UnlockQueue();
}
+void DispatcherThread::OnNotify()
+{
+ // 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.id == SQL_NO_ERROR)
+ i->q->OnResult(*res);
+ else
+ i->q->OnError(res->err);
+ delete i->q;
+ delete i->r;
+ }
+ Parent->rq.clear();
+ this->UnlockQueue();
+}
MODULE_INIT(ModuleSQL)
projects / user / henk / code / inspircd.git / blobdiff