andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix memory alignment with logical sector size

Browse Source 
Summary:
we align the buffer with logical sector size and should not test it with page size, which is usually 4k.
Closes https://github.com/facebook/rocksdb/pull/2245

Differential Revision: D5001842

Pulled By: lightmark

fbshipit-source-id: a7135fcf6351c6db363e8908956b1e193a4a6291
This commit is contained in:
Aaron Gao 2017-05-04 01:21:31 -07:00
parent 5a8e732594
commit 49412d93e2
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
env/io_posix.cc vendored
View File

@ -115,18 +115,13 @@ size_t GetLogicalBufferSize(int __attribute__((__unused__)) fd) {
*/ */
#ifndef NDEBUG #ifndef NDEBUG
namespace { namespace {
#ifdef OS_LINUX
const size_t kPageSize = sysconf(_SC_PAGESIZE);
#else
const size_t kPageSize = 4 * 1024;
#endif
bool IsSectorAligned(const size_t off, size_t sector_size) { bool IsSectorAligned(const size_t off, size_t sector_size) {
return off % sector_size == 0; return off % sector_size == 0;
} }
static bool IsPageAligned(const void* ptr) { bool IsSectorAligned(const void* ptr, size_t sector_size) {
return uintptr_t(ptr) % (kPageSize) == 0; return uintptr_t(ptr) % sector_size == 0;
} }
} }
@ -182,6 +177,11 @@ Status PosixSequentialFile::Read(size_t n, Slice* result, char* scratch) {
Status PosixSequentialFile::PositionedRead(uint64_t offset, size_t n, Status PosixSequentialFile::PositionedRead(uint64_t offset, size_t n,
Slice* result, char* scratch) { Slice* result, char* scratch) {
if (use_direct_io()) {
assert(IsSectorAligned(offset, GetRequiredBufferAlignment()));
assert(IsSectorAligned(n, GetRequiredBufferAlignment()));
assert(IsSectorAligned(scratch, GetRequiredBufferAlignment()));
}
Status s; Status s;
ssize_t r = -1; ssize_t r = -1;
size_t left = n; size_t left = n;
@ -306,6 +306,11 @@ PosixRandomAccessFile::~PosixRandomAccessFile() { close(fd_); }
Status PosixRandomAccessFile::Read(uint64_t offset, size_t n, Slice* result, Status PosixRandomAccessFile::Read(uint64_t offset, size_t n, Slice* result,
char* scratch) const { char* scratch) const {
if (use_direct_io()) {
assert(IsSectorAligned(offset, GetRequiredBufferAlignment()));
assert(IsSectorAligned(n, GetRequiredBufferAlignment()));
assert(IsSectorAligned(scratch, GetRequiredBufferAlignment()));
}
Status s; Status s;
ssize_t r = -1; ssize_t r = -1;
size_t left = n; size_t left = n;
@ -704,9 +709,10 @@ PosixWritableFile::~PosixWritableFile() {
} }
Status PosixWritableFile::Append(const Slice& data) { Status PosixWritableFile::Append(const Slice& data) {
assert(!use_direct_io() || if (use_direct_io()) {
(IsSectorAligned(data.size(), GetRequiredBufferAlignment()) && assert(IsSectorAligned(data.size(), GetRequiredBufferAlignment()));
IsPageAligned(data.data()))); assert(IsSectorAligned(data.data(), GetRequiredBufferAlignment()));
}
const char* src = data.data(); const char* src = data.data();
size_t left = data.size(); size_t left = data.size();
while (left != 0) { while (left != 0) {
@ -725,10 +731,11 @@ Status PosixWritableFile::Append(const Slice& data) {
} }
Status PosixWritableFile::PositionedAppend(const Slice& data, uint64_t offset) { Status PosixWritableFile::PositionedAppend(const Slice& data, uint64_t offset) {
assert(use_direct_io() && if (use_direct_io()) {
IsSectorAligned(offset, GetRequiredBufferAlignment()) && assert(IsSectorAligned(offset, GetRequiredBufferAlignment()));
IsSectorAligned(data.size(), GetRequiredBufferAlignment()) && assert(IsSectorAligned(data.size(), GetRequiredBufferAlignment()));
IsPageAligned(data.data())); assert(IsSectorAligned(data.data(), GetRequiredBufferAlignment()));
}
assert(offset <= std::numeric_limits<off_t>::max()); assert(offset <= std::numeric_limits<off_t>::max());
const char* src = data.data(); const char* src = data.data();
size_t left = data.size(); size_t left = data.size();