1996-01-02 08:57:42 +00:00
|
|
|
/*-
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
|
|
static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94";
|
|
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PACKAGE: hash
|
|
|
|
* DESCRIPTION:
|
|
|
|
* Big key/data handling for the hashing package.
|
|
|
|
*
|
|
|
|
* ROUTINES:
|
|
|
|
* External
|
|
|
|
* __big_keydata
|
|
|
|
* __big_split
|
|
|
|
* __big_insert
|
|
|
|
* __big_return
|
|
|
|
* __big_delete
|
|
|
|
* __find_last_page
|
|
|
|
* Internal
|
|
|
|
* collect_key
|
|
|
|
* collect_data
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
#include <assert.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <db.h>
|
|
|
|
#include "hash.h"
|
|
|
|
#include "page.h"
|
|
|
|
#include "extern.h"
|
|
|
|
|
|
|
|
static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
|
|
|
|
static int collect_data __P((HTAB *, BUFHEAD *, int, int));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Big_insert
|
|
|
|
*
|
|
|
|
* You need to do an insert and the key/data pair is too big
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* 0 ==> OK
|
|
|
|
*-1 ==> ERROR
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__big_insert(hashp, bufp, key, val)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
const DBT *key, *val;
|
|
|
|
{
|
|
|
|
register u_int16_t *p;
|
|
|
|
int key_size, n, val_size;
|
|
|
|
u_int16_t space, move_bytes, off;
|
|
|
|
char *cp, *key_data, *val_data;
|
|
|
|
|
|
|
|
cp = bufp->page; /* Character pointer of p. */
|
|
|
|
p = (u_int16_t *)cp;
|
|
|
|
|
|
|
|
key_data = (char *)key->data;
|
|
|
|
key_size = key->size;
|
|
|
|
val_data = (char *)val->data;
|
|
|
|
val_size = val->size;
|
|
|
|
|
|
|
|
/* First move the Key */
|
|
|
|
for (space = FREESPACE(p) - BIGOVERHEAD; key_size;
|
|
|
|
space = FREESPACE(p) - BIGOVERHEAD) {
|
|
|
|
move_bytes = MIN(space, key_size);
|
|
|
|
off = OFFSET(p) - move_bytes;
|
|
|
|
memmove(cp + off, key_data, move_bytes);
|
|
|
|
key_size -= move_bytes;
|
|
|
|
key_data += move_bytes;
|
|
|
|
n = p[0];
|
|
|
|
p[++n] = off;
|
|
|
|
p[0] = ++n;
|
|
|
|
FREESPACE(p) = off - PAGE_META(n);
|
|
|
|
OFFSET(p) = off;
|
|
|
|
p[n] = PARTIAL_KEY;
|
|
|
|
bufp = __add_ovflpage(hashp, bufp);
|
|
|
|
if (!bufp)
|
|
|
|
return (-1);
|
|
|
|
n = p[0];
|
1998-09-23 14:02:16 +00:00
|
|
|
if (!key_size) {
|
1996-01-02 08:57:42 +00:00
|
|
|
if (FREESPACE(p)) {
|
|
|
|
move_bytes = MIN(FREESPACE(p), val_size);
|
|
|
|
off = OFFSET(p) - move_bytes;
|
|
|
|
p[n] = off;
|
|
|
|
memmove(cp + off, val_data, move_bytes);
|
|
|
|
val_data += move_bytes;
|
|
|
|
val_size -= move_bytes;
|
|
|
|
p[n - 2] = FULL_KEY_DATA;
|
|
|
|
FREESPACE(p) = FREESPACE(p) - move_bytes;
|
|
|
|
OFFSET(p) = off;
|
|
|
|
} else
|
|
|
|
p[n - 2] = FULL_KEY;
|
1998-09-23 14:02:16 +00:00
|
|
|
}
|
1996-01-02 08:57:42 +00:00
|
|
|
p = (u_int16_t *)bufp->page;
|
|
|
|
cp = bufp->page;
|
|
|
|
bufp->flags |= BUF_MOD;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now move the data */
|
|
|
|
for (space = FREESPACE(p) - BIGOVERHEAD; val_size;
|
|
|
|
space = FREESPACE(p) - BIGOVERHEAD) {
|
|
|
|
move_bytes = MIN(space, val_size);
|
|
|
|
/*
|
|
|
|
* Here's the hack to make sure that if the data ends on the
|
|
|
|
* same page as the key ends, FREESPACE is at least one.
|
|
|
|
*/
|
1996-11-15 04:08:00 +00:00
|
|
|
if ((int) space == val_size && (size_t) val_size == val->size)
|
1996-01-02 08:57:42 +00:00
|
|
|
move_bytes--;
|
|
|
|
off = OFFSET(p) - move_bytes;
|
|
|
|
memmove(cp + off, val_data, move_bytes);
|
|
|
|
val_size -= move_bytes;
|
|
|
|
val_data += move_bytes;
|
|
|
|
n = p[0];
|
|
|
|
p[++n] = off;
|
|
|
|
p[0] = ++n;
|
|
|
|
FREESPACE(p) = off - PAGE_META(n);
|
|
|
|
OFFSET(p) = off;
|
|
|
|
if (val_size) {
|
|
|
|
p[n] = FULL_KEY;
|
|
|
|
bufp = __add_ovflpage(hashp, bufp);
|
|
|
|
if (!bufp)
|
|
|
|
return (-1);
|
|
|
|
cp = bufp->page;
|
|
|
|
p = (u_int16_t *)cp;
|
|
|
|
} else
|
|
|
|
p[n] = FULL_KEY_DATA;
|
|
|
|
bufp->flags |= BUF_MOD;
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called when bufp's page contains a partial key (index should be 1)
|
|
|
|
*
|
|
|
|
* All pages in the big key/data pair except bufp are freed. We cannot
|
|
|
|
* free bufp because the page pointing to it is lost and we can't get rid
|
|
|
|
* of its pointer.
|
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* 0 => OK
|
|
|
|
*-1 => ERROR
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__big_delete(hashp, bufp)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
{
|
|
|
|
register BUFHEAD *last_bfp, *rbufp;
|
|
|
|
u_int16_t *bp, pageno;
|
|
|
|
int key_done, n;
|
|
|
|
|
|
|
|
rbufp = bufp;
|
|
|
|
last_bfp = NULL;
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
pageno = 0;
|
|
|
|
key_done = 0;
|
|
|
|
|
|
|
|
while (!key_done || (bp[2] != FULL_KEY_DATA)) {
|
|
|
|
if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA)
|
|
|
|
key_done = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If there is freespace left on a FULL_KEY_DATA page, then
|
|
|
|
* the data is short and fits entirely on this page, and this
|
|
|
|
* is the last page.
|
|
|
|
*/
|
|
|
|
if (bp[2] == FULL_KEY_DATA && FREESPACE(bp))
|
|
|
|
break;
|
|
|
|
pageno = bp[bp[0] - 1];
|
|
|
|
rbufp->flags |= BUF_MOD;
|
|
|
|
rbufp = __get_buf(hashp, pageno, rbufp, 0);
|
|
|
|
if (last_bfp)
|
|
|
|
__free_ovflpage(hashp, last_bfp);
|
|
|
|
last_bfp = rbufp;
|
|
|
|
if (!rbufp)
|
|
|
|
return (-1); /* Error. */
|
|
|
|
bp = (u_int16_t *)rbufp->page;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we get here then rbufp points to the last page of the big
|
|
|
|
* key/data pair. Bufp points to the first one -- it should now be
|
|
|
|
* empty pointing to the next page after this pair. Can't free it
|
|
|
|
* because we don't have the page pointing to it.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* This is information from the last page of the pair. */
|
|
|
|
n = bp[0];
|
|
|
|
pageno = bp[n - 1];
|
|
|
|
|
|
|
|
/* Now, bp is the first page of the pair. */
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
if (n > 2) {
|
|
|
|
/* There is an overflow page. */
|
|
|
|
bp[1] = pageno;
|
|
|
|
bp[2] = OVFLPAGE;
|
|
|
|
bufp->ovfl = rbufp->ovfl;
|
|
|
|
} else
|
|
|
|
/* This is the last page. */
|
|
|
|
bufp->ovfl = NULL;
|
|
|
|
n -= 2;
|
|
|
|
bp[0] = n;
|
|
|
|
FREESPACE(bp) = hashp->BSIZE - PAGE_META(n);
|
|
|
|
OFFSET(bp) = hashp->BSIZE - 1;
|
|
|
|
|
|
|
|
bufp->flags |= BUF_MOD;
|
|
|
|
if (rbufp)
|
|
|
|
__free_ovflpage(hashp, rbufp);
|
Update.
1997-03-16 18:43 Ulrich Drepper <drepper@cygnus.com>
* manual/filesys.texi: Add documentation for scandir and alphasort.
* math/math.c (fpclassify): Correct stupid typos.
* math/libm-test.c: New file. libm test suite by Andreas Jaeger.
* nss/nss_files/files-hosts.c: Add gethostbyname2 imlementation.
* posix/Makefile (routines): Add bsd-getpgrp.
* posix/bsd-getpgrp.c: New file.
* posix/unistd.h [__FAVOR_BSD]: Define macro getpgrp which maps
calls to __bsd_getpgrp.
* sysdeps/generic/getpgrp.c: De-ANSI-declfy.
* sysdeps/i386/huge_val.h: New file. ix87 specific infinity values.
* sysdeps/m68k/huge_val.h: New file. m68k specific infinity values.
* sysdeps/generic/huge_val.h: Remove definition of long double
definition. Make it the same as the double definition.
* sysdeps/libm-i387/e_acos.S: Fix bug in FPU stack handling.
* sysdeps/libm-i387/e_acosf.S: Likewise.
* sysdeps/libm-i387/e_acosl.S: Likewise.
* sysdeps/libm-i387/e_asin.S: Likewise.
* sysdeps/libm-i387/e_asinf.S: Likewise.
* sysdeps/libm-i387/e_asinl.S: Likewise.
* sysdeps/libm-i387/e_exp.S: Likewise.
* sysdeps/libm-i387/e_expf.S: Likewise.
* sysdeps/libm-i387/e_expl.S: Likewise.
* sysdeps/libm-i387/e_scalbn.S: Likewise.
* sysdeps/libm-i387/e_scalbnf.S: Likewise.
* sysdeps/libm-i387/e_scalbnl.S: Likewise.
* sysdeps/libm-i387/e_log.S: Optimize branch code.
* sysdeps/libm-i387/e_logf.S: Likewise.
* sysdeps/libm-i387/e_logl.S: Likewise.
* sysdeps/libm-i387/e_log10.S: Likewise.
* sysdeps/libm-i387/e_log10f.S: Likewise.
* sysdeps/libm-i387/e_log10l.S: Likewise.
* sysdeps/libm-i387/e_pow.S: Major rewrite to handle special cases.
* sysdeps/libm-i387/e_powf.S: Likewise.
* sysdeps/libm-i387/e_powl.S: Likewise.
* sysdeps/libm-i387/e_expm1.S: Change return value for -inf
argument to -1.0.
* sysdeps/libm-i387/e_expm1f.S: Likewise.
* sysdeps/libm-i387/e_expm1l.S: Likewise.
* sysdeps/libm-i387/e_isinfl.c: Return -1 for -inf.
* sysdeps/libm-i387/e_logbl.S: Correct return value. Discard first
stack element after fxtract.
* sysdeps/libm-ieee754/e_atan2l.c: New file. `long double'
implementation for atan2 function.
* sysdeps/libm-ieee754/k_standard.c: Return NAN for libm not in
_SVID_ mode when acos, asin, atan2, log, log10 is called with
argument out of range.
Add new error case for pow(+0,neg).
* sysdeps/libm-ieee754/s_fpclassifyf.c: Correct recognition of
NaN and +-inf.
* sysdeps/libm-ieee754/s_fpclassifyl.c: Mask out explicit leading
digit in stupid 80 bit formats.
* sysdeps/libm-ieee754/s_isinf.c: Rewrite to return -1 for -inf.
* sysdeps/libm-ieee754/s_isinff.c: Likewise.
* sysdeps/libm-ieee754/s_isinfl.c: Likewise.
* sysdeps/libm-ieee754/s_scalbnl.c (huge, tiny): Adapt values for
long double type.
* sysdeps/libm-ieee754/w_atan2.c: Do not raise exception expect when
in SVID mode.
* sysdeps/libm-ieee754/w_atan2f.c: Likewise.
* sysdeps/libm-ieee754/w_atan2l.c: Likewise.
* sysdeps/libm-ieee754/w_pow.c: Distinguish error cases for x is +0
or -0.
* sysdeps/posix/isfdtype.c: Add cast to prevent warning.
* sysdeps/stub/fcntlbits.h: Update copyright.
* sysdeps/unix/bsd/fcntlbits.h: Likewise.
* sysdeps/unix/bsd/bsd4.4/fcntlbits.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/fcntlbits.h: Likewise.
* sysdeps/unix/bsd/ultrix4/fcntlbits.h: Likewise.
* sysdeps/unix/common/fcntlbits.h: Likewise.
* sysdeps/unix/sysv/fcntlbits.h: Likewise. Define O_FSYNC as alias
of O_SYNC. Add BSD compatibility macros FAPPEND, FFSYNC, FNONBLOCK,
and FNDELAY.
* sysdeps/unix/sysv/irix4/fcntlbits.h: Likewise.
* sysdeps/unix/readdir_r.c: Don't copy whole `struct dirent' record,
only reclen bytes.
* sysdeps/unix/sysv/linux/fcntlbits.h [__USE_GNU]: Add O_READ, O_WRITE
and O_NORW.
* sysdeps/unix/sysv/linux/alpha/fcntlbits.h: Likewise.
* sysdeps/unix/sysv/linux/init-first.h: Add copyright.
* sysdeps/unix/sysv/linux/fxstat.c: New file. Rewrite kernel-level
struct stat to user-level form.
* sysdeps/unix/sysv/linux/lxstat: New file.
* sysdeps/unix/sysv/linux/xstat: New file.
* sysdeps/unix/sysv/linux/kernel_stat.h: Define struct stat used in
kernel.
* sysdeps/unix/sysv/linux/statbuf.h (struct stat): Change definition
to use prescribed types for elements.
(_STAT_VER): Change to value 3.
* sysdeps/unix/sysv/linux/alph/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/Dist: Add kernel_stat.h.
* sysdeps/unix/sysv/linux/alpha/Dist: Likewise.
* time/Makefile: Correct dependencies for test-tz.
1997-03-16 14:59 Philip Blundell <phil@london.uk.eu.org>
* resolv/netdb.h: Add prototypes for gai_strerror and getnameinfo
(needed for IPv6 basic sockets API).
1997-03-16 15:02 a sun <asun@zoology.washington.edu>
* sysdeps/unix/sysv/linux/net/if_ppp.h: Don't use incompatible
kernel header.
* sysdeps/unix/sysv/linux/net/ppp_defs.h: Likewise.
1997-03-14 17:15 Ulrich Drepper <drepper@cygnus.com>
* db/hash/hash_bigkey.c (__big_delete): Don't call __free_ovflpage
without testing for last_bfp to be NULL.
Reported by fabsoft@fabserver1.zarm.uni-bremen.de.
1997-03-13 11:42 Jim Meyering <meyering@asic.sc.ti.com>
* time/mktime.c (TIME_T_MIN): Work around a bug in Cray C 5.0.3.0.
1997-03-14 04:00 Kurt Garloff <garloff@kg1.ping.de>
* sysdeps/unix/sysv/linux/fcntlbits.h (O_FSYNC): Make alias for O_SYNC.
(FASYNC): Move to __USE_BSD section. Create new macro O_ASYNC.
1997-03-14 02:50 Ulrich Drepper <drepper@cygnus.com>
* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname2_r): New
functions. Compare result for correct address type.
(_nss_nis_gethostbyname_r): Use _nss_nis_gethostbyname2_r.
Reported by Mirko Streckenbach <mirko@marian.hil.de>.
1997-02-17 01:40 Zlatko Calusic <zcalusic@srce.hr>
* time/strptime.c (recursive): Return rp to caller.
(strptime_internal): First check for long names, then abbreviated
(month & weekday).
1997-03-10 19:44 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makeconfig: Remove useless definitions of ASFLAGS-%.
* config.make.in (ASFLAGS-.so): Remove.
* configure.in: Don't substitute ASFLAGS_SO.
* sysdeps/sparc/configure.in: Remove file.
* sysdeps/sparc/Makefile (ASFLAGS-.so): Define.
1997-03-11 17:00 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/strptime.c (strptime_internal) [case 'Y']: Always subtract
1900 from year, regardless of century.
1997-03-12 05:43 Ulrich Drepper <drepper@cygnus.com>
* stdlib/strtod.c (_tens_in_limb) [BITS_PER_MP_LIMB > 32]: Make
all numbers unsigned to make buggy gccs happy.
Patch by Bryan W. Headley <bheadley@interaccess.com>.
* sysdeps/unix/sysv/linux/netinet/ip.h: Add backward-compatibility
definitions. Patch by a sun <asun@zoology.washington.edu>.
Pretty print header.
* Makerules (build-shlib): Also create symlink if library is versioned.
based on a patch by H.J. Lu <hjl@gnu.ai.mit.edu>.
Remove special rule to libc.so symlink.
1997-03-11 20:16 Andreas Jaeger <aj@arthur.pfalz.de>
* manual/math.texi (Domain and Range Errors): Change descriptions
according to recent changes for ISO C 9X.
1997-03-11 22:39 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/libm-ieee754/k_standard.c (__kernel_standard): Correct
return values for acos, asin, and atan2.
Reported by Andreas Jaeger <aj@arthur.pfalz.de>.
1997-03-10 18:16 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* ypclnt.c (__yp_bind): Fix possible buffer overflow.
1997-03-10 18:06 Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>
* dirent/alphasort.c (alphasort): Interpret arguments as pointers
to pointers to directory entries so that alphasort really can be
used as argument for scandir.
1997-03-09 23:33 Andreas Jaeger <aj@arthur.pfalz.de>
* string/strdup.c: Declare memcpy if !(_LIBC || STDC_HEADERS)
instead of strcpy.
1997-03-10 03:34 Ulrich Drepper <drepper@cygnus.com>
* catgets/catgets.c (catopen): Always add NLSPATH to search path for
catalogs, not only if the envvar NLSPATH is not available.
Reported by Andries.Brouwer@cwi.nl.
1997-03-10 02:46 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (localtime-file): Don't define using installation
directory.
(inst_localtime-file): New variable.
* time/Makefile (installed-localtime-file): Use inst_localtime-file.
Reported by Edward Seidl <seidl@janed.com>.
1997-03-10 02:31 H.J. Lu <hjl@gnu.ai.mit.edu>
* time/Makefile: Add source files to dependencies for test data.
1997-03-09 22:53 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nis/nss_nis/nis-ethers.c: Don't ignore return value of yp_all.
* nis/nss_nis/nis-proto.c: Likewise.
* nis/nss_nis/nis-rpc.c: Likewise.
* nis/nss_nis/nis-service.c: Likewise.
1997-03-08 14:37 Miguel de Icaza <miguel@nuclecu.unam.mx>
* sysdeps/sparc/dl-machine.h (elf_machine_rela): Upgrade to
versioning; Added missing R_SPARC_WDISP30 handling.
(RTLD_START): Implement it.
* sysdeps/unix/sysv/linux/sparc/brk.c: Fix.
* sysdeps/unix/sysv/linux/sparc/start.c: Startup code for
Linux/SPARC.
1997-03-02 18:06 Miguel de Icaza <miguel@nuclecu.unam.mx>
* sysdeps/sparc/dl-machine.h (RTLD_START): Make arg as expected by
the dynamic linker instead of having a new conditional define.
Thanks to Richard Henderson for pointing this out.
* elf/rtld.c: Remove usage of ELF_ADJUST_ARG.
1997-03-20 20:44 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* sysdeps/mach/hurd/euidaccess.c: Define as __euidaccess and make
euidaccess weak alias.
1997-03-07 10:30 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* stdio-common/printf_fphex.c (MIN): New macro.
* sysdeps/generic/netinet/in.h: Include <sys/types.h>.
* sysdeps/generic/sys/mman.h (msync): Mention third arg.
* sysdeps/generic/netinet/in.h: Add definitions for IPv6 basic
API. (See change by Philip Blundell on Feb 16, 1997.)
1997-03-05 10:40 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* hurd/hurd.h (vpprintf): Include <stdarg.h>. New declaration.
* hurd/set-host.c (_hurd_set_host_config): Cast second arg to
__file_name_split.
* mach/mach_error.c (mach_error_string_int): Give full prototype.
* mach/errstring.c (mach_error_string_int): Likewise.
* mach/error_compat.c (__mach_error_map_compat): Likewise.
* hurd/vpprintf.c (pwrite, vpprintf): Likewise.
* stdio/vasprintf.c (vasprintf): Likewise.
* mach/mach/mach_traps.h: Include <mach/kern_return.h>.
* mach/spin-solid.c: Include <mach/mach_traps.h>.
* mach/spin-solid.c (__spin_lock_solid): Provide arg to
swtch_pri.
* mach/mach_init.c: Include <mach/mig_support.h>.
* mach/mach_error.h (mach_error_string, mach_error,
mach_error_type): Always provide prototypes.
* mach/mach/error.h (mach_error_fn_t): Comment out declaration; it
appears to be entirely unused dead code.
* stdio/stdio.h (freopen): Fix spelling error.
1997-03-02 13:38 Miles Bader <miles@gnu.ai.mit.edu>
* string/argz.h (__need_error_t): New macro, before including <errno.h>
[!__const] (__const): New macro.
[!__error_t_defined] (error_t): New typedef.
* sysdeps/generic/socketbits.h: Add PF_FILE as synonym for PF_LOCAL
* sysdeps/unix/sysv/linux/socketbits.h: Likewise.
1997-03-16 20:28:07 +00:00
|
|
|
if (last_bfp && last_bfp != rbufp)
|
1996-01-02 08:57:42 +00:00
|
|
|
__free_ovflpage(hashp, last_bfp);
|
|
|
|
|
|
|
|
hashp->NKEYS--;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Returns:
|
|
|
|
* 0 = key not found
|
|
|
|
* -1 = get next overflow page
|
|
|
|
* -2 means key not found and this is big key/data
|
|
|
|
* -3 error
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__find_bigpair(hashp, bufp, ndx, key, size)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
int ndx;
|
|
|
|
char *key;
|
|
|
|
int size;
|
|
|
|
{
|
|
|
|
register u_int16_t *bp;
|
|
|
|
register char *p;
|
|
|
|
int ksize;
|
|
|
|
u_int16_t bytes;
|
|
|
|
char *kkey;
|
|
|
|
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
p = bufp->page;
|
|
|
|
ksize = size;
|
|
|
|
kkey = key;
|
|
|
|
|
|
|
|
for (bytes = hashp->BSIZE - bp[ndx];
|
|
|
|
bytes <= size && bp[ndx + 1] == PARTIAL_KEY;
|
|
|
|
bytes = hashp->BSIZE - bp[ndx]) {
|
|
|
|
if (memcmp(p + bp[ndx], kkey, bytes))
|
|
|
|
return (-2);
|
|
|
|
kkey += bytes;
|
|
|
|
ksize -= bytes;
|
|
|
|
bufp = __get_buf(hashp, bp[ndx + 2], bufp, 0);
|
|
|
|
if (!bufp)
|
|
|
|
return (-3);
|
|
|
|
p = bufp->page;
|
|
|
|
bp = (u_int16_t *)p;
|
|
|
|
ndx = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bytes != ksize || memcmp(p + bp[ndx], kkey, bytes)) {
|
|
|
|
#ifdef HASH_STATISTICS
|
|
|
|
++hash_collisions;
|
|
|
|
#endif
|
|
|
|
return (-2);
|
|
|
|
} else
|
|
|
|
return (ndx);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given the buffer pointer of the first overflow page of a big pair,
|
|
|
|
* find the end of the big pair
|
|
|
|
*
|
|
|
|
* This will set bpp to the buffer header of the last page of the big pair.
|
|
|
|
* It will return the pageno of the overflow page following the last page
|
|
|
|
* of the pair; 0 if there isn't any (i.e. big pair is the last key in the
|
|
|
|
* bucket)
|
|
|
|
*/
|
|
|
|
extern u_int16_t
|
|
|
|
__find_last_page(hashp, bpp)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD **bpp;
|
|
|
|
{
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
u_int16_t *bp, pageno;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
bufp = *bpp;
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
for (;;) {
|
|
|
|
n = bp[0];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the last page if: the tag is FULL_KEY_DATA and
|
|
|
|
* either only 2 entries OVFLPAGE marker is explicit there
|
|
|
|
* is freespace on the page.
|
|
|
|
*/
|
|
|
|
if (bp[2] == FULL_KEY_DATA &&
|
|
|
|
((n == 2) || (bp[n] == OVFLPAGE) || (FREESPACE(bp))))
|
|
|
|
break;
|
|
|
|
|
|
|
|
pageno = bp[n - 1];
|
|
|
|
bufp = __get_buf(hashp, pageno, bufp, 0);
|
|
|
|
if (!bufp)
|
|
|
|
return (0); /* Need to indicate an error! */
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
}
|
|
|
|
|
|
|
|
*bpp = bufp;
|
|
|
|
if (bp[0] > 2)
|
|
|
|
return (bp[3]);
|
|
|
|
else
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the data for the key/data pair that begins on this page at this
|
|
|
|
* index (index should always be 1).
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__big_return(hashp, bufp, ndx, val, set_current)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
int ndx;
|
|
|
|
DBT *val;
|
|
|
|
int set_current;
|
|
|
|
{
|
|
|
|
BUFHEAD *save_p;
|
|
|
|
u_int16_t *bp, len, off, save_addr;
|
|
|
|
char *tp;
|
|
|
|
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
while (bp[ndx + 1] == PARTIAL_KEY) {
|
|
|
|
bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!bufp)
|
|
|
|
return (-1);
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
ndx = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bp[ndx + 1] == FULL_KEY) {
|
|
|
|
bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!bufp)
|
|
|
|
return (-1);
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
save_p = bufp;
|
|
|
|
save_addr = save_p->addr;
|
|
|
|
off = bp[1];
|
|
|
|
len = 0;
|
|
|
|
} else
|
|
|
|
if (!FREESPACE(bp)) {
|
|
|
|
/*
|
|
|
|
* This is a hack. We can't distinguish between
|
|
|
|
* FULL_KEY_DATA that contains complete data or
|
|
|
|
* incomplete data, so we require that if the data
|
|
|
|
* is complete, there is at least 1 byte of free
|
|
|
|
* space left.
|
|
|
|
*/
|
|
|
|
off = bp[bp[0]];
|
|
|
|
len = bp[1] - off;
|
|
|
|
save_p = bufp;
|
|
|
|
save_addr = bufp->addr;
|
|
|
|
bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!bufp)
|
|
|
|
return (-1);
|
|
|
|
bp = (u_int16_t *)bufp->page;
|
|
|
|
} else {
|
|
|
|
/* The data is all on one page. */
|
|
|
|
tp = (char *)bp;
|
|
|
|
off = bp[bp[0]];
|
|
|
|
val->data = (u_char *)tp + off;
|
|
|
|
val->size = bp[1] - off;
|
|
|
|
if (set_current) {
|
|
|
|
if (bp[0] == 2) { /* No more buckets in
|
|
|
|
* chain */
|
|
|
|
hashp->cpage = NULL;
|
|
|
|
hashp->cbucket++;
|
|
|
|
hashp->cndx = 1;
|
|
|
|
} else {
|
|
|
|
hashp->cpage = __get_buf(hashp,
|
|
|
|
bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!hashp->cpage)
|
|
|
|
return (-1);
|
|
|
|
hashp->cndx = 1;
|
|
|
|
if (!((u_int16_t *)
|
|
|
|
hashp->cpage->page)[0]) {
|
|
|
|
hashp->cbucket++;
|
|
|
|
hashp->cpage = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
val->size = collect_data(hashp, bufp, (int)len, set_current);
|
1996-11-15 04:08:00 +00:00
|
|
|
if (val->size == (size_t) -1)
|
1996-01-02 08:57:42 +00:00
|
|
|
return (-1);
|
|
|
|
if (save_p->addr != save_addr) {
|
|
|
|
/* We are pretty short on buffers. */
|
|
|
|
errno = EINVAL; /* OUT OF BUFFERS */
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
memmove(hashp->tmp_buf, (save_p->page) + off, len);
|
|
|
|
val->data = (u_char *)hashp->tmp_buf;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Count how big the total datasize is by recursing through the pages. Then
|
|
|
|
* allocate a buffer and copy the data as you recurse up.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
collect_data(hashp, bufp, len, set)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
int len, set;
|
|
|
|
{
|
|
|
|
register u_int16_t *bp;
|
|
|
|
register char *p;
|
|
|
|
BUFHEAD *xbp;
|
|
|
|
u_int16_t save_addr;
|
|
|
|
int mylen, totlen;
|
|
|
|
|
|
|
|
p = bufp->page;
|
|
|
|
bp = (u_int16_t *)p;
|
|
|
|
mylen = hashp->BSIZE - bp[1];
|
|
|
|
save_addr = bufp->addr;
|
|
|
|
|
|
|
|
if (bp[2] == FULL_KEY_DATA) { /* End of Data */
|
|
|
|
totlen = len + mylen;
|
|
|
|
if (hashp->tmp_buf)
|
|
|
|
free(hashp->tmp_buf);
|
|
|
|
if ((hashp->tmp_buf = (char *)malloc(totlen)) == NULL)
|
|
|
|
return (-1);
|
|
|
|
if (set) {
|
|
|
|
hashp->cndx = 1;
|
|
|
|
if (bp[0] == 2) { /* No more buckets in chain */
|
|
|
|
hashp->cpage = NULL;
|
|
|
|
hashp->cbucket++;
|
|
|
|
} else {
|
|
|
|
hashp->cpage =
|
|
|
|
__get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!hashp->cpage)
|
|
|
|
return (-1);
|
|
|
|
else if (!((u_int16_t *)hashp->cpage->page)[0]) {
|
|
|
|
hashp->cbucket++;
|
|
|
|
hashp->cpage = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!xbp || ((totlen =
|
|
|
|
collect_data(hashp, xbp, len + mylen, set)) < 1))
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (bufp->addr != save_addr) {
|
|
|
|
errno = EINVAL; /* Out of buffers. */
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
memmove(&hashp->tmp_buf[len], (bufp->page) + bp[1], mylen);
|
|
|
|
return (totlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fill in the key and data for this big pair.
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__big_keydata(hashp, bufp, key, val, set)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
DBT *key, *val;
|
|
|
|
int set;
|
|
|
|
{
|
|
|
|
key->size = collect_key(hashp, bufp, 0, val, set);
|
1996-11-15 04:08:00 +00:00
|
|
|
if (key->size == (size_t) -1)
|
1996-01-02 08:57:42 +00:00
|
|
|
return (-1);
|
|
|
|
key->data = (u_char *)hashp->tmp_key;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Count how big the total key size is by recursing through the pages. Then
|
|
|
|
* collect the data, allocate a buffer and copy the key as you recurse up.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
collect_key(hashp, bufp, len, val, set)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *bufp;
|
|
|
|
int len;
|
|
|
|
DBT *val;
|
|
|
|
int set;
|
|
|
|
{
|
|
|
|
BUFHEAD *xbp;
|
|
|
|
char *p;
|
|
|
|
int mylen, totlen;
|
|
|
|
u_int16_t *bp, save_addr;
|
|
|
|
|
|
|
|
p = bufp->page;
|
|
|
|
bp = (u_int16_t *)p;
|
|
|
|
mylen = hashp->BSIZE - bp[1];
|
|
|
|
|
|
|
|
save_addr = bufp->addr;
|
|
|
|
totlen = len + mylen;
|
|
|
|
if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA) { /* End of Key. */
|
|
|
|
if (hashp->tmp_key != NULL)
|
|
|
|
free(hashp->tmp_key);
|
|
|
|
if ((hashp->tmp_key = (char *)malloc(totlen)) == NULL)
|
|
|
|
return (-1);
|
|
|
|
if (__big_return(hashp, bufp, 1, val, set))
|
|
|
|
return (-1);
|
|
|
|
} else {
|
|
|
|
xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
|
|
|
|
if (!xbp || ((totlen =
|
|
|
|
collect_key(hashp, xbp, totlen, val, set)) < 1))
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
if (bufp->addr != save_addr) {
|
|
|
|
errno = EINVAL; /* MIS -- OUT OF BUFFERS */
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
memmove(&hashp->tmp_key[len], (bufp->page) + bp[1], mylen);
|
|
|
|
return (totlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns:
|
|
|
|
* 0 => OK
|
|
|
|
* -1 => error
|
|
|
|
*/
|
|
|
|
extern int
|
|
|
|
__big_split(hashp, op, np, big_keyp, addr, obucket, ret)
|
|
|
|
HTAB *hashp;
|
|
|
|
BUFHEAD *op; /* Pointer to where to put keys that go in old bucket */
|
|
|
|
BUFHEAD *np; /* Pointer to new bucket page */
|
|
|
|
/* Pointer to first page containing the big key/data */
|
|
|
|
BUFHEAD *big_keyp;
|
|
|
|
int addr; /* Address of big_keyp */
|
|
|
|
u_int32_t obucket;/* Old Bucket */
|
|
|
|
SPLIT_RETURN *ret;
|
|
|
|
{
|
|
|
|
register BUFHEAD *tmpp;
|
|
|
|
register u_int16_t *tp;
|
|
|
|
BUFHEAD *bp;
|
|
|
|
DBT key, val;
|
|
|
|
u_int32_t change;
|
|
|
|
u_int16_t free_space, n, off;
|
|
|
|
|
|
|
|
bp = big_keyp;
|
|
|
|
|
|
|
|
/* Now figure out where the big key/data goes */
|
|
|
|
if (__big_keydata(hashp, big_keyp, &key, &val, 0))
|
|
|
|
return (-1);
|
|
|
|
change = (__call_hash(hashp, key.data, key.size) != obucket);
|
|
|
|
|
1998-09-23 14:02:16 +00:00
|
|
|
if ((ret->next_addr = __find_last_page(hashp, &big_keyp))) {
|
1996-01-02 08:57:42 +00:00
|
|
|
if (!(ret->nextp =
|
|
|
|
__get_buf(hashp, ret->next_addr, big_keyp, 0)))
|
|
|
|
return (-1);;
|
|
|
|
} else
|
|
|
|
ret->nextp = NULL;
|
|
|
|
|
|
|
|
/* Now make one of np/op point to the big key/data pair */
|
|
|
|
#ifdef DEBUG
|
|
|
|
assert(np->ovfl == NULL);
|
|
|
|
#endif
|
|
|
|
if (change)
|
|
|
|
tmpp = np;
|
|
|
|
else
|
|
|
|
tmpp = op;
|
|
|
|
|
|
|
|
tmpp->flags |= BUF_MOD;
|
|
|
|
#ifdef DEBUG1
|
|
|
|
(void)fprintf(stderr,
|
|
|
|
"BIG_SPLIT: %d->ovfl was %d is now %d\n", tmpp->addr,
|
|
|
|
(tmpp->ovfl ? tmpp->ovfl->addr : 0), (bp ? bp->addr : 0));
|
|
|
|
#endif
|
|
|
|
tmpp->ovfl = bp; /* one of op/np point to big_keyp */
|
|
|
|
tp = (u_int16_t *)tmpp->page;
|
|
|
|
#ifdef DEBUG
|
|
|
|
assert(FREESPACE(tp) >= OVFLSIZE);
|
|
|
|
#endif
|
|
|
|
n = tp[0];
|
|
|
|
off = OFFSET(tp);
|
|
|
|
free_space = FREESPACE(tp);
|
|
|
|
tp[++n] = (u_int16_t)addr;
|
|
|
|
tp[++n] = OVFLPAGE;
|
|
|
|
tp[0] = n;
|
|
|
|
OFFSET(tp) = off;
|
|
|
|
FREESPACE(tp) = free_space - OVFLSIZE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally, set the new and old return values. BIG_KEYP contains a
|
|
|
|
* pointer to the last page of the big key_data pair. Make sure that
|
|
|
|
* big_keyp has no following page (2 elements) or create an empty
|
|
|
|
* following page.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ret->newp = np;
|
|
|
|
ret->oldp = op;
|
|
|
|
|
|
|
|
tp = (u_int16_t *)big_keyp->page;
|
|
|
|
big_keyp->flags |= BUF_MOD;
|
|
|
|
if (tp[0] > 2) {
|
|
|
|
/*
|
|
|
|
* There may be either one or two offsets on this page. If
|
|
|
|
* there is one, then the overflow page is linked on normally
|
|
|
|
* and tp[4] is OVFLPAGE. If there are two, tp[4] contains
|
|
|
|
* the second offset and needs to get stuffed in after the
|
|
|
|
* next overflow page is added.
|
|
|
|
*/
|
|
|
|
n = tp[4];
|
|
|
|
free_space = FREESPACE(tp);
|
|
|
|
off = OFFSET(tp);
|
|
|
|
tp[0] -= 2;
|
|
|
|
FREESPACE(tp) = free_space + OVFLSIZE;
|
|
|
|
OFFSET(tp) = off;
|
|
|
|
tmpp = __add_ovflpage(hashp, big_keyp);
|
|
|
|
if (!tmpp)
|
|
|
|
return (-1);
|
|
|
|
tp[4] = n;
|
|
|
|
} else
|
|
|
|
tmpp = big_keyp;
|
|
|
|
|
|
|
|
if (change)
|
|
|
|
ret->newp = tmpp;
|
|
|
|
else
|
|
|
|
ret->oldp = tmpp;
|
|
|
|
return (0);
|
|
|
|
}
|