threading works

Author: habecker

gamemodes/empty/gamemode.py

@@ -167,6 +167,14 @@ def OnPlayerSelectObject(playerid, type, objectid, modelid, fX, fY, fZ):
 
 def OnPlayerWeaponShot(playerid, weaponid, hittype, hitid, fX, fY, fZ):
     return False
-    
+
 def OnProcessTick():
     return None
+
+""" you can initialize your own additional threads here, note that OnThreadingInit isn't supposed to be a worker thread but gives you the ability to start them. Otherwise it would block the plugin initialization """
+def OnThreadingInit():
+    return None
+
+""" your initialized threads must be shutdown during this callbac """
+def OnThreadingStopSignal():
+    return None

src/main.cpp

@@ -1,3 +1,4 @@
+#define VERSION "1.1.0-100"
 
 #include <stdio.h>
 #include <string.h>
@@ -13,7 +14,7 @@ bool threadingInitialized = false;
 
 PLUGIN_EXPORT unsigned int PLUGIN_CALL Supports()
 {
-  return sampgdk::Supports() | SUPPORTS_PROCESS_TICK;
+	return sampgdk::Supports() | SUPPORTS_PROCESS_TICK;
 }
 
 PLUGIN_EXPORT bool PLUGIN_CALL Load(void **ppData) 
@@ -25,23 +26,34 @@ PLUGIN_EXPORT bool PLUGIN_CALL Load(void **ppData)
 	}
 
 	bool sgdk = sampgdk::Load(ppData);
-	if (sgdk) {
-		PySAMP::callback("OnThreadingInit", NULL);
-		threading = std::thread([] { PySAMP::callback("OnThreadingInit", NULL); });
+	if (sgdk) 
+	{
+		sampgdk::logprintf("PySAMP %s", VERSION);
 
+		threadingInitialized = true;
+		threading = std::thread([] { 
+			PyGILState_STATE state = PyGILState_Ensure();
+			PySAMP::callback("OnThreadingInit", NULL);
+			PyGILState_Release(state);
+		});
+
+		
 	}
-	return false;
+	return sgdk;
 }
 
 PLUGIN_EXPORT void PLUGIN_CALL Unload()
 {
-  sampgdk::Unload();
+	if(threadingInitialized)
+	{
+		PySAMP::callback("OnThreadingStopSignal", NULL);
+		threading.join();
+	}
+	sampgdk::Unload();
 }
 
 PLUGIN_EXPORT void PLUGIN_CALL ProcessTick()
 {
-	PySAMP::callback("OnThreadingStopSignal", NULL);
-	threading.join();
 	sampgdk::ProcessTick();
 	PySAMP::callback("OnProcessTick", NULL);
 }

src/pysamp/pygamemode.cpp

@@ -25,7 +25,6 @@ PyGamemode::PyGamemode(const char * path)
 	GetCurrentDir(cCurrentPath, sizeof(cCurrentPath));
 	char* absolute = strcat(cCurrentPath, path);
 
-	sampgdk::logprintf("Setting python workspace to %s", absolute);
 	PyObject* sysPath = PySys_GetObject("path");
 
 	if(!sysPath)
@@ -36,11 +35,7 @@ PyGamemode::PyGamemode(const char * path)
 	pName = PyUnicode_DecodeFSDefault("gamemode");
 	pModule = PyImport_Import(pName);
 
-	if (pModule) 
-	{
-		sampgdk::logprintf("PyGamemode loaded!");
-	}
-	else
+	if (!pModule) 
 	{
 		PyErr_Print();
 		sampgdk::logprintf("PyGamemode::PyGamemode(%s) failed!", "gamemode.py");

src/pysamp/pysamp.cpp

@@ -7,7 +7,8 @@ void PySAMP::load()
 {
 	PySAMP::gamemode = new PyGamemode(PYTHON_PATH);
 
-	if (!PyEval_ThreadsInitialized()) {
+	if (!PyEval_ThreadsInitialized()) 
+	{
 		PyEval_InitThreads();
 	}
 }