Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[AssetHandler] Controll bypass for each thread individually

Browse Source
This commit is contained in:
momo5502 2016-12-19 20:55:38 +01:00
parent bac3f4cd44
commit 28767e9b56
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Components/Modules/AssetHandler.cpp
View File

@ -2,8 +2,8 @@
namespace Components namespace Components
{ {
bool AssetHandler::BypassState = false;
std::recursive_mutex AssetHandler::BypassMutex; std::recursive_mutex AssetHandler::BypassMutex;
std::vector<std::thread::id> AssetHandler::BypassThreads;
std::map<Game::XAssetType, AssetHandler::IAsset*> AssetHandler::AssetInterfaces; std::map<Game::XAssetType, AssetHandler::IAsset*> AssetHandler::AssetInterfaces;
std::map<Game::XAssetType, wink::slot<AssetHandler::Callback>> AssetHandler::TypeCallbacks; std::map<Game::XAssetType, wink::slot<AssetHandler::Callback>> AssetHandler::TypeCallbacks;
wink::signal<wink::slot<AssetHandler::RestrictCallback>> AssetHandler::RestrictSignal; wink::signal<wink::slot<AssetHandler::RestrictCallback>> AssetHandler::RestrictSignal;
@ -55,10 +55,8 @@ namespace Components
if (filename) if (filename)
{ {
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
// Allow call DB_FindXAssetHeader within the hook // Allow call DB_FindXAssetHeader within the hook
AssetHandler::BypassState = true; AssetHandler::SetThreadBypass();
if (AssetHandler::TypeCallbacks.find(type) != AssetHandler::TypeCallbacks.end()) if (AssetHandler::TypeCallbacks.find(type) != AssetHandler::TypeCallbacks.end())
{ {
@ -66,12 +64,43 @@ namespace Components
} }
// Disallow calling DB_FindXAssetHeader ;) // Disallow calling DB_FindXAssetHeader ;)
AssetHandler::BypassState = false; AssetHandler::ClearThreadBypass();
} }
return header; return header;
} }
int AssetHandler::HasThreadBypass()
{
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
return (std::find(AssetHandler::BypassThreads.begin(), AssetHandler::BypassThreads.end(), std::this_thread::get_id()) != AssetHandler::BypassThreads.end()) & 1;
}
void AssetHandler::SetThreadBypass()
{
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
if (!AssetHandler::HasThreadBypass())
{
AssetHandler::BypassThreads.push_back(std::this_thread::get_id());
}
}
void AssetHandler::ClearThreadBypass()
{
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
while (AssetHandler::HasThreadBypass())
{
auto i = std::find(AssetHandler::BypassThreads.begin(), AssetHandler::BypassThreads.end(), std::this_thread::get_id());
if (i != AssetHandler::BypassThreads.end())
{
AssetHandler::BypassThreads.erase(i);
}
}
}
__declspec(naked) void AssetHandler::FindAssetStub() __declspec(naked) void AssetHandler::FindAssetStub()
{ {
__asm __asm
@ -83,8 +112,7 @@ namespace Components
push edi push edi
// Check if custom handler should be bypassed // Check if custom handler should be bypassed
xor eax, eax call AssetHandler::HasThreadBypass
mov al, AssetHandler::BypassState
test al, al test al, al
jnz finishOriginal jnz finishOriginal
@ -313,11 +341,11 @@ namespace Components
{ {
std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex); std::lock_guard<std::recursive_mutex> _(AssetHandler::BypassMutex);
bool originalState = AssetHandler::BypassState; int originalState = AssetHandler::HasThreadBypass();
AssetHandler::BypassState = true; AssetHandler::SetThreadBypass();
Game::XAssetHeader header = Game::DB_FindXAssetHeader(type, filename); Game::XAssetHeader header = Game::DB_FindXAssetHeader(type, filename);
if(!originalState) AssetHandler::BypassState = false; if (!originalState) AssetHandler::ClearThreadBypass();
return header; return header;
} }

6
src/Components/Modules/AssetHandler.hpp
View File

@ -40,8 +40,8 @@ namespace Components
static void StoreTemporaryAsset(Game::XAssetType type, Game::XAssetHeader asset); static void StoreTemporaryAsset(Game::XAssetType type, Game::XAssetHeader asset);
private: private:
static bool BypassState;
static std::recursive_mutex BypassMutex; static std::recursive_mutex BypassMutex;
static std::vector<std::thread::id> BypassThreads;
static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT]; static std::map<std::string, Game::XAssetHeader> TemporaryAssets[Game::XAssetType::ASSET_TYPE_COUNT];
@ -66,6 +66,10 @@ namespace Components
static void StoreEmptyAssetStub(); static void StoreEmptyAssetStub();
static void ModifyAsset(Game::XAssetType type, Game::XAssetHeader asset, std::string name); static void ModifyAsset(Game::XAssetType type, Game::XAssetHeader asset, std::string name);
static int HasThreadBypass();
static void SetThreadBypass();
static void ClearThreadBypass();
}; };
} }