ba1ffaa1c6
Thu Oct 31 00:01:39 1996 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sigwait. * signal/signal.h: Add prototype for sigwait. * sysdeps/posix/sigwait.c: New file. Implementation of sigwait function from POSIX.1c. * sysdeps/stub/sigwait.c: New file. Stub version of sigwait. Wed Oct 30 02:01:17 1996 Richard Henderson <rth@tamu.edu> * sunrpc/xdr_float.c (xdr_float): Handle sizeof(float)!=sizeof(long), but don't bother going farther than sizeof(float)==sizeof(int). (xdr_double): Handle little-endian machines! Handle sizeof(double) != 2*sizeof(long), though again don't bother with more than int. Thu Oct 29 16:09:42 1996 Craig Metz <cmetz@inner.net> * sysdeps/posix/getaddrinfo.c: Use buffer limits for inet_ntop function. Tue Oct 29 12:37:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makerules: Create symbolic links for linking in $(libdir). (make-link): Use absolute path for destination if this is not in the same directory. * elf/rtld.c (dl_main): When verifying don't check the name of the dynamic linker. * shlib-versions: Change entries for Hurd specific libs from *-*-gnu* to *-*-gnu?* so that i586-pc-linux-gnu does not match these entries. * assert/assert.h: Reformat copyright. Change reference to ANSI into reference to ISO C. * ctype/ctype.h: Likewise. * errno.h: Likewise. * limits.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * string/argz.h: Use __const is definitions. * elf/dlfcn.h: Use __const and __P. Reformat copyright. * misc/err.h: Likewise. * wctype/wctype.h (wctrans_t): Use __const instead of const. * Makeconfig ($(common-objpfx)soversions.mk): Generate list of sonames for versioned libraries. * Makefile: Remove code to generate libc-version.h. Generate gnu/lib-names.h with info from soversions.mk. * features.h: Define __GLIBC__ and __GLIBC_MINOR__. * dirent/tst-seekdir.c: Initialize save3. * grp/testgrp.c: Initialize my_group. * grp/fgetgrent_r.c: Change interface to follow POSIX.1c. * grp/grp.h: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/pwd.h: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/sgetspent.c: Likewise. * shadow/sgetspent_r.c: Likewise. * grp/fgetgrent.c: Adapt for change in interface of fgetgrent_r. * pwd/fgetpwent.c: Likewise, for fgetpwent_r.c. * shadow/fgetspent.c: Likewise, for fgetpwent_r.c. * resolv/netdb.h: Adapt prototypes for reentrant functions to follow POSIX.1c. * sunrpc/rpc/netdb.h: Likewise, * shadow/shadow.h: Likewise. * inet/getnetgrent_r.c: Follow change in pwd/grp function interface. * sysdeps/unix/getlogin_r.c: Return ERANGE when buffer is too small. * inet/herrno.c: Don't define __h_errno. Only h_errno otherwise the ELF aliasing creates strange situations. * sysdeps/unix/sysv/linux/errnos.H: Define __set_errno as inline function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Don't define __errno. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * libio/libio.h: Don't declare _IO_flockfile and _IO_funlockfile weak. * locale/programs/charmap.c: Add casts to prevent warnings. * locale/programs/linereader.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/stringtrans.c: Likewise. Change types for various variables to prevent warnings. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.h (lr_ungetc): Likewise. * locale/programs/charset.h (struct charset): Use `unsigned int' as type for width_default. * posix/regex.c: Change type of `this_reg' variables. * stdio-common/Makefile: Use -Wno-format for tstdiomisc.c. * stdio-common/bug5.c: De-ANSI-fy. Use correct types for variables. * stdio-common/printf_fp.c: Initialize to_shift. * stdio-common/test_rdwr.c: Add cast. * stdio-common/vfprintf.c: Add casts and use correct types to prevent warnings. * stdio-common/vfscanf.c: Initialize str and strptr. * sysdeps/libm-ieee754/e_jnf.c: Use correct types to prevent warnings. * sysdeps/libm-ieee754/e_pow.c: Likewise. * sysdeps/libm-ieee754/e_powf.c: Likewise. * sysdeps/libm-ieee754/e_rem_pio2f.c: Likewise. * time/test-tz.c: Likewise. * manual/creature.texi: Document _REENTRANT and _THREAD_SAFE. * manual/libc.texinfo: Prevent makeinfo failure by avoiding libc.cp index. This must be fixed. * manual/nss.texi: Adapt for correct POSIX.1c interface of reentrant functions. * manual/users.texi: Document netgroup functions. * po/es.po: Updated. * po/fr.po: Updated. * posix/fnmatch.c: Change to match libit version. * posix/unistd.h: Change prototype for ttyname_r to match POSIX.1c. * sysdep/posix/ttyname_r.c: Likewise. * stdlib/atexit.h (__new_exitfn): Add internal locking. * stdlib/exit.c: De-ANSI-fy. Handle new ef_us value for flavor. * stdlib/exit.h: De-ANSI-fy. Define new ef_us value for flavor. * stdlib/random.c (__srandom): Add internal locking. (__initstate): Likewise. (__setstate): Likewise. (__random): Likewise. Mon Oct 28 22:28:37 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/generic/crypt-entry.c (crypt_r): Use __set_errno. (crypt): Likewise. * resolv/gethnamaddr.c (gethostbyname2): Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Fix typo. Sun Oct 27 11:12:50 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/programs/ld-collate.c (collate_order_elem): Fix format string. (collate_element_to): Cast field width argument to `int' for format string. (collate_symbol): Likewise. (collate_order_elem): Likewise. (collate_weight_bsymbol): Likewise. (collate_simple_weight): Likewise. * locale/programs/ld-time.c (STRARR_ELEM): Fix format string. * locale/programs/ld-ctype.c (ctype_class_newP): Add missing argument for format string. (ctype_map_newP): Likewise. (set_class_defaults): Fix format string. * locale/programs/localedef.c (construct_output_path): Putting an explicit \0 into the format string does not work, use %c. Sat Oct 26 20:38:36 1996 Richard Henderson <rth@tamu.edu> * Makerules: Install all shared libraries in $(slibdir). * login/Makefile: Build libutil.so in others pass after libc.so is created. * misc/mntent.h: Include <paths.h> for _PATH_MNTTAB & _PATH_MOUNTED. * string/stratcliff.c: Allocate 3 pages instead of one, then use mprotect so that we know that the adjacent pages are inaccessible. * resource/sys/resource.h: Move all structures and enums to ... * sysdeps/generic/resourcebits.h: ... here ... * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: ... and here. * sysdeps/unix/sysv/linux/alpha/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/i386/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/mips/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/resourcebits.h: New file. Use kernel header for RLIMIT_* definitions. The members of struct rlimit are longs. Thu Oct 24 17:43:34 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (sysdep-dirs): Fix typo. Wed Oct 23 03:45:22 1996 Ulrich Drepper <drepper@cygnus.com> * Makefile (headers): Don't mention libc-version.h. (install-others): ...but here. * time/strptime.c: Recognize %s, %u, %g, and %G format. nothing is found. This guarantees all subsequent calls behave * sysdeps/unix/sysv/linux/syscalls.list: Change function name for * io/getwd.c (getwd) [! PATH_MAX]: Don't assume that the user's buffer is any longer than the amount necessary to hold the filename; the Hurd getcwd uses the *entire* contents of the buffer, however long it is specified to be. * posix/getconf.c: De-ANSI-fy. Recognize POSIX.2 constant names. since these do not depend on the platform.
277 lines
11 KiB
C
277 lines
11 KiB
C
/*
|
||
* Copyright (c) 1983 Regents of the University of California.
|
||
* All rights reserved.
|
||
*
|
||
* Redistribution and use in source and binary forms are permitted
|
||
* provided that the above copyright notice and this paragraph are
|
||
* duplicated in all such forms and that any documentation,
|
||
* advertising materials, and other materials related to such
|
||
* distribution and use acknowledge that the software was developed
|
||
* by the University of California, Berkeley. The name of the
|
||
* University may not be used to endorse or promote products derived
|
||
* from this software without specific prior written permission.
|
||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||
*/
|
||
|
||
/*
|
||
* This is derived from the Berkeley source:
|
||
* @(#)random.c 5.5 (Berkeley) 7/6/88
|
||
* It was reworked for the GNU C Library by Roland McGrath.
|
||
* Rewritten to use reentrant functions by Ulrich Drepper, 1995.
|
||
*/
|
||
|
||
#include <libc-lock.h>
|
||
#include <limits.h>
|
||
#include <stddef.h>
|
||
#include <stdlib.h>
|
||
|
||
|
||
/* An improved random number generation package. In addition to the standard
|
||
rand()/srand() like interface, this package also has a special state info
|
||
interface. The initstate() routine is called with a seed, an array of
|
||
bytes, and a count of how many bytes are being passed in; this array is
|
||
then initialized to contain information for random number generation with
|
||
that much state information. Good sizes for the amount of state
|
||
information are 32, 64, 128, and 256 bytes. The state can be switched by
|
||
calling the setstate() function with the same array as was initiallized
|
||
with initstate(). By default, the package runs with 128 bytes of state
|
||
information and generates far better random numbers than a linear
|
||
congruential generator. If the amount of state information is less than
|
||
32 bytes, a simple linear congruential R.N.G. is used. Internally, the
|
||
state information is treated as an array of longs; the zeroeth element of
|
||
the array is the type of R.N.G. being used (small integer); the remainder
|
||
of the array is the state information for the R.N.G. Thus, 32 bytes of
|
||
state information will give 7 longs worth of state information, which will
|
||
allow a degree seven polynomial. (Note: The zeroeth word of state
|
||
information also has some other information stored in it; see setstate
|
||
for details). The random number generation technique is a linear feedback
|
||
shift register approach, employing trinomials (since there are fewer terms
|
||
to sum up that way). In this approach, the least significant bit of all
|
||
the numbers in the state table will act as a linear feedback shift register,
|
||
and will have period 2^deg - 1 (where deg is the degree of the polynomial
|
||
being used, assuming that the polynomial is irreducible and primitive).
|
||
The higher order bits will have longer periods, since their values are
|
||
also influenced by pseudo-random carries out of the lower bits. The
|
||
total period of the generator is approximately deg*(2**deg - 1); thus
|
||
doubling the amount of state information has a vast influence on the
|
||
period of the generator. Note: The deg*(2**deg - 1) is an approximation
|
||
only good for large deg, when the period of the shift register is the
|
||
dominant factor. With deg equal to seven, the period is actually much
|
||
longer than the 7*(2**7 - 1) predicted by this formula. */
|
||
|
||
|
||
|
||
/* For each of the currently supported random number generators, we have a
|
||
break value on the amount of state information (you need at least thi
|
||
bytes of state info to support this random number generator), a degree for
|
||
the polynomial (actually a trinomial) that the R.N.G. is based on, and
|
||
separation between the two lower order coefficients of the trinomial. */
|
||
|
||
/* Linear congruential. */
|
||
#define TYPE_0 0
|
||
#define BREAK_0 8
|
||
#define DEG_0 0
|
||
#define SEP_0 0
|
||
|
||
/* x**7 + x**3 + 1. */
|
||
#define TYPE_1 1
|
||
#define BREAK_1 32
|
||
#define DEG_1 7
|
||
#define SEP_1 3
|
||
|
||
/* x**15 + x + 1. */
|
||
#define TYPE_2 2
|
||
#define BREAK_2 64
|
||
#define DEG_2 15
|
||
#define SEP_2 1
|
||
|
||
/* x**31 + x**3 + 1. */
|
||
#define TYPE_3 3
|
||
#define BREAK_3 128
|
||
#define DEG_3 31
|
||
#define SEP_3 3
|
||
|
||
/* x**63 + x + 1. */
|
||
#define TYPE_4 4
|
||
#define BREAK_4 256
|
||
#define DEG_4 63
|
||
#define SEP_4 1
|
||
|
||
|
||
/* Array versions of the above information to make code run faster.
|
||
Relies on fact that TYPE_i == i. */
|
||
|
||
#define MAX_TYPES 5 /* Max number of types above. */
|
||
|
||
|
||
/* Initially, everything is set up as if from:
|
||
initstate(1, randtbl, 128);
|
||
Note that this initialization takes advantage of the fact that srandom
|
||
advances the front and rear pointers 10*rand_deg times, and hence the
|
||
rear pointer which starts at 0 will also end up at zero; thus the zeroeth
|
||
element of the state information, which contains info about the current
|
||
position of the rear pointer is just
|
||
(MAX_TYPES * (rptr - state)) + TYPE_3 == TYPE_3. */
|
||
|
||
static int32_t randtbl[DEG_3 + 1] =
|
||
{
|
||
TYPE_3,
|
||
|
||
-1726662223, 379960547, 1735697613, 1040273694, 1313901226,
|
||
1627687941, -179304937, -2073333483, 1780058412, -1989503057,
|
||
-615974602, 344556628, 939512070, -1249116260, 1507946756,
|
||
-812545463, 154635395, 1388815473, -1926676823, 525320961,
|
||
-1009028674, 968117788, -123449607, 1284210865, 435012392,
|
||
-2017506339, -911064859, -370259173, 1132637927, 1398500161,
|
||
-205601318,
|
||
};
|
||
|
||
|
||
static struct random_data unsafe_state =
|
||
{
|
||
/* FPTR and RPTR are two pointers into the state info, a front and a rear
|
||
pointer. These two pointers are always rand_sep places aparts, as they
|
||
cycle through the state information. (Yes, this does mean we could get
|
||
away with just one pointer, but the code for random is more efficient
|
||
this way). The pointers are left positioned as they would be from the call:
|
||
initstate(1, randtbl, 128);
|
||
(The position of the rear pointer, rptr, is really 0 (as explained above
|
||
in the initialization of randtbl) because the state table pointer is set
|
||
to point to randtbl[1] (as explained below).) */
|
||
|
||
fptr : &randtbl[SEP_3 + 1],
|
||
rptr : &randtbl[1],
|
||
|
||
/* The following things are the pointer to the state information table,
|
||
the type of the current generator, the degree of the current polynomial
|
||
being used, and the separation between the two pointers.
|
||
Note that for efficiency of random, we remember the first location of
|
||
the state information, not the zeroeth. Hence it is valid to access
|
||
state[-1], which is used to store the type of the R.N.G.
|
||
Also, we remember the last location, since this is more efficient than
|
||
indexing every time to find the address of the last element to see if
|
||
the front and rear pointers have wrapped. */
|
||
|
||
state : &randtbl[1],
|
||
|
||
rand_type : TYPE_3,
|
||
rand_deg : DEG_3,
|
||
rand_sep : SEP_3,
|
||
|
||
end_ptr : &randtbl[sizeof (randtbl) / sizeof (randtbl[0])]
|
||
};
|
||
|
||
/* POSIX.1c requires that there is mutual exclusion for the `rand' and
|
||
`srand' functions to prevent concurrent calls from modifying common
|
||
data. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* Initialize the random number generator based on the given seed. If the
|
||
type is the trivial no-state-information type, just remember the seed.
|
||
Otherwise, initializes state[] based on the given "seed" via a linear
|
||
congruential generator. Then, the pointers are set to known locations
|
||
that are exactly rand_sep places apart. Lastly, it cycles the state
|
||
information a given number of times to get rid of any initial dependencies
|
||
introduced by the L.C.R.N.G. Note that the initialization of randtbl[]
|
||
for default usage relies on values produced by this routine. */
|
||
void
|
||
__srandom (x)
|
||
unsigned int x;
|
||
{
|
||
__libc_lock_lock (lock)
|
||
(void) __srandom_r (x, &unsafe_state);
|
||
__libc_lock_unlock (lock)
|
||
}
|
||
|
||
weak_alias (__srandom, srandom)
|
||
weak_alias (__srandom, srand)
|
||
|
||
/* Initialize the state information in the given array of N bytes for
|
||
future random number generation. Based on the number of bytes we
|
||
are given, and the break values for the different R.N.G.'s, we choose
|
||
the best (largest) one we can and set things up for it. srandom is
|
||
then called to initialize the state information. Note that on return
|
||
from srandom, we set state[-1] to be the type multiplexed with the current
|
||
value of the rear pointer; this is so successive calls to initstate won't
|
||
lose this information and will be able to restart with setstate.
|
||
Note: The first thing we do is save the current state, if any, just like
|
||
setstate so that it doesn't matter when initstate is called.
|
||
Returns a pointer to the old state. */
|
||
void *
|
||
__initstate (seed, arg_state, n)
|
||
unsigned int seed;
|
||
void *arg_state;
|
||
size_t n;
|
||
{
|
||
void *ostate;
|
||
|
||
__libc_lock_lock (lock)
|
||
|
||
ostate = (void *) &unsafe_state.state[-1];
|
||
|
||
__initstate_r (seed, arg_state, n, &unsafe_state);
|
||
|
||
__libc_lock_unlock (lock)
|
||
|
||
return ostate;
|
||
}
|
||
|
||
weak_alias (__initstate, initstate)
|
||
|
||
/* Restore the state from the given state array.
|
||
Note: It is important that we also remember the locations of the pointers
|
||
in the current state information, and restore the locations of the pointers
|
||
from the old state information. This is done by multiplexing the pointer
|
||
location into the zeroeth word of the state information. Note that due
|
||
to the order in which things are done, it is OK to call setstate with the
|
||
same state as the current state
|
||
Returns a pointer to the old state information. */
|
||
void *
|
||
__setstate (arg_state)
|
||
void *arg_state;
|
||
{
|
||
void *ostate;
|
||
|
||
__libc_lock_lock (lock)
|
||
|
||
ostate = (void *) &unsafe_state.state[-1];
|
||
|
||
if (__setstate_r (arg_state, &unsafe_state) < 0)
|
||
ostate = NULL;
|
||
|
||
__libc_lock_unlock (lock)
|
||
|
||
return ostate;
|
||
}
|
||
|
||
weak_alias (__setstate, setstate)
|
||
|
||
/* If we are using the trivial TYPE_0 R.N.G., just do the old linear
|
||
congruential bit. Otherwise, we do our fancy trinomial stuff, which is the
|
||
same in all ther other cases due to all the global variables that have been
|
||
set up. The basic operation is to add the number at the rear pointer into
|
||
the one at the front pointer. Then both pointers are advanced to the next
|
||
location cyclically in the table. The value returned is the sum generated,
|
||
reduced to 31 bits by throwing away the "least random" low bit.
|
||
Note: The code takes advantage of the fact that both the front and
|
||
rear pointers can't wrap on the same call by not testing the rear
|
||
pointer if the front one has wrapped. Returns a 31-bit random number. */
|
||
|
||
int32_t
|
||
__random ()
|
||
{
|
||
int32_t retval;
|
||
|
||
__libc_lock_lock (lock)
|
||
|
||
(void) __random_r (&unsafe_state, &retval);
|
||
|
||
__libc_lock_unlock (lock)
|
||
|
||
return retval;
|
||
}
|
||
|
||
weak_alias (__random, random)
|