added destructor on push back to handle memmory leaks ogf objects

Author: vinitjames

CMakeLists.txt

@@ -14,3 +14,4 @@ target_include_directories(${PROJECT_NAME} INTERFACE ${${PROJECT_NAME}_SOURCE_DI
 
 add_subdirectory(tests)
 
+add_subdirectory(samples)

circular_buffer.h

@@ -210,23 +210,14 @@ inline
 void  CircularBuffer<T>::clear(){
 	std::lock_guard<std::mutex> _lck(_mtx);
 	_head = _tail = _size = _max_size = 0;
-	//_full = false;
 }
 
 template<typename T>
 inline 
 typename CircularBuffer<T>::size_type CircularBuffer<T>::size() const{
 	std::lock_guard<std::mutex> _lck(_mtx);
 	return _size;
-	/*(if(_full)
-		return _max_size;
-	else{
-		if(_head >= _tail)
-			return _head -_tail;
-		else
-			return _max_size - _tail +_head;
-			}*/
-}
+	}
 
 template<typename T>
 inline
@@ -267,6 +258,8 @@ typename CircularBuffer<T>::const_reference CircularBuffer<T>::back() const{
 template<typename T> 
 void CircularBuffer<T>::push_back(const T& data){
 	std::lock_guard<std::mutex> _lck(_mtx);
+	if(full())
+		_buff[_head].~T();
 	_buff[_head] = data;
 	_increment_bufferstate();
 }

samples/CMakeLists.txt

@@ -0,0 +1,8 @@
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(sample_circularbuffer sample_circularbuffer.cpp)
+target_link_libraries(sample_circularbuffer
+					  PRIVATE
+					  circularbuffer
+					  )

sample_circularbuffer.cpp samples/sample_circularbuffer.cppsample_circularbuffer.cpp renamed to samples/sample_circularbuffer.cpp

@@ -6,21 +6,32 @@
 #include "circular_buffer.h"
 #include <iostream>
 #include <string.h>
-#include "gtest/gtest.h"
 
 struct test_struct{
-	int i;
 	static int count ;
 	char* bytes =nullptr; 
 	test_struct(){
-		i=0;
-		bytes = (char*)malloc(10000000);
+		bytes = (char*)malloc(100);
 		std::cout<<"constructing test_struct: "<<count++<<"\n";
 		}
+	test_struct(const test_struct& other){
+		bytes = (char*)malloc(100);
+		memcpy(bytes, other.bytes,100);
+		std::cout<<"copy constructor called for test_struct \n";
+	}
+	
+	test_struct& operator=(const test_struct& other){
+		bytes = (char*)malloc(100);
+		memcpy(bytes, other.bytes,100);
+		std::cout<<"assignment operator called for test_struct \n";
+		return *this;
+	}
+	
 	~test_struct(){
-		std::cout<<"destructing test_struct\n";
+		std::cout<<"destructing test_struct"<<--count<<"\n";
 		free(bytes);
 	}
+	
 
 };
 
@@ -78,6 +89,22 @@ int main(int argc, char *argv[])
 	std::cout<<"Checking deference * operator "<<*it<<"\n";
 	std::cout<<"Checking deference ++ operator "<<*(++it)<<"\n";
 	std::cout<<"Checking deference -- operator "<<*(--it)<<"\n";
+
+	CircularBuffer<test_struct> test_structbuf{5};
+	auto temp_struct = test_struct();
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	test_structbuf.push_back(temp_struct);
+	
+	
+	test_structbuf.pop_front();
 
 
 	return 0;