GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 21:35:45 +02:00
Code Packages

fs: remove thread_local storage

Browse Source 
If we are not zero-filling containers then the overhead of allocating them
on each use is negligible.  The effect that the thread_local containers
were having on RAM usage was very non-negligible.

Use dynamic containers (members or stack objects) for better control
of object lifetimes and much lower peak RAM usage.  They're a tiny bit
faster, too.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2018-11-08 23:36:24 -05:00
parent e3247d3471
commit a676928ed5
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/crucible/fs.h
View File

@ -95,6 +95,7 @@ namespace crucible {
iterator m_end = nullptr; iterator m_end = nullptr;
friend struct BtrfsIoctlLogicalInoArgs; friend struct BtrfsIoctlLogicalInoArgs;
} m_iors; } m_iors;
BtrfsDataContainer m_container;
}; };
ostream & operator<<(ostream &os, const BtrfsIoctlLogicalInoArgs &p); ostream & operator<<(ostream &os, const BtrfsIoctlLogicalInoArgs &p);

19
lib/fs.cc
View File

@ -303,7 +303,8 @@ namespace crucible {
} }
BtrfsIoctlLogicalInoArgs::BtrfsIoctlLogicalInoArgs(uint64_t new_logical, size_t new_size) : BtrfsIoctlLogicalInoArgs::BtrfsIoctlLogicalInoArgs(uint64_t new_logical, size_t new_size) :
m_container_size(new_size) m_container_size(new_size),
m_container(new_size)
{ {
memset_zero<btrfs_ioctl_logical_ino_args>(this); memset_zero<btrfs_ioctl_logical_ino_args>(this);
logical = new_logical; logical = new_logical;
@ -374,9 +375,8 @@ namespace crucible {
BtrfsIoctlLogicalInoArgs::do_ioctl_nothrow(int fd) BtrfsIoctlLogicalInoArgs::do_ioctl_nothrow(int fd)
{ {
btrfs_ioctl_logical_ino_args *p = static_cast<btrfs_ioctl_logical_ino_args *>(this); btrfs_ioctl_logical_ino_args *p = static_cast<btrfs_ioctl_logical_ino_args *>(this);
thread_local BtrfsDataContainer container; inodes = reinterpret_cast<uint64_t>(m_container.prepare(m_container_size));
inodes = reinterpret_cast<uint64_t>(container.prepare(m_container_size)); size = m_container.get_size();
size = container.get_size();
m_iors.clear(); m_iors.clear();
@ -452,7 +452,7 @@ namespace crucible {
BtrfsIoctlInoPathArgs::do_ioctl_nothrow(int fd) BtrfsIoctlInoPathArgs::do_ioctl_nothrow(int fd)
{ {
btrfs_ioctl_ino_path_args *p = static_cast<btrfs_ioctl_ino_path_args *>(this); btrfs_ioctl_ino_path_args *p = static_cast<btrfs_ioctl_ino_path_args *>(this);
thread_local BtrfsDataContainer container; BtrfsDataContainer container(m_container_size);
fspath = reinterpret_cast<uint64_t>(container.prepare(m_container_size)); fspath = reinterpret_cast<uint64_t>(container.prepare(m_container_size));
size = m_container_size; size = m_container_size;
@ -816,13 +816,8 @@ namespace crucible {
// Keep the ioctl buffer from one run to the next to save on malloc costs // Keep the ioctl buffer from one run to the next to save on malloc costs
size_t target_buf_size = sizeof(btrfs_ioctl_search_args_v2) + m_buf_size; size_t target_buf_size = sizeof(btrfs_ioctl_search_args_v2) + m_buf_size;
thread_local vector<char> ioctl_arg; vector<char> ioctl_arg = vector_copy_struct<btrfs_ioctl_search_key>(this);
if (ioctl_arg.size() < m_buf_size) { ioctl_arg.resize(target_buf_size);
ioctl_arg = vector_copy_struct<btrfs_ioctl_search_key>(this);
ioctl_arg.resize(target_buf_size);
} else {
memcpy(ioctl_arg.data(), static_cast<btrfs_ioctl_search_key*>(this), sizeof(btrfs_ioctl_search_key));
}
btrfs_ioctl_search_args_v2 *ioctl_ptr = reinterpret_cast<btrfs_ioctl_search_args_v2 *>(ioctl_arg.data()); btrfs_ioctl_search_args_v2 *ioctl_ptr = reinterpret_cast<btrfs_ioctl_search_args_v2 *>(ioctl_arg.data());