roken: use Win32 rand_s() for rk_random() when available
On Windows if the compiler and C RTL is >= 1400 then the rand_s() function is available. rand_s() unlike rand() makes use of the RtlGenRandom() API to produce a random number between 0 and UINT_MAX. If rand_s() is not available or fails, fallback to rand(). One of the benefits of rand_s() is that no initialization is required so it will provide random output even if rk_random_init() is not called. Change-Id: I2768155de744bd49604fc8237728bb205d637f2a
This commit is contained in:
@@ -33,6 +33,10 @@
|
||||
|
||||
#include "roken.h"
|
||||
|
||||
#ifdef HAVE_WIN32_RAND_S
|
||||
static int hasRand_s = 1;
|
||||
#endif
|
||||
|
||||
void ROKEN_LIB_FUNCTION
|
||||
rk_random_init(void)
|
||||
{
|
||||
@@ -43,6 +47,32 @@ rk_random_init(void)
|
||||
#elif defined(HAVE_RANDOM)
|
||||
srandom(time(NULL));
|
||||
#else
|
||||
# ifdef HAVE_WIN32_RAND_S
|
||||
OSVERSIONINFO osInfo;
|
||||
|
||||
osInfo.dwOSVersionInfoSize = sizeof(osInfo);
|
||||
hasRand_s =
|
||||
(GetVersionEx(&osInfo)
|
||||
&& ((osInfo.dwMajorVersion > 5) ||
|
||||
(osInfo.dwMajorVersion == 5) && (osInfo.dwMinorVersion >= 1)));
|
||||
# endif
|
||||
srand (time(NULL));
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef HAVE_WIN32_RAND_S
|
||||
unsigned int ROKEN_LIB_FUNCTION
|
||||
rk_random(void)
|
||||
{
|
||||
if (hasRand_s) {
|
||||
unsigned int n;
|
||||
int code;
|
||||
|
||||
code = rand_s(&n);
|
||||
if (code == 0)
|
||||
return n;
|
||||
}
|
||||
|
||||
return rand();
|
||||
}
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user