mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
76b87c039b
1997-05-29 12:48 Ulrich Drepper <drepper@cygnus.com> * io/ftw.c: Complete rewrite. Add implementation of `nftw'. * io/ftw.h: Update for new implementation and XPG4.2. * login/Makefile: Update for UTMP daemon implementation. Update resolver code to bind-4.9.6-T1A. * resolv/Banner: Update. * nss/digits_dots.c: Adapt text address matching to T1A. * nss/nss_files/files-hosts.c: Always use inet_pton. * resolv/base64.c (b64_pton): Follow T1A but don't use this code since it would lead to warnings. * resolv/gethnamaddr.c (getanswer): Test host name for maximal length at several places. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Correct typo in comment. * resolv/res_comp.c (dn_expand): Check for overflow. (dn_comp): Likewise. * resolv/res_debug.c (precsize_aton): Better implementation. * resolv/res_init.c (res_init): Make `buf' of size MAXDNAME. * resolv/res_send.c (res_send): Check for overflow in descriptor set. * resolv/nss_dns/dns-host.c (getanswer_r): Test host name for maximal length at several places. 1997-05-29 12:51 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp-private.h (struct utfuncs): Add one more parameter to updwtmp function. Declare all three function jump tables. * login/utmp.h: Declare __utmpname. * login/getutent_r.c: Remove db backend and provide support for utmpd backend. * login/login.c: Use `updwtmp' function insteead of writing the record ourself. * login/logwtmp.c: Move `updwtmp' function to... * login/updwtmp.c: ...here. New file. * login/utmp_db.h: Removed. * login/utmp_file.c: Add updwtmp function to write to file. * login/utmp_daemon.c: New file. Daemon backend. * login/utmpname.c: New file. Implementation of utmpname function. * login/utmpdump.c: New file. Tool to dump utmp-like files. * login/utmpd/connection.c: New file. * login/utmpd/database.c: New file. * login/utmpd/error.c: New file. * login/utmpd/request.c: New file. * login/utmpd/utmpd-private.h: New file. * login/utmpd/utmpd.c: New file. * login/utmpd/utmpd.h: New file. * login/utmpd/xtmp.c: New file. * login/utmpd/xtmp.h: New file. 1997-05-29 12:28 Jim Meyering <meyering@eng.ascend.com> * time/strftime.c: Correct/normalize indentation in cpp directives. 1997-05-28 20:43 Philip Blundell <pjb27@cam.ac.uk> * nis/nis_error.c: Include <string.h> to fix warning. * nis/nis_print.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Arg 3 of map_v4v6_hostent is int* not size_t*. 1997-05-28 21:56 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/cmathcalls.h: Correct typo in comment. * inet/netinet/icmp6.h: Include <netinet/in.h> for in6_addr. * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Include <net/if.h> for IFNAMSIZ. * sysdeps/unix/sysv/linux/net/ppp_defs.h: Include <time.h> for time_t. * login/pty.h: Include <ioctl-types.h> for definition of struct winsize. * misc/regexp.h (compile): Correct typo. * argp/argp.h: Put extern before __const in defintion of argp_program_bug_address. 1997-05-29 00:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-32/inttypes.h: Correct names of unsigned fast and least types. Correct names of ?INT_FAST*_{MIN,MAX} macros. * sysdeps/wordsize-64/inttypes.h: Likewise. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-05-28 22:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/Makefile (make-ioctls-CFLAGS): Use generic ttydefaults.h file instead of non-existing version in termios/sys. Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>. * time/strptime.c (strptime_internal, case 'Y'): Restrict year number to four digits and to representable range for 4 byte time_t values. Patch by H.J. Lu <hjl@lucon.org>. 1997-05-28 18:19 Philip Blundell <pjb27@cam.ac.uk> * posix/execl.c: Include <alloca.h> to avoid warning. 1997-05-27 18:19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c: Implement testing of inlined functions, make output nicer, update comments. * math/test-idouble.c: New file. Frontend for double tests of inlined functions. * math/test-ildoubl.c: New file. Frontend for long double tests of inlined functions. * math/test-ifloat.c: New file. Frontend for float tests of inlined functions. * math/test-longdouble.c: Rename to... * math/test-ldouble.c: ...this. * math/Makefile: Add rules for new test programs, change rules for renaming of longdouble test. 1997-05-20 15:50 H.J. Lu <hjl@gnu.ai.mit.edu> * sunrpc/rpc/svc.h (__dispatch_fn_t): New. (svc_register): Use __dispatch_fn_t in prototype. 1997-05-28 17:02 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/bzero.c (bzero): Fix typo. Patch by Witek Wnuk <spider@pest.waw.ids.edu.pl>. 1997-05-27 12:00 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/generic/vtimes.c: Use ISO C declaration style. * sysdeps/unix/bsd/ualarm.c: Include <unistd.h> for prototype. * sysdeps/generic/memccpy.c: Include <string.h> for prototype. * signal/tst-signal.c (handler): Correct function declaration to avoid warning. * stdlib/testsort.c (compare): Likewise. * string/tester.c: Likewise. 1997-05-27 14:16 Miles Bader <miles@gnu.ai.mit.edu> * argp-help.c (argp_args_usage): Supply correct argp to filter_doc. 1997-05-27 17:51 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * db/hash/extern.h, db/hash/hash.c, db/hash/hash.h, db/hash/hash_log2.c: Rename __log2 to __hash_log2 to avoid clash with libm. 1997-05-27 14:47 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/e_atan2.c: Fix missing negate. Use __m81_test instead of explicit comparisons. 1997-05-26 18:36 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * inet/netinet/icmp6.h: Remove use of <asm/bitops.h> which has no place in a generic header and is no user include file.
294 lines
10 KiB
C
294 lines
10 KiB
C
/*-
|
|
* Copyright (c) 1990, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Margo Seltzer.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)hash.h 8.3 (Berkeley) 5/31/94
|
|
*/
|
|
|
|
/* Operations */
|
|
typedef enum {
|
|
HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
|
|
} ACTION;
|
|
|
|
/* Buffer Management structures */
|
|
typedef struct _bufhead BUFHEAD;
|
|
|
|
struct _bufhead {
|
|
BUFHEAD *prev; /* LRU links */
|
|
BUFHEAD *next; /* LRU links */
|
|
BUFHEAD *ovfl; /* Overflow page buffer header */
|
|
u_int32_t addr; /* Address of this page */
|
|
char *page; /* Actual page data */
|
|
char flags;
|
|
#define BUF_MOD 0x0001
|
|
#define BUF_DISK 0x0002
|
|
#define BUF_BUCKET 0x0004
|
|
#define BUF_PIN 0x0008
|
|
};
|
|
|
|
#define IS_BUCKET(X) ((X) & BUF_BUCKET)
|
|
|
|
typedef BUFHEAD **SEGMENT;
|
|
|
|
/* Hash Table Information */
|
|
typedef struct hashhdr { /* Disk resident portion */
|
|
int magic; /* Magic NO for hash tables */
|
|
int version; /* Version ID */
|
|
u_int32_t lorder; /* Byte Order */
|
|
int bsize; /* Bucket/Page Size */
|
|
int bshift; /* Bucket shift */
|
|
int dsize; /* Directory Size */
|
|
int ssize; /* Segment Size */
|
|
int sshift; /* Segment shift */
|
|
int ovfl_point; /* Where overflow pages are being
|
|
* allocated */
|
|
int last_freed; /* Last overflow page freed */
|
|
int max_bucket; /* ID of Maximum bucket in use */
|
|
int high_mask; /* Mask to modulo into entire table */
|
|
int low_mask; /* Mask to modulo into lower half of
|
|
* table */
|
|
int ffactor; /* Fill factor */
|
|
int nkeys; /* Number of keys in hash table */
|
|
int hdrpages; /* Size of table header */
|
|
int h_charkey; /* value of hash(CHARKEY) */
|
|
#define NCACHED 32 /* number of bit maps and spare
|
|
* points */
|
|
int spares[NCACHED];/* spare pages for overflow */
|
|
u_int16_t bitmaps[NCACHED]; /* address of overflow page
|
|
* bitmaps */
|
|
} HASHHDR;
|
|
|
|
typedef struct htab { /* Memory resident data structure */
|
|
HASHHDR hdr; /* Header */
|
|
int nsegs; /* Number of allocated segments */
|
|
int exsegs; /* Number of extra allocated
|
|
* segments */
|
|
u_int32_t /* Hash function */
|
|
(*hash)__P((const void *, size_t));
|
|
int flags; /* Flag values */
|
|
int fp; /* File pointer */
|
|
char *tmp_buf; /* Temporary Buffer for BIG data */
|
|
char *tmp_key; /* Temporary Buffer for BIG keys */
|
|
BUFHEAD *cpage; /* Current page */
|
|
int cbucket; /* Current bucket */
|
|
int cndx; /* Index of next item on cpage */
|
|
int errnum; /* Error Number -- for DBM
|
|
* compatibility */
|
|
int new_file; /* Indicates if fd is backing store
|
|
* or no */
|
|
int save_file; /* Indicates whether we need to flush
|
|
* file at
|
|
* exit */
|
|
u_int32_t *mapp[NCACHED]; /* Pointers to page maps */
|
|
int nmaps; /* Initial number of bitmaps */
|
|
int nbufs; /* Number of buffers left to
|
|
* allocate */
|
|
BUFHEAD bufhead; /* Header of buffer lru list */
|
|
SEGMENT *dir; /* Hash Bucket directory */
|
|
} HTAB;
|
|
|
|
/*
|
|
* Constants
|
|
*/
|
|
#define MAX_BSIZE 65536 /* 2^16 */
|
|
#define MIN_BUFFERS 6
|
|
#define MINHDRSIZE 512
|
|
#define DEF_BUFSIZE 65536 /* 64 K */
|
|
#define DEF_BUCKET_SIZE 4096
|
|
#define DEF_BUCKET_SHIFT 12 /* log2(BUCKET) */
|
|
#define DEF_SEGSIZE 256
|
|
#define DEF_SEGSIZE_SHIFT 8 /* log2(SEGSIZE) */
|
|
#define DEF_DIRSIZE 256
|
|
#define DEF_FFACTOR 65536
|
|
#define MIN_FFACTOR 4
|
|
#define SPLTMAX 8
|
|
#define CHARKEY "%$sniglet^&"
|
|
#define NUMKEY 1038583
|
|
#define BYTE_SHIFT 3
|
|
#define INT_TO_BYTE 2
|
|
#define INT_BYTE_SHIFT 5
|
|
#define ALL_SET ((u_int32_t)0xFFFFFFFF)
|
|
#define ALL_CLEAR 0
|
|
|
|
#define PTROF(X) ((BUFHEAD *)((ptrdiff_t)(X)&~0x3))
|
|
#define ISMOD(X) ((u_int32_t)(ptrdiff_t)(X)&0x1)
|
|
#define DOMOD(X) ((X) = (char *)((ptrdiff_t)(X)|0x1))
|
|
#define ISDISK(X) ((u_int32_t)(ptrdiff_t)(X)&0x2)
|
|
#define DODISK(X) ((X) = (char *)((ptrdiff_t)(X)|0x2))
|
|
|
|
#define BITS_PER_MAP 32
|
|
|
|
/* Given the address of the beginning of a big map, clear/set the nth bit */
|
|
#define CLRBIT(A, N) ((A)[(N)/BITS_PER_MAP] &= ~(1<<((N)%BITS_PER_MAP)))
|
|
#define SETBIT(A, N) ((A)[(N)/BITS_PER_MAP] |= (1<<((N)%BITS_PER_MAP)))
|
|
#define ISSET(A, N) ((A)[(N)/BITS_PER_MAP] & (1<<((N)%BITS_PER_MAP)))
|
|
|
|
/* Overflow management */
|
|
/*
|
|
* Overflow page numbers are allocated per split point. At each doubling of
|
|
* the table, we can allocate extra pages. So, an overflow page number has
|
|
* the top 5 bits indicate which split point and the lower 11 bits indicate
|
|
* which page at that split point is indicated (pages within split points are
|
|
* numberered starting with 1).
|
|
*/
|
|
|
|
#define SPLITSHIFT 11
|
|
#define SPLITMASK 0x7FF
|
|
#define SPLITNUM(N) (((u_int32_t)(N)) >> SPLITSHIFT)
|
|
#define OPAGENUM(N) ((N) & SPLITMASK)
|
|
#define OADDR_OF(S,O) ((u_int32_t)((u_int32_t)(S) << SPLITSHIFT) + (O))
|
|
|
|
#define BUCKET_TO_PAGE(B) \
|
|
(B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__hash_log2((B)+1)-1] : 0)
|
|
#define OADDR_TO_PAGE(B) \
|
|
BUCKET_TO_PAGE ( (1 << SPLITNUM((B))) -1 ) + OPAGENUM((B));
|
|
|
|
/*
|
|
* page.h contains a detailed description of the page format.
|
|
*
|
|
* Normally, keys and data are accessed from offset tables in the top of
|
|
* each page which point to the beginning of the key and data. There are
|
|
* four flag values which may be stored in these offset tables which indicate
|
|
* the following:
|
|
*
|
|
*
|
|
* OVFLPAGE Rather than a key data pair, this pair contains
|
|
* the address of an overflow page. The format of
|
|
* the pair is:
|
|
* OVERFLOW_PAGE_NUMBER OVFLPAGE
|
|
*
|
|
* PARTIAL_KEY This must be the first key/data pair on a page
|
|
* and implies that page contains only a partial key.
|
|
* That is, the key is too big to fit on a single page
|
|
* so it starts on this page and continues on the next.
|
|
* The format of the page is:
|
|
* KEY_OFF PARTIAL_KEY OVFL_PAGENO OVFLPAGE
|
|
*
|
|
* KEY_OFF -- offset of the beginning of the key
|
|
* PARTIAL_KEY -- 1
|
|
* OVFL_PAGENO - page number of the next overflow page
|
|
* OVFLPAGE -- 0
|
|
*
|
|
* FULL_KEY This must be the first key/data pair on the page. It
|
|
* is used in two cases.
|
|
*
|
|
* Case 1:
|
|
* There is a complete key on the page but no data
|
|
* (because it wouldn't fit). The next page contains
|
|
* the data.
|
|
*
|
|
* Page format it:
|
|
* KEY_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
|
|
*
|
|
* KEY_OFF -- offset of the beginning of the key
|
|
* FULL_KEY -- 2
|
|
* OVFL_PAGENO - page number of the next overflow page
|
|
* OVFLPAGE -- 0
|
|
*
|
|
* Case 2:
|
|
* This page contains no key, but part of a large
|
|
* data field, which is continued on the next page.
|
|
*
|
|
* Page format it:
|
|
* DATA_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
|
|
*
|
|
* KEY_OFF -- offset of the beginning of the data on
|
|
* this page
|
|
* FULL_KEY -- 2
|
|
* OVFL_PAGENO - page number of the next overflow page
|
|
* OVFLPAGE -- 0
|
|
*
|
|
* FULL_KEY_DATA
|
|
* This must be the first key/data pair on the page.
|
|
* There are two cases:
|
|
*
|
|
* Case 1:
|
|
* This page contains a key and the beginning of the
|
|
* data field, but the data field is continued on the
|
|
* next page.
|
|
*
|
|
* Page format is:
|
|
* KEY_OFF FULL_KEY_DATA OVFL_PAGENO DATA_OFF
|
|
*
|
|
* KEY_OFF -- offset of the beginning of the key
|
|
* FULL_KEY_DATA -- 3
|
|
* OVFL_PAGENO - page number of the next overflow page
|
|
* DATA_OFF -- offset of the beginning of the data
|
|
*
|
|
* Case 2:
|
|
* This page contains the last page of a big data pair.
|
|
* There is no key, only the tail end of the data
|
|
* on this page.
|
|
*
|
|
* Page format is:
|
|
* DATA_OFF FULL_KEY_DATA <OVFL_PAGENO> <OVFLPAGE>
|
|
*
|
|
* DATA_OFF -- offset of the beginning of the data on
|
|
* this page
|
|
* FULL_KEY_DATA -- 3
|
|
* OVFL_PAGENO - page number of the next overflow page
|
|
* OVFLPAGE -- 0
|
|
*
|
|
* OVFL_PAGENO and OVFLPAGE are optional (they are
|
|
* not present if there is no next page).
|
|
*/
|
|
|
|
#define OVFLPAGE 0
|
|
#define PARTIAL_KEY 1
|
|
#define FULL_KEY 2
|
|
#define FULL_KEY_DATA 3
|
|
#define REAL_KEY 4
|
|
|
|
/* Short hands for accessing structure */
|
|
#define BSIZE hdr.bsize
|
|
#define BSHIFT hdr.bshift
|
|
#define DSIZE hdr.dsize
|
|
#define SGSIZE hdr.ssize
|
|
#define SSHIFT hdr.sshift
|
|
#define LORDER hdr.lorder
|
|
#define OVFL_POINT hdr.ovfl_point
|
|
#define LAST_FREED hdr.last_freed
|
|
#define MAX_BUCKET hdr.max_bucket
|
|
#define FFACTOR hdr.ffactor
|
|
#define HIGH_MASK hdr.high_mask
|
|
#define LOW_MASK hdr.low_mask
|
|
#define NKEYS hdr.nkeys
|
|
#define HDRPAGES hdr.hdrpages
|
|
#define SPARES hdr.spares
|
|
#define BITMAPS hdr.bitmaps
|
|
#define VERSION hdr.version
|
|
#define MAGIC hdr.magic
|
|
#define NEXT_FREE hdr.next_free
|
|
#define H_CHARKEY hdr.h_charkey
|