Merge remote-tracking branch 'bs/branch-0.16' into fix/empty-folder

BlazingDB · Oct 9, 2020 · 0a0a578 · 0a0a578
2 parents 68e320d + c3b1ef7
commit 0a0a578
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@
 - #1057 Fixed issue with concat all in concatenating cache
 - #1007 Fix arrow and spdlog compilation issues
 - #1068 Just adds a docs important links and avoid the message about filesystem authority not found
+- #1074: Remove lock inside grow() method from PinnedBufferProvider
 - #1071 Fix crash when loading an empty folder
 
 

diff --git a/comms/include/blazingdb/transport/io/reader_writer.h b/comms/include/blazingdb/transport/io/reader_writer.h
@@ -32,6 +32,7 @@ class PinnedBufferProvider {
   void freeAll();
 
 private:
+  // Its not threadsafe and the lock needs to be applied before calling it
   void grow();
 
   std::condition_variable cv;

diff --git a/comms/src/blazingdb/transport/io/reader_writer.cpp b/comms/src/blazingdb/transport/io/reader_writer.cpp
@@ -68,9 +68,8 @@ PinnedBuffer *PinnedBufferProvider::getBuffer() {
 
 
 // Will create a new allocation and grow the buffer pool with this->numBuffers/2 new buffers
+// Its not threadsafe and the lock needs to be applied before calling it
 void PinnedBufferProvider::grow() {
-  std::unique_lock<std::mutex> lock(inUseMutex);
-
   PinnedBuffer *buffer = new PinnedBuffer();
   buffer->size = this->bufferSize;
   allocations.resize(allocations.size() + 1);