mirror of
git://sourceware.org/git/glibc.git
synced 2025-02-11 12:50:58 +08:00
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>.
251 lines
4.6 KiB
C
251 lines
4.6 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 copyright[] =
|
|
"@(#) Copyright (c) 1997\n\
|
|
Sleepycat Software Inc. All rights reserved.\n";
|
|
static const char sccsid[] = "@(#)db_checkpoint.c 10.12 (Sleepycat) 9/4/97";
|
|
#endif
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "db_page.h"
|
|
#include "log.h"
|
|
#include "btree.h"
|
|
#include "hash.h"
|
|
#include "clib_ext.h"
|
|
#include "common_ext.h"
|
|
|
|
char *check __P((DB_ENV *, long, long));
|
|
int checkpoint __P((DB_ENV *, char *, int));
|
|
DB_ENV *db_init __P((char *));
|
|
int logpid __P((char *, int));
|
|
int main __P((int, char *[]));
|
|
void onint __P((int));
|
|
void siginit __P((void));
|
|
void usage __P((void));
|
|
|
|
int interrupted;
|
|
time_t now; /* Checkpoint time. */
|
|
const char
|
|
*progname = "db_checkpoint"; /* Program name. */
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char *argv[];
|
|
{
|
|
extern char *optarg;
|
|
extern int optind;
|
|
DB_ENV *dbenv;
|
|
time_t now;
|
|
long kbytes, minutes, seconds;
|
|
int ch, eval, verbose;
|
|
char *home, *logfile;
|
|
|
|
home = logfile = NULL;
|
|
kbytes = minutes = 0;
|
|
verbose = 0;
|
|
while ((ch = getopt(argc, argv, "h:k:L:p:v")) != EOF)
|
|
switch (ch) {
|
|
case 'h':
|
|
home = optarg;
|
|
break;
|
|
case 'k':
|
|
get_long(optarg, 1, LONG_MAX, &kbytes);
|
|
break;
|
|
case 'L':
|
|
logfile = optarg;
|
|
break;
|
|
case 'p':
|
|
get_long(optarg, 1, LONG_MAX, &minutes);
|
|
break;
|
|
case 'v':
|
|
verbose = 1;
|
|
break;
|
|
case '?':
|
|
default:
|
|
usage();
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 0)
|
|
usage();
|
|
|
|
if (kbytes == 0 && minutes == 0) {
|
|
warnx("at least one of -k and -p must be specified");
|
|
usage();
|
|
}
|
|
|
|
/* Initialize the environment. */
|
|
dbenv = db_init(home);
|
|
|
|
if (logfile != NULL && logpid(logfile, 1)) {
|
|
(void)db_appexit(dbenv);
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* If we have only a time delay, then we'll sleep the right amount
|
|
* to wake up when a checkpoint is necessary. If we have a "kbytes"
|
|
* field set, then we'll check every 30 seconds.
|
|
*/
|
|
eval = 0;
|
|
seconds = kbytes != 0 ? 30 : minutes * 60;
|
|
while (!interrupted) {
|
|
(void)__db_sleep(seconds, 0);
|
|
|
|
if (verbose) {
|
|
(void)time(&now);
|
|
printf("checkpoint: %s", ctime(&now));
|
|
}
|
|
errno = txn_checkpoint(dbenv->tx_info, kbytes, minutes);
|
|
|
|
while (errno == DB_INCOMPLETE) {
|
|
if (verbose)
|
|
__db_err(dbenv,
|
|
"checkpoint did not finish, retrying");
|
|
(void)__db_sleep(2, 0);
|
|
errno = txn_checkpoint(dbenv->tx_info, 0, 0);
|
|
}
|
|
|
|
if (errno != 0) {
|
|
eval = 1;
|
|
__db_err(dbenv, "checkpoint: %s", strerror(errno));
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (logfile != NULL && logpid(logfile, 0))
|
|
eval = 1;
|
|
|
|
if (interrupted) {
|
|
(void)signal(interrupted, SIG_DFL);
|
|
(void)raise(interrupted);
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
return (db_appexit(dbenv) || eval ? 1 : 0);
|
|
}
|
|
|
|
/*
|
|
* db_init --
|
|
* Initialize the environment.
|
|
*/
|
|
DB_ENV *
|
|
db_init(home)
|
|
char *home;
|
|
{
|
|
DB_ENV *dbenv;
|
|
|
|
if ((dbenv = (DB_ENV *)calloc(sizeof(DB_ENV), 1)) == NULL) {
|
|
errno = ENOMEM;
|
|
err(1, NULL);
|
|
}
|
|
dbenv->db_errfile = stderr;
|
|
dbenv->db_errpfx = progname;
|
|
|
|
if ((errno = db_appinit(home, NULL, dbenv,
|
|
DB_INIT_LOG | DB_INIT_TXN | DB_INIT_MPOOL | DB_USE_ENVIRON)) != 0)
|
|
err(1, "db_appinit");
|
|
|
|
if (memp_register(dbenv->mp_info,
|
|
DB_FTYPE_BTREE, __bam_pgin, __bam_pgout) ||
|
|
memp_register(dbenv->mp_info,
|
|
DB_FTYPE_HASH, __ham_pgin, __ham_pgout)) {
|
|
(void)db_appexit(dbenv);
|
|
errx(1,
|
|
"db_appinit: failed to register access method functions");
|
|
}
|
|
|
|
siginit();
|
|
|
|
return (dbenv);
|
|
}
|
|
|
|
/*
|
|
* logpid --
|
|
* Log that we're running.
|
|
*/
|
|
int
|
|
logpid(fname, is_open)
|
|
char *fname;
|
|
int is_open;
|
|
{
|
|
FILE *fp;
|
|
time_t now;
|
|
|
|
if (is_open) {
|
|
if ((fp = fopen(fname, "w")) == NULL) {
|
|
warn("%s", fname);
|
|
return (1);
|
|
}
|
|
(void)time(&now);
|
|
fprintf(fp,
|
|
"%s: %lu %s", progname, (u_long)getpid(), ctime(&now));
|
|
fclose(fp);
|
|
} else
|
|
(void)remove(fname);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* siginit --
|
|
* Initialize the set of signals for which we want to clean up.
|
|
* Generally, we try not to leave the shared regions locked if
|
|
* we can.
|
|
*/
|
|
void
|
|
siginit()
|
|
{
|
|
#ifdef SIGHUP
|
|
(void)signal(SIGHUP, onint);
|
|
#endif
|
|
(void)signal(SIGINT, onint);
|
|
#ifdef SIGKILL
|
|
(void)signal(SIGKILL, onint);
|
|
#endif
|
|
(void)signal(SIGTERM, onint);
|
|
}
|
|
|
|
/*
|
|
* oninit --
|
|
* Interrupt signal handler.
|
|
*/
|
|
void
|
|
onint(signo)
|
|
int signo;
|
|
{
|
|
if ((interrupted = signo) == 0)
|
|
interrupted = SIGINT;
|
|
}
|
|
|
|
void
|
|
usage()
|
|
{
|
|
(void)fprintf(stderr,
|
|
"usage: db_checkpoint [-v] [-h home] [-k kbytes] [-L file] [-p min]\n");
|
|
exit(1);
|
|
}
|