mirror of
https://sourceware.org/git/glibc.git
synced 2024-10-04 04:57:46 +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.
353 lines
8.8 KiB
C
353 lines
8.8 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_pr.c 10.20 (Sleepycat) 11/26/97";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.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"
|
|
|
|
void __memp_debug __P((DB_MPOOL *, FILE *, int));
|
|
|
|
static void __memp_pbh __P((FILE *, DB_MPOOL *, BH *, int));
|
|
static void __memp_pdbmf __P((FILE *, DB_MPOOLFILE *, int));
|
|
static void __memp_pmf __P((FILE *, MPOOLFILE *, int));
|
|
static void __memp_pmp __P((FILE *, DB_MPOOL *, MPOOL *, int));
|
|
|
|
/*
|
|
* memp_stat --
|
|
* Display MPOOL statistics.
|
|
*/
|
|
int
|
|
memp_stat(dbmp, gspp, fspp, db_malloc)
|
|
DB_MPOOL *dbmp;
|
|
DB_MPOOL_STAT **gspp;
|
|
DB_MPOOL_FSTAT ***fspp;
|
|
void *(*db_malloc) __P((size_t));
|
|
{
|
|
DB_MPOOL_FSTAT **tfsp;
|
|
MPOOLFILE *mfp;
|
|
size_t len, nlen;
|
|
char *name;
|
|
|
|
/* Allocate space for the global statistics. */
|
|
if (gspp != NULL) {
|
|
*gspp = NULL;
|
|
|
|
if ((*gspp = db_malloc == NULL ?
|
|
(DB_MPOOL_STAT *)__db_malloc(sizeof(**gspp)) :
|
|
(DB_MPOOL_STAT *)db_malloc(sizeof(**gspp))) == NULL)
|
|
return (ENOMEM);
|
|
|
|
LOCKREGION(dbmp);
|
|
|
|
/* Copy out the global statistics. */
|
|
**gspp = dbmp->mp->stat;
|
|
(*gspp)->st_hash_buckets = dbmp->mp->htab_buckets;
|
|
(*gspp)->st_region_wait =
|
|
dbmp->mp->rlayout.lock.mutex_set_wait;
|
|
(*gspp)->st_region_nowait =
|
|
dbmp->mp->rlayout.lock.mutex_set_nowait;
|
|
|
|
UNLOCKREGION(dbmp);
|
|
}
|
|
|
|
if (fspp != NULL) {
|
|
*fspp = NULL;
|
|
|
|
LOCKREGION(dbmp);
|
|
|
|
/* Count the MPOOLFILE structures. */
|
|
for (len = 0,
|
|
mfp = SH_TAILQ_FIRST(&dbmp->mp->mpfq, __mpoolfile);
|
|
mfp != NULL;
|
|
++len, mfp = SH_TAILQ_NEXT(mfp, q, __mpoolfile));
|
|
|
|
UNLOCKREGION(dbmp);
|
|
|
|
if (len == 0)
|
|
return (0);
|
|
|
|
/* Allocate space for the pointers. */
|
|
len = (len + 1) * sizeof(DB_MPOOL_FSTAT *);
|
|
if ((*fspp = db_malloc == NULL ?
|
|
(DB_MPOOL_FSTAT **)__db_malloc(len) :
|
|
(DB_MPOOL_FSTAT **)db_malloc(len)) == NULL)
|
|
return (ENOMEM);
|
|
|
|
LOCKREGION(dbmp);
|
|
|
|
/* Build each individual entry. */
|
|
for (tfsp = *fspp,
|
|
mfp = SH_TAILQ_FIRST(&dbmp->mp->mpfq, __mpoolfile);
|
|
mfp != NULL;
|
|
++tfsp, mfp = SH_TAILQ_NEXT(mfp, q, __mpoolfile)) {
|
|
name = __memp_fns(dbmp, mfp);
|
|
nlen = strlen(name);
|
|
len = sizeof(DB_MPOOL_FSTAT) + nlen + 1;
|
|
if ((*tfsp = db_malloc == NULL ?
|
|
(DB_MPOOL_FSTAT *)__db_malloc(len) :
|
|
(DB_MPOOL_FSTAT *)db_malloc(len)) == NULL)
|
|
return (ENOMEM);
|
|
**tfsp = mfp->stat;
|
|
(*tfsp)->file_name = (char *)
|
|
(u_int8_t *)*tfsp + sizeof(DB_MPOOL_FSTAT);
|
|
memcpy((*tfsp)->file_name, name, nlen + 1);
|
|
}
|
|
*tfsp = NULL;
|
|
|
|
UNLOCKREGION(dbmp);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* __memp_fn --
|
|
* On errors we print whatever is available as the file name.
|
|
*
|
|
* PUBLIC: char * __memp_fn __P((DB_MPOOLFILE *));
|
|
*/
|
|
char *
|
|
__memp_fn(dbmfp)
|
|
DB_MPOOLFILE *dbmfp;
|
|
{
|
|
return (__memp_fns(dbmfp->dbmp, dbmfp->mfp));
|
|
}
|
|
|
|
/*
|
|
* __memp_fns --
|
|
* On errors we print whatever is available as the file name.
|
|
*
|
|
* PUBLIC: char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
|
|
*
|
|
*/
|
|
char *
|
|
__memp_fns(dbmp, mfp)
|
|
DB_MPOOL *dbmp;
|
|
MPOOLFILE *mfp;
|
|
{
|
|
if (mfp->path_off == 0)
|
|
return ((char *)"temporary");
|
|
|
|
return ((char *)R_ADDR(dbmp, mfp->path_off));
|
|
}
|
|
|
|
/*
|
|
* __memp_debug --
|
|
* Display MPOOL structures.
|
|
*
|
|
* PUBLIC: void __memp_debug __P((DB_MPOOL *, FILE *, int));
|
|
*/
|
|
void
|
|
__memp_debug(dbmp, fp, data)
|
|
DB_MPOOL *dbmp;
|
|
FILE *fp;
|
|
int data;
|
|
{
|
|
DB_MPOOLFILE *dbmfp;
|
|
u_long cnt;
|
|
|
|
/* Make it easy to call from the debugger. */
|
|
if (fp == NULL)
|
|
fp = stderr;
|
|
|
|
/* Welcome message. */
|
|
(void)fprintf(fp, "%s\nMpool per-process (%lu) statistics\n",
|
|
DB_LINE, (u_long)getpid());
|
|
|
|
if (data)
|
|
(void)fprintf(fp, " fd: %d; addr %lx; maddr %lx\n",
|
|
dbmp->fd, (u_long)dbmp->addr, (u_long)dbmp->maddr);
|
|
|
|
/* Display the DB_MPOOLFILE structures. */
|
|
for (cnt = 0, dbmfp = TAILQ_FIRST(&dbmp->dbmfq);
|
|
dbmfp != NULL; ++cnt, dbmfp = TAILQ_NEXT(dbmfp, q));
|
|
(void)fprintf(fp, "%lu process-local files\n", cnt);
|
|
for (dbmfp = TAILQ_FIRST(&dbmp->dbmfq);
|
|
dbmfp != NULL; dbmfp = TAILQ_NEXT(dbmfp, q)) {
|
|
(void)fprintf(fp, "%s\n", __memp_fn(dbmfp));
|
|
__memp_pdbmf(fp, dbmfp, data);
|
|
}
|
|
|
|
/* Switch to global statistics. */
|
|
(void)fprintf(fp, "\n%s\nMpool statistics\n", DB_LINE);
|
|
|
|
/* Display the MPOOL structure. */
|
|
__memp_pmp(fp, dbmp, dbmp->mp, data);
|
|
|
|
/* Flush in case we're debugging. */
|
|
(void)fflush(fp);
|
|
}
|
|
|
|
/*
|
|
* __memp_pdbmf --
|
|
* Display a DB_MPOOLFILE structure.
|
|
*/
|
|
static void
|
|
__memp_pdbmf(fp, dbmfp, data)
|
|
FILE *fp;
|
|
DB_MPOOLFILE *dbmfp;
|
|
int data;
|
|
{
|
|
if (!data)
|
|
return;
|
|
|
|
(void)fprintf(fp, " fd: %d; %s\n",
|
|
dbmfp->fd, F_ISSET(dbmfp, MP_READONLY) ? "readonly" : "read/write");
|
|
}
|
|
|
|
/*
|
|
* __memp_pmp --
|
|
* Display the MPOOL structure.
|
|
*/
|
|
static void
|
|
__memp_pmp(fp, dbmp, mp, data)
|
|
FILE *fp;
|
|
DB_MPOOL *dbmp;
|
|
MPOOL *mp;
|
|
int data;
|
|
{
|
|
BH *bhp;
|
|
MPOOLFILE *mfp;
|
|
DB_HASHTAB *htabp;
|
|
size_t bucket;
|
|
int cnt;
|
|
const char *sep;
|
|
|
|
(void)fprintf(fp, "references: %lu; cachesize: %lu\n",
|
|
(u_long)mp->rlayout.refcnt, (u_long)mp->stat.st_cachesize);
|
|
(void)fprintf(fp,
|
|
" %lu pages created\n", (u_long)mp->stat.st_page_create);
|
|
(void)fprintf(fp,
|
|
" %lu mmap pages returned\n", (u_long)mp->stat.st_map);
|
|
(void)fprintf(fp, " %lu I/O's (%lu read, %lu written)\n",
|
|
(u_long)mp->stat.st_page_in + mp->stat.st_page_out,
|
|
(u_long)mp->stat.st_page_in, (u_long)mp->stat.st_page_out);
|
|
if (mp->stat.st_cache_hit + mp->stat.st_cache_miss != 0)
|
|
(void)fprintf(fp,
|
|
" %.0f%% cache hit rate (%lu hit, %lu miss)\n",
|
|
((double)mp->stat.st_cache_hit /
|
|
(mp->stat.st_cache_hit + mp->stat.st_cache_miss)) * 100,
|
|
(u_long)mp->stat.st_cache_hit,
|
|
(u_long)mp->stat.st_cache_miss);
|
|
|
|
/* Display the MPOOLFILE structures. */
|
|
for (cnt = 0, mfp = SH_TAILQ_FIRST(&dbmp->mp->mpfq, __mpoolfile);
|
|
mfp != NULL; ++cnt, mfp = SH_TAILQ_NEXT(mfp, q, __mpoolfile));
|
|
(void)fprintf(fp, "%d total files\n", cnt);
|
|
for (cnt = 1, mfp = SH_TAILQ_FIRST(&dbmp->mp->mpfq, __mpoolfile);
|
|
mfp != NULL; ++cnt, mfp = SH_TAILQ_NEXT(mfp, q, __mpoolfile)) {
|
|
(void)fprintf(fp, "file %d\n", cnt);
|
|
__memp_pmf(fp, mfp, data);
|
|
}
|
|
|
|
if (!data)
|
|
return;
|
|
|
|
/* Display the hash table list of BH's. */
|
|
(void)fprintf(fp, "%s\nHASH table of BH's (%lu buckets):\n",
|
|
DB_LINE, (u_long)mp->htab_buckets);
|
|
(void)fprintf(fp,
|
|
"longest chain searched %lu\n", (u_long)mp->stat.st_hash_longest);
|
|
(void)fprintf(fp, "average chain searched %lu (total/calls: %lu/%lu)\n",
|
|
(u_long)mp->stat.st_hash_examined /
|
|
(mp->stat.st_hash_searches ? mp->stat.st_hash_searches : 1),
|
|
(u_long)mp->stat.st_hash_examined,
|
|
(u_long)mp->stat.st_hash_searches);
|
|
for (htabp = dbmp->htab,
|
|
bucket = 0; bucket < mp->htab_buckets; ++htabp, ++bucket) {
|
|
if (SH_TAILQ_FIRST(&dbmp->htab[bucket], __bh) != NULL)
|
|
(void)fprintf(fp, "%lu:\n", (u_long)bucket);
|
|
for (bhp = SH_TAILQ_FIRST(&dbmp->htab[bucket], __bh);
|
|
bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
|
|
__memp_pbh(fp, dbmp, bhp, data);
|
|
}
|
|
|
|
/* Display the LRU list of BH's. */
|
|
(void)fprintf(fp, "LRU list of BH's (pgno/offset):");
|
|
for (sep = "\n ", bhp = SH_TAILQ_FIRST(&dbmp->mp->bhq, __bh);
|
|
bhp != NULL; sep = ", ", bhp = SH_TAILQ_NEXT(bhp, q, __bh))
|
|
(void)fprintf(fp, "%s%lu/%lu", sep,
|
|
(u_long)bhp->pgno, (u_long)R_OFFSET(dbmp, bhp));
|
|
(void)fprintf(fp, "\n");
|
|
}
|
|
|
|
/*
|
|
* __memp_pmf --
|
|
* Display an MPOOLFILE structure.
|
|
*/
|
|
static void
|
|
__memp_pmf(fp, mfp, data)
|
|
FILE *fp;
|
|
MPOOLFILE *mfp;
|
|
int data;
|
|
{
|
|
(void)fprintf(fp, " %lu pages created\n",
|
|
(u_long)mfp->stat.st_page_create);
|
|
(void)fprintf(fp, " %lu I/O's (%lu read, %lu written)\n",
|
|
(u_long)mfp->stat.st_page_in + mfp->stat.st_page_out,
|
|
(u_long)mfp->stat.st_page_in, (u_long)mfp->stat.st_page_out);
|
|
if (mfp->stat.st_cache_hit + mfp->stat.st_cache_miss != 0)
|
|
(void)fprintf(fp,
|
|
" %.0f%% cache hit rate (%lu hit, %lu miss)\n",
|
|
((double)mfp->stat.st_cache_hit /
|
|
(mfp->stat.st_cache_hit + mfp->stat.st_cache_miss)) * 100,
|
|
(u_long)mfp->stat.st_cache_hit,
|
|
(u_long)mfp->stat.st_cache_miss);
|
|
if (!data)
|
|
return;
|
|
|
|
(void)fprintf(fp, " %d references; %s; pagesize: %lu\n", mfp->ref,
|
|
F_ISSET(mfp, MP_CAN_MMAP) ? "mmap" : "read/write",
|
|
(u_long)mfp->stat.st_pagesize);
|
|
}
|
|
|
|
/*
|
|
* __memp_pbh --
|
|
* Display a BH structure.
|
|
*/
|
|
static void
|
|
__memp_pbh(fp, dbmp, bhp, data)
|
|
FILE *fp;
|
|
DB_MPOOL *dbmp;
|
|
BH *bhp;
|
|
int data;
|
|
{
|
|
const char *sep;
|
|
|
|
if (!data)
|
|
return;
|
|
|
|
(void)fprintf(fp, " BH @ %lu (mf: %lu): page %lu; ref %lu",
|
|
(u_long)R_OFFSET(dbmp, bhp),
|
|
(u_long)bhp->mf_offset, (u_long)bhp->pgno, (u_long)bhp->ref);
|
|
sep = "; ";
|
|
if (F_ISSET(bhp, BH_DIRTY)) {
|
|
(void)fprintf(fp, "%sdirty", sep);
|
|
sep = ", ";
|
|
}
|
|
if (F_ISSET(bhp, BH_WRITE)) {
|
|
(void)fprintf(fp, "%schk_write", sep);
|
|
sep = ", ";
|
|
}
|
|
(void)fprintf(fp, "\n");
|
|
}
|