Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10892 from unknownbrackets/android-file

Browse source 
Android: Avoid pread64 for > 2GB offsets
This commit is contained in:
Henrik Rydgård 2018-04-08 17:54:12 +02:00 • committed by GitHub
commit 58206f4fe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/FileLoaders/LocalFileLoader.cpp
View file

@ -37,7 +37,7 @@ LocalFileLoader::LocalFileLoader(const std::string &filename)
if (fd_ == -1) { if (fd_ == -1) {
return; return;
} }
#if defined(__ANDROID__) || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64) #if PPSSPP_PLATFORM(ANDROID) || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64)
off64_t off = lseek64(fd_, 0, SEEK_END); off64_t off = lseek64(fd_, 0, SEEK_END);
filesize_ = off; filesize_ = off;
lseek64(fd_, 0, SEEK_SET); lseek64(fd_, 0, SEEK_SET);
@ -112,7 +112,17 @@ std::string LocalFileLoader::Path() const {
} }
size_t LocalFileLoader::ReadAt(s64 absolutePos, size_t bytes, size_t count, void *data, Flags flags) { size_t LocalFileLoader::ReadAt(s64 absolutePos, size_t bytes, size_t count, void *data, Flags flags) {
#ifndef _WIN32 #if PPSSPP_PLATFORM(ANDROID)
// pread64 doesn't appear to actually be 64-bit safe, though such ISOs are uncommon. See #10862.
if (absolutePos <= 0x7FFFFFFF) {
return pread64(fd_, data, bytes * count, absolutePos) / bytes;
} else {
// Since pread64 doesn't change the file offset, it should be safe to avoid the lock in the common case.
std::lock_guard<std::mutex> guard(readLock_);
lseek64(fd_, absolutePos, SEEK_SET);
return read(fd_, data, bytes * count) / bytes;
}
#elif !defined(_WIN32)
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64 #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64
return pread64(fd_, data, bytes * count, absolutePos) / bytes; return pread64(fd_, data, bytes * count, absolutePos) / bytes;
#else #else

2
Core/FileLoaders/LocalFileLoader.h
View file

@ -17,6 +17,7 @@
#pragma once #pragma once
#include <mutex>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/Loaders.h" #include "Core/Loaders.h"
#ifdef _WIN32 #ifdef _WIN32
@ -42,4 +43,5 @@ private:
#endif #endif
u64 filesize_; u64 filesize_;
std::string filename_; std::string filename_;
std::mutex readLock_;
}; };