MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-30 02:32:43 +01:00
Code Issues Releases Wiki Activity

ircd::db: Lock database cache extents in RAM if possible. (closes #144)

Browse source
This commit is contained in:
Jason Volk 2020-05-29 21:33:55 -07:00
parent 489cf7a560
commit a61a67961a
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
ircd/db.cc
View file

@ -8,6 +8,7 @@
// copyright notice and this permission notice is present in all copies. The
// full license for this software is available in the LICENSE file.
#include <RB_INC_SYS_MMAN_H
#include <RB_INC_JEMALLOC_H
#include "db.h"
@ -3528,6 +3529,15 @@ ircd::db::database::allocator::ALIGN_DEFAULT
#endif
};
decltype(ircd::db::database::allocator::mlock_limit)
ircd::db::database::allocator::mlock_limit
{
ircd::allocator::rlimit_memlock()
};
decltype(ircd::db::database::allocator::mlock_current)
ircd::db::database::allocator::mlock_current;
/// Handle to a jemalloc arena when non-zero. Used as the base arena for all
/// cache allocators.
decltype(ircd::db::database::allocator::cache_arena)
@ -3610,7 +3620,22 @@ noexcept
};
#endif
return their_hooks.alloc(hooks, new_addr, size, alignment, zero, commit, arena_ind);
void *const ret
{
their_hooks.alloc(hooks, new_addr, size, alignment, zero, commit, arena_ind)
};
// This feature is only enabled when RLIMIT_MEMLOCK is unlimited. We don't
// want to deal with any limit at all.
#if defined(HAVE_MLOCK2) && defined(MLOCK_ONFAULT)
if(database::allocator::mlock_limit == -1)
{
syscall(::mlock2, ret, size, MLOCK_ONFAULT);
database::allocator::mlock_current += size;
}
#endif
return ret;
}
#endif
@ -3638,7 +3663,21 @@ noexcept
};
#endif
return their_hooks.dalloc(hooks, ptr, size, committed, arena_ind);
const bool ret
{
their_hooks.dalloc(hooks, ptr, size, committed, arena_ind)
};
#if defined(HAVE_MLOCK2)
if(database::allocator::mlock_current && !ret)
{
syscall(::munlock, ptr, size);
assert(database::allocator::mlock_current >= size);
database::allocator::mlock_current -= size;
}
#endif
return ret;
}
#endif
@ -3666,6 +3705,15 @@ noexcept
};
#endif
#if defined(HAVE_MLOCK2)
if(database::allocator::mlock_current)
{
syscall(::munlock, ptr, size);
assert(database::allocator::mlock_current >= size);
database::allocator::mlock_current -= size;
}
#endif
return their_hooks.destroy(hooks, ptr, size, committed, arena_ind);
}
#endif

2
ircd/db_database.h
View file

@ -296,6 +296,8 @@ struct ircd::db::database::allocator final
:rocksdb::MemoryAllocator
{
static const size_t ALIGN_DEFAULT;
static const size_t mlock_limit;
static size_t mlock_current;
static unsigned cache_arena;
database *d {nullptr};