92f1da4da0
1997-08-10 19:17 Philip Blundell <Philip.Blundell@pobox.com> * nss/nss_db/db-XXX.c: Include <db_185.h> not <db.h>. Somebody should update this to use the new db API. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/db-alias.c: Likewise. * db2/Makefile: Makefile for db-2.x in glibc. 1997-08-27 21:20 Ulrich Drepper <drepper@cygnus.com> * csu/Makefile (before-compile): New goal. Make sure abi-tag.h is generated. [$(elf)=yes] (asm-CPPFLAGS): Make sure abi-tag.h file can be found. * Makeconfig [$(build-omitfp)=yes] (CFLAGS-.o): Add -D__USE_STRING_INLINES. * string/string.f: Move strnlen optimization after inclusion of <bits/string.h>. Include <bits/string.h> only if __USE_STRING_INLINES is defined. * sysdeps/generic/memcpy.c: Undef memcpy to allow macro of this name in <bits/string.h>. * sysdeps/generic/memset.c: Likewise. * sysdeps/i386/string.h: i386 optimized string functions. * sysdeps/i386/i486string.h: i486+ optimized string functions. * Makefile (subdirs): Change db to db2. * shlib-versions: Bump libdb verion number to 3. * include/db.h: Include from db2 directory. * include/db_185.h: New file. * sysdeps/i386/Makefile [$(subdirs)=db2] (CPPFLAGS): Add macros to provide spinlock information for db2. * sysdeps/m68k/m68020/Makefile: New file. Likewise. * sysdeps/sparc/Makefile: New file. Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdirs)=db2] (CPPFLAGS): Add -DHAVE_LLSEEK. * db2/config.h: Hand-edited config file for db2 in glibc. * db2/compat.h: New file from db-2.3.4. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/makedb.c: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_compare.c: Likewise. * db2/btree/bt_conv.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/btree/bt_rsearch.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/bt_stat.c: Likewise. * db2/btree/btree.src: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_byteorder.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_salloc.c: Likewise. * db2/common/db_log2.c: Likewise. * db2/common/db_region.c: Likewise. * db2/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db.src: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_overflow.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/db/db_thread.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash.src: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_conv.c: Likewise. * db2/hash/hash_debug.c: Likewise. * db2/hash/hash_stat.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_func.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/mp.h: Likewise. * db2/include/btree.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/db_shash.h: Likewise. * db2/include/db_swap.h: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/txn.h: Likewise. * db2/include/db_am.h: Likewise. * db2/include/shqueue.h: Likewise. * db2/include/hash.h: Likewise. * db2/include/db_dispatch.h: Likewise. * db2/include/lock.h: Likewise. * db2/include/db_page.h: Likewise. * db2/include/log.h: Likewise. * db2/include/db_auto.h: Likewise. * db2/include/btree_auto.h: Likewise. * db2/include/hash_auto.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/txn_auto.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/include/cxx_int.h: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/queue.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_conflict.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log_get.c: Likewise. * db2/log/log.src: Likewise. * db2/log/log_compare.c: Likewise. * db2/log/log_put.c: Likewise. * db2/log/log_rec.c: Likewise. * db2/log/log_archive.c: Likewise. * db2/log/log_register.c: Likewise. * db2/log/log_auto.c: Likewise. * db2/log/log_findckp.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_region.c: Likewise. * db2/mp/mp_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/68020.gcc: Likewise. * db2/mutex/mutex.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/x86.gcc: Likewise. * db2/mutex/sparc.gcc: Likewise. * db2/mutex/uts4.cc.s: Likewise. * db2/mutex/alpha.dec: Likewise. * db2/mutex/alpha.gcc: Likewise. * db2/mutex/parisc.gcc: Likewise. * db2/mutex/parisc.hp: Likewise. * db2/os/db_os_abs.c: Likewise. * db2/os/db_os_dir.c: Likewise. * db2/os/db_os_fid.c: Likewise. * db2/os/db_os_lseek.c: Likewise. * db2/os/db_os_mmap.c: Likewise. * db2/os/db_os_open.c: Likewise. * db2/os/db_os_rw.c: Likewise. * db2/os/db_os_sleep.c: Likewise. * db2/os/db_os_stat.c: Likewise. * db2/os/db_os_unlink.c: Likewise. * db2/txn/txn.c: Likewise. * db2/txn/txn.src: Likewise. * db2/txn/txn_rec.c: Likewise. * db2/txn/txn_auto.c: Likewise. * db2/clib/getlong.c: Likewise. * db2/progs/db_archive/db_archive.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_dump/db_dump.c: Likewise. * db2/progs/db_dump185/db_dump185.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * libio/stdio.h [__cplusplus] (__STDIO_INLINE): Define as inline. * po/de.po, po/sv.po: Update from 2.0.5 translations. * sysdeps/unix/sysv/linux/netinet/tcp.h: Pretty print. * sunrpc/rpc/xdr.h (XDR): Don't define argument of x_destroy callback as const. * sunrpc/xdr_mem.c (xdrmem_destroy): Don't define argument as const. * sunrpx/xdr_rec.c (xdrrec_destroy): Likewise. * sunrpx/xdr_stdio.c (xdrstdio_destroy): Likewise. 1997-08-27 18:47 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/if_index.c: Include <errno.h>. Reported by Benjamin Kosnik <bkoz@cygnus.com>. 1997-08-27 02:27 Roland McGrath <roland@baalperazim.frob.com> * abi-tags: New file. * csu/Makefile (distribute): Remove abi-tag.h. ($(objpfx)abi-tag.h): New target. * Makefile (distribute): Add abi-tags. * sysdeps/unix/sysv/linux/abi-tag.h: File removed. * sysdeps/mach/hurd/abi-tag.h: File removed. * sysdeps/stub/abi-tag.h: File removed. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/make-syscalls.sh: Change output so that it generates compilation rules only for the currently selected object suffixes. 1997-08-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (RTLD_START): Switch back to previous section to avoid confusing the compiler. * sysdeps/alpha/dl-machine.h (RTLD_START): Likewise. * sysdeps/i386/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/dl-machine.h (RTLD_START): Likewise. * sysdeps/mips/mips64/dl-machine.h (RTLD_START): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use a GOT relocation instead of a constant to avoid text relocation. (ELF_MACHINE_BEFORE_RTLD_RELOC): Removed. (RTLD_START): Declare global labels as functions and add size directive. 1997-08-25 17:01 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h: Correct assembler versions to work even for descriptors >= 32. * stdlib/alloca.h: Don't define alloca to __alloca since if gcc is used __alloca is not defined to __builtin_alloca and so might not be available. Reported by Uwe Ohse <uwe@ohse.de>. * sysdeps/unix/sysv/linux/sys/sysmacros.h: Define macros in a special way if gcc is not used and so dev_t is an array. Reported by Uwe Ohse <uwe@ohse.de>. 1997-08-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/libc.texinfo: Reorder chapters to match logical order. 1997-08-25 12:22 Ulrich Drepper <drepper@cygnus.com> * sunrpc/rpc/xdr.h: Change name of parameters in prototypes of xdr_reference, xdrmem_create, and xdrstdio_create because of clash with g++ internal symbols. Patch by Sudish Joseph <sj@eng.mindspring.net>. * elf/dl-deps.c: Implement handling of DT_FILTER.
291 lines
7.0 KiB
C
291 lines
7.0 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)db_salloc.c 10.6 (Sleepycat) 7/5/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "common_ext.h"
|
|
|
|
/*
|
|
* Implement shared memory region allocation, using simple first-fit algorithm.
|
|
* The model is that we take a "chunk" of shared memory store and begin carving
|
|
* it up into areas, similarly to how malloc works. We do coalescing on free.
|
|
*
|
|
* The "len" field in the __data struct contains the length of the free region
|
|
* (less the size_t bytes that holds the length). We use the address provided
|
|
* by the caller to find this length, which allows us to free a chunk without
|
|
* requiring that the caller pass in the length of the chunk they're freeing.
|
|
*/
|
|
SH_LIST_HEAD(__head);
|
|
struct __data {
|
|
size_t len;
|
|
SH_LIST_ENTRY links;
|
|
};
|
|
|
|
/*
|
|
* __db_shalloc_init --
|
|
* Initialize the area as one large chunk.
|
|
*
|
|
* PUBLIC: void __db_shalloc_init __P((void *, size_t));
|
|
*/
|
|
void
|
|
__db_shalloc_init(area, size)
|
|
void *area;
|
|
size_t size;
|
|
{
|
|
struct __data *elp;
|
|
struct __head *hp;
|
|
|
|
hp = area;
|
|
SH_LIST_INIT(hp);
|
|
|
|
elp = (struct __data *)(hp + 1);
|
|
elp->len = size - sizeof(struct __head) - sizeof(elp->len);
|
|
SH_LIST_INSERT_HEAD(hp, elp, links, __data);
|
|
}
|
|
|
|
/*
|
|
* __db_shalloc --
|
|
* Allocate some space from the shared region.
|
|
*
|
|
* PUBLIC: int __db_shalloc __P((void *, size_t, size_t, void *));
|
|
*/
|
|
int
|
|
__db_shalloc(p, len, align, retp)
|
|
void *p, *retp;
|
|
size_t len, align;
|
|
{
|
|
struct __data *elp;
|
|
size_t *sp;
|
|
void *rp;
|
|
|
|
/*
|
|
* We never allocate less than the size of a struct __data, align
|
|
* to less than a size_t boundary, or align to something that's not
|
|
* a multiple of a size_t.
|
|
*/
|
|
if (len < sizeof(struct __data))
|
|
len = sizeof(struct __data);
|
|
align = align <= sizeof(size_t) ?
|
|
sizeof(size_t) : ALIGN(align, sizeof(size_t));
|
|
|
|
/* Walk the list, looking for a slot. */
|
|
for (elp = SH_LIST_FIRST((struct __head *)p, __data);
|
|
elp != NULL;
|
|
elp = SH_LIST_NEXT(elp, links, __data)) {
|
|
/*
|
|
* Calculate the value of the returned pointer if we were to
|
|
* use this chunk.
|
|
* + Find the end of the chunk.
|
|
* + Subtract the memory the user wants.
|
|
* + Find the closest previous correctly-aligned address.
|
|
*/
|
|
rp = (u_int8_t *)elp + sizeof(size_t) + elp->len;
|
|
rp = (u_int8_t *)rp - len;
|
|
rp = (u_int8_t *)((ALIGNTYPE)rp & ~(align - 1));
|
|
|
|
/*
|
|
* Rp may now point before elp->links, in which case the chunk
|
|
* was too small, and we have to try again.
|
|
*/
|
|
if ((u_int8_t *)rp < (u_int8_t *)&elp->links)
|
|
continue;
|
|
|
|
*(void **)retp = rp;
|
|
|
|
/*
|
|
* If there are at least 32 bytes of additional memory, divide
|
|
* the chunk into two chunks.
|
|
*/
|
|
if ((u_int8_t *)rp >= (u_int8_t *)&elp->links + 32) {
|
|
sp = rp;
|
|
*--sp = elp->len -
|
|
((u_int8_t *)rp - (u_int8_t *)&elp->links);
|
|
elp->len -= *sp + sizeof(size_t);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* Otherwise, we return the entire chunk, wasting some amount
|
|
* of space to keep the list compact. However, because the
|
|
* address we're returning to the user may not be the address
|
|
* of the start of the region for alignment reasons, set the
|
|
* size_t length fields back to the "real" length field to a
|
|
* flag value, so that we can find the real length during free.
|
|
*/
|
|
#define ILLEGAL_SIZE 1
|
|
SH_LIST_REMOVE(elp, links, __data);
|
|
for (sp = rp; (u_int8_t *)--sp >= (u_int8_t *)&elp->links;)
|
|
*sp = ILLEGAL_SIZE;
|
|
return (0);
|
|
}
|
|
|
|
/* Nothing found large enough; need to figure out how to grow region. */
|
|
return (ENOMEM);
|
|
}
|
|
|
|
/*
|
|
* __db_shalloc_free --
|
|
* Free a shared memory allocation.
|
|
*
|
|
* PUBLIC: void __db_shalloc_free __P((void *, void *));
|
|
*/
|
|
void
|
|
__db_shalloc_free(regionp, ptr)
|
|
void *regionp, *ptr;
|
|
{
|
|
struct __data *elp, *lastp, *newp;
|
|
struct __head *hp;
|
|
size_t free_size, *sp;
|
|
int merged;
|
|
|
|
/*
|
|
* Step back over flagged length fields to find the beginning of
|
|
* the object and its real size.
|
|
*/
|
|
for (sp = (size_t *)ptr; sp[-1] == ILLEGAL_SIZE; --sp);
|
|
ptr = sp;
|
|
|
|
newp = (struct __data *)((u_int8_t *)ptr - sizeof(size_t));
|
|
free_size = newp->len;
|
|
|
|
/*
|
|
* Walk the list, looking for where this entry goes.
|
|
*
|
|
* We keep the free list sorted by address so that coalescing is
|
|
* trivial.
|
|
*
|
|
* XXX
|
|
* Probably worth profiling this to see how expensive it is.
|
|
*/
|
|
hp = (struct __head *)regionp;
|
|
for (elp = SH_LIST_FIRST(hp, __data), lastp = NULL;
|
|
elp != NULL && (void *)elp < (void *)ptr;
|
|
lastp = elp, elp = SH_LIST_NEXT(elp, links, __data));
|
|
|
|
/*
|
|
* Elp is either NULL (we reached the end of the list), or the slot
|
|
* after the one that's being returned. Lastp is either NULL (we're
|
|
* returning the first element of the list) or the element before the
|
|
* one being returned.
|
|
*
|
|
* Check for coalescing with the next element.
|
|
*/
|
|
merged = 0;
|
|
if ((u_int8_t *)ptr + free_size == (u_int8_t *)elp) {
|
|
newp->len += elp->len + sizeof(size_t);
|
|
SH_LIST_REMOVE(elp, links, __data);
|
|
if (lastp != NULL)
|
|
SH_LIST_INSERT_AFTER(lastp, newp, links, __data);
|
|
else
|
|
SH_LIST_INSERT_HEAD(hp, newp, links, __data);
|
|
merged = 1;
|
|
}
|
|
|
|
/* Check for coalescing with the previous element. */
|
|
if (lastp != NULL && (u_int8_t *)lastp +
|
|
lastp->len + sizeof(size_t) == (u_int8_t *)newp) {
|
|
lastp->len += newp->len + sizeof(size_t);
|
|
|
|
/*
|
|
* If we have already put the new element into the list take
|
|
* it back off again because it's just been merged with the
|
|
* previous element.
|
|
*/
|
|
if (merged)
|
|
SH_LIST_REMOVE(newp, links, __data);
|
|
merged = 1;
|
|
}
|
|
|
|
if (!merged)
|
|
if (lastp == NULL)
|
|
SH_LIST_INSERT_HEAD(hp, newp, links, __data);
|
|
else
|
|
SH_LIST_INSERT_AFTER(lastp, newp, links, __data);
|
|
}
|
|
|
|
/*
|
|
* __db_shalloc_count --
|
|
* Return the amount of memory on the free list.
|
|
*
|
|
* PUBLIC: size_t __db_shalloc_count __P((void *));
|
|
*/
|
|
size_t
|
|
__db_shalloc_count(addr)
|
|
void *addr;
|
|
{
|
|
struct __data *elp;
|
|
size_t count;
|
|
|
|
count = 0;
|
|
for (elp = SH_LIST_FIRST((struct __head *)addr, __data);
|
|
elp != NULL;
|
|
elp = SH_LIST_NEXT(elp, links, __data))
|
|
count += elp->len;
|
|
|
|
return (count);
|
|
}
|
|
|
|
/*
|
|
* __db_shsizeof --
|
|
* Return the size of a shalloc'd piece of memory.
|
|
*
|
|
* PUBLIC: size_t __db_shsizeof __P((void *));
|
|
*/
|
|
size_t
|
|
__db_shsizeof(ptr)
|
|
void *ptr;
|
|
{
|
|
struct __data *elp;
|
|
size_t *sp;
|
|
|
|
/*
|
|
* Step back over flagged length fields to find the beginning of
|
|
* the object and its real size.
|
|
*/
|
|
for (sp = (size_t *)ptr; sp[-1] == ILLEGAL_SIZE; --sp);
|
|
|
|
elp = (struct __data *)((u_int8_t *)sp - sizeof(size_t));
|
|
return (elp->len);
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
/*
|
|
* __db_shalloc_dump --
|
|
*
|
|
* PUBLIC: void __db_shalloc_dump __P((FILE *, void *));
|
|
*/
|
|
void
|
|
__db_shalloc_dump(fp, addr)
|
|
FILE *fp;
|
|
void *addr;
|
|
{
|
|
struct __data *elp;
|
|
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
|
|
for (elp = SH_LIST_FIRST((struct __head *)addr, __data);
|
|
elp != NULL;
|
|
elp = SH_LIST_NEXT(elp, links, __data))
|
|
fprintf(fp, "%#lx: %lu\t", (u_long)elp, (u_long)elp->len);
|
|
fprintf(fp, "\n");
|
|
}
|
|
#endif
|