summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-07-21 19:30:29 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-07-21 19:30:29 +0000
commit68712039b8f1174b75e671058aee98186444ba98 (patch)
treeaaedf987b5dc14850bc3139558b1e2bc86de0b46
parentb5252250880b7a0d27f1eda7cb49ca8b8b91df14 (diff)
Seems to work to a point (dont use it, it wont actually execute a query yet)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4479 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/extra/m_mysql.cpp88
1 files changed, 86 insertions, 2 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index d1329151c..36624ee6e 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -37,6 +37,7 @@ class SQLConnection;
extern InspIRCd* ServerInstance;
typedef std::map<std::string, SQLConnection*> ConnMap;
+bool giveup = false;
#if !defined(MYSQL_VERSION_ID) || MYSQL_VERSION_ID<32224
@@ -153,7 +154,8 @@ private:
}
};
-
+/* A mutex to wrap around queue accesses */
+pthread_mutex_t queue_mutex = PTHREAD_MUTEX_INITIALIZER;
class SQLConnection : public classbase
{
@@ -172,6 +174,8 @@ class SQLConnection : public classbase
public:
+ QueryQueue queue;
+
// 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, long myid)
@@ -194,6 +198,12 @@ class SQLConnection : public classbase
return mysql_real_connect(&connection, host.c_str(), user.c_str(), pass.c_str(), db.c_str(), 0, NULL, 0);
}
+ void DoLeadingQuery()
+ {
+ SQLrequest& query = queue.front();
+ log(DEBUG,"DO QUERY: %s",query.query.q.c_str());
+ }
+
// This method issues a query that expects multiple rows of results. Use GetRow() and QueryDone() to retrieve
// multiple rows.
bool QueryResult(std::string query)
@@ -368,14 +378,54 @@ class ModuleSQL : public Module
Server *Srv;
ConfigReader *Conf;
pthread_t Dispatcher;
+ int currid;
void Implements(char* List)
{
List[I_OnRehash] = List[I_OnRequest] = 1;
}
+ unsigned long NewID()
+ {
+ if (currid+1 == 0)
+ currid++;
+ return ++currid;
+ }
+
char* OnRequest(Request* request)
{
+ if(strcmp(SQLREQID, request->GetData()) == 0)
+ {
+ SQLrequest* req = (SQLrequest*)request;
+
+ /* XXX: Lock */
+ pthread_mutex_lock(&queue_mutex);
+
+ ConnMap::iterator iter;
+
+ char* returnval = NULL;
+
+ 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())
+ {
+ iter->second->queue.push(*req);
+ req->id = NewID();
+ returnval = SQLSUCCESS;
+ }
+ else
+ {
+ req->error.Id(BAD_DBID);
+ }
+
+ pthread_mutex_unlock(&queue_mutex);
+ /* XXX: Unlock */
+
+ return returnval;
+ }
+
+ log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+
return NULL;
}
@@ -384,13 +434,16 @@ class ModuleSQL : public Module
{
Srv = Me;
Conf = new ConfigReader();
+ currid = 0;
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)
{
- log(DEBUG,"m_mysql: Failed to create dispatcher thread: %s", strerror(errno));
+ throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
}
+ Srv->PublishFeature("SQL", this);
+ Srv->PublishFeature("MySQL", this);
}
virtual ~ModuleSQL()
@@ -415,6 +468,37 @@ void* DispatcherThread(void* arg)
ModuleSQL* thismodule = (ModuleSQL*)arg;
LoadDatabases(thismodule->Conf, thismodule->Srv);
+ while (!giveup)
+ {
+ SQLConnection* conn = NULL;
+ /* XXX: Lock here for safety */
+ pthread_mutex_lock(&queue_mutex);
+ for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
+ {
+ if (i->second->queue.totalsize())
+ {
+ conn = i->second;
+ break;
+ }
+ }
+ pthread_mutex_unlock(&queue_mutex);
+ /* XXX: Unlock */
+
+ /* Theres an item! */
+ if (conn)
+ {
+ conn->DoLeadingQuery();
+
+ /* XXX: Lock */
+ pthread_mutex_lock(&queue_mutex);
+ conn->queue.pop();
+ pthread_mutex_unlock(&queue_mutex);
+ /* XXX: Unlock */
+ }
+
+ usleep(50);
+ }
+
return NULL;
}