Merge branch 'stable-1.8' into 'stable-1.9'

Author: lukaszstolarczuk

.github/workflows/gha.yml

@@ -43,7 +43,7 @@ jobs:
             fetch-depth: 50
 
        - 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

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2020, Intel Corporation
+# Copyright 2018-2021, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

ChangeLog

@@ -1,3 +1,34 @@
+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.
+
 Fri Jan 31 2020 Szymon Romik <szymon.romik@intel.com>
 
 	* Version 1.9
@@ -121,7 +152,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
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020, Intel Corporation
+ * Copyright 2018-2021, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -242,7 +242,7 @@ struct range_snapshotting_iterator
 	{
 		assert(data <= ptr);
 
-		if (snapshot_size > 0)
+		if (snapshot_size && ptr)
 			snapshot_range(ptr);
 	}
 

include/libpmemobj++/container/vector.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020, Intel Corporation
+ * Copyright 2018-2021, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -672,7 +672,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);
@@ -1604,7 +1604,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));
 }
 
 /**
@@ -1847,7 +1847,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)
@@ -2323,10 +2323,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);
 
@@ -2344,9 +2345,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;
@@ -2379,7 +2382,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.
  *
@@ -2398,6 +2402,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
@@ -2406,7 +2417,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())];

tests/memcheck-libunwind.supp

@@ -21,3 +21,17 @@
    obj:*libunwind*
    ...
 }
+{
+   libunwind calls glibc's setcontext on some architectures, e.g. ppc
+   Memcheck:Addr8
+   fun:setcontext*
+   ...
+}
+{
+   libunwind exception suppresion
+   Memcheck:Param
+   write(buf)
+   ...
+   obj:*libunwind*
+   ...
+}

tests/ptr/ptr.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020, Intel Corporation
+ * Copyright 2015-2021, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -385,6 +385,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);
+	}
+}
 }
 
 int
@@ -412,6 +444,7 @@ main(int argc, char *argv[])
 	test_ptr_array(pop);
 	test_offset(pop);
 	test_base_ptr_casting(pop);
+	test_offset_alignment(pop);
 
 	pop.close();
 

travis.yml

@@ -27,7 +27,7 @@ before_install:
   - echo $TRAVIS_COMMIT_RANGE
   - export HOST_WORKDIR=`pwd`
   - cd utils/docker
-  - ./pull-or-rebuild-image.sh
+  - ./pull-or-rebuild-image.sh rebuild
 
 script:
   - ./build.sh

utils/docker/pull-or-rebuild-image.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2020, Intel Corporation
+# Copyright 2016-2021, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -34,17 +34,18 @@
 # pull-or-rebuild-image.sh - rebuilds the Docker image used in the
 #                            current Travis build if necessary.
 #
-# The script rebuilds the Docker image if the Dockerfile for the current
-# OS version (Dockerfile.${OS}-${OS_VER}) or any .sh script from the directory
-# with Dockerfiles were modified and committed.
+# The script rebuilds the Docker image if:
+# 1. the Dockerfile for the current OS version (Dockerfile.${OS}-${OS_VER})
+#    or any .sh script in the Dockerfiles directory were modified and committed, or
+# 2. "rebuild" param was passed as a first argument to this script.
 #
 # If the Travis build is not of the "pull_request" type (i.e. in case of
 # merge after pull_request) and it succeed, the Docker image should be pushed
 # to the Docker Hub repository. An empty file is created to signal that to
 # further scripts.
 #
 # If the Docker image does not have to be rebuilt, it will be pulled from
-# Docker Hub.
+# the Docker Hub.
 #
 
 set -e
@@ -78,6 +79,18 @@ if [[ -z "$HOST_WORKDIR" ]]; then
 	exit 1
 fi
 
+# Path to directory with Dockerfiles and image building scripts
+images_dir_name=images
+base_dir=utils/docker/$images_dir_name
+
+# If "rebuild" param is passed to the script, force rebuild
+if [[ "${1}" == "rebuild" ]]; then
+	pushd ${images_dir_name}
+	./build-image.sh ${OS}-${OS_VER}
+	popd
+	exit 0
+fi
+
 # Find all the commits for the current build
 if [ -n "$CI_COMMIT_RANGE" ]; then
 	commits=$(git rev-list $CI_COMMIT_RANGE)
@@ -94,10 +107,6 @@ files=$(for commit in $commits; do git diff-tree --no-commit-id --name-only \
 echo "Files modified within the commit range:"
 for file in $files; do echo $file; done
 
-# Path to directory with Dockerfiles and image building scripts
-images_dir_name=images
-base_dir=utils/docker/$images_dir_name
-
 # Check if committed file modifications require the Docker image to be rebuilt
 for file in $files; do
 	# Check if modified files are relevant to the current build
@@ -106,7 +115,7 @@ for file in $files; do
 	then
 		# Rebuild Docker image for the current OS version
 		echo "Rebuilding the Docker image for the Dockerfile.$OS-$OS_VER"
-		pushd $images_dir_name
+		pushd ${images_dir_name}
 		./build-image.sh ${OS}-${OS_VER}
 		popd