hashmap: run reserve() in a transaction

pmem · Jan 5, 2021 · 46f0862 · 46f0862
1 parent ad644f1
commit 46f0862
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/include/libpmemobj++/container/concurrent_hash_map.hpp b/include/libpmemobj++/container/concurrent_hash_map.hpp
@@ -2875,10 +2875,13 @@ class concurrent_hash_map
 
 		bool is_initial = this->size() == 0;
 
+		pool_base pop = get_pool_base();
+		pmem::obj::transaction::manual tx(pop);
 		for (size_type m = mask(); buckets > m; m = mask())
 			enable_segment(
 				segment_traits_t::segment_index_of(m + 1),
 				is_initial);
+		pmem::obj::transaction::commit();
 	}
 
 	/**

diff --git a/tests/concurrent_hash_map_tx/concurrent_hash_map_tx.cpp b/tests/concurrent_hash_map_tx/concurrent_hash_map_tx.cpp
@@ -276,6 +276,19 @@ test_tx_singlethread(nvobj::pool<root> &pop)
 	UT_ASSERTeq(bucket_count, map->bucket_count());
 	verify_elements(pop, number_of_inserts);
 
+	/* try {
+		pmem::obj::transaction::run(pop, [&] {
+			map->reserve(10 * (size_t)number_of_inserts);
+			pmem::obj::transaction::abort(0);
+		});
+	} catch (pmem::manual_tx_abort &) {
+	} catch (std::exception &e) {
+		UT_FATALexc(e);
+	}
+
+	UT_ASSERTeq(bucket_count, map->bucket_count());
+	verify_elements(pop, number_of_inserts); */
+
 	try {
 		pmem::obj::transaction::run(pop, [&] {
 			pmem::obj::delete_persistent<persistent_map_type>(map);