vlc_(d|l|m)rand48: thread-safe wrappers for non-secure/fast PRNG

These functions are just convenience so we don't need to seed the
PRNG all the time, nor to use vlc_rand_bytes() for non-security-critical
randomness.

diff --git a/include/vlc_rand.h b/include/vlc_rand.h
index 56e07affa8179e4fd54966b63e717f96e37b8fc4..0023d7cdaf6869e0de68a1e6412906d08a21f8f4 100644 (file)
--- a/include/vlc_rand.h
+++ b/include/vlc_rand.h
@@ -29,4 +29,9 @@
 
 VLC_EXPORT( void, vlc_rand_bytes, (void *buf, size_t len) );
 
+/* Interlocked (but not reproducible) functions for the POSIX PRNG */
+VLC_EXPORT( double, vlc_drand48, (void) LIBVLC_USED );
+VLC_EXPORT( long, vlc_lrand48, (void) LIBVLC_USED );
+VLC_EXPORT( long, vlc_mrand48, (void) LIBVLC_USED );
+
 #endif

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 6ed173227e3e8100cb5003d10ce8619f2adc85b2..ae488f8d93d42e49d40a8869820829c7b022af4c 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -553,6 +553,9 @@ vlc_plugin_set
 vlc_poll
 vlc_tdestroy
 vlc_rand_bytes
+vlc_drand48
+vlc_lrand48
+vlc_mrand48
 vlc_release
 vlc_restorecancel
 vlc_rwlock_destroy

diff --git a/src/misc/rand.c b/src/misc/rand.c
index 8932e407ad1343eb23d2dc04b7cefa323290f925..28546271b3d13f6f95b52b0a0653f8a1b04210a3 100644 (file)
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -163,3 +163,82 @@ void vlc_rand_bytes (void *buf, size_t len)
     }
 }
 #endif
+
+static struct
+{
+    bool           init;
+    unsigned short subi[3];
+    vlc_mutex_t    lock;
+} rand48 = { false, { 0, 0, 0, }, VLC_STATIC_MUTEX, };
+
+static void init_rand48 (void)
+{
+    if (!rand48.init)
+    {
+        vlc_rand_bytes (rand48.subi, sizeof (rand48.subi));
+#if 0 // short would be more than 16-bits ?
+        for (unsigned i = 0; i < 3; i++)
+            subi[i] &= 0xffff;
+#endif
+    }
+}
+
+/**
+ * PRNG uniformly distributed between 0.0 and 1.0 with 48-bits precision.
+ *
+ * @note Contrary to POSIX drand48(), this function is thread-safe.
+ * @warning Series generated by this function are not reproducible.
+ * Use erand48() if you need reproducible series.
+ *
+ * @return a double value within [0.0, 1.0] inclusive
+ */
+double vlc_drand48 (void)
+{
+    double ret;
+
+    vlc_mutex_lock (&rand48.lock);
+    init_rand48 ();
+    ret = erand48 (rand48.subi);
+    vlc_mutex_unlock (&rand48.lock);
+    return ret;
+}
+
+/**
+ * PRNG uniformly distributed between 0 and 2^32 - 1.
+ *
+ * @note Contrary to POSIX lrand48(), this function is thread-safe.
+ * @warning Series generated by this function are not reproducible.
+ * Use nrand48() if you need reproducible series.
+ *
+ * @return a double value within [0.0, 1.0] inclusive
+ */
+long vlc_lrand48 (void)
+{
+    long ret;
+
+    vlc_mutex_lock (&rand48.lock);
+    init_rand48 ();
+    ret = nrand48 (rand48.subi);
+    vlc_mutex_unlock (&rand48.lock);
+    return ret;
+}
+
+/**
+ * PRNG uniformly distributed between -2^32 and 2^32 - 1.
+ *
+ * @note Contrary to POSIX mrand48(), this function is thread-safe.
+ * @warning Series generated by this function are not reproducible.
+ * Use jrand48() if you need reproducible series.
+ *
+ * @return a double value within [0.0, 1.0] inclusive
+ */
+long vlc_mrand48 (void)
+{
+    long ret;
+
+    vlc_mutex_lock (&rand48.lock);
+    init_rand48 ();
+    ret = jrand48 (rand48.subi);
+    vlc_mutex_unlock (&rand48.lock);
+    return ret;
+}