mirror of
https://github.com/Atmosphere-NX/Atmosphere-libs.git
synced 2025-06-27 13:32:43 +02:00
* Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commit d6ff261fcc8c1f26968e894b02c17a01a12ec98b. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit 168447d80e9640768fb1b43f04a385507c1bb5ab. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commit d6ff261fcc8c1f26968e894b02c17a01a12ec98b. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit 168447d80e9640768fb1b43f04a385507c1bb5ab. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Updated AddOnContentLocationResolver and RegisteredLocationResolver to 9.0.0 * Finished updating lr to 9.0.0 * Updated NCM to 9.0.0 * Fix libstrat includes * Fixed application launching * title_id_2 -> owner_tid * Updated to new-ipc * Change to using pure virtuals * Title Id -> Program Id * Fixed compilation against master * std::scoped_lock<> -> std::scoped_lock * Adopted R_UNLESS and R_CONVERT * Prefix namespace to Results * Adopt std::numeric_limits * Fixed incorrect error handling in ReadFile * Adopted AMS_ABORT_UNLESS * Adopt util::GenerateUuid() * Syntax improvements * ncm_types: Address review * Address more review comments * Updated copyrights * Address more feedback * More feedback addressed * More changes * Move dispatch tables out of interface files * Addressed remaining comments * lr: move into libstratosphere * ncm: Fix logic inversion * lr: Add comments * lr: Remove whitespace * ncm: Start addressing feedback * ncm: Cleanup InitializeContentManager * lr: support client-side usage * lr_service -> lr_api * ncm: Begin refactoring content manager * ncm: More content manager improvements * ncm: Content manager mount improvements * ldr: use lr bindings * lr bindings usage: minor fixes * ncm/lr: Pointer placement * ncm: placeholder accessor cleanup * ncm: minor fixes * ncm: refactor rights cache * ncm: content meta database cleanup * ncm: move content meta database impl out of interface file * ncm: Use const ContentMetaKey & * ncm: fix other non-const ContentMetaKey references * ncm: content meta database cleanup * ncm: content storage fixes for 2.0.0 * ncm: add missing end of file newlines * ncm: implement ContentMetaReader * ncm: client-side api * ncm: trim trailing spaces * ncm: FS_MAX_PATH-1 -> fs::EntryNameLengthMax * ncm: Use PathString and Path * fs: implement accessor wrappers for ncm * fs: implement user fs wrappers * fs: add MountSdCard * ncm: move to content manager impl * ncm: fix up main * kvdb: use fs:: * fs: Add wrappers needed for ncm * ncm: use fs bindings, other refactoring * ncm: minor fixes * fsa: fix ReadFile without size output * fs: add substorage, rom path tool * ncm: fix dangling fsdev usage * fs: fix bug in Commit * fs: fixed incorrect mode check * fs: implement Mount(System)Data * ncm: don't delete hos * results: add R_SUCCEED_IF * ams-except-ncm: use R_SUCCEED_IF * ncm: added comments * ncm: fix api definitions * ncm: use R_SUCCEED_IF * pm: think of the savings * ncm: employ kernel strats * ncm: Nintendo has 5 MiB of heap. Give ourselves 4 to be safe, pending analysis * ncm: refactor IDs, split types header into many headers * ams.mitm: use fs bindings instead of stdio * fs: SystemData uses SystemDataId * ncm: improve meta-db accuracy * ncm: inline getlatestkey * fs: improve UnsupportedOperation results * fs: modernize mount utils * ams: misc fixes for merge-errors * fs: improve unsupportedoperation results * git subrepo pull emummc subrepo: subdir: "emummc" merged: "d12dd546" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "d12dd546" git-subrepo: version: "0.4.1" origin: "???" commit: "???" * util: add boundedmap * ncm: minor style fixes * ncm: don't unmount if mounting fails * lr: bug fixes * ncm: implement ncm.for-initialize + ncm.for-safemode * lr: ncm::ProgramId::Invalid -> ncm::InvalidProgramId * ncm: fix open directory mode on 1.0.0 * ncm: fix fs use, implement more of < 4.0.0 for-initialize/safemode * ncm: implement packagedcontent -> content for building metadb * ncm: fix save data flag management * ncm: address some review suggestions (thanks @leoetlino!) * updater: use fs bindings * fs: implement MountCode * fs: prefer make_unique to operator new * ncm: implement remaining ContentMetaDatabaseBuilder functionality Co-authored-by: Michael Scire <SciresM@gmail.com>
312 lines
12 KiB
C++
312 lines
12 KiB
C++
/*
|
|
* Copyright (c) 2018-2020 Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <stratosphere.hpp>
|
|
|
|
namespace ams::kvdb {
|
|
|
|
/* Cache implementation. */
|
|
void *FileKeyValueStore::Cache::Allocate(size_t size) {
|
|
if (this->backing_buffer_size - this->backing_buffer_free_offset < size) {
|
|
return nullptr;
|
|
}
|
|
ON_SCOPE_EXIT { this->backing_buffer_free_offset += size; };
|
|
return this->backing_buffer + this->backing_buffer_free_offset;
|
|
}
|
|
|
|
Result FileKeyValueStore::Cache::Initialize(void *buffer, size_t buffer_size, size_t capacity) {
|
|
this->backing_buffer = static_cast<u8 *>(buffer);
|
|
this->backing_buffer_size = buffer_size;
|
|
this->backing_buffer_free_offset = 0;
|
|
this->entries = nullptr;
|
|
this->count = 0;
|
|
this->capacity = capacity;
|
|
|
|
/* If we have memory to work with, ensure it's at least enough for the cache entries. */
|
|
if (this->backing_buffer != nullptr) {
|
|
this->entries = static_cast<decltype(this->entries)>(this->Allocate(sizeof(*this->entries) * this->capacity));
|
|
R_UNLESS(this->entries != nullptr, ResultBufferInsufficient());
|
|
}
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
void FileKeyValueStore::Cache::Invalidate() {
|
|
if (!this->HasEntries()) {
|
|
return;
|
|
}
|
|
|
|
/* Reset the allocation pool. */
|
|
this->backing_buffer_free_offset = 0;
|
|
this->count = 0;
|
|
this->entries = static_cast<decltype(this->entries)>(this->Allocate(sizeof(*this->entries) * this->capacity));
|
|
AMS_ABORT_UNLESS(this->entries != nullptr);
|
|
}
|
|
|
|
std::optional<size_t> FileKeyValueStore::Cache::TryGet(void *out_value, size_t max_out_size, const void *key, size_t key_size) {
|
|
if (!this->HasEntries()) {
|
|
return std::nullopt;
|
|
}
|
|
|
|
/* Try to find the entry. */
|
|
for (size_t i = 0; i < this->count; i++) {
|
|
const auto &entry = this->entries[i];
|
|
if (entry.key_size == key_size && std::memcmp(entry.key, key, key_size) == 0) {
|
|
/* If we don't have enough space, fail to read from cache. */
|
|
if (max_out_size < entry.value_size) {
|
|
return std::nullopt;
|
|
}
|
|
|
|
std::memcpy(out_value, entry.value, entry.value_size);
|
|
return entry.value_size;
|
|
}
|
|
}
|
|
|
|
return std::nullopt;
|
|
}
|
|
|
|
std::optional<size_t> FileKeyValueStore::Cache::TryGetSize(const void *key, size_t key_size) {
|
|
if (!this->HasEntries()) {
|
|
return std::nullopt;
|
|
}
|
|
|
|
/* Try to find the entry. */
|
|
for (size_t i = 0; i < this->count; i++) {
|
|
const auto &entry = this->entries[i];
|
|
if (entry.key_size == key_size && std::memcmp(entry.key, key, key_size) == 0) {
|
|
return entry.value_size;
|
|
}
|
|
}
|
|
|
|
return std::nullopt;
|
|
}
|
|
|
|
void FileKeyValueStore::Cache::Set(const void *key, size_t key_size, const void *value, size_t value_size) {
|
|
if (!this->HasEntries()) {
|
|
return;
|
|
}
|
|
|
|
/* Ensure key size is small enough. */
|
|
AMS_ABORT_UNLESS(key_size <= MaxKeySize);
|
|
|
|
/* If we're at capacity, invalidate the cache. */
|
|
if (this->count == this->capacity) {
|
|
this->Invalidate();
|
|
}
|
|
|
|
/* Allocate memory for the value. */
|
|
void *value_buf = this->Allocate(value_size);
|
|
if (value_buf == nullptr) {
|
|
/* We didn't have enough memory for the value. Invalidating might get us enough memory. */
|
|
this->Invalidate();
|
|
value_buf = this->Allocate(value_size);
|
|
if (value_buf == nullptr) {
|
|
/* If we still don't have enough memory, just fail to put the value in the cache. */
|
|
return;
|
|
}
|
|
}
|
|
|
|
auto &entry = this->entries[this->count++];
|
|
std::memcpy(entry.key, key, key_size);
|
|
entry.key_size = key_size;
|
|
entry.value = value_buf;
|
|
std::memcpy(entry.value, value, value_size);
|
|
entry.value_size = value_size;
|
|
}
|
|
|
|
bool FileKeyValueStore::Cache::Contains(const void *key, size_t key_size) {
|
|
return this->TryGetSize(key, key_size).has_value();
|
|
}
|
|
|
|
/* Store functionality. */
|
|
FileKeyValueStore::Path FileKeyValueStore::GetPath(const void *_key, size_t key_size) {
|
|
/* Format is "<dir>/<hex formatted key>.val" */
|
|
FileKeyValueStore::Path key_path(this->dir_path.Get());
|
|
key_path.Append('/');
|
|
|
|
/* Append hex formatted key. */
|
|
const u8 *key = static_cast<const u8 *>(_key);
|
|
for (size_t i = 0; i < key_size; i++) {
|
|
key_path.AppendFormat("%02x", key[i]);
|
|
}
|
|
|
|
/* Append extension. */
|
|
key_path.Append(FileExtension);
|
|
|
|
return key_path;
|
|
}
|
|
|
|
Result FileKeyValueStore::GetKey(size_t *out_size, void *_out_key, size_t max_out_size, const FileKeyValueStore::FileName &file_name) {
|
|
/* Validate that the filename can be converted to a key. */
|
|
/* TODO: Nintendo does not validate that the key is valid hex. Should we do this? */
|
|
const size_t file_name_len = file_name.GetLength();
|
|
const size_t key_name_len = file_name_len - FileExtensionLength;
|
|
R_UNLESS(file_name_len >= FileExtensionLength + 2, ResultInvalidKeyValue());
|
|
R_UNLESS(file_name.EndsWith(FileExtension), ResultInvalidKeyValue());
|
|
R_UNLESS(util::IsAligned(key_name_len, 2), ResultInvalidKeyValue());
|
|
|
|
/* Validate that we have space for the converted key. */
|
|
const size_t key_size = key_name_len / 2;
|
|
R_UNLESS(key_size <= max_out_size, ResultBufferInsufficient());
|
|
|
|
/* Convert the hex key back. */
|
|
u8 *out_key = static_cast<u8 *>(_out_key);
|
|
for (size_t i = 0; i < key_size; i++) {
|
|
char substr[2 * sizeof(u8) + 1];
|
|
file_name.GetSubstring(substr, sizeof(substr), 2 * i, sizeof(substr) - 1);
|
|
out_key[i] = static_cast<u8>(std::strtoul(substr, nullptr, 0x10));
|
|
}
|
|
|
|
*out_size = key_size;
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileKeyValueStore::Initialize(const char *dir) {
|
|
return this->InitializeWithCache(dir, nullptr, 0, 0);
|
|
}
|
|
|
|
Result FileKeyValueStore::InitializeWithCache(const char *dir, void *cache_buffer, size_t cache_buffer_size, size_t cache_capacity) {
|
|
/* Ensure that the passed path is a directory. */
|
|
fs::DirectoryEntryType entry_type;
|
|
R_TRY(fs::GetEntryType(std::addressof(entry_type), dir));
|
|
R_UNLESS(entry_type == fs::DirectoryEntryType_Directory, fs::ResultPathNotFound());
|
|
|
|
/* Set path. */
|
|
this->dir_path.Set(dir);
|
|
|
|
/* Initialize our cache. */
|
|
R_TRY(this->cache.Initialize(cache_buffer, cache_buffer_size, cache_capacity));
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileKeyValueStore::Get(size_t *out_size, void *out_value, size_t max_out_size, const void *key, size_t key_size) {
|
|
std::scoped_lock lk(this->lock);
|
|
|
|
/* Ensure key size is small enough. */
|
|
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource());
|
|
|
|
/* Try to get from cache. */
|
|
{
|
|
auto size = this->cache.TryGet(out_value, max_out_size, key, key_size);
|
|
if (size) {
|
|
*out_size = *size;
|
|
return ResultSuccess();
|
|
}
|
|
}
|
|
|
|
/* Open the value file. */
|
|
fs::FileHandle file;
|
|
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
|
|
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound());
|
|
} R_END_TRY_CATCH;
|
|
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
|
|
|
/* Get the value size. */
|
|
s64 file_size;
|
|
R_TRY(fs::GetFileSize(std::addressof(file_size), file));
|
|
|
|
/* Ensure there's enough space for the value. */
|
|
R_UNLESS(file_size <= static_cast<s64>(max_out_size), ResultBufferInsufficient());
|
|
|
|
/* Read the value. */
|
|
const size_t value_size = static_cast<size_t>(value_size);
|
|
R_TRY(fs::ReadFile(file, 0, out_value, value_size));
|
|
*out_size = value_size;
|
|
|
|
/* Cache the newly read value. */
|
|
this->cache.Set(key, key_size, out_value, value_size);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileKeyValueStore::GetSize(size_t *out_size, const void *key, size_t key_size) {
|
|
std::scoped_lock lk(this->lock);
|
|
|
|
/* Ensure key size is small enough. */
|
|
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource());
|
|
|
|
/* Try to get from cache. */
|
|
{
|
|
auto size = this->cache.TryGetSize(key, key_size);
|
|
if (size) {
|
|
*out_size = *size;
|
|
return ResultSuccess();
|
|
}
|
|
}
|
|
|
|
/* Open the value file. */
|
|
fs::FileHandle file;
|
|
R_TRY_CATCH(fs::OpenFile(std::addressof(file), this->GetPath(key, key_size), fs::OpenMode_Read)) {
|
|
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound());
|
|
} R_END_TRY_CATCH;
|
|
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
|
|
|
/* Get the value size. */
|
|
s64 file_size;
|
|
R_TRY(fs::GetFileSize(std::addressof(file_size), file));
|
|
|
|
*out_size = static_cast<size_t>(file_size);
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileKeyValueStore::Set(const void *key, size_t key_size, const void *value, size_t value_size) {
|
|
std::scoped_lock lk(this->lock);
|
|
|
|
/* Ensure key size is small enough. */
|
|
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource());
|
|
|
|
/* When the cache contains the key being set, Nintendo invalidates the cache. */
|
|
if (this->cache.Contains(key, key_size)) {
|
|
this->cache.Invalidate();
|
|
}
|
|
|
|
/* Delete the file, if it exists. Don't check result, since it's okay if it's already deleted. */
|
|
auto key_path = this->GetPath(key, key_size);
|
|
fs::DeleteFile(key_path);
|
|
|
|
/* Create the new value file. */
|
|
R_TRY(fs::CreateFile(key_path, value_size));
|
|
|
|
/* Open the value file. */
|
|
fs::FileHandle file;
|
|
R_TRY(fs::OpenFile(std::addressof(file), key_path, fs::OpenMode_Write));
|
|
ON_SCOPE_EXIT { fs::CloseFile(file); };
|
|
|
|
/* Write the value file and flush. */
|
|
R_TRY(fs::WriteFile(file, 0, value, value_size, fs::WriteOption::Flush));
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
Result FileKeyValueStore::Remove(const void *key, size_t key_size) {
|
|
std::scoped_lock lk(this->lock);
|
|
|
|
/* Ensure key size is small enough. */
|
|
R_UNLESS(key_size <= MaxKeySize, ResultOutOfKeyResource());
|
|
|
|
/* When the cache contains the key being set, Nintendo invalidates the cache. */
|
|
if (this->cache.Contains(key, key_size)) {
|
|
this->cache.Invalidate();
|
|
}
|
|
|
|
/* Remove the file. */
|
|
R_TRY_CATCH(fs::DeleteFile(this->GetPath(key, key_size))) {
|
|
R_CONVERT(fs::ResultPathNotFound, ResultKeyNotFound())
|
|
} R_END_TRY_CATCH;
|
|
|
|
return ResultSuccess();
|
|
}
|
|
|
|
} |