huge changes to everything (see below).
Changelog: - re-enable use in release build. - remove ftpsrv and untitled from builtin ghdl options, as both packages are available in the appstore. - add image viewer (png, jpg, bmp) - add music player (bfstm, bfwav, mp3, wav, ogg) - add idv3 tag parsing support for mp3. - add "decyption" of GTA Vice City mp3. - add usbdvd support for music playback and file browsing. - add nsz export support (solid, block, ldm). - add xcz export support (same as above). - add nro fs proper mount support (romfs, nacp, icon). - add program nca fs support. - add bfsar fs support. - re-write the usb protocol, still wip. replaces tinfoil protocol. - all threads are now create with pre-emptive support with the proper affinity mask set. - fix oob crash in libpulsar when a bfwav was opened that had more than 2 channels. - bump yyjson version. - bump usbhsfs version. - disable nvjpg. - add support for theme music of any supported playback type (bfstm, bfwav, mp3, wav, ogg). - add support for setting background music. - add async exit to blocking threads (download, nxlink, ftpsrv) to reduce exit time. - add support for dumping to pc via usb. - add null, deflate, zstd hash options, mainly used for benchmarking. - add sidebar slider (currently unused). - file_viwer can now be used with any filesystem. - filebrowser will only ever stat file once. previously it would keep stat'ing until it succeeded. - disabled themezer due to the api breaking and i am not willing to keep maintaining it. - disable zlt handling in usbds as it's not needed for my api's because the size is always known. - remove usbds enums and GetSpeed() as i pr'd it to libnx. - added support for mounting nca's from any source, including files, memory, nsps, xcis etc. - split the lru cache into it's own header as it's now used in multiple places (nsz, all mounted options). - add support for fetching and decrypting es personalised tickets. - fix es common ticket converting where i forgot to also convert the cert chain as well. - remove the download default music option. - improve performance of libpulsar when opening a bfsar by remove the large setvbuf option. instead, use the default 1k buffer and handle large buffers manually in sphaira by using a lru cache (todo: just write my own bfsar parser). - during app init and exit, load times have been halved as i now load/exit async. timestamps have also been added to measure how long everything takes. - download now async loads / exits the etag json file to improve init times. - add custom zip io to dumper to support writing a zip to any dest (such as usb). - dumper now returns a proper error if the transfer was cancelled by the user. - fatfs mount now sets the timestamp for files. - fatfs mount handles folders with the archive bit by reporting them as a file. - ftpsrv config is async loaded to speed up load times. - nxlink now tries attempt to connect/accept by handling blocking rather than just bailing out. - added support for minini floats. - thread_file_transfer now spawns 3 threads rather than 2, to have the middle thread be a optional processor (mainly used for compressing/decompressing). - added spinner to progress box, taken from nvg demo. - progress box disables sleep mode on init. - add gamecard detection to game menu to detect a refresh. - handle xci that have the key area prepended. - change gamecard mount fs to use the xci mount code instead of native fs, that way we can see all the partitions rather than just secure. - reformat the ghdl entries to show the timestamp first. - support for exporting saves to pc via usb. - zip fs now uses lru cache.
This commit is contained in:
@@ -1,35 +1,84 @@
|
||||
#pragma once
|
||||
|
||||
#include "yati/source/file.hpp"
|
||||
#include "utils/lru.hpp"
|
||||
#include <memory>
|
||||
#include <span>
|
||||
|
||||
namespace sphaira::devoptab::common {
|
||||
|
||||
// max entries per devoptab, should be enough.
|
||||
enum { MAX_ENTRIES = 4 };
|
||||
|
||||
// buffers data in 512k chunks to maximise throughput.
|
||||
// not suitable if random access >= 512k is common.
|
||||
// if that is needed, see the LRU cache varient used for fatfs.
|
||||
struct BufferedData final : yati::source::Base {
|
||||
static constexpr inline u64 CHUNK_SIZE = 1024 * 512;
|
||||
|
||||
BufferedData(std::unique_ptr<yati::source::Base>&& _source, u64 _size)
|
||||
: source{std::forward<decltype(_source)>(_source)}
|
||||
struct BufferedDataBase : yati::source::Base {
|
||||
BufferedDataBase(const std::shared_ptr<yati::source::Base>& _source, u64 _size)
|
||||
: source{_source}
|
||||
, capacity{_size} {
|
||||
|
||||
}
|
||||
|
||||
Result Read(void *buf, s64 off, s64 size);
|
||||
Result Read(void* buf, s64 off, s64 size, u64* bytes_read) override;
|
||||
virtual Result Read(void* buf, s64 off, s64 size, u64* bytes_read) override {
|
||||
return source->Read(buf, off, size, bytes_read);
|
||||
}
|
||||
|
||||
protected:
|
||||
std::shared_ptr<yati::source::Base> source;
|
||||
const u64 capacity;
|
||||
};
|
||||
|
||||
// buffers data in 512k chunks to maximise throughput.
|
||||
// not suitable if random access >= 512k is common.
|
||||
// if that is needed, see the LRU cache varient used for fatfs.
|
||||
struct BufferedData : BufferedDataBase {
|
||||
BufferedData(const std::shared_ptr<yati::source::Base>& _source, u64 _size, u64 _alloc = 1024 * 512)
|
||||
: BufferedDataBase{_source, _size} {
|
||||
m_data.resize(_alloc);
|
||||
}
|
||||
|
||||
virtual Result Read(void* buf, s64 off, s64 size, u64* bytes_read) override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<yati::source::Base> source;
|
||||
const u64 capacity;
|
||||
|
||||
u64 m_off{};
|
||||
u64 m_size{};
|
||||
u8 m_data[CHUNK_SIZE]{};
|
||||
std::vector<u8> m_data{};
|
||||
};
|
||||
|
||||
struct BufferedFileData {
|
||||
u8* data{};
|
||||
u64 off{};
|
||||
u64 size{};
|
||||
|
||||
~BufferedFileData() {
|
||||
if (data) {
|
||||
free(data);
|
||||
}
|
||||
}
|
||||
|
||||
void Allocate(u64 new_size) {
|
||||
data = (u8*)realloc(data, new_size * sizeof(*data));
|
||||
off = 0;
|
||||
size = 0;
|
||||
}
|
||||
};
|
||||
|
||||
constexpr u64 CACHE_LARGE_ALLOC_SIZE = 1024 * 512;
|
||||
constexpr u64 CACHE_LARGE_SIZE = 1024 * 16;
|
||||
|
||||
struct LruBufferedData : BufferedDataBase {
|
||||
LruBufferedData(const std::shared_ptr<yati::source::Base>& _source, u64 _size, u32 small = 1024, u32 large = 2)
|
||||
: BufferedDataBase{_source, _size} {
|
||||
buffered_small.resize(small);
|
||||
buffered_large.resize(large);
|
||||
lru_cache[0].Init(buffered_small);
|
||||
lru_cache[1].Init(buffered_large);
|
||||
}
|
||||
|
||||
virtual Result Read(void* buf, s64 off, s64 size, u64* bytes_read) override;
|
||||
|
||||
private:
|
||||
utils::Lru<BufferedFileData> lru_cache[2]{};
|
||||
std::vector<BufferedFileData> buffered_small{}; // 1MiB (usually).
|
||||
std::vector<BufferedFileData> buffered_large{}; // 1MiB
|
||||
};
|
||||
|
||||
bool fix_path(const char* str, char* out);
|
||||
|
||||
Reference in New Issue
Block a user