mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 08:40:07 +00:00
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.
359 lines
8.9 KiB
C
359 lines
8.9 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_region.c 10.18 (Sleepycat) 11/29/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "db_shash.h"
|
|
#include "mp.h"
|
|
#include "common_ext.h"
|
|
|
|
/*
|
|
* __memp_ralloc --
|
|
* Allocate some space in the mpool region.
|
|
*
|
|
* PUBLIC: int __memp_ralloc __P((DB_MPOOL *, size_t, size_t *, void *));
|
|
*/
|
|
int
|
|
__memp_ralloc(dbmp, len, offsetp, retp)
|
|
DB_MPOOL *dbmp;
|
|
size_t len, *offsetp;
|
|
void *retp;
|
|
{
|
|
BH *bhp, *nbhp;
|
|
MPOOL *mp;
|
|
MPOOLFILE *mfp;
|
|
size_t fsize, total;
|
|
int nomore, restart, ret, wrote;
|
|
void *p;
|
|
|
|
mp = dbmp->mp;
|
|
|
|
nomore = 0;
|
|
alloc: if ((ret = __db_shalloc(dbmp->addr, len, MUTEX_ALIGNMENT, &p)) == 0) {
|
|
if (offsetp != NULL)
|
|
*offsetp = R_OFFSET(dbmp, p);
|
|
*(void **)retp = p;
|
|
return (0);
|
|
}
|
|
if (nomore) {
|
|
__db_err(dbmp->dbenv, "%s", strerror(ret));
|
|
return (ret);
|
|
}
|
|
|
|
/* Look for a buffer on the free list that's the right size. */
|
|
for (bhp =
|
|
SH_TAILQ_FIRST(&mp->bhfq, __bh); bhp != NULL; bhp = nbhp) {
|
|
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
|
|
|
|
if (__db_shsizeof(bhp) == len) {
|
|
SH_TAILQ_REMOVE(&mp->bhfq, bhp, q, __bh);
|
|
if (offsetp != NULL)
|
|
*offsetp = R_OFFSET(dbmp, bhp);
|
|
*(void **)retp = bhp;
|
|
return (0);
|
|
}
|
|
}
|
|
|
|
/* Discard from the free list until we've freed enough memory. */
|
|
total = 0;
|
|
for (bhp =
|
|
SH_TAILQ_FIRST(&mp->bhfq, __bh); bhp != NULL; bhp = nbhp) {
|
|
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
|
|
|
|
SH_TAILQ_REMOVE(&mp->bhfq, bhp, q, __bh);
|
|
__db_shalloc_free(dbmp->addr, bhp);
|
|
--mp->stat.st_page_clean;
|
|
|
|
/*
|
|
* Retry as soon as we've freed up sufficient space. If we
|
|
* have to coalesce of memory to satisfy the request, don't
|
|
* try until it's likely (possible?) that we'll succeed.
|
|
*/
|
|
total += fsize = __db_shsizeof(bhp);
|
|
if (fsize >= len || total >= 3 * len)
|
|
goto alloc;
|
|
}
|
|
|
|
retry: /* Find a buffer we can flush; pure LRU. */
|
|
total = 0;
|
|
for (bhp =
|
|
SH_TAILQ_FIRST(&mp->bhq, __bh); bhp != NULL; bhp = nbhp) {
|
|
nbhp = SH_TAILQ_NEXT(bhp, q, __bh);
|
|
|
|
/* Ignore pinned or locked (I/O in progress) buffers. */
|
|
if (bhp->ref != 0 || F_ISSET(bhp, BH_LOCKED))
|
|
continue;
|
|
|
|
/* Find the associated MPOOLFILE. */
|
|
mfp = R_ADDR(dbmp, bhp->mf_offset);
|
|
|
|
/*
|
|
* Write the page if it's dirty.
|
|
*
|
|
* If we wrote the page, fall through and free the buffer. We
|
|
* don't have to rewalk the list to acquire the buffer because
|
|
* it was never available for any other process to modify it.
|
|
* If we didn't write the page, but we discarded and reacquired
|
|
* the region lock, restart the buffer list walk. If we neither
|
|
* wrote the buffer nor discarded the region lock, continue down
|
|
* the buffer list.
|
|
*/
|
|
if (F_ISSET(bhp, BH_DIRTY)) {
|
|
if ((ret = __memp_bhwrite(dbmp,
|
|
mfp, bhp, &restart, &wrote)) != 0)
|
|
return (ret);
|
|
|
|
/*
|
|
* It's possible that another process wants this buffer
|
|
* and incremented the ref count while we were writing
|
|
* it.
|
|
*/
|
|
if (bhp->ref != 0)
|
|
goto retry;
|
|
|
|
if (wrote)
|
|
++mp->stat.st_rw_evict;
|
|
else {
|
|
if (restart)
|
|
goto retry;
|
|
continue;
|
|
}
|
|
} else
|
|
++mp->stat.st_ro_evict;
|
|
|
|
/*
|
|
* Check to see if the buffer is the size we're looking for.
|
|
* If it is, simply reuse it.
|
|
*/
|
|
total += fsize = __db_shsizeof(bhp);
|
|
if (fsize == len) {
|
|
__memp_bhfree(dbmp, mfp, bhp, 0);
|
|
|
|
if (offsetp != NULL)
|
|
*offsetp = R_OFFSET(dbmp, bhp);
|
|
*(void **)retp = bhp;
|
|
return (0);
|
|
}
|
|
|
|
/* Free the buffer. */
|
|
__memp_bhfree(dbmp, mfp, bhp, 1);
|
|
|
|
/*
|
|
* Retry as soon as we've freed up sufficient space. If we
|
|
* have to coalesce of memory to satisfy the request, don't
|
|
* try until it's likely (possible?) that we'll succeed.
|
|
*/
|
|
if (fsize >= len || total >= 3 * len)
|
|
goto alloc;
|
|
|
|
/* Restart the walk if we discarded the region lock. */
|
|
if (restart)
|
|
goto retry;
|
|
}
|
|
nomore = 1;
|
|
goto alloc;
|
|
}
|
|
|
|
/*
|
|
* __memp_ropen --
|
|
* Attach to, and optionally create, the mpool region.
|
|
*
|
|
* PUBLIC: int __memp_ropen
|
|
* PUBLIC: __P((DB_MPOOL *, const char *, size_t, int, int));
|
|
*/
|
|
int
|
|
__memp_ropen(dbmp, path, cachesize, mode, flags)
|
|
DB_MPOOL *dbmp;
|
|
const char *path;
|
|
size_t cachesize;
|
|
int mode, flags;
|
|
{
|
|
MPOOL *mp;
|
|
size_t rlen;
|
|
int fd, newregion, ret, retry_cnt;
|
|
|
|
/*
|
|
* Unlike other DB subsystems, mpool can't simply grow the region
|
|
* because it returns pointers into the region to its clients. To
|
|
* "grow" the region, we'd have to allocate a new region and then
|
|
* store a region number in the structures that reference regional
|
|
* objects. It's reasonable that we fail regardless, as clients
|
|
* shouldn't have every page in the region pinned, so the only
|
|
* "failure" mode should be a performance penalty because we don't
|
|
* find a page in the cache that we'd like to have found.
|
|
*
|
|
* Up the user's cachesize by 25% to account for our overhead.
|
|
*/
|
|
if (cachesize < DB_CACHESIZE_MIN)
|
|
if (cachesize == 0)
|
|
cachesize = DB_CACHESIZE_DEF;
|
|
else
|
|
cachesize = DB_CACHESIZE_MIN;
|
|
rlen = cachesize + cachesize / 4;
|
|
|
|
/* Map in the region. */
|
|
retry_cnt = newregion = 0;
|
|
retry: if (LF_ISSET(DB_CREATE)) {
|
|
/*
|
|
* If it's a private mpool, use malloc, it's a lot faster than
|
|
* instantiating a region.
|
|
*
|
|
* XXX
|
|
* If we're doing locking and don't have spinlocks for this
|
|
* architecture, we'd have to instantiate the file, we need
|
|
* the file descriptor for locking. However, it should not
|
|
* be possible for DB_THREAD to be set if HAVE_SPINLOCKS aren't
|
|
* defined.
|
|
*
|
|
* XXX
|
|
* HP-UX won't permit mutexes to live in anything but shared
|
|
* memory. So, instantiate the shared mpool region file on
|
|
* that architecture, regardless. If this turns out to be a
|
|
* performance problem, we could use anonymous memory instead.
|
|
*/
|
|
#if !defined(__hppa)
|
|
if (F_ISSET(dbmp, MP_ISPRIVATE))
|
|
if ((dbmp->maddr = __db_malloc(rlen)) == NULL)
|
|
ret = ENOMEM;
|
|
else {
|
|
F_SET(dbmp, MP_MALLOC);
|
|
ret = __db_rinit(dbmp->dbenv,
|
|
dbmp->maddr, 0, rlen, 0);
|
|
}
|
|
else
|
|
#endif
|
|
ret = __db_rcreate(dbmp->dbenv, DB_APP_NONE, path,
|
|
DB_DEFAULT_MPOOL_FILE, mode, rlen,
|
|
F_ISSET(dbmp, MP_ISPRIVATE) ? DB_TEMPORARY : 0,
|
|
&fd, &dbmp->maddr);
|
|
if (ret == 0) {
|
|
/* Put the MPOOL structure first in the region. */
|
|
mp = dbmp->maddr;
|
|
|
|
SH_TAILQ_INIT(&mp->bhq);
|
|
SH_TAILQ_INIT(&mp->bhfq);
|
|
SH_TAILQ_INIT(&mp->mpfq);
|
|
|
|
/* Initialize the rest of the region as free space. */
|
|
dbmp->addr = (u_int8_t *)dbmp->maddr + sizeof(MPOOL);
|
|
__db_shalloc_init(dbmp->addr, rlen - sizeof(MPOOL));
|
|
|
|
/*
|
|
*
|
|
* Pretend that the cache will be broken up into 4K
|
|
* pages, and that we want to keep it under, say, 10
|
|
* pages on each chain. This means a 256MB cache will
|
|
* allocate ~6500 offset pairs.
|
|
*/
|
|
mp->htab_buckets =
|
|
__db_tablesize((cachesize / (4 * 1024)) / 10);
|
|
|
|
/* Allocate hash table space and initialize it. */
|
|
if ((ret = __db_shalloc(dbmp->addr,
|
|
mp->htab_buckets * sizeof(DB_HASHTAB),
|
|
0, &dbmp->htab)) != 0)
|
|
goto err;
|
|
__db_hashinit(dbmp->htab, mp->htab_buckets);
|
|
mp->htab = R_OFFSET(dbmp, dbmp->htab);
|
|
|
|
ZERO_LSN(mp->lsn);
|
|
mp->lsn_cnt = 0;
|
|
|
|
memset(&mp->stat, 0, sizeof(mp->stat));
|
|
mp->stat.st_cachesize = cachesize;
|
|
|
|
mp->flags = 0;
|
|
|
|
newregion = 1;
|
|
} else if (ret != EEXIST)
|
|
return (ret);
|
|
}
|
|
|
|
/* If we didn't or couldn't create the region, try and join it. */
|
|
if (!newregion &&
|
|
(ret = __db_ropen(dbmp->dbenv, DB_APP_NONE,
|
|
path, DB_DEFAULT_MPOOL_FILE, 0, &fd, &dbmp->maddr)) != 0) {
|
|
/*
|
|
* If we failed because the file wasn't available, wait a
|
|
* second and try again.
|
|
*/
|
|
if (ret == EAGAIN && ++retry_cnt < 3) {
|
|
(void)__db_sleep(1, 0);
|
|
goto retry;
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/* Set up the common pointers. */
|
|
dbmp->mp = dbmp->maddr;
|
|
dbmp->addr = (u_int8_t *)dbmp->maddr + sizeof(MPOOL);
|
|
|
|
/*
|
|
* If not already locked, lock the region -- if it's a new region,
|
|
* then either __db_rcreate() locked it for us or we malloc'd it
|
|
* instead of creating a region, neither of which requires locking
|
|
* here.
|
|
*/
|
|
if (!newregion)
|
|
LOCKREGION(dbmp);
|
|
|
|
/*
|
|
* Get the hash table address; it's on the shared page, so we have
|
|
* to lock first.
|
|
*/
|
|
dbmp->htab = R_ADDR(dbmp, dbmp->mp->htab);
|
|
|
|
dbmp->fd = fd;
|
|
|
|
/* If we locked the region, release it now. */
|
|
if (!F_ISSET(dbmp, MP_MALLOC))
|
|
UNLOCKREGION(dbmp);
|
|
return (0);
|
|
|
|
err: if (fd != -1) {
|
|
dbmp->fd = fd;
|
|
(void)__memp_rclose(dbmp);
|
|
}
|
|
|
|
if (newregion)
|
|
(void)memp_unlink(path, 1, dbmp->dbenv);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __memp_rclose --
|
|
* Close the mpool region.
|
|
*
|
|
* PUBLIC: int __memp_rclose __P((DB_MPOOL *));
|
|
*/
|
|
int
|
|
__memp_rclose(dbmp)
|
|
DB_MPOOL *dbmp;
|
|
{
|
|
if (F_ISSET(dbmp, MP_MALLOC)) {
|
|
__db_free(dbmp->maddr);
|
|
return (0);
|
|
}
|
|
return (__db_rclose(dbmp->dbenv, dbmp->fd, dbmp->maddr));
|
|
}
|