mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-28 19:30:05 +00:00
File_Sys: Add a size dependend delay for each file read
This commit is contained in:
parent
e51a642a13
commit
58b16c5459
src/core
@ -56,6 +56,17 @@ public:
|
|||||||
return ERROR_UNSUPPORTED_OPEN_FLAGS;
|
return ERROR_UNSUPPORTED_OPEN_FLAGS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 GetReadDelayNs(size_t length) const {
|
||||||
|
// The delay was measured on O3DS and O2DS with
|
||||||
|
// https://gist.github.com/B3n30/ac40eac20603f519ff106107f4ac9182
|
||||||
|
// from the results the average of each length was taken.
|
||||||
|
static constexpr u64 slope(94);
|
||||||
|
static constexpr u64 offset(582778);
|
||||||
|
static constexpr u64 minimum(663124);
|
||||||
|
u64 IPCDelayNanoseconds = std::max<u64>(static_cast<u64>(length) * slope + offset, minimum);
|
||||||
|
return IPCDelayNanoseconds;
|
||||||
|
}
|
||||||
|
|
||||||
u64 GetSize() const override {
|
u64 GetSize() const override {
|
||||||
return data->size();
|
return data->size();
|
||||||
}
|
}
|
||||||
|
@ -36,6 +36,20 @@ ResultVal<size_t> DiskFile::Write(const u64 offset, const size_t length, const b
|
|||||||
return MakeResult<size_t>(written);
|
return MakeResult<size_t>(written);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 DiskFile::GetReadDelayNs(size_t length) const {
|
||||||
|
// TODO(B3N30): figure out the time a 3ds needs for those write
|
||||||
|
// for that backend.
|
||||||
|
// For now take the results from the romfs test.
|
||||||
|
// The delay was measured on O3DS and O2DS with
|
||||||
|
// https://gist.github.com/B3n30/ac40eac20603f519ff106107f4ac9182
|
||||||
|
// from the results the average of each length was taken.
|
||||||
|
static constexpr u64 slope(183);
|
||||||
|
static constexpr u64 offset(524879);
|
||||||
|
static constexpr u64 minimum(631826);
|
||||||
|
u64 IPCDelayNanoseconds = std::max<u64>(static_cast<u64>(length) * slope + offset, minimum);
|
||||||
|
return IPCDelayNanoseconds;
|
||||||
|
}
|
||||||
|
|
||||||
u64 DiskFile::GetSize() const {
|
u64 DiskFile::GetSize() const {
|
||||||
return file->GetSize();
|
return file->GetSize();
|
||||||
}
|
}
|
||||||
|
@ -29,6 +29,7 @@ public:
|
|||||||
|
|
||||||
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
|
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
|
||||||
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override;
|
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override;
|
||||||
|
u64 GetReadDelayNs(size_t length) const override;
|
||||||
u64 GetSize() const override;
|
u64 GetSize() const override;
|
||||||
bool SetSize(u64 size) const override;
|
bool SetSize(u64 size) const override;
|
||||||
bool Close() const override;
|
bool Close() const override;
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
@ -37,6 +38,24 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) = 0;
|
virtual ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the amount of time a 3ds needs to read those data
|
||||||
|
* @param length Length in bytes of data read from file
|
||||||
|
* @return Nanoseconds for the delay
|
||||||
|
*/
|
||||||
|
virtual u64 GetReadDelayNs(size_t length) const {
|
||||||
|
// Return the default delay for the case that the subclass backend didn't
|
||||||
|
// implement one. We take the one measured for romfs reads
|
||||||
|
// This should be removed as soon as every subclass backend
|
||||||
|
// has one implemented
|
||||||
|
LOG_WARNING(Service_FS, "Using default delay for read");
|
||||||
|
static constexpr u64 slope(94);
|
||||||
|
static constexpr u64 offset(582778);
|
||||||
|
static constexpr u64 minimum(663124);
|
||||||
|
u64 IPCDelayNanoseconds = std::max<u64>(static_cast<u64>(length) * slope + offset, minimum);
|
||||||
|
return IPCDelayNanoseconds;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the size of the file in bytes
|
* Get the size of the file in bytes
|
||||||
* @return Size of the file in bytes
|
* @return Size of the file in bytes
|
||||||
|
@ -107,6 +107,17 @@ ResultVal<size_t> IVFCFile::Write(const u64 offset, const size_t length, const b
|
|||||||
return MakeResult<size_t>(0);
|
return MakeResult<size_t>(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
u64 IVFCFile::GetReadDelayNs(size_t length) const {
|
||||||
|
// The delay was measured on O3DS and O2DS with
|
||||||
|
// https://gist.github.com/B3n30/ac40eac20603f519ff106107f4ac9182
|
||||||
|
// from the results the average of each length was taken.
|
||||||
|
static constexpr u64 slope(94);
|
||||||
|
static constexpr u64 offset(582778);
|
||||||
|
static constexpr u64 minimum(663124);
|
||||||
|
u64 IPCDelayNanoseconds = std::max<u64>(static_cast<u64>(length) * slope + offset, minimum);
|
||||||
|
return IPCDelayNanoseconds;
|
||||||
|
}
|
||||||
|
|
||||||
u64 IVFCFile::GetSize() const {
|
u64 IVFCFile::GetSize() const {
|
||||||
return data_size;
|
return data_size;
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,7 @@ public:
|
|||||||
|
|
||||||
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
|
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
|
||||||
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override;
|
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) override;
|
||||||
|
u64 GetReadDelayNs(size_t length) const override;
|
||||||
u64 GetSize() const override;
|
u64 GetSize() const override;
|
||||||
bool SetSize(u64 size) const override;
|
bool SetSize(u64 size) const override;
|
||||||
bool Close() const override {
|
bool Close() const override {
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
#include "core/hle/kernel/client_port.h"
|
#include "core/hle/kernel/client_port.h"
|
||||||
#include "core/hle/kernel/client_session.h"
|
#include "core/hle/kernel/client_session.h"
|
||||||
|
#include "core/hle/kernel/event.h"
|
||||||
#include "core/hle/kernel/handle_table.h"
|
#include "core/hle/kernel/handle_table.h"
|
||||||
#include "core/hle/kernel/server_session.h"
|
#include "core/hle/kernel/server_session.h"
|
||||||
#include "core/hle/result.h"
|
#include "core/hle/result.h"
|
||||||
@ -121,6 +122,13 @@ void File::Read(Kernel::HLERequestContext& ctx) {
|
|||||||
rb.Push<u32>(*read);
|
rb.Push<u32>(*read);
|
||||||
}
|
}
|
||||||
rb.PushMappedBuffer(buffer);
|
rb.PushMappedBuffer(buffer);
|
||||||
|
|
||||||
|
u64 read_timeout_ns = backend->GetReadDelayNs(length);
|
||||||
|
ctx.SleepClientThread(Kernel::GetCurrentThread(), "file::read", read_timeout_ns,
|
||||||
|
[](Kernel::SharedPtr<Kernel::Thread> thread,
|
||||||
|
Kernel::HLERequestContext& ctx, ThreadWakeupReason reason) {
|
||||||
|
// Nothing to do here
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void File::Write(Kernel::HLERequestContext& ctx) {
|
void File::Write(Kernel::HLERequestContext& ctx) {
|
||||||
|
Loading…
Reference in New Issue
Block a user