mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
bf7997b65c
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
302 lines
7.2 KiB
C
302 lines
7.2 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)db_salloc.c 10.13 (Sleepycat) 5/10/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <string.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;
|
|
|
|
#define SHALLOC_FRAGMENT 32
|
|
/*
|
|
* If there are at least SHALLOC_FRAGMENT additional bytes of
|
|
* memory, divide the chunk into two chunks.
|
|
*/
|
|
if ((u_int8_t *)rp >=
|
|
(u_int8_t *)&elp->links + SHALLOC_FRAGMENT) {
|
|
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 grow the 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;
|
|
|
|
/* Trash the returned memory. */
|
|
#ifdef DIAGNOSTIC
|
|
memset(ptr, 0xff, free_size);
|
|
#endif
|
|
|
|
/*
|
|
* 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);
|
|
}
|
|
|
|
/*
|
|
* __db_shalloc_dump --
|
|
*
|
|
* PUBLIC: void __db_shalloc_dump __P((void *, FILE *));
|
|
*/
|
|
void
|
|
__db_shalloc_dump(addr, fp)
|
|
void *addr;
|
|
FILE *fp;
|
|
{
|
|
struct __data *elp;
|
|
|
|
/* Make it easy to call from the debugger. */
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
|
|
fprintf(fp, "%s\nMemory free list\n", DB_LINE);
|
|
|
|
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");
|
|
}
|