From a2bce6ef8b9f3861d22a6f38774782affc1783fe Mon Sep 17 00:00:00 2001 From: Adir Lev Date: Mon, 27 Feb 2017 12:19:43 +0200 Subject: [PATCH] rename chunk_size Change-Id: Icfcc80fa836b0076b839b59eac4271bdda9e1a9e Signed-off-by: Adir Lev --- src/msg/async/rdma/Infiniband.cc | 14 +++++++------- src/msg/async/rdma/Infiniband.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/msg/async/rdma/Infiniband.cc b/src/msg/async/rdma/Infiniband.cc index 0160c04cf31a5..66856e006bf7d 100644 --- a/src/msg/async/rdma/Infiniband.cc +++ b/src/msg/async/rdma/Infiniband.cc @@ -561,7 +561,7 @@ void Infiniband::MemoryManager::Chunk::post_srq(Infiniband *ib) } Infiniband::MemoryManager::Cluster::Cluster(MemoryManager& m, uint32_t s) - : manager(m), chunk_size(s), lock("cluster_lock") + : manager(m), buffer_size(s), lock("cluster_lock") { } @@ -577,7 +577,7 @@ Infiniband::MemoryManager::Cluster::~Cluster() int Infiniband::MemoryManager::Cluster::fill(uint32_t num) { assert(!base); - uint32_t bytes = chunk_size * num; + uint32_t bytes = buffer_size * num; if (manager.enabled_huge_page) { base = (char*)manager.malloc_huge_pages(bytes); } else { @@ -589,11 +589,11 @@ int Infiniband::MemoryManager::Cluster::fill(uint32_t num) memset(chunk_base, 0, sizeof(Chunk) * num); free_chunks.reserve(num); char *ptr = chunk_base; - for (uint32_t offset = 0; offset < bytes; offset += chunk_size){ + for (uint32_t offset = 0; offset < bytes; offset += buffer_size){ Chunk *chunk = reinterpret_cast(ptr); - ibv_mr* m = ibv_reg_mr(manager.pd->pd, base+offset, chunk_size, IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE); + ibv_mr* m = ibv_reg_mr(manager.pd->pd, base+offset, buffer_size, IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE); assert(m); - new(chunk) Chunk(m, chunk_size, base+offset); + new(chunk) Chunk(m, buffer_size, base+offset); free_chunks.push_back(chunk); ptr += sizeof(Chunk); } @@ -611,8 +611,8 @@ void Infiniband::MemoryManager::Cluster::take_back(std::vector &ck) int Infiniband::MemoryManager::Cluster::get_buffers(std::vector &chunks, size_t bytes) { - uint32_t num = bytes / chunk_size + 1; - if (bytes % chunk_size == 0) + uint32_t num = bytes / buffer_size + 1; + if (bytes % buffer_size == 0) --num; int r = num; Mutex::Locker l(lock); diff --git a/src/msg/async/rdma/Infiniband.h b/src/msg/async/rdma/Infiniband.h index 3e3c72d462d5b..71296d3eafc3f 100644 --- a/src/msg/async/rdma/Infiniband.h +++ b/src/msg/async/rdma/Infiniband.h @@ -170,7 +170,7 @@ class Infiniband { void take_back(std::vector &ck); int get_buffers(std::vector &chunks, size_t bytes); Chunk *get_chunk_by_buffer(const char *c) { - uint32_t idx = (c - base) / chunk_size; + uint32_t idx = (c - base) / buffer_size; Chunk *chunk = reinterpret_cast(chunk_base + sizeof(Chunk) * idx); return chunk; } @@ -179,7 +179,7 @@ class Infiniband { } MemoryManager& manager; - uint32_t chunk_size; + uint32_t buffer_size; Mutex lock; std::vector free_chunks; char *base = nullptr; @@ -201,8 +201,8 @@ class Infiniband { Chunk *get_tx_chunk_by_buffer(const char *c) { return send->get_chunk_by_buffer(c); } - uint32_t get_tx_chunk_size() const { - return send->chunk_size; + uint32_t get_tx_buffer_size() const { + return send->buffer_size; } bool enabled_huge_page; -- 2.39.5