summaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-10 09:40:23 +0000
committerRoland McGrath <roland@gnu.org>2005-02-10 09:40:23 +0000
commitf17c2202e4238b7408b8ee8ab742e5d2198cff6e (patch)
treebb7302826f1e982e4e3010e8cceacd0dbf7d3fc1 /stdlib
parent1a53c052c34ec4e934ba177b4f5bcf0b51be2ceb (diff)
downloadglibc-f17c2202e4238b7408b8ee8ab742e5d2198cff6e.tar.gz
[BZ #710]
2005-02-09 Jakub Jelinek <jakub@redhat.com> [BZ #710] * stdlib/random_r.c (__initstate_r): Save old state. * stdlib/Makefile (tests): Add tst-random2. * stdlib/tst-random2.c: New test. Reported by Peter Bergner <bergner@vnet.ibm.com>. (s390-.*-.*, powerpc.*-.*-.*, sparc.*-.*-.*): Add WORDSIZE64 entries for these mapping back to the above.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/Makefile6
-rw-r--r--stdlib/random_r.c11
-rw-r--r--stdlib/tst-random2.c59
3 files changed, 72 insertions, 4 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index a0c0e71704..fafe6061a0 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -61,9 +61,9 @@ distribute := exit.h grouping.h abort-instr.h isomac.c tst-fmtmsg.sh \
test-srcs := tst-fmtmsg
tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
test-canon test-canon2 tst-strtoll tst-environ \
- tst-xpg-basename tst-random tst-bsearch tst-limits \
- tst-rand48 bug-strtod tst-setcontext test-a64l tst-qsort \
- tst-system testmb2
+ tst-xpg-basename tst-random tst-random2 tst-bsearch \
+ tst-limits tst-rand48 bug-strtod tst-setcontext \
+ test-a64l tst-qsort tst-system testmb2
include ../Makeconfig
diff --git a/stdlib/random_r.c b/stdlib/random_r.c
index 09677e6077..c85fd5eeef 100644
--- a/stdlib/random_r.c
+++ b/stdlib/random_r.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1995 Free Software Foundation
+ Copyright (C) 1995, 2005 Free Software Foundation
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -240,10 +240,19 @@ __initstate_r (seed, arg_state, n, buf)
int degree;
int separation;
int32_t *state;
+ int old_type;
+ int32_t *old_state;
if (buf == NULL)
goto fail;
+ old_type = buf->rand_type;
+ old_state = buf->state;
+ if (old_type == TYPE_0)
+ old_state[-1] = TYPE_0;
+ else
+ old_state[-1] = (MAX_TYPES * (buf->rptr - old_state)) + old_type;
+
if (n >= BREAK_3)
type = n < BREAK_4 ? TYPE_3 : TYPE_4;
else if (n < BREAK_1)
diff --git a/stdlib/tst-random2.c b/stdlib/tst-random2.c
new file mode 100644
index 0000000000..aa1b89d905
--- /dev/null
+++ b/stdlib/tst-random2.c
@@ -0,0 +1,59 @@
+/* Test initstate saving the old state.
+ Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+ int pass;
+ int ret = 0;
+ long int r[2];
+
+ for (pass = 0; pass < 2; pass++)
+ {
+ srandom (0x12344321);
+
+ int j;
+ for (j = 0; j < 3; ++j)
+ random ();
+ if (pass == 1)
+ {
+ char state[128];
+ char *ostate = initstate (0x34562101, state, 128);
+ if (setstate (ostate) != state)
+ {
+ puts ("setstate (ostate) != state");
+ ret = 1;
+ }
+ }
+
+ random ();
+ r[pass] = random ();
+ }
+
+ if (r[0] != r[1])
+ {
+ printf ("%ld != %ld\n", r[0], r[1]);
+ ret = 1;
+ }
+ return ret;
+}