mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-14 05:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

ncm: More content manager improvements

Browse Source
This commit is contained in:
Adubbz 2020-02-29 00:22:50 +11:00
parent 29687b5300
commit 60757f180e
1 changed files with 96 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
stratosphere/ncm/source/impl/ncm_content_manager.cpp
View File

@ -165,7 +165,7 @@ namespace ams::ncm::impl {
return id != StorageId::None && id != StorageId::Any; return id != StorageId::None && id != StorageId::Any;
} }
inline Result FindContentStorageRoot(ContentStorageRoot **out, StorageId storage_id) { Result FindContentStorageRoot(ContentStorageRoot **out, StorageId storage_id) {
for (size_t i = 0; i < MaxContentStorageEntries; i++) { for (size_t i = 0; i < MaxContentStorageEntries; i++) {
ContentStorageRoot* root = &g_content_storage_roots[i]; ContentStorageRoot* root = &g_content_storage_roots[i];
@ -183,7 +183,7 @@ namespace ams::ncm::impl {
return FindContentStorageRoot(out, storage_id); return FindContentStorageRoot(out, storage_id);
} }
inline Result FindContentMetaDatabaseEntry(ContentMetaDatabaseEntry **out, StorageId storage_id) { Result FindContentMetaDatabaseEntry(ContentMetaDatabaseEntry **out, StorageId storage_id) {
for (size_t i = 0; i < MaxContentMetaDatabaseEntries; i++) { for (size_t i = 0; i < MaxContentMetaDatabaseEntries; i++) {
ContentMetaDatabaseEntry* entry = &g_content_meta_entries[i]; ContentMetaDatabaseEntry* entry = &g_content_meta_entries[i];
@ -201,6 +201,46 @@ namespace ams::ncm::impl {
return FindContentMetaDatabaseEntry(out, storage_id); return FindContentMetaDatabaseEntry(out, storage_id);
} }
inline Result GetContentStorageNotActiveResult(StorageId storage_id) {
switch (storage_id) {
case StorageId::GameCard:
return ResultGameCardContentStorageNotActive();
case StorageId::BuiltInSystem:
return ResultNandSystemContentStorageNotActive();
case StorageId::BuiltInUser:
return ResultNandUserContentStorageNotActive();
case StorageId::SdCard:
return ResultSdCardContentStorageNotActive();
default:
return ResultUnknownContentStorageNotActive();
}
}
inline Result GetContentMetaDatabaseNotActiveResult(StorageId storage_id) {
switch (storage_id) {
case StorageId::GameCard:
return ResultGameCardContentMetaDatabaseNotActive();
case StorageId::BuiltInSystem:
return ResultNandSystemContentMetaDatabaseNotActive();
case StorageId::BuiltInUser:
return ResultNandUserContentMetaDatabaseNotActive();
case StorageId::SdCard:
return ResultSdCardContentMetaDatabaseNotActive();
default:
return ResultUnknownContentMetaDatabaseNotActive();
}
}
Result EnsureAndMountSystemSaveData(const char *mount_name, const SaveDataMeta &save_meta) {
R_TRY_CATCH(fs::MountSystemSaveData(mount_name, save_meta.space_id, save_meta.id)) {
R_CATCH(ams::fs::ResultTargetNotFound) {
R_TRY(fsCreate_SystemSaveData(save_meta.space_id, save_meta.id, save_meta.size, save_meta.journal_size, save_meta.flags));
R_TRY(fs::MountSystemSaveData(mount_name, save_meta.space_id, save_meta.id));
}
} R_END_TRY_CATCH;
return ResultSuccess();
}
} }
Result InitializeContentManager() { Result InitializeContentManager() {
@ -315,11 +355,9 @@ namespace ams::ncm::impl {
char mount_root[128] = {0}; char mount_root[128] = {0};
strcpy(mount_root, mount_name.name); strcpy(mount_root, mount_name.name);
strcat(mount_root, strchr(root->root_path, ':')); strcat(mount_root, strchr(root->root_path, ':'));
R_TRY(fs::MountContentStorage(mount_name.name, root->content_storage_id));
ON_SCOPE_EXIT { R_TRY(fs::MountContentStorage(mount_name.name, root->content_storage_id));
fs::Unmount(mount_name.name); ON_SCOPE_EXIT { fs::Unmount(mount_name.name); };
};
R_TRY(fs::CheckContentStorageDirectoriesExist(mount_root)); R_TRY(fs::CheckContentStorageDirectoriesExist(mount_root));
@ -334,30 +372,15 @@ namespace ams::ncm::impl {
auto content_storage = root->content_storage; auto content_storage = root->content_storage;
if (!content_storage) { if (hos::GetVersion() >= hos::Version_200) {
R_UNLESS(content_storage, GetContentStorageNotActiveResult(storage_id));
} else {
/* 1.0.0 activates content storages as soon as they are opened. */ /* 1.0.0 activates content storages as soon as they are opened. */
if (hos::GetVersion() == hos::Version_100) { if (!content_storage) {
R_TRY(ActivateContentStorage(storage_id)); R_TRY(ActivateContentStorage(storage_id));
content_storage = root->content_storage; content_storage = root->content_storage;
} else {
switch (storage_id) {
case StorageId::GameCard:
return ResultGameCardContentStorageNotActive();
case StorageId::BuiltInSystem:
return ResultNandSystemContentStorageNotActive();
case StorageId::BuiltInUser:
return ResultNandUserContentStorageNotActive();
case StorageId::SdCard:
return ResultSdCardContentStorageNotActive();
default:
return ResultUnknownContentStorageNotActive();
}
} }
} }
*out = std::move(content_storage); *out = std::move(content_storage);
return ResultSuccess(); return ResultSuccess();
@ -369,12 +392,14 @@ namespace ams::ncm::impl {
R_UNLESS(storage_id != StorageId::None, ncm::ResultUnknownStorage()); R_UNLESS(storage_id != StorageId::None, ncm::ResultUnknownStorage());
ContentStorageRoot* root; ContentStorageRoot* root;
R_TRY(FindContentStorageRoot(std::addressof(root), storage_id)); R_TRY(FindContentStorageRoot(std::addressof(root), storage_id));
R_UNLESS(root->content_storage, ResultSuccess());
/* N doesn't bother checking the result of this */ if (root->content_storage) {
root->content_storage->DisableForcibly(); /* N doesn't bother checking the result of this */
fs::Unmount(root->mount_point); root->content_storage->DisableForcibly();
root->content_storage = nullptr; fs::Unmount(root->mount_point);
root->content_storage = nullptr;
}
return ResultSuccess(); return ResultSuccess();
} }
@ -391,15 +416,17 @@ namespace ams::ncm::impl {
FsGameCardHandle gc_hnd; FsGameCardHandle gc_hnd;
R_TRY(fs::GetGameCardHandle(&gc_hnd)); R_TRY(fs::GetGameCardHandle(&gc_hnd));
R_TRY(fs::MountGameCardPartition(root->mount_point, gc_hnd, FsGameCardPartition_Secure)); R_TRY(fs::MountGameCardPartition(root->mount_point, gc_hnd, FsGameCardPartition_Secure));
auto mount_guard = SCOPE_GUARD { fs::Unmount(root->mount_point); };
auto content_storage = std::make_shared<ReadOnlyContentStorageInterface>();
R_TRY(content_storage->Initialize(root->root_path, path::MakeContentPathFlat));
root->content_storage = std::move(content_storage);
mount_guard.Cancel();
} else { } else {
R_TRY(fs::MountContentStorage(root->mount_point, root->content_storage_id)); R_TRY(fs::MountContentStorage(root->mount_point, root->content_storage_id));
auto mount_guard = SCOPE_GUARD { fs::Unmount(root->mount_point); }; }
auto mount_guard = SCOPE_GUARD { fs::Unmount(root->mount_point); };
if (storage_id == StorageId::GameCard) {
auto content_storage = std::make_shared<ReadOnlyContentStorageInterface>();
R_TRY(content_storage->Initialize(root->root_path, path::MakeContentPathFlat));
root->content_storage = std::move(content_storage);
} else {
MakeContentPathFunc content_path_func = nullptr; MakeContentPathFunc content_path_func = nullptr;
MakePlaceHolderPathFunc placeholder_path_func = nullptr; MakePlaceHolderPathFunc placeholder_path_func = nullptr;
bool delay_flush = false; bool delay_flush = false;
@ -410,7 +437,6 @@ namespace ams::ncm::impl {
content_path_func = path::MakeContentPathFlat; content_path_func = path::MakeContentPathFlat;
placeholder_path_func = path::MakePlaceHolderPathFlat; placeholder_path_func = path::MakePlaceHolderPathFlat;
break; break;
case StorageId::SdCard: case StorageId::SdCard:
delay_flush = true; delay_flush = true;
default: default:
@ -421,9 +447,9 @@ namespace ams::ncm::impl {
R_TRY(content_storage->Initialize(root->root_path, content_path_func, placeholder_path_func, delay_flush, &g_rights_id_cache)); R_TRY(content_storage->Initialize(root->root_path, content_path_func, placeholder_path_func, delay_flush, &g_rights_id_cache));
root->content_storage = std::move(content_storage); root->content_storage = std::move(content_storage);
mount_guard.Cancel();
} }
mount_guard.Cancel();
return ResultSuccess(); return ResultSuccess();
} }
@ -452,16 +478,8 @@ namespace ams::ncm::impl {
/* N doesn't bother checking the result of this. */ /* N doesn't bother checking the result of this. */
fsDisableAutoSaveDataCreation(); fsDisableAutoSaveDataCreation();
R_TRY_CATCH(fs::MountSystemSaveData(entry->mount_point, entry->save_meta.space_id, entry->save_meta.id)) { R_TRY(EnsureAndMountSystemSaveData(entry->mount_point, entry->save_meta));
R_CATCH(ams::fs::ResultTargetNotFound) { ON_SCOPE_EXIT { fs::Unmount(entry->mount_point); };
R_TRY(fsCreate_SystemSaveData(entry->save_meta.space_id, entry->save_meta.id, entry->save_meta.size, entry->save_meta.journal_size, entry->save_meta.flags));
R_TRY(fs::MountSystemSaveData(entry->mount_point, entry->save_meta.space_id, entry->save_meta.id));
}
} R_END_TRY_CATCH;
ON_SCOPE_EXIT {
fs::Unmount(entry->mount_point);
};
R_TRY(fs::EnsureDirectoryRecursively(entry->meta_path)); R_TRY(fs::EnsureDirectoryRecursively(entry->meta_path));
R_TRY(fsdevCommitDevice(entry->mount_point)); R_TRY(fsdevCommitDevice(entry->mount_point));
@ -476,18 +494,13 @@ namespace ams::ncm::impl {
ContentMetaDatabaseEntry* entry; ContentMetaDatabaseEntry* entry;
R_TRY(GetUniqueContentMetaDatabaseEntry(&entry, storage_id)); R_TRY(GetUniqueContentMetaDatabaseEntry(&entry, storage_id));
bool mounted_save_data = false; auto mount_guard = SCOPE_GUARD { fs::Unmount(entry->mount_point); };
if (!entry->content_meta_database) { if (!entry->content_meta_database) {
R_TRY(fs::MountSystemSaveData(entry->mount_point, entry->save_meta.space_id, entry->save_meta.id)); R_TRY(fs::MountSystemSaveData(entry->mount_point, entry->save_meta.space_id, entry->save_meta.id));
mounted_save_data = true; } else {
mount_guard.Cancel();
} }
ON_SCOPE_EXIT {
if (mounted_save_data) {
fs::Unmount(entry->mount_point);
}
};
bool has_meta_path = false; bool has_meta_path = false;
R_TRY(fs::HasDirectory(&has_meta_path, entry->meta_path)); R_TRY(fs::HasDirectory(&has_meta_path, entry->meta_path));
R_UNLESS(has_meta_path, ncm::ResultInvalidContentMetaDatabase()); R_UNLESS(has_meta_path, ncm::ResultInvalidContentMetaDatabase());
@ -503,30 +516,15 @@ namespace ams::ncm::impl {
auto content_meta_db = entry->content_meta_database; auto content_meta_db = entry->content_meta_database;
if (!content_meta_db) { if (hos::GetVersion() >= hos::Version_200) {
/* 1.0.0 activates content meta dbs as soon as they are opened. */ R_UNLESS(content_meta_db, GetContentMetaDatabaseNotActiveResult(storage_id));
if (hos::GetVersion() == hos::Version_100) { } else {
/* 1.0.0 activates content meta databases as soon as they are opened. */
if (!content_meta_db) {
R_TRY(ActivateContentMetaDatabase(storage_id)); R_TRY(ActivateContentMetaDatabase(storage_id));
content_meta_db = entry->content_meta_database; content_meta_db = entry->content_meta_database;
} else {
switch (storage_id) {
case StorageId::GameCard:
return ResultGameCardContentMetaDatabaseNotActive();
case StorageId::BuiltInSystem:
return ResultNandSystemContentMetaDatabaseNotActive();
case StorageId::BuiltInUser:
return ResultNandUserContentMetaDatabaseNotActive();
case StorageId::SdCard:
return ResultSdCardContentMetaDatabaseNotActive();
default:
return ResultUnknownContentMetaDatabaseNotActive();
}
} }
} }
*out = std::move(content_meta_db); *out = std::move(content_meta_db);
return ResultSuccess(); return ResultSuccess();
@ -540,17 +538,19 @@ namespace ams::ncm::impl {
R_TRY(FindContentMetaDatabaseEntry(&entry, storage_id)); R_TRY(FindContentMetaDatabaseEntry(&entry, storage_id));
auto content_meta_db = entry->content_meta_database; auto content_meta_db = entry->content_meta_database;
R_UNLESS(content_meta_db, ResultSuccess());
/* N doesn't bother checking the result of this */ if (content_meta_db) {
content_meta_db->DisableForcibly(); /* N doesn't bother checking the result of this */
content_meta_db->DisableForcibly();
if (storage_id != StorageId::GameCard) { if (storage_id != StorageId::GameCard) {
fs::Unmount(entry->mount_point); fs::Unmount(entry->mount_point);
}
entry->content_meta_database = nullptr;
entry->kvs = std::nullopt;
} }
entry->content_meta_database = nullptr;
entry->kvs.reset();
return ResultSuccess(); return ResultSuccess();
} }
@ -581,15 +581,12 @@ namespace ams::ncm::impl {
auto mount_guard = SCOPE_GUARD { fs::Unmount(entry->mount_point); }; auto mount_guard = SCOPE_GUARD { fs::Unmount(entry->mount_point); };
R_TRY(entry->kvs->Initialize(entry->meta_path, entry->max_content_metas)); R_TRY(entry->kvs->Initialize(entry->meta_path, entry->max_content_metas));
R_TRY(entry->kvs->Load()); R_TRY(entry->kvs->Load());
entry->content_meta_database = std::make_shared<ContentMetaDatabaseInterface>(std::addressof(*entry->kvs), entry->mount_point);
auto content_meta_database = std::make_shared<ContentMetaDatabaseInterface>(&*entry->kvs, entry->mount_point);
entry->content_meta_database = std::move(content_meta_database);
mount_guard.Cancel(); mount_guard.Cancel();
} else { } else {
R_TRY(entry->kvs->Initialize(entry->max_content_metas)); R_TRY(entry->kvs->Initialize(entry->max_content_metas));
R_TRY(entry->kvs->Load()); R_TRY(entry->kvs->Load());
auto content_meta_database = std::make_shared<OnMemoryContentMetaDatabaseInterface>(&*entry->kvs); entry->content_meta_database = std::make_shared<OnMemoryContentMetaDatabaseInterface>(std::addressof(*entry->kvs));
entry->content_meta_database = std::move(content_meta_database);
} }
return ResultSuccess(); return ResultSuccess();
@ -602,15 +599,15 @@ namespace ams::ncm::impl {
R_TRY(GetUniqueContentMetaDatabaseEntry(&entry, storage_id)); R_TRY(GetUniqueContentMetaDatabaseEntry(&entry, storage_id));
/* Already inactivated. */ /* Already inactivated. */
R_UNLESS(entry->content_meta_database != nullptr, ResultSuccess()); if (entry->content_meta_database != nullptr) {
entry->content_meta_database->DisableForcibly();
entry->content_meta_database = nullptr;
/* This should lead to Index's destructor performing cleanup for us. */
entry->kvs = std::nullopt;
entry->content_meta_database->DisableForcibly(); if (storage_id != StorageId::GameCard) {
entry->content_meta_database = nullptr; fs::Unmount(entry->mount_point);
/* This should lead to Index's destructor performing cleanup for us. */ }
entry->kvs.reset();
if (storage_id != StorageId::GameCard) {
fs::Unmount(entry->mount_point);
} }
return ResultSuccess(); return ResultSuccess();