X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=be6f4bc4c89e957c7314bc9e285afda795526e20;hb=813bc55a8496875cef52e6da42d608e4d2fa35da;hp=5ce87c4b495af7f843a3ea37f6f4ab82545b9e49;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 5ce87c4b4..be6f4bc4c 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -11,6 +11,9 @@
  * ---------------------------------------------------
  */
 
+/* Stop mysql wanting to use long long */
+#define NO_CLIENT_LONG_LONG
+
 #include "inspircd.h"
 #include <mysql.h>
 #include <pthread.h>
@@ -25,7 +28,6 @@
 /* $CompileFlags: exec("mysql_config --include") */
 /* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
 /* $ModDep: m_sqlv2.h */
-/* $NoPedantic */
 
 /* THE NONBLOCKING MYSQL API!
  * 
@@ -68,6 +70,7 @@ class Notifier;
 
 typedef std::map<std::string, SQLConnection*> ConnMap;
 bool giveup = false;
+bool threadfinished = false;
 static Module* SQLModule = NULL;
 static Notifier* MessagePipe = NULL;
 int QueueFD = -1;
@@ -99,7 +102,7 @@ class MySQLresult : public SQLresult
 	int rows;
  public:
 
-	MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int id) : SQLresult(self, to, id), currentrow(0), fieldmap(NULL)
+	MySQLresult(Module* self, Module* to, MYSQL_RES* res, int affected_rows, unsigned int rid) : SQLresult(self, to, rid), currentrow(0), fieldmap(NULL)
 	{
 		/* A number of affected rows from from mysql_affected_rows.
 		 */
@@ -145,7 +148,7 @@ class MySQLresult : public SQLresult
 		}
 	}
 
-	MySQLresult(Module* self, Module* to, SQLerror e, unsigned int id) : SQLresult(self, to, id), currentrow(0)
+	MySQLresult(Module* self, Module* to, SQLerror e, unsigned int rid) : SQLresult(self, to, rid), currentrow(0)
 	{
 		rows = 0;
 		error = e;
@@ -542,7 +545,7 @@ void ConnectDatabases(InspIRCd* ServerInstance)
 		{
 			/* XXX: MUTEX */
 			pthread_mutex_lock(&logging_mutex);
-			ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+			ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
 			i->second->SetEnable(false);
 			pthread_mutex_unlock(&logging_mutex);
 		}
@@ -725,16 +728,24 @@ class ModuleSQL : public Module
 		
 		pthread_attr_t attribs;
 		pthread_attr_init(&attribs);
-		pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED);
+		pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE);
 		if (pthread_create(&this->Dispatcher, &attribs, DispatcherThread, (void *)this) != 0)
 		{
 			throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
 		}
+		pthread_attr_destroy(&attribs);
 
 		if (!ServerInstance->Modules->PublishFeature("SQL", this))
 		{
 			/* Tell worker thread to exit NOW */
+			int rc;
+			void *status;
 			giveup = true;
+			rc = pthread_join(Dispatcher, &status);
+			if (rc)
+			{
+				ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc);
+			}
 			throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
 		}
 
@@ -745,7 +756,14 @@ class ModuleSQL : public Module
 
 	virtual ~ModuleSQL()
 	{
+		int rc;
+		void *status;
 		giveup = true;
+		rc = pthread_join(Dispatcher, &status);
+		if (rc)
+		{
+			ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc);
+		}
 		ClearAllConnections();
 		delete Conf;
 		ServerInstance->Modules->UnpublishInterface("SQL", this);
@@ -762,7 +780,7 @@ class ModuleSQL : public Module
 		return ++currid;
 	}
 
-	char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		if(strcmp(SQLREQID, request->GetId()) == 0)
 		{
@@ -773,7 +791,7 @@ class ModuleSQL : public Module
 
 			ConnMap::iterator iter;
 
-			char* returnval = NULL;
+			const char* returnval = NULL;
 
 			if((iter = Connections.find(req->dbid)) != Connections.end())
 			{
@@ -802,7 +820,7 @@ class ModuleSQL : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 	
 };
@@ -881,7 +899,7 @@ void* DispatcherThread(void* arg)
 		usleep(1000);
 	}
 
-	return NULL;
+	pthread_exit((void *) 0);
 }
 
 MODULE_INIT(ModuleSQL)