mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 02:40:08 +00:00
a5a0310d8e
1997-09-30 18:03 Ulrich Drepper <drepper@cygnus.com> * Makerules: Undo last change. * csu/Makefile: Define before-compile at the right place. * aclocal.m4: Remove a.out file created by assembler test. * set-init.c: Find set-hooks.h using <...>. Update to db 2.3.10. * db2/Makefile: Update. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree.src: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_page.h: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/txn.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/log/log_register.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/mutex/mutex.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. * elf/link.h: Define struct libname_list outside struct link_map to not confuse C++ compilers. * include/features.h: Recognize _XOPEN_SOURCE == 500 and set __USE_UNIX98. * manual/creature.texi: Explain this. * libc.map: Add new functions. * libio/Makefile (routines): Add fseeko and ftello. * libio/ftello.c: New file. * libio/fseeko.c: New file. * libio/stdio.h: Add prototypes for new functions. * manual/stdio.texi: Document fseeko and ftello. * posix/Makefile (routines): Add pread and pwrite. * sysdeps/posix/pread.c: New file. * sysdeps/posix/pwrite.c: New file. * sysdeps/stub/pread.c: New file. * sysdeps/stub/pwrite.c: New file. * posix/unistd.h: Add prototypes for pread and pwrite. Pretty print header. Define gid_t, uid_t, off_t, pid_t if __USE_UNIX98. Declare ctermid and cuserid if __USE_UNIX98. (swab): Change to take void * arguments. * string/swab.c: Change parameter to void *. * posix/sys/types: Define gid_t, uid_t, off_t, pid_t only if not already happened. * manual/llio.texi: Document pread and pwrite. * string/strings.h: Don't simply include string.h. Define BSD functions according to Unix98. * stdlib/tst-strtol.c: Include <string.h> not <strings.h>. * sunrpc/clnt_simp.c: Likewise. * malloc/Makefile (aux): Add set-freeres. * malloc/mtrace.c: Define function release_libc_mem which calls the __libc_subfreeres handler. (mtrace): Register release_libc_mem. * malloc/set-freeres.c: New file. * intl/dcgettext.c: Define free_mem function and add to __libc_subfreeres list. * intl/finddomain.c: Likewise. * intl/gettextP.h (struct loaded_domain): Add new fields use_mmap and mmap_size. Add prototype for _nl_unloaded_domain. * intl/loadmsgcat.c: Define new function _nl_unload_domain. (_nl_load_domain): Store informaiton about mmap use and file size. * intl/localealias.c (read_alias_file): Optimize locale alias file reading by avoid frequen mallocs. Define free_mem function and add to __libc_subfreeres list. * locale/localeinfo.h: Make a difference between MAX_USAGE_COUNT and undeletable. Add prototype for _nl_unload_locale. * locale/C-collate: Mark data as undeletable by using UNDELETABLE. * locale/C-ctype: Likewise. * locale/C-messages: Likewise. * locale/C-monetary: Likewise. * locale/C-numeric: Likewise. * locale/C-time: Likewise. * locale/findlocale.c (_nl_find_locale, _nl_remove_locale): Handle MAX_USAGE_COUNT and UNDELETABLE. (free_mem): New function. Add it to __libc_subfreeres list. * locale/loadlocale.c: Define _nl_unload_locale function. * misc/hsearch.c: Register hdestroy in __libc_subfreeres list. * stdlib/fmtmsg.c (addseverity): Handle illegal severity arguments correctly Define free_mem function and add to __libc_subfreeres list. * locale/programs/localedef.c (options): short form os verbose is v. Reported by Andreas Jaeger. * misc/sys/select.h: Define pselect only is __USE_POSIX since this header is used in some others as well for historical reasons. * resolv/resolv.h: Include <netinet/in.h> to make self-contained. * string/bits/string2.h: Add missing braces and optimize strcmp a bit more. * sysdeps/i386/i486/bits/string.h: Likewise. * sunrpc/rpc/auth_des.h: Include rpc/auth.h to be self-contained. Pretty print. * sysdeps/mach/hurd/cthreads.c: Add copyright text. * sysdeps/unix/sysv/linux/syscalls.list: Correct prctl entry. * sysdeps/unix/sysv/linux/sys/mman.h: Get definition of size_t. * time/time.h: Pretty print. 1997-09-29 Paul Eggert <eggert@twinsun.com> * time/strftime.c: Synchronize with GNU Emacs strftime.c. (HAVE_MEMCPY): Define if emacs is defined and HAVE_BCOPY isn't. (gmtime_r, localtime_r): Undef before defining. (iso_week_days): Use __inline__, not inline. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/bits/mathinline.h: Rename exp2{,l,f} to __ieee754_exp2{,l,f}. * sysdeps/m68k/fpu/s_exp2.c: Likewise. * sysdeps/m68k/fpu/s_exp2l.c: Likewise. * sysdeps/m68k/fpu/s_exp2f.c: Likewise. 1997-09-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/soinit.c (__EH_FRAME_BEGIN__): Don't make the .eh_frame section read-only, it contains relocations. * elf/sofini.c (__FRAME_END__): Likewise. 1997-09-29 03:08 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/bits/string.h [__PIC__] (__strspn_cg, __strcspn_cg, __strpbrk_cg, __strstr_cg): Optimize even more. No spill register needed. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-28 08:27 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c (__do_niscall2): Fix return code, add missing break in switch case. * nis/nis_mkdir.c: Fix return codes to match Solaris version. * nis/nis_rmdir.c: Likewise. * nis/rpcsvc/yp_prot.h: Rename struct keydat to struct keydat_t for C++. 1997-09-28 04:32 Ulrich Drepper <drepper@cygnus.com> * configure.in: Fix typo. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-09-25 20:14 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/scsi/sg.h: New file. * sysdeps/unix/sysv/linux/Makefile: Install <scsi/sg.h>.
319 lines
10 KiB
C
319 lines
10 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.
|
|
*
|
|
* @(#)btree.h 10.17 (Sleepycat) 9/23/97
|
|
*/
|
|
|
|
/* Forward structure declarations. */
|
|
struct __btree; typedef struct __btree BTREE;
|
|
struct __cursor; typedef struct __cursor CURSOR;
|
|
struct __epg; typedef struct __epg EPG;
|
|
struct __rcursor; typedef struct __rcursor RCURSOR;
|
|
struct __recno; typedef struct __recno RECNO;
|
|
|
|
#undef DEFMINKEYPAGE /* Minimum keys per page */
|
|
#define DEFMINKEYPAGE (2)
|
|
|
|
#undef ISINTERNAL /* If an internal page. */
|
|
#define ISINTERNAL(p) (TYPE(p) == P_IBTREE || TYPE(p) == P_IRECNO)
|
|
#undef ISLEAF /* If a leaf page. */
|
|
#define ISLEAF(p) (TYPE(p) == P_LBTREE || TYPE(p) == P_LRECNO)
|
|
|
|
/* Allocate and discard thread structures. */
|
|
#define GETHANDLE(dbp, set_txn, dbpp, ret) { \
|
|
if (F_ISSET(dbp, DB_AM_THREAD)) { \
|
|
if ((ret = __db_gethandle(dbp, __bam_bdup, dbpp)) != 0) \
|
|
return (ret); \
|
|
} else \
|
|
*dbpp = dbp; \
|
|
*dbpp->txn = set_txn; \
|
|
}
|
|
#define PUTHANDLE(dbp) { \
|
|
dbp->txn = NULL; \
|
|
if (F_ISSET(dbp, DB_AM_THREAD)) \
|
|
__db_puthandle(dbp); \
|
|
}
|
|
|
|
/*
|
|
* If doing transactions we have to hold the locks associated with a data item
|
|
* from a page for the entire transaction. However, we don't have to hold the
|
|
* locks associated with walking the tree. Distinguish between the two so that
|
|
* we don't tie up the internal pages of the tree longer than necessary.
|
|
*/
|
|
#define __BT_LPUT(dbp, lock) \
|
|
(F_ISSET((dbp), DB_AM_LOCKING) ? \
|
|
lock_put((dbp)->dbenv->lk_info, lock) : 0)
|
|
#define __BT_TLPUT(dbp, lock) \
|
|
(F_ISSET((dbp), DB_AM_LOCKING) && (dbp)->txn == NULL ? \
|
|
lock_put((dbp)->dbenv->lk_info, lock) : 0)
|
|
|
|
/*
|
|
* Flags to __bt_search() and __rec_search().
|
|
*
|
|
* Note, internal page searches must find the largest record less than key in
|
|
* the tree so that descents work. Leaf page searches must find the smallest
|
|
* record greater than key so that the returned index is the record's correct
|
|
* position for insertion.
|
|
*
|
|
* The flags parameter to the search routines describes three aspects of the
|
|
* search: the type of locking required (including if we're locking a pair of
|
|
* pages), the item to return in the presence of duplicates and whether or not
|
|
* to return deleted entries. To simplify both the mnemonic representation
|
|
* and the code that checks for various cases, we construct a set of bitmasks.
|
|
*/
|
|
#define S_READ 0x0001 /* Read locks. */
|
|
#define S_WRITE 0x0002 /* Write locks. */
|
|
|
|
#define S_APPEND 0x0040 /* Append to the tree. */
|
|
#define S_DELNO 0x0080 /* Don't return deleted items. */
|
|
#define S_DUPFIRST 0x0100 /* Return first duplicate. */
|
|
#define S_DUPLAST 0x0200 /* Return last duplicate. */
|
|
#define S_EXACT 0x0400 /* Exact items only. */
|
|
#define S_PARENT 0x0800 /* Lock page pair. */
|
|
|
|
#define S_DELETE (S_WRITE | S_DUPFIRST | S_DELNO | S_EXACT)
|
|
#define S_FIND (S_READ | S_DUPFIRST | S_DELNO)
|
|
#define S_INSERT (S_WRITE | S_DUPLAST)
|
|
#define S_KEYFIRST (S_WRITE | S_DUPFIRST)
|
|
#define S_KEYLAST (S_WRITE | S_DUPLAST)
|
|
#define S_WRPAIR (S_WRITE | S_DUPLAST | S_PARENT)
|
|
|
|
/*
|
|
* Flags to __bam_iitem().
|
|
*/
|
|
#define BI_NEWKEY 0x01 /* New key. */
|
|
#define BI_DELETED 0x02 /* Key/data pair only placeholder. */
|
|
|
|
/*
|
|
* Various routines pass around page references. A page reference can be a
|
|
* pointer to the page or a page number; for either, an indx can designate
|
|
* an item on the page.
|
|
*/
|
|
struct __epg {
|
|
PAGE *page; /* The page. */
|
|
db_indx_t indx; /* The index on the page. */
|
|
DB_LOCK lock; /* The page's lock. */
|
|
};
|
|
|
|
/*
|
|
* Btree cursor.
|
|
*
|
|
* Arguments passed to __bam_ca_replace().
|
|
*/
|
|
typedef enum {
|
|
REPLACE_SETUP,
|
|
REPLACE_SUCCESS,
|
|
REPLACE_FAILED
|
|
} ca_replace_arg;
|
|
struct __cursor {
|
|
DBC *dbc; /* Enclosing DBC. */
|
|
|
|
PAGE *page; /* Cursor page. */
|
|
|
|
db_pgno_t pgno; /* Page. */
|
|
db_indx_t indx; /* Page item ref'd by the cursor. */
|
|
|
|
db_pgno_t dpgno; /* Duplicate page. */
|
|
db_indx_t dindx; /* Page item ref'd by the cursor. */
|
|
|
|
DB_LOCK lock; /* Cursor read lock. */
|
|
db_lockmode_t mode; /* Lock mode. */
|
|
|
|
/*
|
|
* If a cursor record is deleted, the key/data pair has to remain on
|
|
* the page so that subsequent inserts/deletes don't interrupt the
|
|
* cursor progression through the file. This results in interesting
|
|
* cases when "standard" operations, e.g., dbp->put() are done in the
|
|
* context of "deleted" cursors.
|
|
*
|
|
* C_DELETED -- The item referenced by the cursor has been "deleted"
|
|
* but not physically removed from the page.
|
|
* C_REPLACE -- The "deleted" item referenced by a cursor has been
|
|
* replaced by a dbp->put(), so the cursor is no longer
|
|
* responsible for physical removal from the page.
|
|
* C_REPLACE_SETUP --
|
|
* We are about to overwrite a "deleted" item, flag any
|
|
* cursors referencing it for transition to C_REPLACE
|
|
* state.
|
|
*/
|
|
#define C_DELETED 0x0001
|
|
#define C_REPLACE 0x0002
|
|
#define C_REPLACE_SETUP 0x0004
|
|
|
|
/*
|
|
* Internal cursor held for DB->get; don't hold locks unless involved
|
|
* in a TXN.
|
|
*/
|
|
#define C_INTERNAL 0x0008
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* Recno cursor.
|
|
*
|
|
* Arguments passed to __ram_ca().
|
|
*/
|
|
typedef enum {
|
|
CA_DELETE,
|
|
CA_IAFTER,
|
|
CA_IBEFORE
|
|
} ca_recno_arg;
|
|
struct __rcursor {
|
|
DBC *dbc; /* Enclosing DBC. */
|
|
|
|
db_recno_t recno; /* Current record number. */
|
|
|
|
/*
|
|
* Cursors referencing "deleted" records are positioned between
|
|
* two records, and so must be specially adjusted until they are
|
|
* moved.
|
|
*/
|
|
#define CR_DELETED 0x0001 /* Record deleted. */
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* We maintain a stack of the pages that we're locking in the tree. Btree's
|
|
* (currently) only save two levels of the tree at a time, so the default
|
|
* stack is always large enough. Recno trees have to lock the entire tree to
|
|
* do inserts/deletes, however. Grow the stack as necessary.
|
|
*/
|
|
#undef BT_STK_CLR
|
|
#define BT_STK_CLR(t) \
|
|
((t)->bt_csp = (t)->bt_sp)
|
|
|
|
#undef BT_STK_ENTER
|
|
#define BT_STK_ENTER(t, pagep, page_indx, lock, ret) do { \
|
|
if ((ret = \
|
|
(t)->bt_csp == (t)->bt_esp ? __bam_stkgrow(t) : 0) == 0) { \
|
|
(t)->bt_csp->page = pagep; \
|
|
(t)->bt_csp->indx = page_indx; \
|
|
(t)->bt_csp->lock = lock; \
|
|
} \
|
|
} while (0)
|
|
|
|
#undef BT_STK_PUSH
|
|
#define BT_STK_PUSH(t, pagep, page_indx, lock, ret) do { \
|
|
BT_STK_ENTER(t, pagep, page_indx, lock, ret); \
|
|
++(t)->bt_csp; \
|
|
} while (0)
|
|
|
|
#undef BT_STK_POP
|
|
#define BT_STK_POP(t) \
|
|
((t)->bt_csp == (t)->bt_stack ? NULL : --(t)->bt_csp)
|
|
|
|
/*
|
|
* The in-memory recno data structure.
|
|
*
|
|
* !!!
|
|
* These fields are ignored as far as multi-threading is concerned. There
|
|
* are no transaction semantics associated with backing files, nor is there
|
|
* any thread protection.
|
|
*/
|
|
#undef RECNO_OOB
|
|
#define RECNO_OOB 0 /* Illegal record number. */
|
|
|
|
struct __recno {
|
|
int re_delim; /* Variable-length delimiting byte. */
|
|
int re_pad; /* Fixed-length padding byte. */
|
|
u_int32_t re_len; /* Length for fixed-length records. */
|
|
|
|
char *re_source; /* Source file name. */
|
|
int re_fd; /* Source file descriptor */
|
|
db_recno_t re_last; /* Last record number read. */
|
|
void *re_cmap; /* Current point in mapped space. */
|
|
void *re_smap; /* Start of mapped space. */
|
|
void *re_emap; /* End of mapped space. */
|
|
size_t re_msize; /* Size of mapped region. */
|
|
/* Recno input function. */
|
|
int (*re_irec) __P((DB *, db_recno_t));
|
|
|
|
#define RECNO_EOF 0x0001 /* EOF on backing source file. */
|
|
#define RECNO_MODIFIED 0x0002 /* Tree was modified. */
|
|
u_int32_t flags;
|
|
};
|
|
|
|
/*
|
|
* The in-memory btree data structure.
|
|
*/
|
|
struct __btree {
|
|
/*
|
|
* These fields are per-thread and are initialized when the BTREE structure
|
|
* is created.
|
|
*/
|
|
db_pgno_t bt_lpgno; /* Last insert location. */
|
|
|
|
DBT bt_rkey; /* Returned key. */
|
|
DBT bt_rdata; /* Returned data. */
|
|
|
|
EPG *bt_sp; /* Stack pointer. */
|
|
EPG *bt_csp; /* Current stack entry. */
|
|
EPG *bt_esp; /* End stack pointer. */
|
|
EPG bt_stack[5];
|
|
|
|
RECNO *bt_recno; /* Private recno structure. */
|
|
|
|
DB_BTREE_LSTAT lstat; /* Btree local statistics. */
|
|
|
|
/*
|
|
* These fields are copied from the original BTREE structure and never
|
|
* change.
|
|
*/
|
|
db_indx_t bt_maxkey; /* Maximum keys per page. */
|
|
db_indx_t bt_minkey; /* Minimum keys per page. */
|
|
|
|
int (*bt_compare) /* Comparison function. */
|
|
__P((const DBT *, const DBT *));
|
|
size_t(*bt_prefix) /* Prefix function. */
|
|
__P((const DBT *, const DBT *));
|
|
|
|
db_indx_t bt_ovflsize; /* Maximum key/data on-page size. */
|
|
};
|
|
|
|
#include "btree_auto.h"
|
|
#include "btree_ext.h"
|
|
#include "db_am.h"
|
|
#include "common_ext.h"
|