encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3319 - Getting the POSIX out of testqsort.c 

Simon Hug

There's a call to the POSIX function random in test/testqsort.c. Naturally, Windows doesn't do that. The attached patch changes the call to the SDLtest framework random functions and adds some seed control.

Looking at SDLTest_RandomInitTime, I just want to say that 'srand((unsigned int)time(NULL)); a=rand(); srand(clock()); b=rand();' is an absolutely terrible way to initialize a seed on Windows because of its terrible LCG.
This commit is contained in:
Sam Lantinga 2016-10-01 12:33:26 -07:00
parent d870f2719b
commit 3ac201cf7f
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/testqsort.c
View File

@ -10,10 +10,7 @@
freely. freely.
*/ */
#include <stdio.h> #include "SDL_test.h"
#include <stdlib.h>
#include "SDL.h"
static int static int
num_compare(const void *_a, const void *_b) num_compare(const void *_a, const void *_b)
@ -50,6 +47,33 @@ main(int argc, char *argv[])
static int nums[1024 * 100]; static int nums[1024 * 100];
static const int itervals[] = { SDL_arraysize(nums), 12 }; static const int itervals[] = { SDL_arraysize(nums), 12 };
int iteration; int iteration;
SDLTest_RandomContext rndctx;
if (argc > 1)
{
int success;
Uint64 seed = 0;
if (argv[1][0] == '0' && argv[1][1] == 'x')
success = SDL_sscanf(argv[1] + 2, "%llx", &seed);
else
success = SDL_sscanf(argv[1], "%llu", &seed);
if (!success)
{
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Invalid seed. Use a decimal or hexadecimal number.\n");
return 1;
}
if (seed <= 0xffffffff)
{
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Seed must be equal or greater than 0x100000000.\n");
return 1;
}
SDLTest_RandomInit(&rndctx, (unsigned int)(seed >> 32), (unsigned int)(seed & 0xffffffff));
}
else
{
SDLTest_RandomInitTime(&rndctx);
}
SDL_Log("Using random seed 0x%08x%08x\n", rndctx.x, rndctx.c);
for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) { for (iteration = 0; iteration < SDL_arraysize(itervals); iteration++) {
const int arraylen = itervals[iteration]; const int arraylen = itervals[iteration];
@ -72,7 +96,7 @@ main(int argc, char *argv[])
test_sort("reverse sorted", nums, arraylen); test_sort("reverse sorted", nums, arraylen);
for (i = 0; i < arraylen; i++) { for (i = 0; i < arraylen; i++) {
nums[i] = random(); nums[i] = SDLTest_RandomInt(&rndctx);
} }
test_sort("random sorted", nums, arraylen); test_sort("random sorted", nums, arraylen);
} }