04be94a87d
1997-12-01 17:27 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Add iconvdata and localedata. * iconv/gconv.h: Define UNKNOWN_10646_CHAR as error value. * iconv/gconv_conf.c (read_conf_file): Little optimization. * iconvdata/8bit-gap.c: New file. * iconvdata/8bit-generic.c: Renamed from ... * iconvdata/iso8859-generic.c: ...this. * iconvdata/configure: Removed. * iconvdata/Makefile: Add new modules and better rules. * iconvdata/iso6937.c: Minor bug fixes. * iconvdata/iso8859-1.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/iso8859-2.c: Change to use 8bit-generic.c. Minor bug fixes. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/ebcdic-at-de-a.c: New file. * iconvdata/ebcdic-at-de.c: New file. * iconvdata/ebcdic-ca-fr.c: New file. * iconvdata/hp-roman8.c: New file. * iconvdata/koi-8.c: New file. * iconvdata/koi8-r.c: New file. * iconvdata/koi8-h.c: New file. * iconvdata/latin-greek-1.c: New file. * iconvdata/latin-greek-1.h: New file. * iconvdata/latin-greek.c: New file. * iconvdata/latin-greek.h: New file. * iconvdata/jis0201.c: New file. * iconvdata/jis0201.h: New file. * iconvdata/jis0208.c: New file. * iconvdata/jis0208.h: New file. * iconvdata/jis0212.c: New file. * iconvdata/jis0212.h: New file. * iconvdata/sjis.c: New file. * iconvdata/gap.pl: New file. Script to generate table header. * iconvdata/gaptab.pl: New file. * iconvdata/gconv-modules: Add info about new modules. * locale/programs/charmap.c: Also examine alias names given in charmap files. * localedata/*: Add to here from add-on. We need the information to generate tables for iconv. Update from db-2.3.14. * db2/Makefile: Updated. * db2/config.h: Likewise. * db2/db.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_search.c: Likewise. * db2/btree/bt_split.c: Likewise. * db2/btree/btree_auto.c: Likewise. * db2/common/db_appinit.c: Likewise. * db2/common/db_apprec.c: Likewise. * db2/common/db_err.c: Likewise. * db2/common/db_region.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_ret.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_cxx.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/lock.h: Likewise. * db2/include/log.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.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/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_pr.c: Likewise. * db2/mp/mp_region.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/README: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_open.c: Likewise. * db2/os/os_func.c: Removed. * db2/os/os_config.c: New file. * db2/os/os_spin.c: New file. * db2/txn/txn.c: Likewise. * db2/txn/txn_auto.c: Likewise. 1997-11-30 06:01 Ulrich Drepper <drepper@cygnus.com> * posix/sys/wait.h (__WAIT_INT): Don't use complex version with __typeof for C++ since this fails for class members. Reported by Neal Becker <neal@ctd.comsat.com>. 1997-11-28 11:21 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for a working makeinfo (3.11 or better). * config.make.in: Add MAKEINFO to be substituted. * manual/Makefile: Don't update info if makeinfo is too old. 1997-11-30 05:21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/setjmp.S: Define _ASM and _SETJMP_H to get definitions. * sysdeps/alpha/__longjmp.S: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_termios.h: Include <termios.h> not <bits/termios.h>. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define syscall as __llseek and make llseek and lseek64 weak aliases. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. Patches by a sun <asun@zoology.washington.edu>. 1997-11-29 19:19 Zack Weinberg <zack@rabi.phys.columbia.edu> * misc/sys/syslog.h: Delete KERNEL preprocessor conditional. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Likewise. * misc/sys/syslog.h: Clean up BSD header. 1997-11-29 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/in.h: Add changes from Linux 2.1.67. * sysdeps/libm-ieee754/s_ctan.c (__ctan): Raise invalid exception for ctan(+-inf,x). * sysdeps/libm-ieee754/s_ctanl.c (__ctanl): Likewise. * sysdeps/libm-ieee754/s_ctanf.c (__ctanf): Likewise. * math/libm-test.c (csqrt_test): Add tests for cabs, carg, ctan, csqrt (-1), ctanh(i*pi/4). 1997-11-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/bits/confname.h: Fix comma in enumerator. 1997-11-28 13:28 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_arp.h: Add more ARPHRD_ constants. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcrtomb.c (__wcrtomb): Remove unused variable fake. 1997-11-26 21:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c (GETCWD_STORYGE_CLASS): Remove definition and use. Define GETCWD_RETURN_TYPE instead and use it. * sysdeps/unix/sysv/linux/getcwd.c: Define GETCWD_RETURN_TYPE instead of GETCWD_STORYGE_CLASS and put the return type and the `internal_function' in the right order for gcc 2.7.2. 1997-11-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/module.h: Remove file. It's incompatible with Linux 2.1.x. Packages using modules (e.g. modutils) should/do provide their own version. Suggested by Richard Henderson. * sysdeps/unix/sysv/linux/Dist: Remove sys/module.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Remove sys/module.h. * libio/stdio.h: Correct comment of sys_nerr/sys_errlist.
333 lines
8.4 KiB
C
333 lines
8.4 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.32 (Sleepycat) 11/26/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;
|
|
DB_MPOOL *dbmp;
|
|
MPOOL *mp;
|
|
MPOOLFILE *mfp;
|
|
size_t bucket, mf_offset;
|
|
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 &&
|
|
(__db_yield == NULL || __db_yield() != 0))
|
|
__db_sleep(0, 1);
|
|
#endif
|
|
|
|
mp = dbmp->mp;
|
|
mfp = dbmfp->mfp;
|
|
mf_offset = R_OFFSET(dbmp, mfp);
|
|
addr = NULL;
|
|
bhp = NULL;
|
|
b_incr = b_inserted = 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 && F_ISSET(dbmfp->mfp, MP_CAN_MMAP)) {
|
|
readonly_alloc = 0;
|
|
if (LF_ISSET(DB_MPOOL_LAST))
|
|
*pgnoaddr = mfp->last_pgno;
|
|
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 > mfp->last_pgno) {
|
|
__db_err(dbmp->dbenv,
|
|
"%s: page %lu doesn't exist",
|
|
__memp_fn(dbmfp), (u_long)*pgnoaddr);
|
|
ret = EINVAL;
|
|
goto err;
|
|
}
|
|
}
|
|
if (!readonly_alloc) {
|
|
addr = R_ADDR(dbmfp, *pgnoaddr * mfp->stat.st_pagesize);
|
|
|
|
++mp->stat.st_map;
|
|
++mfp->stat.st_map;
|
|
|
|
goto mapret;
|
|
}
|
|
}
|
|
|
|
/* Check if requesting the last page or a new page. */
|
|
if (LF_ISSET(DB_MPOOL_LAST))
|
|
*pgnoaddr = mfp->last_pgno;
|
|
|
|
if (LF_ISSET(DB_MPOOL_NEW)) {
|
|
*pgnoaddr = mfp->last_pgno + 1;
|
|
goto alloc;
|
|
}
|
|
|
|
/* Check the BH hash bucket queue. */
|
|
bucket = BUCKET(mp, mf_offset, *pgnoaddr);
|
|
for (cnt = 0,
|
|
bhp = SH_TAILQ_FIRST(&dbmp->htab[bucket], __bh);
|
|
bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) {
|
|
++cnt;
|
|
if (bhp->pgno == *pgnoaddr && bhp->mf_offset == mf_offset) {
|
|
addr = bhp->buf;
|
|
++mp->stat.st_hash_searches;
|
|
if (cnt > mp->stat.st_hash_longest)
|
|
mp->stat.st_hash_longest = cnt;
|
|
mp->stat.st_hash_examined += cnt;
|
|
goto found;
|
|
}
|
|
}
|
|
if (cnt != 0) {
|
|
++mp->stat.st_hash_searches;
|
|
if (cnt > mp->stat.st_hash_longest)
|
|
mp->stat.st_hash_longest = cnt;
|
|
mp->stat.st_hash_examined += cnt;
|
|
}
|
|
|
|
alloc: /*
|
|
* 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, hq, __bh);
|
|
SH_TAILQ_INSERT_TAIL(&mp->bhq, bhp, q);
|
|
++mp->stat.st_page_clean;
|
|
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 can't move
|
|
* and its contents can't change.
|
|
*/
|
|
++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",
|
|
__memp_fn(dbmfp), 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 can't move and its contents
|
|
* can't change.
|
|
*/
|
|
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;
|
|
}
|
|
|
|
/*
|
|
* If we're returning a page after our current notion of the last-page,
|
|
* update our information. Note, there's no way to un-instantiate this
|
|
* page, it's going to exist whether it's returned to us dirty or not.
|
|
*/
|
|
if (bhp->pgno > mfp->last_pgno)
|
|
mfp->last_pgno = bhp->pgno;
|
|
|
|
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);
|
|
}
|