projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix inconsistent signature of __libc_start_main
[musl]
/
src
/
prng
/
random.c
diff --git
a/src/prng/random.c
b/src/prng/random.c
index
cc5702e
..
d3780fa
100644
(file)
--- a/
src/prng/random.c
+++ b/
src/prng/random.c
@@
-1,22
+1,12
@@
-/*
- * random.c - Copyright © 2011 Szabolcs Nagy
- * Permission to use, copy, modify, and/or distribute this code
- * for any purpose with or without fee is hereby granted.
- * There is no warranty.
-*/
-
#include <stdlib.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdint.h>
-#include "libc.h"
+#include "lock.h"
+#include "fork_impl.h"
/*
this code uses the same lagged fibonacci generator as the
original bsd random implementation except for the seeding
/*
this code uses the same lagged fibonacci generator as the
original bsd random implementation except for the seeding
-
-different seeds produce different sequences with long period
-(other libcs seed the state with a park-miller generator
-when seed=0 some fail to produce good random sequence
-others produce the same sequence as another seed)
+which was broken in the original
*/
static uint32_t init[] = {
*/
static uint32_t init[] = {
@@
-33,7
+23,8
@@
static int n = 31;
static int i = 3;
static int j = 0;
static uint32_t *x = init+1;
static int i = 3;
static int j = 0;
static uint32_t *x = init+1;
-static int lock;
+static volatile int lock[1];
+volatile int *const __random_lockptr = lock;
static uint32_t lcg31(uint32_t x) {
return (1103515245*x + 12345) & 0x7fffffff;
static uint32_t lcg31(uint32_t x) {
return (1103515245*x + 12345) & 0x7fffffff;
@@
-74,9
+65,9
@@
static void __srandom(unsigned seed) {
}
void srandom(unsigned seed) {
}
void srandom(unsigned seed) {
- LOCK(
&
lock);
+ LOCK(lock);
__srandom(seed);
__srandom(seed);
- UNLOCK(
&
lock);
+ UNLOCK(lock);
}
char *initstate(unsigned seed, char *state, size_t size) {
}
char *initstate(unsigned seed, char *state, size_t size) {
@@
-84,7
+75,7
@@
char *initstate(unsigned seed, char *state, size_t size) {
if (size < 8)
return 0;
if (size < 8)
return 0;
- LOCK(
&
lock);
+ LOCK(lock);
old = savestate();
if (size < 32)
n = 0;
old = savestate();
if (size < 32)
n = 0;
@@
-98,24
+89,25
@@
char *initstate(unsigned seed, char *state, size_t size) {
n = 63;
x = (uint32_t*)state + 1;
__srandom(seed);
n = 63;
x = (uint32_t*)state + 1;
__srandom(seed);
- UNLOCK(&lock);
+ savestate();
+ UNLOCK(lock);
return old;
}
char *setstate(char *state) {
void *old;
return old;
}
char *setstate(char *state) {
void *old;
- LOCK(
&
lock);
+ LOCK(lock);
old = savestate();
loadstate((uint32_t*)state);
old = savestate();
loadstate((uint32_t*)state);
- UNLOCK(
&
lock);
+ UNLOCK(lock);
return old;
}
long random(void) {
long k;
return old;
}
long random(void) {
long k;
- LOCK(
&
lock);
+ LOCK(lock);
if (n == 0) {
k = x[0] = lcg31(x[0]);
goto end;
if (n == 0) {
k = x[0] = lcg31(x[0]);
goto end;
@@
-127,6
+119,6
@@
long random(void) {
if (++j == n)
j = 0;
end:
if (++j == n)
j = 0;
end:
- UNLOCK(
&
lock);
+ UNLOCK(lock);
return k;
}
return k;
}