diff --git a/Makefile b/Makefile index 885bae7..2a6b597 100755 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ LD = g++ LDFLAGS += -std=c++14 #NAME = $(wildcard *.cpp) -#NAME = benchmark.cpp -NAME = main.cpp +NAME = benchmark.cpp +#NAME = main.cpp NAME-OBJS = $(patsubst %.cpp, %.o, $(NAME)) TARGET = $(patsubst %.cpp, %, $(NAME)) diff --git a/benchmark.cpp b/benchmark.cpp index 9ab4dc2..3e8889c 100644 --- a/benchmark.cpp +++ b/benchmark.cpp @@ -52,7 +52,7 @@ int main(int argc, char* argv[]) // Prepare data int total_data = 256 * MB; - int block_data = 512 * KB; + int block_data = 4 * KB; if (strcmp(argv[1], "s") == 0) { diff --git a/src/rdma_buffer.cpp b/src/rdma_buffer.cpp index d2cbf42..165118e 100755 --- a/src/rdma_buffer.cpp +++ b/src/rdma_buffer.cpp @@ -27,13 +27,13 @@ RDMA_Buffer::RDMA_Buffer(RDMA_Channel* channel, ibv_pd* pd, int size, void* addr } } else { - log_info("ddddddddddddddddddddd"); + //log_info("ddddddddddddddddddddd"); //buffer_ = malloc(size); memblock_ = (RDMA_MemBlock*)channel_->endpoint()->session()->mempool()->blockalloc(size); buffer_ = memblock_->dataaddr(); mr_ = memblock_->mr(); buffer_owned_ = true; - channel_->endpoint()->session()->mempool()->travel(); + //channel_->endpoint()->session()->mempool()->travel(); } log_info("RDMA_Buffer Created"); @@ -45,7 +45,7 @@ RDMA_Buffer::~RDMA_Buffer() { //free(buffer_); memblock_->free(); - channel_->endpoint()->session()->mempool()->travel(); + //channel_->endpoint()->session()->mempool()->travel(); } else { if (ibv_dereg_mr(mr_)) diff --git a/src/rdma_memorypool.cpp b/src/rdma_memorypool.cpp index b4ce380..79a1925 100644 --- a/src/rdma_memorypool.cpp +++ b/src/rdma_memorypool.cpp @@ -27,6 +27,8 @@ RDMA_MemBlock::~RDMA_MemBlock() { log_error("ibv_dereg_mr failed"); } + + if (size_ > 0) ::free(blockaddr_); log_info("RDMA_MemBlock Deleted"); } @@ -55,5 +57,9 @@ RDMA_MemoryPool::RDMA_MemoryPool(ibv_pd* pd) RDMA_MemoryPool::~RDMA_MemoryPool() { + for (auto i:bllist_) + { + + } log_info("RDMA_MemoryPool Deleted"); } \ No newline at end of file diff --git a/utils/MemoryPool b/utils/MemoryPool index 8fa399a..5567525 160000 --- a/utils/MemoryPool +++ b/utils/MemoryPool @@ -1 +1 @@ -Subproject commit 8fa399a70247876ab7505cbbbe631799b582736a +Subproject commit 55675255c86a81d251bbb468c56050c6da239d7e