Merge pull request #39336 from Cyberboss/BSQLUpdate

Updates BSQL. Adds thread limiter config

code/__DEFINES/bsql.dm

@@ -1,10 +1,12 @@
-//BSQL - DMAPI v1.2.0.1
+//BSQL - DMAPI
+#define BSQL_VERSION "v1.3.0.0"
 
 //types of connections
 #define BSQL_CONNECTION_TYPE_MARIADB "MySql"
 #define BSQL_CONNECTION_TYPE_SQLSERVER "SqlServer"
 
 #define BSQL_DEFAULT_TIMEOUT 5
+#define BSQL_DEFAULT_THREAD_LIMIT 50
 
 //Call this before rebooting or shutting down your world to clean up gracefully. This invalidates all active connection and operation datums
 /world/proc/BSQL_Shutdown()
@@ -22,8 +24,9 @@ Create a new database connection, does not perform the actual connect
   connection_type: The BSQL connection_type to use
   asyncTimeout: The timeout to use for normal operations, 0 for infinite, defaults to BSQL_DEFAULT_TIMEOUT
   blockingTimeout: The timeout to use for blocking operations, must be less than or equal to asyncTimeout, 0 for infinite, defaults to asyncTimeout
+  threadLimit: The limit of additional threads BSQL will run simultaneously, defaults to BSQL_DEFAULT_THREAD_LIMIT
 */
-/datum/BSQL_Connection/New(connection_type, asyncTimeout, blockingTimeout)
+/datum/BSQL_Connection/New(connection_type, asyncTimeout, blockingTimeout, threadLimit)
 	return ..()
 
 /*

code/controllers/configuration/entries/dbconfig.dm

@@ -44,4 +44,8 @@
 	min_val = 0
 	protection = CONFIG_ENTRY_LOCKED
 
+/datum/config_entry/number/bsql_thread_limit
+	config_entry_value = 50
+	min_val = 1
+
 /datum/config_entry/flag/bsql_debug

code/controllers/subsystem/dbcore.dm

@@ -76,7 +76,7 @@ SUBSYSTEM_DEF(dbcore)
 	var/address = CONFIG_GET(string/address)
 	var/port = CONFIG_GET(number/port)
 
-	connection = new /datum/BSQL_Connection(BSQL_CONNECTION_TYPE_MARIADB, CONFIG_GET(number/async_query_timeout), CONFIG_GET(number/blocking_query_timeout))
+	connection = new /datum/BSQL_Connection(BSQL_CONNECTION_TYPE_MARIADB, CONFIG_GET(number/async_query_timeout), CONFIG_GET(number/blocking_query_timeout), CONFIG_GET(number/bsql_thread_limit))
 	var/error
 	if(QDELETED(connection))
 		connection = null

code/modules/bsql/core/connection.dm

@@ -4,17 +4,19 @@
 
 BSQL_PROTECT_DATUM(/datum/BSQL_Connection)
 
-/datum/BSQL_Connection/New(connection_type, asyncTimeout, blockingTimeout)
+/datum/BSQL_Connection/New(connection_type, asyncTimeout, blockingTimeout, threadLimit)
 	if(asyncTimeout == null)
 		asyncTimeout = BSQL_DEFAULT_TIMEOUT
 	if(blockingTimeout == null)
 		blockingTimeout = asyncTimeout
+	if(threadLimit == null)
+		threadLimit = BSQL_DEFAULT_THREAD_LIMIT
 
 	src.connection_type = connection_type
 
 	world._BSQL_InitCheck(src)
 
-	var/error = world._BSQL_Internal_Call("CreateConnection", connection_type, "[asyncTimeout]", "[blockingTimeout]")
+	var/error = world._BSQL_Internal_Call("CreateConnection", connection_type, "[asyncTimeout]", "[blockingTimeout]", "[threadLimit]")
 	if(error)
 		BSQL_ERROR(error)
 		return

code/modules/bsql/core/library.dm

@@ -17,6 +17,12 @@
 		BSQL_ERROR("Could not find [libPath]!")
 		return
 
+	var/version = _BSQL_Internal_Call("Version")
+	if(version != BSQL_VERSION)
+		BSQL_DEL_CALL(caller)
+		BSQL_ERROR("BSQL DMAPI version mismatch! Expected [BSQL_VERSION], got [version == null ? "NULL" : version]!")
+		return
+
 	var/result = _BSQL_Internal_Call("Initialize")
 	if(result)
 		BSQL_DEL_CALL(caller)

config/dbconfig.txt

@@ -38,5 +38,8 @@ ASYNC_QUERY_TIMEOUT 10
 ## Must be less than or equal to ASYNC_QUERY_TIMEOUT
 BLOCKING_QUERY_TIMEOUT 5
 
+## The maximum number of additional threads BSQL is allowed to run at once
+BSQL_THREAD_LIMIT 50
+
 ## Uncomment to enable verbose BSQL communication logs
 #BSQL_DEBUG

dependencies.sh

@@ -13,7 +13,7 @@ export BYOND_MINOR=1441
 export RUST_G_VERSION=0.3.0
 
 #bsql git tag
-export BSQL_VERSION=v1.3.0.2
+export BSQL_VERSION=v1.4.0.0
 
 #node version
 export NODE_VERSION=4