Merge pull request #1128 from lukaszstolarczuk/merge-stable-1.6-into-stable-1.7

Merge stable-1.6 into stable-1.7

Author: lukaszstolarczuk

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.
+
 Wed Jun 26 2019 Szymon Romik <szymon.romik@intel.com>
 
 	* Version 1.7
@@ -46,7 +77,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++/detail/persistent_ptr_base.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018, 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
@@ -372,7 +372,10 @@ class persistent_ptr_base {
 	inline ptrdiff_t
 	calculate_offset() const
 	{
-		static const ptrdiff_t ptr_offset_magic = 0xDEADBEEF;
+		static const ptrdiff_t ptr_offset_magic = 0xF00000000000000;
+
+		static_assert(ptr_offset_magic % alignof(U) == 0, "");
+		static_assert(ptr_offset_magic % alignof(T) == 0, "");
 
 		U *tmp{reinterpret_cast<U *>(ptr_offset_magic)};
 		T *diff = static_cast<T *>(tmp);

include/libpmemobj++/experimental/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
@@ -245,7 +245,7 @@ struct range_snapshotting_iterator
 	{
 		assert(data <= ptr);
 
-		if (snapshot_size > 0)
+		if (snapshot_size && ptr)
 			snapshot_range(ptr);
 	}
 

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-2019, 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
@@ -344,6 +344,38 @@ test_offset(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
@@ -370,6 +402,7 @@ main(int argc, char *argv[])
 	test_ptr_transactional(pop);
 	test_ptr_array(pop);
 	test_offset(pop);
+	test_offset_alignment(pop);
 
 	pop.close();
 

travis.yml

@@ -20,7 +20,7 @@ before_install:
   - export GITHUB_REPO=pmem/libpmemobj-cpp
   - export DOCKERHUB_REPO=pmem/libpmemobj-cpp
   - cd utils/docker
-  - ./pull-or-rebuild-image.sh
+  - ./pull-or-rebuild-image.sh rebuild
   - if [[ -f push_image_to_repo_flag ]]; then PUSH_THE_IMAGE=1; fi
   - if [[ -f skip_build_package_check ]]; then export SKIP_CHECK=1; fi
   - rm -f push_image_to_repo_flag skip_build_package_check

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

@@ -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
@@ -75,6 +76,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 ${DOCKERHUB_REPO} ${OS}-${OS_VER}
+	popd
+	exit 0
+fi
+
 # TRAVIS_COMMIT_RANGE is usually invalid for force pushes - ignore such values
 # when used with non-upstream repository
 if [ -n "$TRAVIS_COMMIT_RANGE" -a $TRAVIS_REPO_SLUG != "${GITHUB_REPO}" ]; then
@@ -102,10 +115,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