Update Event and Request APIs

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11808 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 26 insertions, 33 deletions

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index a0ac9ffac..a921dea8e 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -99,7 +99,7 @@ class ModuleSQL : public Module
 	 ModuleSQL();
 	 ~ModuleSQL();
 	 unsigned long NewID();
-	 const char* OnRequest(Request* request);
+	 void OnRequest(Request& request);
 	 void OnRehash(User* user);
 	 Version GetVersion();
 };
@@ -340,7 +340,7 @@ class SQLConnection : public classbase
 			mysql_query(connection,initquery.c_str());
 
 		/* Parse the command string and dispatch it to mysql */
-		SQLrequest& req = queue.front();
+		SQLrequest* req = queue.front();
 
 		/* Pointer to the buffer we screw around with substitution in */
 		char* query;
@@ -354,17 +354,17 @@ class SQLConnection : public classbase
 		/* The length of the longest parameter */
 		maxparamlen = 0;
 
-		for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++)
+		for(ParamL::iterator i = req->query.p.begin(); i != req->query.p.end(); i++)
 		{
 			if (i->size() > maxparamlen)
 				maxparamlen = i->size();
 		}
 
 		/* How many params are there in the query? */
-		paramcount = count(req.query.q.c_str(), '?');
+		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);
+		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
@@ -372,16 +372,16 @@ class SQLConnection : public classbase
 		 * The +1 is for null-terminating the string for mysql_real_escape_string
 		 */
 
-		query = new char[req.query.q.length() + (maxparamlen*paramcount*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
 		 * the parameters into it...
 		 */
 
-		for(unsigned long i = 0; i < req.query.q.length(); i++)
+		for(unsigned long i = 0; i < req->query.q.length(); i++)
 		{
-			if(req.query.q[i] == '?')
+			if(req->query.q[i] == '?')
 			{
 				/* We found a place to substitute..what fun.
 				 * use mysql calls to escape and write the
@@ -404,11 +404,11 @@ class SQLConnection : public classbase
 				/* 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'))
+				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';
+					paramnum = paramnum * 10 + req->query.q[i] - '0';
 				}
 
 				if (paramnum > paramscopy.size() - 1)
@@ -424,35 +424,35 @@ class SQLConnection : public classbase
 
 					queryend += len;
 				}
-				else if (req.query.p.size())
+				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();
+					req->query.p.pop_front();
 				}
 				else
 					break;
 			}
 			else
 			{
-				*queryend = req.query.q[i];
+				*queryend = req->query.q[i];
 				queryend++;
 			}
 		}
 
 		*queryend = 0;
 
-		req.query.q = query;
+		req->query.q = query;
 
-		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(Parent, req.GetSource(), res, rows, req.id);
+			MySQLresult* r = new MySQLresult(Parent, req->source, res, rows, req->id);
 			r->dbid = this->GetID();
-			r->query = req.query.q;
+			r->query = req->query.q;
 			/* Put this new result onto the results queue.
 			 * XXX: Remember to mutex the queue!
 			 */
@@ -465,9 +465,9 @@ class SQLConnection : public classbase
 			/* 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);
+			MySQLresult* r = new MySQLresult(Parent, req->source, e, req->id);
 			r->dbid = this->GetID();
-			r->query = req.query.q;
+			r->query = req->query.q;
 
 			Parent->ResultsMutex.Lock();
 			rq.push_back(r);
@@ -698,8 +698,8 @@ ModuleSQL::ModuleSQL() : rehashing(false)
 	}
 
 	ServerInstance->Modules->PublishInterface("SQL", this);
-	Implementation eventlist[] = { I_OnRehash, I_OnRequest };
-	ServerInstance->Modules->Attach(eventlist, this, 2);
+	Implementation eventlist[] = { I_OnRehash };
+	ServerInstance->Modules->Attach(eventlist, this, 1);
 }
 
 ModuleSQL::~ModuleSQL()
@@ -719,23 +719,20 @@ unsigned long ModuleSQL::NewID()
 	return ++currid;
 }
 
-const char* ModuleSQL::OnRequest(Request* request)
+void ModuleSQL::OnRequest(Request& request)
 {
-	if(strcmp(SQLREQID, request->GetId()) == 0)
+	if(strcmp(SQLREQID, request.id) == 0)
 	{
-		SQLrequest* req = (SQLrequest*)request;
+		SQLrequest* req = (SQLrequest*)&request;
 
 		ConnMap::iterator iter;
 
-		const char* returnval = NULL;
-
 		Dispatcher->LockQueue();
 		ConnMutex.Lock();
 		if((iter = Connections.find(req->dbid)) != Connections.end())
 		{
 			req->id = NewID();
-			iter->second->queue.push(*req);
-			returnval = SQLSUCCESS;
+			iter->second->queue.push(new SQLrequest(*req));
 		}
 		else
 		{
@@ -747,11 +744,7 @@ const char* ModuleSQL::OnRequest(Request* request)
 		/* Yes, it's possible this will generate a spurious wakeup.
 		 * That's fine, it'll just get ignored.
 		 */
-
-		return returnval;
 	}
-
-	return NULL;
 }
 
 void ModuleSQL::OnRehash(User* user)