Merge pull request #1142 from lukaszstolarczuk/merge-stable-1.12-into-master

lukaszstolarczuk · web-flow · commit 8e5eec1f8b9d · 2021-07-08T11:06:31.000+02:00
Merge stable-1.12 into master
diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
@@ -84,6 +84,8 @@ jobs:
     steps:
       - name: Clone the git repo
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Pull the image
         run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh pull
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-XXX Igor Chorążewicz <igor.chorazewicz@intel.com>
+XXX XXX XXX Igor Chorążewicz <igor.chorazewicz@intel.com>
 
 	* Version 1.13
 
@@ -13,6 +13,37 @@ XXX Igor Chorążewicz <igor.chorazewicz@intel.com>
 		it's relevant for a GitHub users (who may e.g. run some benchmarks)
 	-
 
+Tue Jul 06 2021 Łukasz Stolarczuk <lukasz.stolarczuk@intel.com>
+
+	* 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 <lukasz.stolarczuk@intel.com>
+
+	* 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.
+
 Mon Feb 15 2021 Igor Chorążewicz <igor.chorazewicz@intel.com>
 
 	* Version 1.12
@@ -216,7 +247,7 @@ Fri Mar 15 2019 Igor Chorążewicz <igor.chorazewicz@intel.com>
 	- decrease number of persistent_ptr dereferences in
 	  make_persistent_array
 
-Tue Feb 19 2018 Marcin Ślusarz <marcin.slusarz@intel.com>
+Tue Feb 19 2019 Marcin Ślusarz <marcin.slusarz@intel.com>
 
 	* Version 1.5.1
 
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # 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)
@@ -74,6 +73,7 @@ You will need the following packages for compilation:
 	- **valgrind-devel** (at best with [pmemcheck support](https://github.com/pmem/valgrind))
 	- **clang-format** 9.0
 	- **perl**
+	- **libatomic**
 - for Windows compilation:
 	- [**vcpkg**](https://github.com/microsoft/vcpkg#quick-start-windows)
 
@@ -170,4 +170,5 @@ or just use graphical CMake frontend like **cmake-qt-gui** or **cmake-curses-gui
 ## Contact us
 For more information on this library, contact Igor Chorążewicz (igor.chorazewicz@intel.com),
 Piotr Balcer (piotr.balcer@intel.com) or post on our **#pmem** Slack channel using
-[this invite link](https://join.slack.com/t/pmem-io/shared_invite/enQtNzU4MzQ2Mzk3MDQwLWQ1YThmODVmMGFkZWI0YTdhODg4ODVhODdhYjg3NmE4N2ViZGI5NTRmZTBiNDYyOGJjYTIyNmZjYzQxODcwNDg) or [Google group](https://groups.google.com/group/pmem).
+[this invite link](https://join.slack.com/t/pmem-io/shared_invite/enQtNzU4MzQ2Mzk3MDQwLWQ1YThmODVmMGFkZWI0YTdhODg4ODVhODdhYjg3NmE4N2ViZGI5NTRmZTBiNDYyOGJjYTIyNmZjYzQxODcwNDg)
+or [Google group](https://groups.google.com/group/pmem).
diff --git a/include/libpmemobj++/container/detail/contiguous_iterator.hpp b/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
@@ -213,7 +213,7 @@ struct range_snapshotting_iterator
 	{
 		assert(data <= ptr);
 
-		if (snapshot_size > 0)
+		if (snapshot_size && ptr)
 			snapshot_range(ptr);
 	}
 
diff --git a/include/libpmemobj++/container/vector.hpp b/include/libpmemobj++/container/vector.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;
@@ -2384,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())];
diff --git a/include/libpmemobj++/detail/self_relative_ptr_base_impl.hpp b/include/libpmemobj++/detail/self_relative_ptr_base_impl.hpp
@@ -222,9 +222,8 @@ class self_relative_ptr_base_impl {
 		*/
 		uintptr_t mask = other_offset == nullptr_offset;
 		--mask;
-		uintptr_t ptr = reinterpret_cast<uintptr_t>(
-			reinterpret_cast<const_byte_ptr_type>(this) +
-			other_offset + 1);
+		uintptr_t ptr = static_cast<uintptr_t>(
+			reinterpret_cast<intptr_t>(this) + other_offset + 1);
 		ptr &= mask;
 		return reinterpret_cast<void *>(ptr);
 	}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -310,10 +310,10 @@ if(TEST_SELF_RELATIVE_POINTER)
 	build_test(self_relative_ptr_arith ptr/self_relative_ptr_arith.cpp)
 	add_test_generic(NAME self_relative_ptr_arith TRACERS none memcheck pmemcheck)
 
-	build_test_atomic(self_relative_ptr_atomic ptr/self_relative_ptr_atomic.cpp)
+	build_test(self_relative_ptr_atomic ptr/self_relative_ptr_atomic.cpp)
 	add_test_generic(NAME self_relative_ptr_atomic TRACERS none memcheck drd helgrind)
 
-	build_test_atomic(self_relative_ptr_atomic_pmem ptr/self_relative_ptr_atomic_pmem.cpp)
+	build_test(self_relative_ptr_atomic_pmem ptr/self_relative_ptr_atomic_pmem.cpp)
 	add_test_generic(NAME self_relative_ptr_atomic_pmem TRACERS none memcheck pmemcheck drd helgrind)
 endif()
 
diff --git a/tests/compatibility/CMakeLists.txt b/tests/compatibility/CMakeLists.txt
@@ -54,17 +54,20 @@ add_libpmemobj_cpp(1.8.1)
 add_libpmemobj_cpp(1.9)
 add_libpmemobj_cpp(1.10)
 add_libpmemobj_cpp(1.11)
+add_libpmemobj_cpp(1.12)
 
 build_test_with_cpp_version(1.7 version_1.7 version/version_1.7.cpp)
 build_test_with_cpp_version(1.8.1 version_1.8.1 version/version_1.8.cpp)
 build_test_with_cpp_version(1.9 version_1.9 version/version_1.9.cpp)
 build_test_with_cpp_version(1.10 version_1.10 version/version_1.10.cpp)
 build_test_with_cpp_version(1.11 version_1.11 version/version_1.11.cpp)
+build_test_with_cpp_version(1.12 version_1.12 version/version_1.12.cpp)
 
 build_test_with_cpp_version(1.8.1 concurrent_hash_map_feature_size_1.8.1 concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
 build_test_with_cpp_version(1.9 concurrent_hash_map_feature_size_1.9 concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
 build_test_with_cpp_version(1.10 concurrent_hash_map_feature_size_1.10 concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
 build_test_with_cpp_version(1.11 concurrent_hash_map_feature_size_1.11 concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
+build_test_with_cpp_version(1.12 concurrent_hash_map_feature_size_1.12 concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
 build_test_with_cpp_version(master concurrent_hash_map_feature_size_master concurrent_hash_map_feature_size/concurrent_hash_map_feature_size.cpp)
 
 add_compatibility_test(concurrent_hash_map_feature_size_1.8.1_master_compatibility concurrent_hash_map_feature_size_1.8.1 concurrent_hash_map_feature_size_master)
@@ -78,3 +81,6 @@ add_compatibility_test(concurrent_hash_map_feature_size_master_1.10_compatibilit
 
 add_compatibility_test(concurrent_hash_map_feature_size_1.11_master_compatibility concurrent_hash_map_feature_size_1.11 concurrent_hash_map_feature_size_master)
 add_compatibility_test(concurrent_hash_map_feature_size_master_1.11_compatibility concurrent_hash_map_feature_size_master concurrent_hash_map_feature_size_1.11)
+
+add_compatibility_test(concurrent_hash_map_feature_size_1.12_master_compatibility concurrent_hash_map_feature_size_1.12 concurrent_hash_map_feature_size_master)
+add_compatibility_test(concurrent_hash_map_feature_size_master_1.12_compatibility concurrent_hash_map_feature_size_master concurrent_hash_map_feature_size_1.12)
diff --git a/tests/compatibility/version/version_1.10.cpp b/tests/compatibility/version/version_1.10.cpp
@@ -6,6 +6,7 @@
 int
 main()
 {
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 10, "");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 10,
+		      "Wrong minor version");
 }
diff --git a/tests/compatibility/version/version_1.11.cpp b/tests/compatibility/version/version_1.11.cpp
@@ -6,6 +6,7 @@
 int
 main()
 {
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 11, "");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 11,
+		      "Wrong minor version");
 }
diff --git a/tests/compatibility/version/version_1.12.cpp b/tests/compatibility/version/version_1.12.cpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/* Copyright 2021, Intel Corporation */
+
+#include <libpmemobj++/version.hpp>
+
+int
+main()
+{
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 12,
+		      "Wrong minor version");
+}
diff --git a/tests/compatibility/version/version_1.7.cpp b/tests/compatibility/version/version_1.7.cpp
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 #include <libpmemobj++/version.hpp>
 
 int
 main()
 {
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 7, "");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 7, "Wrong minor version");
 }
diff --git a/tests/compatibility/version/version_1.8.cpp b/tests/compatibility/version/version_1.8.cpp
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2020, Intel Corporation */
+/* Copyright 2020-2021, Intel Corporation */
 
 #include <libpmemobj++/version.hpp>
 
 int
 main()
 {
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 8, "");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 8, "Wrong minor version");
 }
diff --git a/tests/compatibility/version/version_1.9.cpp b/tests/compatibility/version/version_1.9.cpp
@@ -6,6 +6,6 @@
 int
 main()
 {
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");
-	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 9, "");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");
+	static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 9, "Wrong minor version");
 }
diff --git a/tests/ctest_helpers.cmake b/tests/ctest_helpers.cmake
@@ -116,6 +116,8 @@ function(build_test name)
 	endif()
 	if(WIN32)
 		target_link_libraries(${name} dbghelp)
+	else()
+		target_link_libraries(${name} atomic)
 	endif()
 
 	add_dependencies(tests ${name})
@@ -136,14 +138,6 @@ function(build_test_tbb name)
 	target_link_libraries(${name} ${TBB_LIBRARIES})
 endfunction()
 
-# Function to build test with atomic
-function(build_test_atomic name)
-	build_test(${name} ${ARGN})
-	if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		target_link_libraries(${name} atomic)
-	endif()
-endfunction()
-
 # Function to build a TBB test with mocked pmemobj_defrag() function
 function(build_test_tbb_defrag name)
 	build_test_tbb(${name} ${ARGN})
diff --git a/tests/ptr/ptr.cpp b/tests/ptr/ptr.cpp
@@ -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();
 }
diff --git a/utils/docker/images/Dockerfile.centos-8 b/utils/docker/images/Dockerfile.centos-8
@@ -81,7 +81,7 @@ RUN dnf update -y \
  && dnf install -y 'dnf-command(config-manager)' \
  && dnf config-manager --set-enabled powertools \
  && dnf update -y \
- && dnf install -y \
+ && dnf install -y --nobest \
 	${BASE_DEPS} \
 	${LIBPMEMOBJ_CPP_DEPS} \
 	${PMDK_DEPS} \
diff --git a/utils/docker/images/install-libndctl.sh b/utils/docker/images/install-libndctl.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018-2020, Intel Corporation
+# Copyright 2018-2021, Intel Corporation
 
 #
 # install-libndctl.sh - installs libndctl
diff --git a/utils/docker/images/install-pmdk.sh b/utils/docker/images/install-pmdk.sh

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// SPDX-License-Identifier: BSD-3-Clause`
`2`		`-/* Copyright 2018-2020, Intel Corporation */`
	`2`	`+/* Copyright 2018-2021, Intel Corporation */`
`3`	`3`
`4`	`4`	`/**`
`5`	`5`	`* @file`
`@@ -213,7 +213,7 @@ struct range_snapshotting_iterator`
`213`	`213`	`{`
`214`	`214`	`assert(data <= ptr);`
`215`	`215`
`216`		`- if (snapshot_size > 0)`
	`216`	`+ if (snapshot_size && ptr)`
`217`	`217`	`snapshot_range(ptr);`
`218`	`218`	`}`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`int`
`7`	`7`	`main()`
`8`	`8`	`{`
`9`		`- static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "");`
`10`		`- static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 10, "");`
	`9`	`+ static_assert(LIBPMEMOBJ_CPP_VERSION_MAJOR == 1, "Wrong major version");`
	`10`	`+ static_assert(LIBPMEMOBJ_CPP_VERSION_MINOR == 10,`
	`11`	`+ "Wrong minor version");`
`11`	`12`	`}`