X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frandom.cpp;h=ba9d937ba32b95f43f877348ac0f358ea9c7e071;hb=32670d719327feb585374283a50eeb76ce36b962;hp=ec74688ec976df098f60ea330b3a7ae4eb4903e2;hpb=5b9eda8a30a21a1c9de4572dd2b397c7cf923fa1;p=lttng-tools.git

diff --git a/src/common/random.cpp b/src/common/random.cpp
index ec74688ec..ba9d937ba 100644
--- a/src/common/random.cpp
+++ b/src/common/random.cpp
@@ -67,11 +67,22 @@ 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)))
@@ -141,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()));
 	}
 
@@ -172,7 +183,7 @@ lttng::random::seed_t lttng::random::produce_best_effort_random_seed()
 		return lttng::random::produce_true_random_seed();
 	} 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());
@@ -186,8 +197,8 @@ lttng::random::seed_t lttng::random::produce_best_effort_random_seed()
 		produce_random_seed_from_urandom();
 	} 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());
 	}