X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frandom.cpp;h=26f51d3a4a0a674e19c3721b69ee5ad23eefa2b0;hb=f053d40c60b9dd38da27d88412dcac3a8404324c;hp=5a038a563e12b339a25f307cf4e83cc12c6d1bfc;hpb=28f23191dcbf047429d51950a337a57d7a3f866a;p=lttng-tools.git

diff --git a/src/common/random.cpp b/src/common/random.cpp
index 5a038a563..26f51d3a4 100644
--- a/src/common/random.cpp
+++ b/src/common/random.cpp
@@ -72,6 +72,17 @@ void getrandom_nonblock(char *out_data, std::size_t size)
 			errno);
 	}
 }
+#elif defined(HAVE_ARC4RANDOM)
+
+#include <stdlib.h>
+
+/*
+ * According to the MacOS / FreeBSD manpage, this function never fails nor blocks.
+ */
+void getrandom_nonblock(char *out_data, std::size_t size)
+{
+	arc4random_buf(out_data, size);
+}
 #else /* defined(__linux__) && defined(SYS_getrandom) && defined(HAVE_SYS_RANDOM_H) */
 __attribute__((noreturn)) void getrandom_nonblock(char *out_data __attribute__((unused)),
 						  std::size_t size __attribute__((unused)))
@@ -170,7 +181,7 @@ lttng::random::seed_t lttng::random::produce_best_effort_random_seed()
 {
 	try {
 		return lttng::random::produce_true_random_seed();
-	} catch (std::exception& e) {
+	} catch (const std::exception& e) {
 		WARN("%s",
 		     fmt::format(
 			     "Failed to produce a random seed using getrandom(), falling back to pseudo-random device seed generation which will block until its pool is initialized: {}",
@@ -184,7 +195,7 @@ lttng::random::seed_t lttng::random::produce_best_effort_random_seed()
 		 * under some containerized environments.
 		 */
 		produce_random_seed_from_urandom();
-	} catch (std::exception& e) {
+	} catch (const std::exception& e) {
 		WARN("%s",
 		     fmt::format("Failed to produce a random seed from the urandom device: {}",
 				 e.what())