emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[block-cache] fix potential file descriptor leak

Browse Source 
Encapsulate file descriptor into an object, to ensure that an fd will be
closed properly while exception raised, e.g., the block_cache throws
exception during the block_manager's construction.
This commit is contained in:
Ming-Hung Tsai
2020-02-22 17:37:22 +08:00
parent c85ea5ef76
commit 955e11bc28
9 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
block-cache/block_cache.cc
View File

@ -15,6 +15,7 @@
#include <sstream>
using namespace bcache;
using namespace file_utils;
//----------------------------------------------------------------
@ -290,7 +291,7 @@ block_cache::setup_control_block(block &b)
size_t block_size_bytes = block_size_ << SECTOR_SHIFT;
memset(cb, 0, sizeof(*cb));
cb->aio_fildes = fd_;
cb->aio_fildes = fd_.fd_;
cb->u.c.buf = b.data_;
cb->u.c.offset = block_size_bytes * b.index_;
@ -371,8 +372,9 @@ block_cache::calc_nr_buckets(unsigned nr_blocks)
return r;
}
block_cache::block_cache(int fd, sector_t block_size, uint64_t on_disk_blocks, size_t mem)
: nr_locked_(0),
block_cache::block_cache(file_descriptor &fd, sector_t block_size, uint64_t on_disk_blocks, size_t mem)
: fd_(fd),
nr_locked_(0),
nr_dirty_(0),
nr_io_pending_(0),
read_hits_(0),
@ -386,7 +388,6 @@ block_cache::block_cache(int fd, sector_t block_size, uint64_t on_disk_blocks, s
int r;
unsigned nr_cache_blocks = calc_nr_cache_blocks(mem, block_size);
fd_ = fd;
block_size_ = block_size;
nr_data_blocks_ = on_disk_blocks;
nr_cache_blocks_ = nr_cache_blocks;
@ -418,8 +419,6 @@ block_cache::~block_cache()
if (aio_context_)
io_destroy(aio_context_);
::close(fd_);
#if 0
std::cerr << "\nblock cache stats\n"
<< "=================\n"

5
block-cache/block_cache.h
View File

@ -2,6 +2,7 @@
#define BLOCK_CACHE_H
#include "base/container_of.h"
#include "base/file_utils.h"
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/set.hpp>
@ -185,7 +186,7 @@ namespace bcache {
//--------------------------------
block_cache(int fd, sector_t block_size,
block_cache(file_utils::file_descriptor &fd, sector_t block_size,
uint64_t max_nr_blocks, size_t mem);
~block_cache();
@ -247,7 +248,7 @@ namespace bcache {
//--------------------------------
int fd_;
file_utils::file_descriptor &fd_;
sector_t block_size_;
uint64_t nr_data_blocks_;
uint64_t nr_cache_blocks_;