mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +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>.
360 lines
9.2 KiB
C
360 lines
9.2 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[] = "@(#)mp_fget.c 10.25 (Sleepycat) 9/23/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "db_shash.h"
|
|
#include "mp.h"
|
|
#include "common_ext.h"
|
|
|
|
int __sleep_on_every_page_get; /* XXX: thread debugging option. */
|
|
|
|
/*
|
|
* memp_fget --
|
|
* Get a page from the file.
|
|
*/
|
|
int
|
|
memp_fget(dbmfp, pgnoaddr, flags, addrp)
|
|
DB_MPOOLFILE *dbmfp;
|
|
db_pgno_t *pgnoaddr;
|
|
int flags;
|
|
void *addrp;
|
|
{
|
|
BH *bhp, *tbhp;
|
|
DB_MPOOL *dbmp;
|
|
MPOOL *mp;
|
|
MPOOLFILE *mfp;
|
|
db_pgno_t lastpgno;
|
|
size_t bucket, mf_offset;
|
|
off_t size;
|
|
u_long cnt;
|
|
int b_incr, b_inserted, readonly_alloc, ret;
|
|
void *addr;
|
|
|
|
dbmp = dbmfp->dbmp;
|
|
|
|
/*
|
|
* Validate arguments.
|
|
*
|
|
* !!!
|
|
* Don't test for DB_MPOOL_CREATE and DB_MPOOL_NEW flags for readonly
|
|
* files here, and create non-existent pages in readonly files if the
|
|
* flags are set, later. The reason is that the hash access method
|
|
* wants to get empty pages that don't really exist in readonly files.
|
|
* The only alternative is for hash to write the last "bucket" all the
|
|
* time, which we don't want to do because one of our big goals in life
|
|
* is to keep database files small. It's sleazy as hell, but we catch
|
|
* any attempt to actually write the file in memp_fput().
|
|
*/
|
|
#define OKFLAGS (DB_MPOOL_CREATE | DB_MPOOL_LAST | DB_MPOOL_NEW)
|
|
if (flags != 0) {
|
|
if ((ret =
|
|
__db_fchk(dbmp->dbenv, "memp_fget", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
|
|
switch (flags) {
|
|
case DB_MPOOL_CREATE:
|
|
case DB_MPOOL_LAST:
|
|
case DB_MPOOL_NEW:
|
|
case 0:
|
|
break;
|
|
default:
|
|
return (__db_ferr(dbmp->dbenv, "memp_fget", 1));
|
|
}
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
/*
|
|
* XXX
|
|
* We want to switch threads as often as possible. Sleep every time
|
|
* we get a new page to make it more likely.
|
|
*/
|
|
if (__sleep_on_every_page_get && (dbmp->dbenv == NULL ||
|
|
dbmp->dbenv->db_yield == NULL || dbmp->dbenv->db_yield() != 0))
|
|
__db_sleep(0, 1);
|
|
#endif
|
|
|
|
mp = dbmp->mp;
|
|
mfp = dbmfp->mfp;
|
|
mf_offset = OFFSET(dbmp, mfp);
|
|
addr = NULL;
|
|
bhp = NULL;
|
|
b_incr = b_inserted = readonly_alloc = ret = 0;
|
|
|
|
LOCKREGION(dbmp);
|
|
|
|
/*
|
|
* If mmap'ing the file, just return a pointer. However, if another
|
|
* process has opened the file for writing since we mmap'd it, start
|
|
* playing the game by their rules, i.e. everything goes through the
|
|
* cache. All pages previously returned should be safe, as long as
|
|
* a locking protocol was observed.
|
|
*
|
|
* XXX
|
|
* We don't discard the map because we don't know when all of the
|
|
* pages will have been discarded from the process' address space.
|
|
* It would be possible to do so by reference counting the open
|
|
* pages from the mmap, but it's unclear to me that it's worth it.
|
|
*/
|
|
if (dbmfp->addr != NULL && dbmfp->mfp->can_mmap) {
|
|
lastpgno = dbmfp->len == 0 ?
|
|
0 : (dbmfp->len - 1) / mfp->stat.st_pagesize;
|
|
if (LF_ISSET(DB_MPOOL_LAST))
|
|
*pgnoaddr = lastpgno;
|
|
else {
|
|
/*
|
|
* !!!
|
|
* Allocate a page that can never really exist. See
|
|
* the comment above about non-existent pages and the
|
|
* hash access method.
|
|
*/
|
|
if (LF_ISSET(DB_MPOOL_CREATE | DB_MPOOL_NEW))
|
|
readonly_alloc = 1;
|
|
else if (*pgnoaddr > lastpgno) {
|
|
__db_err(dbmp->dbenv,
|
|
"%s: page %lu doesn't exist",
|
|
dbmfp->path, (u_long)*pgnoaddr);
|
|
ret = EINVAL;
|
|
goto err;
|
|
}
|
|
}
|
|
if (!readonly_alloc) {
|
|
addr = ADDR(dbmfp, *pgnoaddr * mfp->stat.st_pagesize);
|
|
|
|
++mp->stat.st_map;
|
|
++mfp->stat.st_map;
|
|
|
|
goto mapret;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* If requesting the last page or a new page, find the last page. The
|
|
* tricky thing is that the user may have created a page already that's
|
|
* after any page that exists in the file.
|
|
*/
|
|
if (LF_ISSET(DB_MPOOL_LAST | DB_MPOOL_NEW)) {
|
|
/*
|
|
* Temporary files may not yet have been created.
|
|
*
|
|
* Don't lock -- there are no atomicity issues for stat(2).
|
|
*/
|
|
if (dbmfp->fd == -1)
|
|
size = 0;
|
|
else if ((ret = __db_stat(dbmp->dbenv,
|
|
dbmfp->path, dbmfp->fd, &size, NULL)) != 0)
|
|
goto err;
|
|
|
|
*pgnoaddr = size == 0 ? 0 : (size - 1) / mfp->stat.st_pagesize;
|
|
|
|
/*
|
|
* Walk the list of BH's, looking for later pages. Save the
|
|
* pointer if a later page is found so that we don't have to
|
|
* search the list twice.
|
|
*
|
|
* If requesting a new page, return the page one after the last
|
|
* page -- which we'll have to create.
|
|
*/
|
|
for (tbhp = SH_TAILQ_FIRST(&mp->bhq, __bh);
|
|
tbhp != NULL; tbhp = SH_TAILQ_NEXT(tbhp, q, __bh))
|
|
if (tbhp->pgno >= *pgnoaddr &&
|
|
tbhp->mf_offset == mf_offset) {
|
|
bhp = tbhp;
|
|
*pgnoaddr = bhp->pgno;
|
|
}
|
|
if (LF_ISSET(DB_MPOOL_NEW))
|
|
++*pgnoaddr;
|
|
}
|
|
|
|
/* If we already found the right buffer, return it. */
|
|
if (LF_ISSET(DB_MPOOL_LAST) && bhp != NULL) {
|
|
addr = bhp->buf;
|
|
goto found;
|
|
}
|
|
|
|
/* If we haven't checked the BH list yet, do the search. */
|
|
if (!LF_ISSET(DB_MPOOL_LAST | DB_MPOOL_NEW)) {
|
|
++mp->stat.st_hash_searches;
|
|
bucket = BUCKET(mp, mf_offset, *pgnoaddr);
|
|
for (cnt = 0,
|
|
bhp = SH_TAILQ_FIRST(&dbmp->htab[bucket], __bh);
|
|
bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, mq, __bh)) {
|
|
++cnt;
|
|
if (bhp->pgno == *pgnoaddr &&
|
|
bhp->mf_offset == mf_offset) {
|
|
addr = bhp->buf;
|
|
if (cnt > mp->stat.st_hash_longest)
|
|
mp->stat.st_hash_longest = cnt;
|
|
mp->stat.st_hash_examined += cnt;
|
|
goto found;
|
|
}
|
|
}
|
|
if (cnt > mp->stat.st_hash_longest)
|
|
mp->stat.st_hash_longest = cnt;
|
|
mp->stat.st_hash_examined += cnt;
|
|
}
|
|
|
|
/*
|
|
* Allocate a new buffer header and data space, and mark the contents
|
|
* as useless.
|
|
*/
|
|
if ((ret = __memp_ralloc(dbmp, sizeof(BH) -
|
|
sizeof(u_int8_t) + mfp->stat.st_pagesize, NULL, &bhp)) != 0)
|
|
goto err;
|
|
addr = bhp->buf;
|
|
#ifdef DEBUG
|
|
if ((ALIGNTYPE)addr & (sizeof(size_t) - 1)) {
|
|
__db_err(dbmp->dbenv,
|
|
"Internal error: BH data NOT size_t aligned.");
|
|
abort();
|
|
}
|
|
#endif
|
|
memset(bhp, 0, sizeof(BH));
|
|
LOCKINIT(dbmp, &bhp->mutex);
|
|
|
|
/*
|
|
* Prepend the bucket header to the head of the appropriate MPOOL
|
|
* bucket hash list. Append the bucket header to the tail of the
|
|
* MPOOL LRU chain.
|
|
*
|
|
* We have to do this before we read in the page so we can discard
|
|
* our region lock without screwing up the world.
|
|
*/
|
|
bucket = BUCKET(mp, mf_offset, *pgnoaddr);
|
|
SH_TAILQ_INSERT_HEAD(&dbmp->htab[bucket], bhp, mq, __bh);
|
|
SH_TAILQ_INSERT_TAIL(&mp->bhq, bhp, q);
|
|
b_inserted = 1;
|
|
|
|
/* Set the page number, and associated MPOOLFILE. */
|
|
bhp->mf_offset = mf_offset;
|
|
bhp->pgno = *pgnoaddr;
|
|
|
|
/*
|
|
* If we know we created the page, zero it out and continue.
|
|
*
|
|
* !!!
|
|
* Note: DB_MPOOL_NEW deliberately doesn't call the pgin function.
|
|
* If DB_MPOOL_CREATE is used, then the application's pgin function
|
|
* has to be able to handle pages of 0's -- if it uses DB_MPOOL_NEW,
|
|
* it can detect all of its page creates, and not bother.
|
|
*
|
|
* Otherwise, read the page into memory, optionally creating it if
|
|
* DB_MPOOL_CREATE is set.
|
|
*
|
|
* Increment the reference count for created buffers, but importantly,
|
|
* increment the reference count for buffers we're about to read so
|
|
* that the buffer can't move.
|
|
*/
|
|
++bhp->ref;
|
|
b_incr = 1;
|
|
|
|
if (LF_ISSET(DB_MPOOL_NEW))
|
|
memset(addr, 0, mfp->stat.st_pagesize);
|
|
else {
|
|
/*
|
|
* It's possible for the read function to fail, which means
|
|
* that we fail as well.
|
|
*/
|
|
reread: if ((ret = __memp_pgread(dbmfp,
|
|
bhp, LF_ISSET(DB_MPOOL_CREATE | DB_MPOOL_NEW))) != 0)
|
|
goto err;
|
|
|
|
/*
|
|
* !!!
|
|
* The __memp_pgread call discarded and reacquired the region
|
|
* lock. Because the buffer reference count was incremented
|
|
* before the region lock was discarded the buffer didn't move.
|
|
*/
|
|
++mp->stat.st_cache_miss;
|
|
++mfp->stat.st_cache_miss;
|
|
}
|
|
|
|
if (0) {
|
|
found: /* Increment the reference count. */
|
|
if (bhp->ref == UINT16_T_MAX) {
|
|
__db_err(dbmp->dbenv,
|
|
"%s: too many references to page %lu",
|
|
dbmfp->path, bhp->pgno);
|
|
ret = EINVAL;
|
|
goto err;
|
|
}
|
|
++bhp->ref;
|
|
b_incr = 1;
|
|
|
|
/*
|
|
* Any found buffer might be trouble.
|
|
*
|
|
* BH_LOCKED --
|
|
* I/O in progress, wait for it to finish. Because the buffer
|
|
* reference count was incremented before the region lock was
|
|
* discarded we know the buffer didn't move.
|
|
*/
|
|
if (F_ISSET(bhp, BH_LOCKED)) {
|
|
UNLOCKREGION(dbmp);
|
|
LOCKBUFFER(dbmp, bhp);
|
|
/* Waiting for I/O to finish... */
|
|
UNLOCKBUFFER(dbmp, bhp);
|
|
LOCKREGION(dbmp);
|
|
}
|
|
|
|
/*
|
|
* BH_TRASH --
|
|
* The buffer is garbage.
|
|
*/
|
|
if (F_ISSET(bhp, BH_TRASH))
|
|
goto reread;
|
|
|
|
/*
|
|
* BH_CALLPGIN --
|
|
* The buffer was written, and the contents need to be
|
|
* converted again.
|
|
*/
|
|
if (F_ISSET(bhp, BH_CALLPGIN)) {
|
|
if ((ret = __memp_pg(dbmfp, bhp, 1)) != 0)
|
|
goto err;
|
|
F_CLR(bhp, BH_CALLPGIN);
|
|
}
|
|
|
|
++mp->stat.st_cache_hit;
|
|
++mfp->stat.st_cache_hit;
|
|
}
|
|
|
|
mapret: LOCKHANDLE(dbmp, dbmfp->mutexp);
|
|
++dbmfp->pinref;
|
|
UNLOCKHANDLE(dbmp, dbmfp->mutexp);
|
|
|
|
if (0) {
|
|
err: /*
|
|
* If no other process is already waiting on a created buffer,
|
|
* go ahead and discard it, it's not useful.
|
|
*/
|
|
if (b_incr)
|
|
--bhp->ref;
|
|
if (b_inserted && bhp->ref == 0)
|
|
__memp_bhfree(dbmp, mfp, bhp, 1);
|
|
}
|
|
|
|
UNLOCKREGION(dbmp);
|
|
|
|
*(void **)addrp = addr;
|
|
return (ret);
|
|
}
|