Core/DBLayer: Convert async queries to new query callbacks and remove…
… old callback handling
This commit is contained in:
1 parent
8a63c4919e
commit
5ac5176a53
23 files changed
+569
-849
No files matched your search
@@ -24,6 +24,7 @@
|
||||
#include "Config.h"
|
||||
#include "Common.h"
|
||||
#include "DatabaseEnv.h"
|
||||
#include "QueryCallback.h"
|
||||
#include "AccountMgr.h"
|
||||
#include "Log.h"
|
||||
#include "Opcodes.h"
|
||||
@@ -140,8 +141,6 @@ WorldSession::WorldSession(uint32 id, std::string&& name, uint32 battlenetAccoun
|
||||
LoginDatabase.PExecute("UPDATE account SET online = 1 WHERE id = %u;", GetAccountId()); // One-time query
|
||||
}
|
||||
|
||||
InitializeQueryCallbackParameters();
|
||||
|
||||
_compressionStream = new z_stream();
|
||||
_compressionStream->zalloc = (alloc_func)NULL;
|
||||
_compressionStream->zfree = (free_func)NULL;
|
||||
@@ -1027,108 +1026,16 @@ void WorldSession::SetPlayer(Player* player)
|
||||
m_GUIDLow = _player->GetGUID().GetCounter();
|
||||
}
|
||||
|
||||
void WorldSession::InitializeQueryCallbackParameters()
|
||||
{
|
||||
// Callback parameters that have pointers in them should be properly
|
||||
// initialized to NULL here.
|
||||
_charCreateCallback.SetParam(NULL);
|
||||
}
|
||||
|
||||
void WorldSession::ProcessQueryCallbacks()
|
||||
{
|
||||
PreparedQueryResult result;
|
||||
_queryProcessor.ProcessReadyQueries();
|
||||
|
||||
if (_realmAccountLoginCallback.valid() && _realmAccountLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
|
||||
InitializeSessionCallback(_realmAccountLoginCallback.get());
|
||||
|
||||
//! HandleCharEnumOpcode
|
||||
if (_charEnumCallback.valid() && _charEnumCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
|
||||
{
|
||||
result = _charEnumCallback.get();
|
||||
HandleCharEnum(result);
|
||||
}
|
||||
|
||||
if (_charCreateCallback.IsReady())
|
||||
{
|
||||
_charCreateCallback.GetResult(result);
|
||||
HandleCharCreateCallback(result, _charCreateCallback.GetParam());
|
||||
}
|
||||
|
||||
//! HandlePlayerLoginOpcode
|
||||
if (_charLoginCallback.valid() && _charLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
|
||||
{
|
||||
SQLQueryHolder* param = _charLoginCallback.get();
|
||||
HandlePlayerLogin((LoginQueryHolder*)param);
|
||||
}
|
||||
|
||||
//! HandleAddFriendOpcode
|
||||
if (_addFriendCallback.IsReady())
|
||||
{
|
||||
std::string param = _addFriendCallback.GetParam();
|
||||
_addFriendCallback.GetResult(result);
|
||||
HandleAddFriendOpcodeCallback(result, param);
|
||||
_addFriendCallback.FreeResult();
|
||||
}
|
||||
|
||||
//- HandleCharRenameOpcode
|
||||
if (_charRenameCallback.IsReady())
|
||||
{
|
||||
_charRenameCallback.GetResult(result);
|
||||
CharacterRenameInfo* renameInfo = _charRenameCallback.GetParam();
|
||||
HandleChangePlayerNameOpcodeCallBack(result, renameInfo);
|
||||
delete renameInfo;
|
||||
_charRenameCallback.Reset();
|
||||
}
|
||||
|
||||
//- HandleCharAddIgnoreOpcode
|
||||
if (_addIgnoreCallback.valid() && _addIgnoreCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
|
||||
{
|
||||
result = _addIgnoreCallback.get();
|
||||
HandleAddIgnoreOpcodeCallback(result);
|
||||
}
|
||||
|
||||
//- SendStabledPet
|
||||
if (_sendStabledPetCallback.IsReady())
|
||||
{
|
||||
ObjectGuid param = _sendStabledPetCallback.GetParam();
|
||||
_sendStabledPetCallback.GetResult(result);
|
||||
SendStablePetCallback(result, param);
|
||||
_sendStabledPetCallback.FreeResult();
|
||||
}
|
||||
|
||||
//- HandleStablePet
|
||||
if (_stablePetCallback.valid() && _stablePetCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
|
||||
{
|
||||
result = _stablePetCallback.get();
|
||||
HandleStablePetCallback(result);
|
||||
}
|
||||
|
||||
//- HandleUnstablePet
|
||||
if (_unstablePetCallback.IsReady())
|
||||
{
|
||||
uint32 param = _unstablePetCallback.GetParam();
|
||||
_unstablePetCallback.GetResult(result);
|
||||
HandleUnstablePetCallback(result, param);
|
||||
_unstablePetCallback.FreeResult();
|
||||
}
|
||||
|
||||
//- HandleStableSwapPet
|
||||
if (_stableSwapCallback.IsReady())
|
||||
{
|
||||
uint32 param = _stableSwapCallback.GetParam();
|
||||
_stableSwapCallback.GetResult(result);
|
||||
HandleStableSwapPetCallback(result, param);
|
||||
_stableSwapCallback.FreeResult();
|
||||
}
|
||||
|
||||
//- HandleRenameGuild
|
||||
if(_guildRenameCallback.IsReady())
|
||||
{
|
||||
std::string param = _guildRenameCallback.GetParam();
|
||||
_guildRenameCallback.GetResult(result);
|
||||
HandleGuildRenameCallback(param);
|
||||
_guildRenameCallback.FreeResult();
|
||||
}
|
||||
HandlePlayerLogin(reinterpret_cast<LoginQueryHolder*>(_charLoginCallback.get()));
|
||||
}
|
||||
|
||||
void WorldSession::InitWarden(BigNumber* k, std::string const& os)
|
||||
@@ -1155,7 +1062,7 @@ void WorldSession::LoadPermissions()
|
||||
_RBACData->LoadFromDB();
|
||||
}
|
||||
|
||||
PreparedQueryResultFuture WorldSession::LoadPermissionsAsync()
|
||||
QueryCallback WorldSession::LoadPermissionsAsync()
|
||||
{
|
||||
uint32 id = GetAccountId();
|
||||
uint8 secLevel = GetSecurity();
|
||||
|
||||
Reference in new issue
Block a user