[examples] Reduce scope of try-catch block and add missing catches

Author: KFilipek

examples/concurrent_hash_map/concurrent_hash_map.cpp

@@ -37,23 +37,23 @@ main(int argc, char *argv[])
 	pool<root> pop;
 	bool remove_hashmap = false;
 
-	try {
-		if (argc < 2)
-			std::cerr << "usage: " << argv[0]
-				  << " file-name [remove_hashmap]" << std::endl;
+	if (argc < 2)
+		std::cerr << "usage: " << argv[0]
+			  << " file-name [remove_hashmap]" << std::endl;
 
-		auto path = argv[1];
+	auto path = argv[1];
 
-		if (argc == 3)
-			remove_hashmap = std::string(argv[2]) == "1";
+	if (argc == 3)
+		remove_hashmap = std::string(argv[2]) == "1";
 
-		try {
-			pop = pool<root>::open(path, "concurrent_hash_map");
-		} catch (pmem::pool_error &e) {
-			std::cerr << e.what() << std::endl;
-			return -1;
-		}
+	try {
+		pop = pool<root>::open(path, "concurrent_hash_map");
+	} catch (pmem::pool_error &e) {
+		std::cerr << e.what() << std::endl;
+		return -1;
+	}
 
+	try {
 		auto &r = pop.root()->pptr;
 
 		if (r == nullptr) {
@@ -184,16 +184,19 @@ main(int argc, char *argv[])
 				r = nullptr;
 			});
 		}
-		pop.close();
+	} catch (const pmem::transaction_out_of_memory &e) {
+		std::cerr << "Exception occurred: " << e.what() << std::endl;
 	} catch (std::exception &e) {
 		std::cerr << "Exception occurred: " << e.what() << std::endl;
-		try {
-			pop.close();
-		} catch (const std::logic_error &e) {
-			std::cerr << "Exception: " << e.what() << std::endl;
-		}
+	}
+
+	try {
+		pop.close();
+	} catch (const std::logic_error &e) {
+		std::cerr << "Exception: " << e.what() << std::endl;
 		return -1;
 	}
+
 	return 0;
 }
 //! [concurrent_hash_map_ex]

examples/concurrent_hash_map/concurrent_hash_map_string.cpp

@@ -202,14 +202,17 @@ main(int argc, char *argv[])
 				r = nullptr;
 			});
 		}
-	} catch (std::exception &e) {
+	} catch (const pmem::transaction_out_of_memory &e) {
+		std::cerr << "Exception occurred: " << e.what() << std::endl;
+		retval = -127;
+	} catch (const std::exception &e) {
 		std::cerr << "Exception occurred: " << e.what() << std::endl;
 		retval = -1;
 	}
 	try {
 		pop.close();
 	} catch (const std::logic_error &e) {
-		std::cerr << "Exception: " << e.what() << std::endl;
+		std::cerr << "Exception occurred: " << e.what() << std::endl;
 		retval = -2;
 	}
 	return retval;

examples/pool/pool_as_class_member.cpp

@@ -46,7 +46,11 @@ class Foo {
 	~Foo()
 	{
 		/* Close a pmemobj pool */
-		pop.close();
+		try {
+			pop.close();
+		} catch (...) {
+			/* Let's ignore all exceptions during close */
+		}
 	}
 
 	void

examples/transaction/transaction.cpp

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BSD-3-Clause
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2021, Intel Corporation */
 
 /*
  * transaction.cpp -- C++ documentation snippets.
@@ -302,6 +302,9 @@ struct simple_ptr {
 		} catch (pmem::transaction_free_error &e) {
 			std::cerr << e.what() << std::endl;
 			std::terminate();
+		} catch (pmem::transaction_scope_error &e) {
+			std::cerr << e.what() << std::endl;
+			std::terminate();
 		}
 	}
 

include/libpmemobj++/container/concurrent_hash_map.hpp

@@ -2828,7 +2828,7 @@ class concurrent_hash_map
 	 *	[start_percent, start_percent + amount_percent]
 	 *	is incorrect.
 	 *
-	 * @throw rethrows pmem::defrag_error when a failure during
+	 * @throw pmem::defrag_error rethrows defrag_error when a failure during
 	 *	defragmentation occurs. Even if this error is thrown,
 	 *	some of objects could have been relocated,
 	 *	see in such case defrag_error.result for summary stats.