X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frandom.cpp;h=ba9d937ba32b95f43f877348ac0f358ea9c7e071;hb=5983bb6d3d405e34c690bf33d861f143fb16f8ce;hp=dfab9538c0cab31cd4f556547a9f4e7b261d7fe3;hpb=20c734f5b9940033f4ab96e47523c7d9e3d299bb;p=lttng-tools.git

diff --git a/src/common/random.cpp b/src/common/random.cpp
index dfab9538c..ba9d937ba 100644
--- a/src/common/random.cpp
+++ b/src/common/random.cpp
@@ -67,15 +67,25 @@ void getrandom_nonblock(char *out_data, std::size_t size)
 
 	if (ret < 0) {
 		LTTNG_THROW_POSIX(
-			fmt::format("Failed to get true random data using getrandom(): size={}",
-				    size),
+			lttng::format("Failed to get true random data using getrandom(): size={}",
+				      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)))
+__attribute__((noreturn)) void getrandom_nonblock(char *out_data __attribute__((unused)),
+						  std::size_t size __attribute__((unused)))
 {
 	LTTNG_THROW_RANDOM_PRODUCTION_ERROR("getrandom() is not supported by this platform");
 }
@@ -142,7 +152,7 @@ lttng::random::seed_t produce_random_seed_from_urandom()
 	try {
 		urandom.read(&seed, sizeof(seed));
 	} catch (const std::exception& e) {
-		LTTNG_THROW_RANDOM_PRODUCTION_ERROR(fmt::format(
+		LTTNG_THROW_RANDOM_PRODUCTION_ERROR(lttng::format(
 			"Failed to read from `/dev/urandom`: size={}: {}", sizeof(seed), e.what()));
 	}
 
@@ -171,9 +181,9 @@ 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(
+		     lttng::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: {}",
 			     e.what())
 			     .c_str());
@@ -185,10 +195,10 @@ 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())
+		     lttng::format("Failed to produce a random seed from the urandom device: {}",
+				   e.what())
 			     .c_str());
 	}