Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #207 from ClaudiuHKS/MySQLThreadingFix

Browse Source 
Fix SQL Modules Threading
This commit is contained in:
Vincent Herbet 2015-02-18 19:34:18 +01:00
commit 2b9e9c79b9
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mysqlx/AMBuilder
View File

@ -27,7 +27,7 @@ if AMXX.mysql_path:
binary.compiler.linkflags += [ binary.compiler.linkflags += [
os.path.join(AMXX.mysql_path, 'lib', 'opt', 'mysqlclient.lib'), os.path.join(AMXX.mysql_path, 'lib', 'opt', 'mysqlclient.lib'),
os.path.join(AMXX.mysql_path, 'lib', 'opt', 'zlib.lib'), os.path.join(AMXX.mysql_path, 'lib', 'opt', 'zlib.lib'),
'wsock32.lib' 'ws2_32.lib'
] ]
binary.sources = [ binary.sources = [

6
dlls/mysqlx/msvc12/mysqlx.vcxproj
View File

@ -66,8 +66,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>wsock32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>LIBCMT;LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mysql2.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)mysql2.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -88,7 +88,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>wsock32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

2
dlls/mysqlx/mysql/MysqlHeaders.h
View File

@ -30,7 +30,7 @@
#include <ISQLDriver.h> #include <ISQLDriver.h>
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
#include <winsock.h> #include <WinSock2.h>
#endif #endif
typedef unsigned long ulong; typedef unsigned long ulong;
#include <mysql.h> #include <mysql.h>

2
dlls/mysqlx/thread/ThreadWorker.h
View File

@ -12,7 +12,7 @@
#include "BaseWorker.h" #include "BaseWorker.h"
#define DEFAULT_THINK_TIME_MS 200 #define DEFAULT_THINK_TIME_MS 25
class ThreadWorker : public BaseWorker, public IThread class ThreadWorker : public BaseWorker, public IThread
{ {

8
dlls/mysqlx/threading.cpp
View File

@ -29,6 +29,8 @@ void ShutdownThreading()
{ {
if (g_pWorker) if (g_pWorker)
{ {
// Flush all the remaining job fast!
g_pWorker->SetMaxThreadsPerFrame(8192);
g_pWorker->Stop(true); g_pWorker->Stop(true);
delete g_pWorker; delete g_pWorker;
g_pWorker = NULL; g_pWorker = NULL;
@ -316,7 +318,7 @@ void OnPluginsLoaded()
g_QueueLock = g_Threader.MakeMutex(); g_QueueLock = g_Threader.MakeMutex();
} }
g_pWorker = new ThreadWorker(&g_Threader, 250); g_pWorker = new ThreadWorker(&g_Threader, DEFAULT_THINK_TIME_MS);
if (!g_pWorker->Start()) if (!g_pWorker->Start())
{ {
delete g_pWorker; delete g_pWorker;
@ -333,7 +335,7 @@ void StartFrame()
{ {
if (g_pWorker && (g_lasttime < gpGlobals->time)) if (g_pWorker && (g_lasttime < gpGlobals->time))
{ {
g_lasttime = gpGlobals->time + 0.05f; g_lasttime = gpGlobals->time + 0.025f;
g_QueueLock->Lock(); g_QueueLock->Lock();
size_t remaining = g_ThreadQueue.size(); size_t remaining = g_ThreadQueue.size();
if (remaining) if (remaining)
@ -364,6 +366,8 @@ void OnPluginsUnloading()
return; return;
} }
// Flush all the remaining job fast!
g_pWorker->SetMaxThreadsPerFrame(8192);
g_pWorker->Stop(false); g_pWorker->Stop(false);
delete g_pWorker; delete g_pWorker;
g_pWorker = NULL; g_pWorker = NULL;

2
dlls/sqlite/thread/ThreadWorker.h
View File

@ -12,7 +12,7 @@
#include "BaseWorker.h" #include "BaseWorker.h"
#define DEFAULT_THINK_TIME_MS 500 #define DEFAULT_THINK_TIME_MS 25
class ThreadWorker : public BaseWorker, public IThread class ThreadWorker : public BaseWorker, public IThread
{ {

8
dlls/sqlite/threading.cpp
View File

@ -28,6 +28,8 @@ void ShutdownThreading()
{ {
if (g_pWorker) if (g_pWorker)
{ {
// Flush all the remaining job fast!
g_pWorker->SetMaxThreadsPerFrame(8192);
g_pWorker->Stop(true); g_pWorker->Stop(true);
delete g_pWorker; delete g_pWorker;
g_pWorker = NULL; g_pWorker = NULL;
@ -293,7 +295,7 @@ void OnPluginsLoaded()
g_QueueLock = g_Threader.MakeMutex(); g_QueueLock = g_Threader.MakeMutex();
} }
g_pWorker = new ThreadWorker(&g_Threader, 250); g_pWorker = new ThreadWorker(&g_Threader, DEFAULT_THINK_TIME_MS);
if (!g_pWorker->Start()) if (!g_pWorker->Start())
{ {
delete g_pWorker; delete g_pWorker;
@ -310,7 +312,7 @@ void StartFrame()
{ {
if (g_pWorker && (g_lasttime < gpGlobals->time)) if (g_pWorker && (g_lasttime < gpGlobals->time))
{ {
g_lasttime = gpGlobals->time + 0.05f; g_lasttime = gpGlobals->time + 0.025f;
g_QueueLock->Lock(); g_QueueLock->Lock();
size_t remaining = g_ThreadQueue.size(); size_t remaining = g_ThreadQueue.size();
if (remaining) if (remaining)
@ -341,6 +343,8 @@ void OnPluginsUnloading()
return; return;
} }
// Flush all the remaining job fast!
g_pWorker->SetMaxThreadsPerFrame(8192);
g_pWorker->Stop(false); g_pWorker->Stop(false);
delete g_pWorker; delete g_pWorker;
g_pWorker = NULL; g_pWorker = NULL;