zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly state whenever unloading zones in linker

Browse Source
This commit is contained in:
Jan 2022-04-16 16:42:33 +02:00
parent 4a03efe636
commit 2108737f22
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Linker/Linker.cpp
View File

@ -50,6 +50,7 @@ class Linker::Impl
SearchPaths m_asset_search_paths; SearchPaths m_asset_search_paths;
SearchPaths m_gdt_search_paths; SearchPaths m_gdt_search_paths;
SearchPaths m_source_search_paths; SearchPaths m_source_search_paths;
std::vector<std::unique_ptr<Zone>> m_loaded_zones;
/** /**
* \brief Loads a search path. * \brief Loads a search path.
@ -453,7 +454,7 @@ class Linker::Impl
if (!stream.is_open()) if (!stream.is_open())
return false; return false;
if(!ZoneWriting::WriteZone(stream, zone)) if (!ZoneWriting::WriteZone(stream, zone))
{ {
std::cout << "Writing zone failed." << std::endl; std::cout << "Writing zone failed." << std::endl;
stream.close(); stream.close();
@ -488,23 +489,8 @@ class Linker::Impl
return result; return result;
} }
public: bool LoadZones()
Impl()
= default;
/**
* \copydoc Linker::Start
*/
bool Start(const int argc, const char** argv)
{ {
if (!m_args.ParseArgs(argc, argv))
return false;
if (!BuildZoneIndependentSearchPaths())
return false;
std::vector<std::unique_ptr<Zone>> zones;
for (const auto& zonePath : m_args.m_zones_to_load) for (const auto& zonePath : m_args.m_zones_to_load)
{ {
if (!fs::is_regular_file(zonePath)) if (!fs::is_regular_file(zonePath))
@ -527,9 +513,45 @@ public:
printf("Loaded zone \"%s\"\n", zone->m_name.c_str()); printf("Loaded zone \"%s\"\n", zone->m_name.c_str());
} }
zones.emplace_back(std::move(zone)); m_loaded_zones.emplace_back(std::move(zone));
} }
return true;
}
void UnloadZones()
{
for (auto i = m_loaded_zones.rbegin(); i != m_loaded_zones.rend(); ++i)
{
auto& loadedZone = *i;
std::string zoneName = loadedZone->m_name;
loadedZone.reset();
if (m_args.m_verbose)
std::cout << "Unloaded zone \"" << zoneName << "\"\n";
}
m_loaded_zones.clear();
}
public:
Impl()
= default;
/**
* \copydoc Linker::Start
*/
bool Start(const int argc, const char** argv)
{
if (!m_args.ParseArgs(argc, argv))
return false;
if (!BuildZoneIndependentSearchPaths())
return false;
if (!LoadZones())
return false;
auto result = true; auto result = true;
for (const auto& zone : m_args.m_zones_to_build) for (const auto& zone : m_args.m_zones_to_build)
{ {
@ -540,7 +562,7 @@ public:
} }
} }
zones.clear(); UnloadZones();
return result; return result;
} }