Skip to content

Commit

Permalink
fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
JacksonYao287 committed Sep 9, 2023
1 parent 30232dc commit 68d6fd7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/include/homestore/chunk_selector.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ChunkSelector {
ChunkSelector() = default;
virtual void add_chunk(VChunk chunk) = 0;
virtual void foreach_chunks(std::function< void(VChunk&) >&& cb) = 0;
virtual Chunk* select(blk_count_t nblks, const blk_alloc_hints& hints) = 0;
virtual Chunk* select_chunk(blk_count_t nblks, const blk_alloc_hints& hints) = 0;

virtual ~ChunkSelector() = default;
};
Expand Down
10 changes: 5 additions & 5 deletions src/include/homestore/vchunk.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ class VChunk {

~VChunk() = default;

void set_user_private(const sisl::blob& data);
uint8_t* get_user_private();
blk_cap_t available_blks();
uint32_t getPdevID();
cshared< Chunk > getInternalChunk();
void set_user_private(const sisl::blob& data) const;
uint8_t* get_user_private() const;
blk_cap_t available_blks() const;
uint32_t get_pdev_id() const;
cshared< Chunk > get_internal_chunk () const;

private:
cshared< Chunk > internalChunk;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/device/round_robin_chunk_selector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ RoundRobinChunkSelector::RoundRobinChunkSelector(bool dynamic_chunk_add) : m_dyn

void RoundRobinChunkSelector::add_chunk(VChunk chunk) { m_chunks.push_back(chunk); }

Chunk* RoundRobinChunkSelector::select(blk_count_t, const blk_alloc_hints&) {
Chunk* RoundRobinChunkSelector::select_chunk(blk_count_t, const blk_alloc_hints&) {
if (*m_next_chunk_index >= m_chunks.size()) { *m_next_chunk_index = 0; }
return m_chunks[(*m_next_chunk_index)++].getInternalChunk().get();
return m_chunks[(*m_next_chunk_index)++].get_internal_chunk().get();
}

void RoundRobinChunkSelector::foreach_chunks(std::function< void(VChunk&) >&& cb) {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/device/round_robin_chunk_selector.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class RoundRobinChunkSelector : public ChunkSelector {
~RoundRobinChunkSelector() = default;

void add_chunk(VChunk chunk) override;
Chunk* select(blk_count_t nblks, const blk_alloc_hints& hints) override;
Chunk* select_chunk(blk_count_t nblks, const blk_alloc_hints& hints) override;
void foreach_chunks(std::function< void(VChunk&) >&& cb) override;

private:
Expand Down
10 changes: 5 additions & 5 deletions src/lib/device/vchunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
namespace homestore {
VChunk::VChunk(cshared< Chunk >& chunk) : internalChunk(chunk){}

void VChunk::set_user_private(const sisl::blob& data){
void VChunk::set_user_private(const sisl::blob& data) const{
internalChunk->set_user_private(data);
}

uint8_t* VChunk::get_user_private() {
uint8_t* VChunk::get_user_private() const {
return internalChunk->user_private();
};

blk_cap_t VChunk::available_blks() {
blk_cap_t VChunk::available_blks() const {
return internalChunk->blk_allocator()->available_blks();
}

uint32_t VChunk::getPdevID() {
uint32_t VChunk::get_pdev_id() const {
return internalChunk->physical_dev()->pdev_id();
}

cshared< Chunk > VChunk::getInternalChunk() {return internalChunk;}
cshared< Chunk > VChunk::get_internal_chunk() const {return internalChunk;}
}// namespace homestore
4 changes: 2 additions & 2 deletions src/lib/device/virtual_dev.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ BlkAllocStatus VirtualDev::do_alloc_blk(blk_count_t nblks, const blk_alloc_hints
size_t attempt{0};

do {
chunk = m_chunk_selector->select(nblks, hints);
chunk = m_chunk_selector->select_chunk(nblks, hints);
if (chunk == nullptr) { status = BlkAllocStatus::SPACE_FULL; }

status = alloc_blk_from_chunk(nblks, hints, out_blkid, chunk);
Expand Down Expand Up @@ -435,7 +435,7 @@ uint64_t VirtualDev::used_size() const {
}

void VirtualDev::cp_flush() {
m_chunk_selector->foreach_chunks([this](VChunk& vchunk) { vchunk.getInternalChunk()->cp_flush(); });
m_chunk_selector->foreach_chunks([this](VChunk& vchunk) { vchunk.get_internal_chunk()->cp_flush(); });
}

std::vector< shared< Chunk > > VirtualDev::get_chunks() const { return m_all_chunks; }
Expand Down

0 comments on commit 68d6fd7

Please sign in to comment.