The-Homebrew-Cloud/WiiUPluginLoaderBackend
2
0
Fork 0
mirror of https://github.com/wiiu-env/WiiUPluginLoaderBackend.git synced 2024-11-05 20:45:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

StorageAPI: Store root item not inside a shared_ptr

Browse Source
This commit is contained in:
Maschell 2024-03-23 08:00:28 +01:00
parent 8b215a5ea7
commit f88e72a387
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/utils/storage/StorageUtils.cpp
View File

@ -11,7 +11,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
namespace StorageUtils { namespace StorageUtils {
std::forward_list<std::shared_ptr<StorageItemRoot>> gStorage; std::forward_list<StorageItemRoot> gStorage;
std::mutex gStorageMutex; std::mutex gStorageMutex;
namespace Helper { namespace Helper {
@ -152,9 +152,9 @@ namespace StorageUtils {
} }
static StorageItemRoot *getRootItem(wups_storage_root_item root) { static StorageItemRoot *getRootItem(wups_storage_root_item root) {
for (const auto &cur : gStorage) { for (auto &cur : gStorage) {
if (cur->getHandle() == (uint32_t) root) { if (cur.getHandle() == (uint32_t) root) {
return cur.get(); return &cur;
} }
} }
@ -212,15 +212,15 @@ namespace StorageUtils {
storage = make_unique_nothrow<StorageItemRoot>(plugin_id); storage = make_unique_nothrow<StorageItemRoot>(plugin_id);
} }
} }
rootItem = *storage; rootItem = std::move(*storage);
return WUPS_STORAGE_ERROR_SUCCESS; return WUPS_STORAGE_ERROR_SUCCESS;
} }
static WUPSStorageError WriteStorageToSD(wups_storage_root_item root, bool forceSave) { static WUPSStorageError WriteStorageToSD(wups_storage_root_item root, bool forceSave) {
std::shared_ptr<StorageItemRoot> rootItem; const StorageItemRoot *rootItem = nullptr;
for (const auto &cur : gStorage) { for (const auto &cur : gStorage) {
if (cur->getHandle() == (uint32_t) root) { if (cur.getHandle() == (uint32_t) root) {
rootItem = cur; rootItem = &cur;
break; break;
} }
} }
@ -272,7 +272,7 @@ namespace StorageUtils {
} }
static StorageItem *createOrGetItem(wups_storage_root_item root, wups_storage_item parent, const char *key, WUPSStorageError &error) { static StorageItem *createOrGetItem(wups_storage_root_item root, wups_storage_item parent, const char *key, WUPSStorageError &error) {
const auto subItem = getSubItem(root, parent); auto subItem = getSubItem(root, parent);
if (!subItem) { if (!subItem) {
error = WUPS_STORAGE_ERROR_NOT_FOUND; error = WUPS_STORAGE_ERROR_NOT_FOUND;
return {}; return {};
@ -400,21 +400,18 @@ namespace StorageUtils {
namespace API { namespace API {
namespace Internal { namespace Internal {
WUPSStorageError OpenStorage(std::string_view plugin_id, wups_storage_root_item &outItem) { WUPSStorageError OpenStorage(std::string_view plugin_id, wups_storage_root_item &outItem) {
std::unique_ptr<StorageItemRoot> root = make_unique_nothrow<StorageItemRoot>(plugin_id); StorageItemRoot root(plugin_id);
if (!root) {
return WUPS_STORAGE_ERROR_MALLOC_FAILED;
}
WUPSStorageError err = Helper::LoadFromFile(plugin_id, *root); WUPSStorageError err = Helper::LoadFromFile(plugin_id, root);
if (err == WUPS_STORAGE_ERROR_NOT_FOUND) { if (err == WUPS_STORAGE_ERROR_NOT_FOUND) {
// Create new clean StorageItemRoot if no existing storage was found // Create new clean StorageItemRoot if no existing storage was found
root = make_unique_nothrow<StorageItemRoot>(plugin_id); root = StorageItemRoot(plugin_id);
} else if (err != WUPS_STORAGE_ERROR_SUCCESS) { } else if (err != WUPS_STORAGE_ERROR_SUCCESS) {
// Return on any other error // Return on any other error
return err; return err;
} }
outItem = (wups_storage_root_item) root->getHandle(); outItem = (wups_storage_root_item) root.getHandle();
{ {
std::lock_guard lock(gStorageMutex); std::lock_guard lock(gStorageMutex);
gStorage.push_front(std::move(root)); gStorage.push_front(std::move(root));
@ -429,7 +426,7 @@ namespace StorageUtils {
auto res = StorageUtils::Helper::WriteStorageToSD(root, false); auto res = StorageUtils::Helper::WriteStorageToSD(root, false);
// TODO: handle write error? // TODO: handle write error?
if (!remove_locked_first_if(gStorageMutex, gStorage, [root](auto &cur) { return cur->getHandle() == (uint32_t) root; })) { if (!remove_locked_first_if(gStorageMutex, gStorage, [root](auto &cur) { return cur.getHandle() == (uint32_t) root; })) {
DEBUG_FUNCTION_LINE_WARN("Failed to close storage: Not opened (\"%08X\")", root); DEBUG_FUNCTION_LINE_WARN("Failed to close storage: Not opened (\"%08X\")", root);
return WUPS_STORAGE_ERROR_NOT_FOUND; return WUPS_STORAGE_ERROR_NOT_FOUND;
} }