mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
6355131153
1997-04-13 01:06 Ulrich Drepper <drepper@cygnus.com> * isomac.c: Improve messages. * math/Makefile (libm-calls): Add s_nearbyint, s_catan, s_casin, s_ccos, s_csin, s_ctan, s_ctanh, s_cacos, s_casinh, s_cacosh, s_catanh, s_csqrt, and s_cpow. * math/libm-test.c: New functions ccos_test, cacos_test, cacosh_test, casin_test, casinh_test, catan_test, catanh_test, ctanh_test, csqrt_test, cpow_test, rint_test. * math/math.h: Include new header mathbits.h which defines some more (system dependent) types and some macros. (isfinite): Use __finite instead of fpclassify. * sysdeps/generic/mathbits.h: New file. * sysdeps/i386/fpu/mathbits.h: New file. * sysdeps/i386/huge_val.h: Don't define INFINITY. * sysdeps/ieee754/huge_val.h: Likewise. * sysdeps/m68k/huge_val.h: Likewise. * sysdeps/i386/fpu/fenvbits.h: Define FE_NOMASK_ENV. * sysdeps/i386/fpu/fesetenv.c: Handle FE_NOMASK_ENV. * math/complex.h (_Imaginary_I): Define correctly. I misread the standard first. * sysdeps/libm-i387/s_finite.S: Optimized rewrite. * sysdeps/libm-i387/s_finitef.S: Likewise. * sysdeps/libm-i387/s_finitel.S: Likewise. Provided by Joe Keane <jgk@jgk.org>. * sysdeps/libm-i387/s_nearbyint.S: New file. * sysdeps/libm-i387/s_nearbyintf.S: New file. * sysdeps/libm-i387/s_nearbyintl.S: New file. * sysdeps/libm-ieee754/s_nearbyint.S: New file. * sysdeps/libm-ieee754/s_nearbyintf.S: New file. * sysdeps/libm-ieee754/s_nearbyintl.S: New file. * sysdeps/libm-ieee754/s_cacos.c: New file. * sysdeps/libm-ieee754/s_cacosf.c: New file. * sysdeps/libm-ieee754/s_cacosl.c: New file. * sysdeps/libm-ieee754/s_cacosh.c: New file. * sysdeps/libm-ieee754/s_cacoshf.c: New file. * sysdeps/libm-ieee754/s_cacoshl.c: New file. * sysdeps/libm-ieee754/s_casin.c: New file. * sysdeps/libm-ieee754/s_casinf.c: New file. * sysdeps/libm-ieee754/s_casinl.c: New file. * sysdeps/libm-ieee754/s_casinh.c: New file. * sysdeps/libm-ieee754/s_casinhf.c: New file. * sysdeps/libm-ieee754/s_casinhl.c: New file. * sysdeps/libm-ieee754/s_catan.c: New file. * sysdeps/libm-ieee754/s_catanf.c: New file. * sysdeps/libm-ieee754/s_catanl.c: New file. * sysdeps/libm-ieee754/s_catanh.c: New file. * sysdeps/libm-ieee754/s_catanhf.c: New file. * sysdeps/libm-ieee754/s_catanhl.c: New file. * sysdeps/libm-ieee754/s_ccos.c: New file. * sysdeps/libm-ieee754/s_ccosf.c: New file. * sysdeps/libm-ieee754/s_ccosl.c: New file. * sysdeps/libm-ieee754/s_cpow.c: New file. * sysdeps/libm-ieee754/s_cpowf.c: New file. * sysdeps/libm-ieee754/s_cpowl.c: New file. * sysdeps/libm-ieee754/s_csin.c: New file. * sysdeps/libm-ieee754/s_csinf.c: New file. * sysdeps/libm-ieee754/s_csinl.c: New file. * sysdeps/libm-ieee754/s_csqrt.c: New file. * sysdeps/libm-ieee754/s_csqrtf.c: New file. * sysdeps/libm-ieee754/s_csqrtl.c: New file. * sysdeps/libm-ieee754/s_ctan.c: New file. * sysdeps/libm-ieee754/s_ctanf.c: New file. * sysdeps/libm-ieee754/s_ctanl.c: New file. * sysdeps/libm-ieee754/s_ctanh.c: New file. * sysdeps/libm-ieee754/s_ctanhf.c: New file. * sysdeps/libm-ieee754/s_ctanhl.c: New file. * time/strftime.c (memset_space): Increment pointer. * time/strptime.c: Interpret year number 00-59 as 2000--2059. Patches by Karl Heuer <kwzh@gnu.ai.mit.edu>. 1997-04-11 11:57 Miguel de Icaza <miguel@nuclecu.unam.mx> * sysdeps/unix/sysv/linux/sparc/syscalls.list: Remove fork, pipe, syscall. 1997-04-05 00:57 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_remquo.c: Change algorithm, although probably still wrong. * sysdeps/libm-ieee754/s_remquof.c: Likewise. * sysdeps/libm-ieee754/s_remquol.c: Likewise. * math/libm-test.c (remquo_test): Corrected. 1997-04-11 00:01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/__math.h (__rinttol, rinttol): New inline. * sysdeps/m68k/fpu/s_rinttol.c: New file. * sysdeps/m68k/fpu/s_rinttoll.c: New file. * math/libm-test.c (remquo_test): Use check_long to test the quotient. (cbrt_test): Add epsilons for long double. 1997-04-10 18:48 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/localeinfo.h: Update declaration of _nl_current. 1997-04-11 11:27 Ulrich Drepper <drepper@cygnus.com> * rellnsh-sh: Use explicitely /bin/pwd to find the external program. * math/Makefile (headers): Add fenv.h and fenvbits.h. (libm-support): Add s_rountol, s_roundtoll, fclrexcpt, fgetexcptflg, fraiseexcpt, fsetexcptflg, ftestexcept, fegetround, fesetround, fegetenv, feholdexcpt, fesetenv, feupdateenv. (libm-calls): Add s_round. * math/fenv.h: New file. * math/libm-test.c: Correct tests for s_rinttol and s_rinttoll. Add roundtol_check and roundtoll_check. * math/math.h: Pretty printing. * sysdeps/i386/fpu/fclrexcpt.c: New file. * sysdeps/i386/fpu/fegetenv.c: New file. * sysdeps/i386/fpu/fegetround.c: New file. * sysdeps/i386/fpu/feholdexcpt.c: New file. * sysdeps/i386/fpu/fenvbits.h: New file. * sysdeps/i386/fpu/fesetenv.c: New file. * sysdeps/i386/fpu/fesetround.c: New file. * sysdeps/i386/fpu/fgetexcptflg.c: New file. * sysdeps/i386/fpu/fraiseexcpt.c: New file. * sysdeps/i386/fpu/fsetexcptflg.c: New file. * sysdeps/i386/fpu/ftestexcept.c: New file. * sysdeps/stub/fclrexcpt.c: New file. * sysdeps/stub/fegetenv.c: New file. * sysdeps/stub/fegetround.c: New file. * sysdeps/stub/feholdexcpt.c: New file. * sysdeps/stub/fenvbits.h: New file. * sysdeps/stub/fesetenv.c: New file. * sysdeps/stub/fesetround.c: New file. * sysdeps/stub/fgetexcptflg.c: New file. * sysdeps/stub/fraiseexcpt.c: New file. * sysdeps/stub/fsetexcptflg.c: New file. * sysdeps/stub/ftestexcept.c: New file. * sysdeps/libm-i387/s_trunc.S: New file. * sysdeps/libm-i387/s_truncf.S: New file. * sysdeps/libm-i387/s_truncl.S: New file. * sysdeps/libm-ieee754/s_round.c: New file. * sysdeps/libm-ieee754/s_roundf.c: New file. * sysdeps/libm-ieee754/s_roundl.c: New file. * sysdeps/libm-ieee754/s_ccosh.c: Rewritten to use fpclassify. * sysdeps/libm-ieee754/s_ccoshf.c: Likewise. * sysdeps/libm-ieee754/s_ccoshl.c: Likewise. * sysdeps/libm-ieee754/s_cexp.c: Likewise. * sysdeps/libm-ieee754/s_cexpf.c: Likewise. * sysdeps/libm-ieee754/s_cexpl.c: Likewise. * sysdeps/libm-ieee754/s_clog.c: Likewise. * sysdeps/libm-ieee754/s_clogf.c: Likewise. * sysdeps/libm-ieee754/s_clogl.c: Likewise. * sysdeps/libm-ieee754/s_csinh.c. Likewise. * sysdeps/libm-ieee754/s_csinhf.c. Likewise. * sysdeps/libm-ieee754/s_csinhl.c. Likewise. * sysdeps/libm-ieee754/s_ceill.c: Corrected. The mantissa has only 63 bits. * sysdeps/libm-ieee754/s_floorl.c: Likewise. * po/pl.po: Updated. * string/swab.c: Correctly handle array of odd length. * sysdeps/generic/memmem.c: Update copyright. 1997-04-10 20:22 Ulrich Drepper <drepper@cygnus.com> * hurd/Makefile (sunrpc-headers): Add clnt.h. Proposed by Thomas Bushnell <thomas@gnu.ai.mit.edu>. 1997-04-09 14:21 Miguel de Icaza <miguel@nuclecu.unam.mx> * sysdeps/sparc/dl-machine.h: Bug fix: I was not loading the proper value from the GOT. Pass argument block to init function. * sysdeps/sparc/elf/start.c: Call atexit (_fini) after calling _init (). * sysdeps/sparc/fpu_control.h: Fix the FPU constants. I got them wrong the first time. * sysdeps/sparc/setjmp.S: PIC code was clobbering a callee saved register. * sysdeps/sparc/udiv_qrnnd.S: Add type @function. * sysdeps/unix/sysv/linux/sparc/init-first.h: Linux/SPARC specific SYSDEP_CALL_INIT. * sysdeps/unix/sysv/linux/sparc/signum.h: Remove definition for NSIG and duplicated SIGIOT. 1997-04-05 00:57 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_remquo.c: Change algorithm, although probably still wrong. * sysdeps/libm-ieee754/s_remquof.c: Likewise. * sysdeps/libm-ieee754/s_remquol.c: Likewise. * math/libm-test.c (remquo_test): Corrected. 1997-04-03 18:35 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (parent-tests): New target to run the tests to that they are executed even if some subdir tests have failed. (tests): Depend on parent-tests instead of running the tests directly. 1997-04-03 12:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> Clean up name space pollution in libnss_*.so: * nis/nss_compat/compat-pwd.c, resolv/mapv4v6addr.h, resolv/nss_dns/dns-host.c: Replace bzero by memset, bcopy by memcpy and bcmp by memcmp to clean up namespace. * nss/nss_db/db-XXX.c (internal_setent): Use __dbopen instead of dbopen. * nss/nss_db/db-alias.c (internal_setent): Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Likewise. * db/db/db.c [_LIBC]: Define __dbopen instead of dbopen and make the latter a weak alias. * db/db.h: Declare __dbopen. * db/btree/btree.h [_LIBC]: Prepend __ to all mpool functions. * db/mpool/mpool.c [_LIBC]: Define all external functions with __ prefix and make the old names weak aliases. * db/mpool.h: Declare the new internal names. 1997-04-04 23:57 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfscanf.c: Fix scanning of hexadecimal fp number. * stdio-common/tstscanf.c: Add test case for this. 1997-04-04 17:26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c: Fix more typos. 1997-04-03 17:15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c (csinh_test): Fix test names. (ccosh_test): Likewise. * sysdeps/libm-ieee754/s_csinh.c: Use sinh function instead of computing it directly. * sysdeps/libm-ieee754/s_csinhf.c: Likewise. * sysdeps/libm-ieee754/s_csinhl.c: Likewise. * sysdeps/libm-ieee754/s_ccosh.c: Use cosh function instead of computing it directly. * sysdeps/libm-ieee754/s_ccoshf.c: Likewise. * sysdeps/libm-ieee754/s_ccoshl.c: Likewise. * sysdeps/libm-ieee754/s_cexp.c: Use internal exp function instead of wrapper. * sysdeps/libm-ieee754/s_cexpf.c: Likewise. * sysdeps/libm-ieee754/s_cexpl.c: Likewise. * sysdeps/m68k/fpu/s_cexp.c: Likewise. Correct handling of special values. Avoid use of fsincos if all that is needed is the quadrant. * sysdeps/m68k/fpu/s_ccosh.c: New file. * sysdeps/m68k/fpu/s_ccoshf.c: New file. * sysdeps/m68k/fpu/s_ccoshl.c: New file. * sysdeps/m68k/fpu/s_csinh.c: New file. * sysdeps/m68k/fpu/s_csinhl.c: New file. * sysdeps/m68k/fpu/s_csinhf.c: New file. 1997-04-03 10:18 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/Makefile (dir-add.texi): Simplify. * libio/genops.c (_IO_flush_all_linebuffered): Don't flush on
494 lines
11 KiB
C
494 lines
11 KiB
C
/*-
|
|
* Copyright (c) 1990, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/queue.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <db.h>
|
|
|
|
#define __MPOOLINTERFACE_PRIVATE
|
|
#include <mpool.h>
|
|
|
|
#ifdef _LIBC
|
|
/* In the GNU C library we must not pollute the namespace because libdb is
|
|
needed by libnss_db. */
|
|
#define mpool_open __mpool_open
|
|
#define mpool_filter __mpool_filter
|
|
#define mpool_new __mpool_new
|
|
#define mpool_get __mpool_get
|
|
#define mpool_put __mpool_put
|
|
#define mpool_sync __mpool_sync
|
|
#define mpool_close __mpool_close
|
|
#endif
|
|
|
|
static BKT *mpool_bkt __P((MPOOL *));
|
|
static BKT *mpool_look __P((MPOOL *, pgno_t));
|
|
static int mpool_write __P((MPOOL *, BKT *));
|
|
|
|
/*
|
|
* mpool_open --
|
|
* Initialize a memory pool.
|
|
*/
|
|
MPOOL *
|
|
mpool_open(key, fd, pagesize, maxcache)
|
|
void *key;
|
|
int fd;
|
|
pgno_t pagesize, maxcache;
|
|
{
|
|
struct stat sb;
|
|
MPOOL *mp;
|
|
int entry;
|
|
|
|
/*
|
|
* Get information about the file.
|
|
*
|
|
* XXX
|
|
* We don't currently handle pipes, although we should.
|
|
*/
|
|
if (fstat(fd, &sb))
|
|
return (NULL);
|
|
if (!S_ISREG(sb.st_mode)) {
|
|
errno = ESPIPE;
|
|
return (NULL);
|
|
}
|
|
|
|
/* Allocate and initialize the MPOOL cookie. */
|
|
if ((mp = (MPOOL *)calloc(1, sizeof(MPOOL))) == NULL)
|
|
return (NULL);
|
|
CIRCLEQ_INIT(&mp->lqh);
|
|
for (entry = 0; entry < HASHSIZE; ++entry)
|
|
CIRCLEQ_INIT(&mp->hqh[entry]);
|
|
mp->maxcache = maxcache;
|
|
mp->npages = sb.st_size / pagesize;
|
|
mp->pagesize = pagesize;
|
|
mp->fd = fd;
|
|
return (mp);
|
|
}
|
|
|
|
/*
|
|
* mpool_filter --
|
|
* Initialize input/output filters.
|
|
*/
|
|
void
|
|
mpool_filter(mp, pgin, pgout, pgcookie)
|
|
MPOOL *mp;
|
|
void (*pgin) __P((void *, pgno_t, void *));
|
|
void (*pgout) __P((void *, pgno_t, void *));
|
|
void *pgcookie;
|
|
{
|
|
mp->pgin = pgin;
|
|
mp->pgout = pgout;
|
|
mp->pgcookie = pgcookie;
|
|
}
|
|
|
|
/*
|
|
* mpool_new --
|
|
* Get a new page of memory.
|
|
*/
|
|
void *
|
|
mpool_new(mp, pgnoaddr)
|
|
MPOOL *mp;
|
|
pgno_t *pgnoaddr;
|
|
{
|
|
struct _hqh *head;
|
|
BKT *bp;
|
|
|
|
if (mp->npages == MAX_PAGE_NUMBER) {
|
|
(void)fprintf(stderr, "mpool_new: page allocation overflow.\n");
|
|
abort();
|
|
}
|
|
#ifdef STATISTICS
|
|
++mp->pagenew;
|
|
#endif
|
|
/*
|
|
* Get a BKT from the cache. Assign a new page number, attach
|
|
* it to the head of the hash chain, the tail of the lru chain,
|
|
* and return.
|
|
*/
|
|
if ((bp = mpool_bkt(mp)) == NULL)
|
|
return (NULL);
|
|
*pgnoaddr = bp->pgno = mp->npages++;
|
|
bp->flags = MPOOL_PINNED;
|
|
|
|
head = &mp->hqh[HASHKEY(bp->pgno)];
|
|
CIRCLEQ_INSERT_HEAD(head, bp, hq);
|
|
CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
|
|
return (bp->page);
|
|
}
|
|
|
|
/*
|
|
* mpool_get
|
|
* Get a page.
|
|
*/
|
|
void *
|
|
mpool_get(mp, pgno, flags)
|
|
MPOOL *mp;
|
|
pgno_t pgno;
|
|
u_int flags; /* XXX not used? */
|
|
{
|
|
struct _hqh *head;
|
|
BKT *bp;
|
|
off_t off;
|
|
int nr;
|
|
|
|
/* Check for attempt to retrieve a non-existent page. */
|
|
if (pgno >= mp->npages) {
|
|
errno = EINVAL;
|
|
return (NULL);
|
|
}
|
|
|
|
#ifdef STATISTICS
|
|
++mp->pageget;
|
|
#endif
|
|
|
|
/* Check for a page that is cached. */
|
|
if ((bp = mpool_look(mp, pgno)) != NULL) {
|
|
#ifdef DEBUG
|
|
if (bp->flags & MPOOL_PINNED) {
|
|
(void)fprintf(stderr,
|
|
"mpool_get: page %d already pinned\n", bp->pgno);
|
|
abort();
|
|
}
|
|
#endif
|
|
/*
|
|
* Move the page to the head of the hash chain and the tail
|
|
* of the lru chain.
|
|
*/
|
|
head = &mp->hqh[HASHKEY(bp->pgno)];
|
|
CIRCLEQ_REMOVE(head, bp, hq);
|
|
CIRCLEQ_INSERT_HEAD(head, bp, hq);
|
|
CIRCLEQ_REMOVE(&mp->lqh, bp, q);
|
|
CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
|
|
|
|
/* Return a pinned page. */
|
|
bp->flags |= MPOOL_PINNED;
|
|
return (bp->page);
|
|
}
|
|
|
|
/* Get a page from the cache. */
|
|
if ((bp = mpool_bkt(mp)) == NULL)
|
|
return (NULL);
|
|
|
|
/* Read in the contents. */
|
|
#ifdef STATISTICS
|
|
++mp->pageread;
|
|
#endif
|
|
off = mp->pagesize * pgno;
|
|
if (lseek(mp->fd, off, SEEK_SET) != off)
|
|
return (NULL);
|
|
if ((u_long) (nr = read(mp->fd, bp->page, mp->pagesize))
|
|
!= mp->pagesize) {
|
|
if (nr >= 0)
|
|
errno = EFTYPE;
|
|
return (NULL);
|
|
}
|
|
|
|
/* Set the page number, pin the page. */
|
|
bp->pgno = pgno;
|
|
bp->flags = MPOOL_PINNED;
|
|
|
|
/*
|
|
* Add the page to the head of the hash chain and the tail
|
|
* of the lru chain.
|
|
*/
|
|
head = &mp->hqh[HASHKEY(bp->pgno)];
|
|
CIRCLEQ_INSERT_HEAD(head, bp, hq);
|
|
CIRCLEQ_INSERT_TAIL(&mp->lqh, bp, q);
|
|
|
|
/* Run through the user's filter. */
|
|
if (mp->pgin != NULL)
|
|
(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
|
|
|
|
return (bp->page);
|
|
}
|
|
|
|
/*
|
|
* mpool_put
|
|
* Return a page.
|
|
*/
|
|
int
|
|
mpool_put(mp, page, flags)
|
|
MPOOL *mp;
|
|
void *page;
|
|
u_int flags;
|
|
{
|
|
BKT *bp;
|
|
|
|
#ifdef STATISTICS
|
|
++mp->pageput;
|
|
#endif
|
|
bp = (BKT *)((char *)page - sizeof(BKT));
|
|
#ifdef DEBUG
|
|
if (!(bp->flags & MPOOL_PINNED)) {
|
|
(void)fprintf(stderr,
|
|
"mpool_put: page %d not pinned\n", bp->pgno);
|
|
abort();
|
|
}
|
|
#endif
|
|
bp->flags &= ~MPOOL_PINNED;
|
|
bp->flags |= flags & MPOOL_DIRTY;
|
|
return (RET_SUCCESS);
|
|
}
|
|
|
|
/*
|
|
* mpool_close
|
|
* Close the buffer pool.
|
|
*/
|
|
int
|
|
mpool_close(mp)
|
|
MPOOL *mp;
|
|
{
|
|
BKT *bp;
|
|
|
|
/* Free up any space allocated to the lru pages. */
|
|
while ((bp = mp->lqh.cqh_first) != (void *)&mp->lqh) {
|
|
CIRCLEQ_REMOVE(&mp->lqh, mp->lqh.cqh_first, q);
|
|
free(bp);
|
|
}
|
|
|
|
/* Free the MPOOL cookie. */
|
|
free(mp);
|
|
return (RET_SUCCESS);
|
|
}
|
|
|
|
/*
|
|
* mpool_sync
|
|
* Sync the pool to disk.
|
|
*/
|
|
int
|
|
mpool_sync(mp)
|
|
MPOOL *mp;
|
|
{
|
|
BKT *bp;
|
|
|
|
/* Walk the lru chain, flushing any dirty pages to disk. */
|
|
for (bp = mp->lqh.cqh_first;
|
|
bp != (void *)&mp->lqh; bp = bp->q.cqe_next)
|
|
if (bp->flags & MPOOL_DIRTY &&
|
|
mpool_write(mp, bp) == RET_ERROR)
|
|
return (RET_ERROR);
|
|
|
|
/* Sync the file descriptor. */
|
|
return (fsync(mp->fd) ? RET_ERROR : RET_SUCCESS);
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
#undef mpool_open
|
|
#undef mpool_filter
|
|
#undef mpool_new
|
|
#undef mpool_get
|
|
#undef mpool_put
|
|
#undef mpool_close
|
|
#undef mpool_sync
|
|
weak_alias (__mpool_open, mpool_open)
|
|
weak_alias (__mpool_filter, mpool_filter)
|
|
weak_alias (__mpool_new, mpool_new)
|
|
weak_alias (__mpool_get, mpool_get)
|
|
weak_alias (__mpool_put, mpool_put)
|
|
weak_alias (__mpool_close, mpool_close)
|
|
weak_alias (__mpool_sync, mpool_sync)
|
|
#endif
|
|
|
|
/*
|
|
* mpool_bkt
|
|
* Get a page from the cache (or create one).
|
|
*/
|
|
static BKT *
|
|
mpool_bkt(mp)
|
|
MPOOL *mp;
|
|
{
|
|
struct _hqh *head;
|
|
BKT *bp;
|
|
|
|
/* If under the max cached, always create a new page. */
|
|
if (mp->curcache < mp->maxcache)
|
|
goto new;
|
|
|
|
/*
|
|
* If the cache is max'd out, walk the lru list for a buffer we
|
|
* can flush. If we find one, write it (if necessary) and take it
|
|
* off any lists. If we don't find anything we grow the cache anyway.
|
|
* The cache never shrinks.
|
|
*/
|
|
for (bp = mp->lqh.cqh_first;
|
|
bp != (void *)&mp->lqh; bp = bp->q.cqe_next)
|
|
if (!(bp->flags & MPOOL_PINNED)) {
|
|
/* Flush if dirty. */
|
|
if (bp->flags & MPOOL_DIRTY &&
|
|
mpool_write(mp, bp) == RET_ERROR)
|
|
return (NULL);
|
|
#ifdef STATISTICS
|
|
++mp->pageflush;
|
|
#endif
|
|
/* Remove from the hash and lru queues. */
|
|
head = &mp->hqh[HASHKEY(bp->pgno)];
|
|
CIRCLEQ_REMOVE(head, bp, hq);
|
|
CIRCLEQ_REMOVE(&mp->lqh, bp, q);
|
|
#ifdef DEBUG
|
|
{ void *spage;
|
|
spage = bp->page;
|
|
memset(bp, 0xff, sizeof(BKT) + mp->pagesize);
|
|
bp->page = spage;
|
|
}
|
|
#endif
|
|
return (bp);
|
|
}
|
|
|
|
new: if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL)
|
|
return (NULL);
|
|
#ifdef STATISTICS
|
|
++mp->pagealloc;
|
|
#endif
|
|
#if defined(DEBUG) || defined(PURIFY)
|
|
memset(bp, 0xff, sizeof(BKT) + mp->pagesize);
|
|
#endif
|
|
bp->page = (char *)bp + sizeof(BKT);
|
|
++mp->curcache;
|
|
return (bp);
|
|
}
|
|
|
|
/*
|
|
* mpool_write
|
|
* Write a page to disk.
|
|
*/
|
|
static int
|
|
mpool_write(mp, bp)
|
|
MPOOL *mp;
|
|
BKT *bp;
|
|
{
|
|
off_t off;
|
|
|
|
#ifdef STATISTICS
|
|
++mp->pagewrite;
|
|
#endif
|
|
|
|
/* Run through the user's filter. */
|
|
if (mp->pgout)
|
|
(mp->pgout)(mp->pgcookie, bp->pgno, bp->page);
|
|
|
|
off = mp->pagesize * bp->pgno;
|
|
if (lseek(mp->fd, off, SEEK_SET) != off)
|
|
return (RET_ERROR);
|
|
if ((u_long) write(mp->fd, bp->page, mp->pagesize) != mp->pagesize)
|
|
return (RET_ERROR);
|
|
|
|
bp->flags &= ~MPOOL_DIRTY;
|
|
return (RET_SUCCESS);
|
|
}
|
|
|
|
/*
|
|
* mpool_look
|
|
* Lookup a page in the cache.
|
|
*/
|
|
static BKT *
|
|
mpool_look(mp, pgno)
|
|
MPOOL *mp;
|
|
pgno_t pgno;
|
|
{
|
|
struct _hqh *head;
|
|
BKT *bp;
|
|
|
|
head = &mp->hqh[HASHKEY(pgno)];
|
|
for (bp = head->cqh_first; bp != (void *)head; bp = bp->hq.cqe_next)
|
|
if (bp->pgno == pgno) {
|
|
#ifdef STATISTICS
|
|
++mp->cachehit;
|
|
#endif
|
|
return (bp);
|
|
}
|
|
#ifdef STATISTICS
|
|
++mp->cachemiss;
|
|
#endif
|
|
return (NULL);
|
|
}
|
|
|
|
#ifdef STATISTICS
|
|
/*
|
|
* mpool_stat
|
|
* Print out cache statistics.
|
|
*/
|
|
void
|
|
mpool_stat(mp)
|
|
MPOOL *mp;
|
|
{
|
|
BKT *bp;
|
|
int cnt;
|
|
char *sep;
|
|
|
|
(void)fprintf(stderr, "%lu pages in the file\n", mp->npages);
|
|
(void)fprintf(stderr,
|
|
"page size %lu, cacheing %lu pages of %lu page max cache\n",
|
|
mp->pagesize, mp->curcache, mp->maxcache);
|
|
(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
|
|
mp->pageput, mp->pageget, mp->pagenew);
|
|
(void)fprintf(stderr, "%lu page allocs, %lu page flushes\n",
|
|
mp->pagealloc, mp->pageflush);
|
|
if (mp->cachehit + mp->cachemiss)
|
|
(void)fprintf(stderr,
|
|
"%.0f%% cache hit rate (%lu hits, %lu misses)\n",
|
|
((double)mp->cachehit / (mp->cachehit + mp->cachemiss))
|
|
* 100, mp->cachehit, mp->cachemiss);
|
|
(void)fprintf(stderr, "%lu page reads, %lu page writes\n",
|
|
mp->pageread, mp->pagewrite);
|
|
|
|
sep = "";
|
|
cnt = 0;
|
|
for (bp = mp->lqh.cqh_first;
|
|
bp != (void *)&mp->lqh; bp = bp->q.cqe_next) {
|
|
(void)fprintf(stderr, "%s%d", sep, bp->pgno);
|
|
if (bp->flags & MPOOL_DIRTY)
|
|
(void)fprintf(stderr, "d");
|
|
if (bp->flags & MPOOL_PINNED)
|
|
(void)fprintf(stderr, "P");
|
|
if (++cnt == 10) {
|
|
sep = "\n";
|
|
cnt = 0;
|
|
} else
|
|
sep = ", ";
|
|
|
|
}
|
|
(void)fprintf(stderr, "\n");
|
|
}
|
|
#endif
|