X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=465992d304578da9a7b916ad2e3cdb935970dfd3;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=fe4e0896511f21a88bcf45d2a776c301e999eeaf;hpb=7b6eae36661bc798f69b22393b85a4f06d533cf6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index fe4e08965..465992d30 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -65,14 +65,10 @@ class SQLConnection; -class MySQLListener; - +class DispatcherThread; typedef std::map ConnMap; -static MySQLListener *MessagePipe = NULL; -int QueueFD = -1; - -class DispatcherThread; +typedef std::deque ResultQueue; unsigned long count(const char * const str, char a) { @@ -97,27 +93,23 @@ class ModuleSQL : public Module int currid; bool rehashing; DispatcherThread* Dispatcher; - Mutex* QueueMutex; - Mutex* ResultsMutex; - Mutex* LoggingMutex; - Mutex* ConnMutex; + 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); + void OnRehash(User* user); Version GetVersion(); }; - #if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224 #define mysql_field_count mysql_num_fields #endif -typedef std::deque ResultQueue; - /** Represents a mysql result set */ class MySQLresult : public SQLresult @@ -301,10 +293,6 @@ class MySQLresult : public SQLresult } }; -class SQLConnection; - -void NotifyMainThread(SQLConnection* connection_with_new_result); - /** Represents a connection to a mysql database */ class SQLConnection : public classbase @@ -452,9 +440,7 @@ class SQLConnection : public classbase *queryend = 0; - Parent->QueueMutex->Lock(); req.query.q = query; - Parent->QueueMutex->Unlock(); if (!mysql_real_query(connection, req.query.q.data(), req.query.q.length())) { @@ -467,9 +453,9 @@ class SQLConnection : public classbase /* Put this new result onto the results queue. * XXX: Remember to mutex the queue! */ - Parent->ResultsMutex->Lock(); + Parent->ResultsMutex.Lock(); rq.push_back(r); - Parent->ResultsMutex->Unlock(); + Parent->ResultsMutex.Unlock(); } else { @@ -480,18 +466,12 @@ class SQLConnection : public classbase r->dbid = this->GetID(); r->query = req.query.q; - Parent->ResultsMutex->Lock(); + Parent->ResultsMutex.Lock(); rq.push_back(r); - Parent->ResultsMutex->Unlock(); + 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() @@ -615,17 +595,17 @@ void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent) if (!i->second->Connect()) { /* XXX: MUTEX */ - Parent->LoggingMutex->Lock(); + 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(); + Parent->LoggingMutex.Unlock(); } } } void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent) { - Parent->ConnMutex->Lock(); + Parent->ConnMutex.Lock(); ClearOldConnections(conf); for (int j =0; j < conf->Enumerate("database"); j++) { @@ -648,7 +628,7 @@ void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Pare } } ConnectDatabases(ServerInstance, Parent); - Parent->ConnMutex->Unlock(); + Parent->ConnMutex.Unlock(); } char FindCharId(const std::string &id) @@ -675,123 +655,18 @@ ConnMap::iterator GetCharId(char id) 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 +class DispatcherThread : public SocketThread { private: ModuleSQL* Parent; InspIRCd* ServerInstance; public: - DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : Thread(), Parent(CreatorModule), ServerInstance(Instance) { } + DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : SocketThread(Instance), 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) - { - Parent->ConnMutex->Lock(); - ConnMap::iterator iter = GetCharId(data); - Parent->ConnMutex->Unlock(); - if (iter != Connections.end()) - { - 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; - } - /* 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 - } + virtual void OnNotify(); }; ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false) @@ -802,44 +677,14 @@ ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false) 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'"); } @@ -857,10 +702,6 @@ ModuleSQL::~ModuleSQL() 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() @@ -876,14 +717,12 @@ const char* ModuleSQL::OnRequest(Request* request) { SQLrequest* req = (SQLrequest*)request; - /* XXX: Lock */ - QueueMutex->Lock(); - ConnMap::iterator iter; const char* returnval = NULL; - ConnMutex->Lock(); + Dispatcher->LockQueue(); + ConnMutex.Lock(); if((iter = Connections.find(req->dbid)) != Connections.end()) { req->id = NewID(); @@ -895,8 +734,11 @@ const char* ModuleSQL::OnRequest(Request* request) req->error.Id(SQL_BAD_DBID); } - ConnMutex->Unlock(); - QueueMutex->Unlock(); + ConnMutex.Unlock(); + Dispatcher->UnlockQueueWakeup(); + /* Yes, it's possible this will generate a spurious wakeup. + * That's fine, it'll just get ignored. + */ return returnval; } @@ -904,9 +746,11 @@ const char* ModuleSQL::OnRequest(Request* request) return NULL; } -void ModuleSQL::OnRehash(User* user, const std::string ¶meter) +void ModuleSQL::OnRehash(User* user) { + Dispatcher->LockQueue(); rehashing = true; + Dispatcher->UnlockQueueWakeup(); } Version ModuleSQL::GetVersion() @@ -918,50 +762,19 @@ 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; + SQLConnection* conn = NULL; -#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) - { - /* wtf, we cant connect to it, but we just created it! */ - return; - } - - while (this->GetExitFlag() == false) + this->LockQueue(); + while (!this->GetExitFlag()) { 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 */ - Parent->QueueMutex->Lock(); - Parent->ConnMutex->Lock(); + conn = NULL; + Parent->ConnMutex.Lock(); for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++) { if (i->second->queue.totalsize()) @@ -970,25 +783,59 @@ void DispatcherThread::Run() break; } } - Parent->ConnMutex->Unlock(); - Parent->QueueMutex->Unlock(); - /* XXX: Unlock */ + Parent->ConnMutex.Unlock(); - /* Theres an item! */ if (conn) { + /* There's an item! */ + this->UnlockQueue(); conn->DoLeadingQuery(); - - /* XXX: Lock */ - Parent->QueueMutex->Lock(); + this->NotifyParent(); + this->LockQueue(); conn->queue.pop(); - Parent->QueueMutex->Unlock(); - /* XXX: Unlock */ } - - usleep(1000); + else + { + /* We know the queue is empty, we can safely hang this thread until + * something happens + */ + this->WaitForQueue(); + } } + this->UnlockQueue(); } +void DispatcherThread::OnNotify() +{ + SQLConnection* conn; + while (1) + { + 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; + + 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)