mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
04be94a87d
1997-12-01 17:27 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Add iconvdata and localedata. * iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value. * iconv/gconv_conf.c (read_conf_file): Little optimization. * iconvdata/8bit-gap.c: New file. * iconvdata/8bit-generic.c: Renamed from ... * iconvdata/iso8859-generic.c: ...this. * iconvdata/configure: Removed. * iconvdata/Makefile: Add new modules and better rules. * iconvdata/iso6937.c: Minor bug fixes. * iconvdata/iso8859-1.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/iso8859-2.c: Change to use 8bit-generic.c. Minor bug fixes. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/ebcdic-at-de-a.c: New file. * iconvdata/ebcdic-at-de.c: New file. * iconvdata/ebcdic-ca-fr.c: New file. * iconvdata/hp-roman8.c: New file. * iconvdata/koi-8.c: New file. * iconvdata/koi8-r.c: New file. * iconvdata/koi8-h.c: New file. * iconvdata/latin-greek-1.c: New file. * iconvdata/latin-greek-1.h: New file. * iconvdata/latin-greek.c: New file. * iconvdata/latin-greek.h: New file. * iconvdata/jis0201.c: New file. * iconvdata/jis0201.h: New file. * iconvdata/jis0208.c: New file. * iconvdata/jis0208.h: New file. * iconvdata/jis0212.c: New file. * iconvdata/jis0212.h: New file. * iconvdata/sjis.c: New file. * iconvdata/gap.pl: New file. Script to generate table header. * iconvdata/gaptab.pl: New file. * iconvdata/gconv-modules: Add info about new modules. * locale/programs/charmap.c: Also examine alias names given in charmap files. * localedata/*: Add to here from add-on. We need the information to generate tables for iconv. Update from db-2.3.14. * db2/Makefile: Updated. * db2/config.h: Likewise. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log_put.c: Likewise. * db2/mp/mp_bh.c: Likewise. * db2/mp/mp_fget.c: Likewise. * db2/mp/mp_fopen.c: Likewise. * db2/mp/mp_fput.c: Likewise. * db2/mp/mp_fset.c: Likewise. * db2/mp/mp_open.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_func.c: Removed. * db2/os/os_config.c: New file. * db2/os/os_spin.c: New file. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. 1997-11-30 06:01 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h (__WAIT_INT): Don't use complex version with __typeof for C++ since this fails for class members. Reported by Neal Becker <neal@ctd.comsat.com>. 1997-11-28 11:21 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for a working makeinfo (3.11 or better). * config.make.in: Add MAKEINFO to be substituted. * manual/Makefile: Don't update info if makeinfo is too old. 1997-11-30 05:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions. * sysdeps/alpha/__longjmp.S: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h> not <bits/termios.h>. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. Patches by a sun <asun@zoology.washington.edu>. 1997-11-29 19:19 Zack Weinberg <zack@rabi.phys.columbia.edu> * misc/sys/syslog.h: Delete KERNEL preprocessor conditional. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise. * misc/sys/syslog.h: Clean up BSD header. 1997-11-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67. * sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception for ctan(+-inf,x). * sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise. * sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise. * math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan, csqrt (-1), ctanh(i*pi/4). 1997-11-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/confname.h: Fix comma in enumerator. 1997-11-28 13:28 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake. 1997-11-26 21:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition and use. Define GETCWD_RETURN_TYPE instead and use it. * sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead of GETCWD_STORYGE_CLASS and put the return type and the `internal_function' in the right order for gcc 2.7.2. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/module.h: Remove file. It's incompatible with Linux 2.1.x. Packages using modules (e.g. modutils) should/do provide their own version. Suggested by Richard Henderson. * sysdeps/unix/sysv/linux/Dist: Remove sys/module.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Remove sys/module.h. * libio/stdio.h: Correct comment of sys_nerr/sys_errlist.
344 lines
9.4 KiB
C
344 lines
9.4 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995, 1996
|
|
* Keith Bostic. All rights reserved.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1990, 1993, 1994, 1995
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* Mike Olson.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)bt_search.c 10.9 (Sleepycat) 11/18/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "db_page.h"
|
|
#include "btree.h"
|
|
|
|
/*
|
|
* __bam_search --
|
|
* Search a btree for a key.
|
|
*
|
|
* PUBLIC: int __bam_search __P((DB *,
|
|
* PUBLIC: const DBT *, u_int, int, db_recno_t *, int *));
|
|
*/
|
|
int
|
|
__bam_search(dbp, key, flags, stop, recnop, exactp)
|
|
DB *dbp;
|
|
const DBT *key;
|
|
u_int flags;
|
|
int stop, *exactp;
|
|
db_recno_t *recnop;
|
|
{
|
|
BTREE *t;
|
|
DB_LOCK lock;
|
|
EPG cur;
|
|
PAGE *h;
|
|
db_indx_t base, i, indx, lim;
|
|
db_pgno_t pg;
|
|
db_recno_t recno;
|
|
int cmp, jump, ret, stack;
|
|
|
|
t = dbp->internal;
|
|
recno = 0;
|
|
|
|
BT_STK_CLR(t);
|
|
|
|
/*
|
|
* There are several ways we search a btree tree. The flags argument
|
|
* specifies if we're acquiring read or write locks, if we position
|
|
* to the first or last item in a set of duplicates, if we return
|
|
* deleted items, and if we are locking pairs of pages. See btree.h
|
|
* for more details. In addition, if we're doing record numbers, we
|
|
* have to lock the entire tree regardless.
|
|
*
|
|
* If write-locking pages, we need to know whether or not to acquire a
|
|
* write lock on a page before getting it. This depends on how deep it
|
|
* is in tree, which we don't know until we acquire the root page. So,
|
|
* if we need to lock the root page we may have to upgrade it later,
|
|
* because we won't get the correct lock initially.
|
|
*
|
|
* Retrieve the root page.
|
|
*/
|
|
pg = PGNO_ROOT;
|
|
stack = F_ISSET(dbp, DB_BT_RECNUM) &&
|
|
(flags == S_INSERT || flags == S_DELETE);
|
|
if ((ret = __bam_lget(dbp,
|
|
0, pg, stack ? DB_LOCK_WRITE : DB_LOCK_READ, &lock)) != 0)
|
|
return (ret);
|
|
if ((ret = __bam_pget(dbp, &h, &pg, 0)) != 0) {
|
|
(void)__BT_LPUT(dbp, lock);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* Decide if we need to save this page; if we do, write lock it.
|
|
* We deliberately don't lock-couple on this call. If the tree
|
|
* is tiny, i.e., one page, and two threads are busily updating
|
|
* the root page, we're almost guaranteed deadlocks galore, as
|
|
* each one gets a read lock and then blocks the other's attempt
|
|
* for a write lock.
|
|
*/
|
|
if (!stack &&
|
|
((LF_ISSET(S_PARENT) && (u_int8_t)(stop + 1) >= h->level) ||
|
|
(LF_ISSET(S_WRITE) && h->level == LEAFLEVEL))) {
|
|
(void)memp_fput(dbp->mpf, h, 0);
|
|
(void)__BT_LPUT(dbp, lock);
|
|
if ((ret = __bam_lget(dbp, 0, pg, DB_LOCK_WRITE, &lock)) != 0)
|
|
return (ret);
|
|
if ((ret = __bam_pget(dbp, &h, &pg, 0)) != 0) {
|
|
(void)__BT_LPUT(dbp, lock);
|
|
return (ret);
|
|
}
|
|
|
|
stack = 1;
|
|
}
|
|
|
|
for (;;) {
|
|
/*
|
|
* Do a binary search on the current page. If we're searching
|
|
* a leaf page, we have to manipulate the indices in groups of
|
|
* two. If we're searching an internal page, they're an index
|
|
* per page item. If we find an exact match on a leaf page,
|
|
* we're done.
|
|
*/
|
|
cur.page = h;
|
|
jump = TYPE(h) == P_LBTREE ? P_INDX : O_INDX;
|
|
for (base = 0,
|
|
lim = NUM_ENT(h) / (db_indx_t)jump; lim != 0; lim >>= 1) {
|
|
cur.indx = indx = base + ((lim >> 1) * jump);
|
|
if ((cmp = __bam_cmp(dbp, key, &cur)) == 0) {
|
|
if (TYPE(h) == P_LBTREE)
|
|
goto match;
|
|
goto next;
|
|
}
|
|
if (cmp > 0) {
|
|
base = indx + jump;
|
|
--lim;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* No match found. Base is the smallest index greater than
|
|
* key and may be zero or a last + O_INDX index.
|
|
*
|
|
* If it's a leaf page, return base as the "found" value.
|
|
* Delete only deletes exact matches.
|
|
*/
|
|
if (TYPE(h) == P_LBTREE) {
|
|
*exactp = 0;
|
|
|
|
if (LF_ISSET(S_EXACT))
|
|
goto notfound;
|
|
|
|
BT_STK_ENTER(t, h, base, lock, ret);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* If it's not a leaf page, record the internal page (which is
|
|
* a parent page for the key). Decrement the base by 1 if it's
|
|
* non-zero so that if a split later occurs, the inserted page
|
|
* will be to the right of the saved page.
|
|
*/
|
|
indx = base > 0 ? base - O_INDX : base;
|
|
|
|
/*
|
|
* If we're trying to calculate the record number, sum up
|
|
* all the record numbers on this page up to the indx point.
|
|
*/
|
|
if (recnop != NULL)
|
|
for (i = 0; i < indx; ++i)
|
|
recno += GET_BINTERNAL(h, i)->nrecs;
|
|
|
|
next: pg = GET_BINTERNAL(h, indx)->pgno;
|
|
if (stack) {
|
|
/* Return if this is the lowest page wanted. */
|
|
if (LF_ISSET(S_PARENT) && stop == h->level) {
|
|
BT_STK_ENTER(t, h, indx, lock, ret);
|
|
return (ret);
|
|
}
|
|
BT_STK_PUSH(t, h, indx, lock, ret);
|
|
if (ret != 0)
|
|
goto err;
|
|
|
|
if ((ret =
|
|
__bam_lget(dbp, 0, pg, DB_LOCK_WRITE, &lock)) != 0)
|
|
goto err;
|
|
} else {
|
|
(void)memp_fput(dbp->mpf, h, 0);
|
|
|
|
/*
|
|
* Decide if we want to return a pointer to the next
|
|
* page in the stack. If we do, write lock it and
|
|
* never unlock it.
|
|
*/
|
|
if ((LF_ISSET(S_PARENT) &&
|
|
(u_int8_t)(stop + 1) >= (u_int8_t)(h->level - 1)) ||
|
|
(h->level - 1) == LEAFLEVEL)
|
|
stack = 1;
|
|
|
|
if ((ret =
|
|
__bam_lget(dbp, 1, pg, stack && LF_ISSET(S_WRITE) ?
|
|
DB_LOCK_WRITE : DB_LOCK_READ, &lock)) != 0)
|
|
goto err;
|
|
}
|
|
if ((ret = __bam_pget(dbp, &h, &pg, 0)) != 0)
|
|
goto err;
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
match: *exactp = 1;
|
|
|
|
/*
|
|
* If we're trying to calculate the record number, add in the
|
|
* offset on this page and correct for the fact that records
|
|
* in the tree are 0-based.
|
|
*/
|
|
if (recnop != NULL)
|
|
*recnop = recno + (indx / P_INDX) + 1;
|
|
|
|
/*
|
|
* If we got here, we know that we have a btree leaf page.
|
|
*
|
|
* If there are duplicates, go to the first/last one.
|
|
*/
|
|
if (LF_ISSET(S_DUPLAST))
|
|
while (indx < (db_indx_t)(NUM_ENT(h) - P_INDX) &&
|
|
h->inp[indx] == h->inp[indx + P_INDX])
|
|
indx += P_INDX;
|
|
else
|
|
while (indx > 0 &&
|
|
h->inp[indx] == h->inp[indx - P_INDX])
|
|
indx -= P_INDX;
|
|
|
|
/*
|
|
* Now check if we are allowed to return deleted item; if not
|
|
* find/last the first non-deleted item.
|
|
*/
|
|
if (LF_ISSET(S_DELNO)) {
|
|
if (LF_ISSET(S_DUPLAST))
|
|
while (B_DISSET(GET_BKEYDATA(h, indx + O_INDX)->type) &&
|
|
indx > 0 &&
|
|
h->inp[indx] == h->inp[indx - P_INDX])
|
|
indx -= P_INDX;
|
|
else
|
|
while (B_DISSET(GET_BKEYDATA(h, indx + O_INDX)->type) &&
|
|
indx < (db_indx_t)(NUM_ENT(h) - P_INDX) &&
|
|
h->inp[indx] == h->inp[indx + P_INDX])
|
|
indx += P_INDX;
|
|
|
|
if (B_DISSET(GET_BKEYDATA(h, indx + O_INDX)->type))
|
|
goto notfound;
|
|
}
|
|
|
|
BT_STK_ENTER(t, h, indx, lock, ret);
|
|
return (ret);
|
|
|
|
notfound:
|
|
(void)memp_fput(dbp->mpf, h, 0);
|
|
(void)__BT_LPUT(dbp, lock);
|
|
ret = DB_NOTFOUND;
|
|
|
|
err: if (t->bt_csp > t->bt_sp) {
|
|
BT_STK_POP(t);
|
|
__bam_stkrel(dbp);
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __bam_stkrel --
|
|
* Release all pages currently held in the stack.
|
|
*
|
|
* PUBLIC: int __bam_stkrel __P((DB *));
|
|
*/
|
|
int
|
|
__bam_stkrel(dbp)
|
|
DB *dbp;
|
|
{
|
|
BTREE *t;
|
|
EPG *epg;
|
|
|
|
t = dbp->internal;
|
|
for (epg = t->bt_sp; epg <= t->bt_csp; ++epg) {
|
|
(void)memp_fput(dbp->mpf, epg->page, 0);
|
|
(void)__BT_TLPUT(dbp, epg->lock);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* __bam_stkgrow --
|
|
* Grow the stack.
|
|
*
|
|
* PUBLIC: int __bam_stkgrow __P((BTREE *));
|
|
*/
|
|
int
|
|
__bam_stkgrow(t)
|
|
BTREE *t;
|
|
{
|
|
EPG *p;
|
|
size_t entries;
|
|
|
|
entries = t->bt_esp - t->bt_sp;
|
|
|
|
if ((p = (EPG *)__db_calloc(entries * 2, sizeof(EPG))) == NULL)
|
|
return (ENOMEM);
|
|
memcpy(p, t->bt_sp, entries * sizeof(EPG));
|
|
if (t->bt_sp != t->bt_stack)
|
|
FREE(t->bt_sp, entries * sizeof(EPG));
|
|
t->bt_sp = p;
|
|
t->bt_csp = p + entries;
|
|
t->bt_esp = p + entries * 2;
|
|
return (0);
|
|
}
|