Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Use std::scoped_lock instead of unique_lock where possible (and old lock_guard)

Browse Source
This commit is contained in:
Shauren
2025-11-30 14:25:32 +01:00
parent d3f2aee245
commit 90be8fafb3
23 changed files with 92 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/database/Database/Transaction.cpp
View File

@@ -24,7 +24,7 @@
#include <mysqld_error.h>
#include <sstream>
#include <thread>
#include <cstring>
#include <utility>
std::mutex TransactionTask::_deadlockLock;
@@ -73,7 +73,7 @@ bool TransactionTask::Execute(MySQLConnection* conn, std::shared_ptr<Transaction
}();
// Make sure only 1 async thread retries a transaction so they don't keep dead-locking each other
std::lock_guard<std::mutex> lock(_deadlockLock);
std::scoped_lock lock(_deadlockLock);
for (uint32 loopDuration = 0, startMSTime = getMSTime(); loopDuration <= DEADLOCK_MAX_RETRY_TIME_MS; loopDuration = GetMSTimeDiffToNow(startMSTime))
{
@@ -94,7 +94,7 @@ bool TransactionTask::Execute(MySQLConnection* conn, std::shared_ptr<Transaction
int TransactionTask::TryExecute(MySQLConnection* conn, std::shared_ptr<TransactionBase> trans)
{
return conn->ExecuteTransaction(trans);
return conn->ExecuteTransaction(std::move(trans));
}
bool TransactionCallback::InvokeIfReady()