#include "modules.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 */
* 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;
-static Notifier* MessagePipe = NULL;
+static MySQLListener *MessagePipe = NULL;
int QueueFD = -1;
class DispatcherThread;
Mutex* QueueMutex;
Mutex* ResultsMutex;
Mutex* LoggingMutex;
+ Mutex* ConnMutex;
ModuleSQL(InspIRCd* Me);
~ModuleSQL();
*queryend = 0;
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
req.query.q = query;
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length()))
{
/* Put this new result onto the results queue.
* XXX: Remember to mutex the queue!
*/
- Parent->ResultsMutex->Enable(true);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- Parent->ResultsMutex->Enable(false);
+ 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));
+ 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->Enable(true);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- Parent->ResultsMutex->Enable(false);
+ Parent->ResultsMutex->Unlock();
}
/* Now signal the main thread that we've got a result to process.
if (!i->second->Connect())
{
/* XXX: MUTEX */
- Parent->LoggingMutex->Enable(true);
+ 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->Enable(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++)
{
}
}
ConnectDatabases(ServerInstance, Parent);
+ Parent->ConnMutex->Unlock();
}
char FindCharId(const std::string &id)
*/
class Notifier : public BufferedSocket
{
- insp_sockaddr sock_us;
- socklen_t uslen;
ModuleSQL* Parent;
public:
-
- /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-#ifdef IPV6
- Notifier(InspIRCd* SI, ModuleSQL* Creator) : BufferedSocket(SI, "::1", 0, true, 3000), Parent(Creator)
-#else
- Notifier(InspIRCd* SI, ModuleSQL* Creator) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), Parent(Creator)
-#endif
- {
- uslen = sizeof(sock_us);
- if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
- {
- throw ModuleException("Could not create random listening port on localhost");
- }
- }
-
- Notifier(InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip)
- {
- }
-
- /* 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)
- {
- Notifier* n = new Notifier(this->Instance, newsock, ip);
- n = n; /* Stop bitching at me, GCC */
- return true;
- }
+ Notifier(ModuleSQL* P, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), Parent(P) { }
virtual bool OnDataReady()
{
* 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->Enable(true);
+ Parent->ResultsMutex->Lock();
ResultQueue::iterator n = iter->second->rq.begin();
(*n)->Send();
delete (*n);
iter->second->rq.pop_front();
- Parent->ResultsMutex->Enable(false);
+ Parent->ResultsMutex->Unlock();
+ Parent->ConnMutex->Unlock();
return true;
}
/* No error, but unknown id */
+ Parent->ConnMutex->Unlock();
return true;
}
}
};
+/** Spawn sockets from a listener
+ */
+class MySQLListener : public ListenSocketBase
+{
+ ModuleSQL* Parent;
+ insp_sockaddr sock_us;
+ socklen_t uslen;
+ FileReader* index;
-ModuleSQL::ModuleSQL(InspIRCd* Me) : Module::Module(Me), rehashing(false)
+ public:
+ MySQLListener(ModuleSQL* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P)
+ {
+ uslen = sizeof(sock_us);
+ if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+ {
+ throw ModuleException("Could not getsockname() to find out port number for ITC port");
+ }
+ }
+
+ virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+ {
+ new Notifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck
+ }
+
+ /* Using getsockname and ntohs, we can determine which port number we were allocated */
+ int GetPort()
+ {
+#ifdef IPV6
+ return ntohs(sock_us.sin6_port);
+#else
+ return ntohs(sock_us.sin_port);
+#endif
+ }
+};
+
+ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
{
ServerInstance->Modules->UseInterface("SQLutils");
PublicServerInstance = ServerInstance;
currid = 0;
- MessagePipe = new Notifier(ServerInstance, this);
+ /* Create a socket on a random port. Let the tcp stack allocate us an available port */
+#ifdef IPV6
+ MessagePipe = new MySQLListener(this, ServerInstance, 0, "::1");
+#else
+ MessagePipe = new MySQLListener(this, ServerInstance, 0, "127.0.0.1");
+#endif
+
+ LoggingMutex = ServerInstance->Mutexes->CreateMutex();
+ ConnMutex = ServerInstance->Mutexes->CreateMutex();
+
+ if (MessagePipe->GetFd() == -1)
+ {
+ delete ConnMutex;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ throw ModuleException("m_mysql: unable to create ITC pipe");
+ }
+ else
+ {
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mysql", DEBUG, "MySQL: Interthread comms port is %d", MessagePipe->GetPort());
+ LoggingMutex->Unlock();
+ }
Dispatcher = new DispatcherThread(ServerInstance, this);
ServerInstance->Threads->Create(Dispatcher);
+ ResultsMutex = ServerInstance->Mutexes->CreateMutex();
+ QueueMutex = ServerInstance->Mutexes->CreateMutex();
+
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'");
}
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)
SQLrequest* req = (SQLrequest*)request;
/* XXX: Lock */
- QueueMutex->Enable(true);
+ QueueMutex->Lock();
ConnMap::iterator iter;
const char* returnval = NULL;
+ ConnMutex->Lock();
if((iter = Connections.find(req->dbid)) != Connections.end())
{
req->id = NewID();
}
else
{
- req->error.Id(BAD_DBID);
+ req->error.Id(SQL_BAD_DBID);
}
- QueueMutex->Enable(false);
- /* XXX: Unlock */
+ ConnMutex->Unlock();
+ QueueMutex->Unlock();
return returnval;
}
if (Parent->rehashing)
{
/* XXX: Lock */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
Parent->rehashing = false;
LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
}
SQLConnection* conn = NULL;
/* XXX: Lock here for safety */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
+ Parent->ConnMutex->Lock();
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
if (i->second->queue.totalsize())
break;
}
}
- Parent->QueueMutex->Enable(false);
+ Parent->ConnMutex->Unlock();
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
/* Theres an item! */
conn->DoLeadingQuery();
/* XXX: Lock */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
conn->queue.pop();
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
}
projects / user / henk / code / inspircd.git / blobdiff