mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
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.
This commit is contained in:
Ulrich Drepper
@ -1,21 +1,21 @@
|
||||
/*-
|
||||
* See the file LICENSE for redistribution information.
|
||||
*
|
||||
* Copyright (c) 1996, 1997
|
||||
* Copyright (c) 1996, 1997, 1998
|
||||
* Sleepycat Software. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char sccsid[] = "@(#)db_salloc.c 10.6 (Sleepycat) 7/5/97";
|
||||
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 <stdio.h>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "db_int.h"
|
||||
@ -109,11 +109,13 @@ __db_shalloc(p, len, align, retp)
|
||||
|
||||
*(void **)retp = rp;
|
||||
|
||||
#define SHALLOC_FRAGMENT 32
|
||||
/*
|
||||
* If there are at least 32 bytes of additional memory, divide
|
||||
* the chunk into two chunks.
|
||||
* 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 + 32) {
|
||||
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);
|
||||
@ -136,7 +138,7 @@ __db_shalloc(p, len, align, retp)
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Nothing found large enough; need to figure out how to grow region. */
|
||||
/* Nothing found large enough; need to grow the region. */
|
||||
return (ENOMEM);
|
||||
}
|
||||
|
||||
@ -159,12 +161,18 @@ __db_shalloc_free(regionp, ptr)
|
||||
* 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);
|
||||
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.
|
||||
*
|
||||
@ -177,7 +185,8 @@ __db_shalloc_free(regionp, ptr)
|
||||
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));
|
||||
lastp = elp, elp = SH_LIST_NEXT(elp, links, __data))
|
||||
;
|
||||
|
||||
/*
|
||||
* Elp is either NULL (we reached the end of the list), or the slot
|
||||
@ -259,32 +268,34 @@ __db_shsizeof(ptr)
|
||||
* 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);
|
||||
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 *));
|
||||
* PUBLIC: void __db_shalloc_dump __P((void *, FILE *));
|
||||
*/
|
||||
void
|
||||
__db_shalloc_dump(fp, addr)
|
||||
FILE *fp;
|
||||
__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");
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user