Merge pull request #1139 from lukaszstolarczuk/merge-stable-1.10-into-stable-1.11

Merge stable-1.10 into stable-1.11

Author: lukaszstolarczuk

.github/workflows/gha.yml

@@ -13,27 +13,29 @@ jobs:
     env:
       DOCKERHUB_USER:          ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_PASSWORD:      ${{ secrets.DOCKERHUB_PASSWORD }}
+      GITHUB_TOKEN:   ${{ secrets.DOC_UPDATE_GITHUB_TOKEN }}
       HOST_WORKDIR:   /home/runner/work/libpmemobj-cpp/libpmemobj-cpp
       WORKDIR:        utils/docker
     strategy:
       matrix:
         CONFIG: ["TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1",
                  "TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1",
                  "TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1",
-                 "TYPE=release OS=fedora OS_VER=32",
+                 "TYPE=release OS=fedora OS_VER=32 AUTO_DOC_UPDATE=1",
                  "TYPE=release OS=ubuntu OS_VER=20.04",
                  "TYPE=valgrind OS=ubuntu OS_VER=20.04",
                  "TYPE=memcheck_drd OS=ubuntu OS_VER=20.04",
                  "TYPE=package OS=fedora OS_VER=32",
-                 "TYPE=package OS=ubuntu OS_VER=20.04"]
+                 "TYPE=package OS=ubuntu OS_VER=20.04",
+                 "TYPE=coverity OS=ubuntu OS_VER=20.04"]
     steps:
       - name: Clone the git repo
         uses: actions/checkout@v2
         with:
-          fetch-depth: 50
+          fetch-depth: 0
 
       - name: Pull or rebuild the image
-        run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh
+        run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh rebuild
 
       - name: Run the build
         run: cd $WORKDIR && ${{ matrix.CONFIG }} ./build.sh
@@ -66,7 +68,7 @@ jobs:
       - name: Clone the git repo
         uses: actions/checkout@v2
         with:
-          fetch-depth: 50
+          fetch-depth: 0
       - name: Run the build
         run: cd $WORKDIR && ${{ matrix.CONFIG }} ./build.sh
   windows:
@@ -106,7 +108,7 @@ jobs:
       - name: Clone the git repo
         uses: actions/checkout@v2
         with:
-          fetch-depth: 50
+          fetch-depth: 0
 
       - name: Install PMDK
         run: |

.gitignore

@@ -3,7 +3,6 @@
 !.gitattributes
 !.github/
 !.clang-format
-!.travis.yml
 !.mailmap
 !.version
 build/

.travis.yml

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018-2020, Intel Corporation
+# Copyright 2018-2021, Intel Corporation
 
 cmake_minimum_required(VERSION 3.3)
 project(libpmemobj-cpp C CXX)

CMakeLists.txt

@@ -1,3 +1,34 @@
+Tue Jul 06 2021 Łukasz Stolarczuk <[email protected]>
+
+	* Version 1.6.1
+
+	This release fixes minor bugs.
+
+	This is the last patch release for libpmemobj-cpp 1.6 version.
+	Maintenance of this version is no longer supported.
+
+	Notable changes:
+	- string: fix max_size() return value
+	- allocation_flag: mark constructor as explicit
+	- peristent_ptr: change ptr_offset_magic to be properly aligned
+	- fix few headers' includes
+
+Mon Jun 28 2021 Łukasz Stolarczuk <[email protected]>
+
+	* Version 1.5.2
+
+	This release fixes minor bugs.
+
+	This is the last patch release for libpmemobj-cpp 1.5 version.
+	Maintenance of this version is no longer supported.
+
+	Notable changes:
+	- operator[] for contiguous_iterator takes signed integral instead of
+		unsigned
+	- throw an exception when pmemobj_mutex_unlock fail
+	- fix crash when a previous transaction failed to start because of
+		already taken lock.
+
 Wed Sep 30 2020 Szymon Romik <[email protected]>
 
 	* Version 1.11
@@ -174,7 +205,7 @@ Fri Mar 15 2019 Igor Chorążewicz <[email protected]>
 	- decrease number of persistent_ptr dereferences in
 	  make_persistent_array
 
-Tue Feb 19 2018 Marcin Ślusarz <[email protected]>
+Tue Feb 19 2019 Marcin Ślusarz <[email protected]>
 
 	* Version 1.5.1
 

ChangeLog

@@ -1,7 +1,6 @@
 libpmemobj-cpp
 ===============
 
-[![Build Status](https://travis-ci.org/pmem/libpmemobj-cpp.svg?branch=master)](https://travis-ci.org/pmem/libpmemobj-cpp)
 [![Build status](https://github.com/pmem/libpmemobj-cpp/workflows/CPP/badge.svg)](https://github.com/pmem/libpmemobj-cpp/actions)
 [![libpmemobj-cpp version](https://img.shields.io/github/tag/pmem/libpmemobj-cpp.svg)](https://github.com/pmem/libpmemobj-cpp/releases/latest)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/15911/badge.svg)](https://scan.coverity.com/projects/pmem-libpmemobj-cpp)

README.md

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2021, Intel Corporation */
 
 /**
  * @file
@@ -213,7 +213,7 @@ struct range_snapshotting_iterator
 	{
 		assert(data <= ptr);
 
-		if (snapshot_size > 0)
+		if (snapshot_size && ptr)
 			snapshot_range(ptr);
 	}
 

include/libpmemobj++/container/detail/contiguous_iterator.hpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2021, Intel Corporation */
 
 /**
  * @file
@@ -644,7 +644,7 @@ vector<T>::assign(size_type count, const_reference value)
 			add_data_to_tx(0, size_old);
 
 			std::fill_n(
-				&_data[0],
+				_data.get(),
 				(std::min)(count,
 					   static_cast<size_type>(size_old)),
 				value);
@@ -1578,7 +1578,7 @@ vector<T>::insert(const_iterator pos, size_type count, const value_type &value)
 			single_element_iterator<value_type>(&value, count));
 	});
 
-	return iterator(&_data[static_cast<difference_type>(idx)]);
+	return iterator(_data.get() + static_cast<difference_type>(idx));
 }
 
 /**
@@ -1821,7 +1821,7 @@ typename vector<T>::iterator
 vector<T>::erase(const_iterator first, const_iterator last)
 {
 	size_type idx = static_cast<size_type>(
-		std::distance(const_iterator(&_data[0]), first));
+		std::distance(const_iterator(_data.get()), first));
 	size_type count = static_cast<size_type>(std::distance(first, last));
 
 	if (count == 0)
@@ -2293,10 +2293,11 @@ vector<T>::internal_insert(size_type idx, InputIt first, InputIt last)
 	auto count = static_cast<size_type>(std::distance(first, last));
 
 	if (_capacity >= size() + count) {
-		pointer dest =
-			&_data[static_cast<difference_type>(size() + count)];
-		pointer begin = &_data[static_cast<difference_type>(idx)];
-		pointer end = &_data[static_cast<difference_type>(size())];
+		pointer dest = _data.get() +
+			static_cast<difference_type>(size() + count);
+		pointer begin = _data.get() + static_cast<difference_type>(idx);
+		pointer end =
+			_data.get() + static_cast<difference_type>(size());
 
 		add_data_to_tx(idx, size() - idx + count);
 
@@ -2314,9 +2315,11 @@ vector<T>::internal_insert(size_type idx, InputIt first, InputIt last)
 
 		auto old_data = _data;
 		auto old_size = _size;
-		pointer old_begin = &_data[0];
-		pointer old_mid = &_data[static_cast<difference_type>(idx)];
-		pointer old_end = &_data[static_cast<difference_type>(size())];
+		pointer old_begin = _data.get();
+		pointer old_mid =
+			_data.get() + static_cast<difference_type>(idx);
+		pointer old_end =
+			_data.get() + static_cast<difference_type>(size());
 
 		_data = nullptr;
 		_size = _capacity = 0;
@@ -2349,7 +2352,8 @@ vector<T>::internal_insert(size_type idx, InputIt first, InputIt last)
  * Private helper function. Must be called during transaction. Allocates new
  * memory for capacity_new number of elements and copies or moves old elements
  * to new memory area. If the current size is greater than capacity_new, the
- * container is reduced to its first capacity_new elements.
+ * container is reduced to its first capacity_new elements. If was never
+ * allocated behaves as an alloc call.
  *
  * param[in] capacity_new new capacity.
  *
@@ -2368,6 +2372,13 @@ vector<T>::realloc(size_type capacity_new)
 {
 	assert(pmemobj_tx_stage() == TX_STAGE_WORK);
 
+	/*
+	 * If _data == nullptr this object has never allocated any memory
+	 * so we need to behave as alloc instead.
+	 */
+	if (_data == nullptr)
+		return alloc(capacity_new);
+
 	/*
 	 * XXX: future optimization: we don't have to snapshot data
 	 * which we will not overwrite
@@ -2376,7 +2387,7 @@ vector<T>::realloc(size_type capacity_new)
 
 	auto old_data = _data;
 	auto old_size = _size;
-	pointer old_begin = &_data[0];
+	pointer old_begin = _data.get();
 	pointer old_end = capacity_new < _size
 		? &_data[static_cast<difference_type>(capacity_new)]
 		: &_data[static_cast<difference_type>(size())];

include/libpmemobj++/container/vector.hpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2021, Intel Corporation */
 
 /*
  * obj_cpp_ptr.c -- cpp bindings test
@@ -128,6 +128,38 @@ test_base_ptr_casting(nvobj::pool<root> &pop)
 		UT_ASSERT(0);
 	}
 }
+
+/*
+ * test_offset_with_alignment -- test offset calculation within a hierarchy of
+ * objects with different alignments
+ */
+void
+test_offset_alignment(nvobj::pool<root> &pop)
+{
+	struct A {
+		char a;
+	};
+
+	struct B {
+		uint64_t b;
+	};
+
+	struct C : public A, public B {
+		uint64_t c;
+	};
+
+	try {
+		nvobj::transaction::run(pop, [] {
+			auto cptr = nvobj::make_persistent<C>();
+			nvobj::persistent_ptr<B> bptr = cptr;
+			UT_ASSERT((bptr.raw().off - cptr.raw().off) ==
+				  alignof(B));
+			nvobj::delete_persistent<C>(cptr);
+		});
+	} catch (...) {
+		UT_ASSERT(0);
+	}
+}
 }
 
 static void
@@ -155,6 +187,7 @@ test(int argc, char *argv[])
 	test_ptr_array(pop);
 	test_offset(pop);
 	test_base_ptr_casting(pop);
+	test_offset_alignment(pop);
 
 	pop.close();
 }