mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1997-09-05 03:15 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Reorganize order so that nss follows add-ons. * config.make.in (LDAP): Add. * configure.in: Prepare for ldap add-on. * shlib-versions: Add version numbers for ldap NSS module. * nss/Makefile: Add rules to build ldap NSS module. * db/btree/bt_page.c (__bt_free): Update meta data information. Update db from db-2.3.6. * db2/db.h: Updated. * db2/btree/bt_close.c: Updated. * db2/btree/bt_compare.c: Updated. * db2/btree/bt_conv.c: Updated. * db2/btree/bt_cursor.c: Updated. * db2/btree/bt_delete.c: Updated. * db2/btree/bt_put.c: Updated. * db2/btree/bt_rec.c: Updated. * db2/btree/bt_recno.c: Updated. * db2/btree/bt_search.c: Updated. * db2/btree/bt_split.c: Updated. * db2/btree/bt_stat.c: Updated. * db2/common/db_appinit.c: Updated. * db2/common/db_apprec.c: Updated. * db2/common/db_byteorder.c: Updated. * db2/common/db_err.c: Updated. * db2/common/db_region.c: Updated. * db2/db/db.c: Updated. * db2/db/db_conv.c: Updated. * db2/db/db_dup.c: Updated. * db2/db/db_pr.c: Updated. * db2/db/db_ret.c: Updated. * db2/db185/db185.c: Updated. * db2/dbm/dbm.c: Updated. * db2/hash/hash_dup.c: Updated. * db2/include/db_am.h: Updated. * db2/include/db_page.h: Updated. * db2/include/mp.h: Updated. * db2/include/queue.h: Updated. * db2/log/log.c: Updated. * db2/log/log_findckp.c: Updated. * db2/log/log_get.c: Updated. * db2/log/log_rec.c: Updated. * db2/mp/mp_bh.c: Updated. * db2/mp/mp_fopen.c: Updated. * db2/mp/mp_pr.c: Updated. * db2/mp/mp_sync.c: Updated. * db2/mutex/x86.gcc: Updated. * db2/os/db_os_dir.c: Updated. * db2/os/db_os_fid.c: Updated. * db2/progs/db_archive/db_archive.c: Updated. * db2/progs/db_checkpoint/db_checkpoint.c: Updated. * db2/progs/db_deadlock/db_deadlock.c: Updated. * db2/progs/db_dump/db_dump.c: Updated. * db2/progs/db_dump185/db_dump185.c: Updated. * db2/progs/db_load/db_load.c: Updated. * db2/progs/db_printlog/db_printlog.c: Updated. * db2/progs/db_recover/db_recover.c: Updated. * db2/progs/db_stat/db_stat.c: Updated. * db2/txn/txn.c: Updated. * db2/txn/txn_rec.c: Updated. * db2/Makefile: Add rule to build db_printlog. * db2/config.h: Don't include endian.h and don't define WORDS_BIGENDIAN. Only define HAVE_ENDIAN_H. * elf/dl-open.c (_dl_open): Make thread-safe. * elf/dl-close.c (_dl_close): Likewise. * elf/dlclose.c: Pretty print. * elf/dl-version.c (make_string): Use __strdup not strdup. (find_needed): Don't use l_searchlist of _dl_loaded, use the l_next list. * elf/dl-deps.c (_dl_map_object_deps): Remove variable head. * manual/math.texi: Add note about == and != for FP values. * manual/message.texi: Mention problems with relative paths and binstextdomain. * manual/string.texi: Mark strdupa and strndupa correctly as macros. * sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings. * sunrpc/rpc_cout.c: Avoid needless races around return value. * sysdeps/generic/stpcpy.c: Include <config.h> if wanted. Update from tzdata-1997h. * time/africa: Updated. * time/europe: Updated. * time/iso3166.tab: Updated. * time/northamerica: Updated. * time/southamerica: Updated. * time/zone.tab: Updated. 1997-09-04 13:19 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/w_sqrt.S: Removed. * sysdeps/alpha/fpu/e_sqrt.c: New. Obey -mieee and -mieee-with-inexact and build a version that is as fast as possible given the constraint. 1997-08-30 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/maint.texi: Document some defaults for configuration parameters. 1997-09-04 15:57 Ulrich Drepper <drepper@cygnus.com> * termios/cfsetspeed.c (cfsetspeed): Change return value to int. * termios/termios.h: Change prototype accordingly. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-07-26 14:42 H.J. Lu <hjl@gnu.ai.mit.edu> * libio/stdfiles.c (_libio_using_thunks): Define if _G_USING_THUNKS is defined. * libio/_G_config.h: Moved to ... * sysdeps/generic/_G_config.h: ...here. * sysdeps/unix/sysv/linux/_G_config.h: New, Add vtable thunks support. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/Makefile (pic-ccflag): Override it for more efficient code (together with a change in gcc). * Makeconfig (pic-ccflag): New variable. (CFLAGS-.os): Use it instead of hardcoding -fPIC. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use _dl_start instead of a local label, to avoid getting an unreadable label name. 1997-09-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find libdb.so. * Makeconfig (dbobjdir): Use db2. 1997-08-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/maint.texi (Porting to Unix): Update description of the implementation of Unix system calls. (Contributors): Use real umlaut in tege's name. 1997-08-30 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/w_gamma.c: Make compilable with _IEEE_LIBM. * sysdeps/libm-ieee754/w_gammaf.c: Likewise. * sysdeps/libm-ieee754/w_gammal.c: Likewise.
This commit is contained in:
Ulrich Drepper
@ -11,7 +11,7 @@
|
||||
static const char copyright[] =
|
||||
"@(#) Copyright (c) 1997\n\
|
||||
Sleepycat Software Inc. All rights reserved.\n";
|
||||
static const char sccsid[] = "@(#)db_apprec.c 10.15 (Sleepycat) 7/27/97";
|
||||
static const char sccsid[] = "@(#)db_apprec.c 10.16 (Sleepycat) 8/27/97";
|
||||
#endif
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
@ -19,6 +19,7 @@ static const char sccsid[] = "@(#)db_apprec.c 10.15 (Sleepycat) 7/27/97";
|
||||
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#include "db_int.h"
|
||||
@ -30,6 +31,12 @@ static const char sccsid[] = "@(#)db_apprec.c 10.15 (Sleepycat) 7/27/97";
|
||||
#include "txn.h"
|
||||
#include "common_ext.h"
|
||||
|
||||
#define FREE_DBT(L, D) { \
|
||||
if (F_ISSET((L), DB_AM_THREAD) && (D).data != NULL) \
|
||||
free((D).data); \
|
||||
(D).data = NULL; \
|
||||
} \
|
||||
|
||||
/*
|
||||
* __db_apprec --
|
||||
* Perform recovery.
|
||||
@ -45,30 +52,34 @@ __db_apprec(dbenv, flags)
|
||||
DB_LOG *lp;
|
||||
DB_LSN ckp_lsn, first_lsn, lsn, tmp_lsn;
|
||||
time_t now;
|
||||
int first_flag, ret, tret;
|
||||
int first_flag, ret;
|
||||
void *txninfo;
|
||||
|
||||
ZERO_LSN(ckp_lsn);
|
||||
|
||||
/* Initialize the transaction list. */
|
||||
if ((ret = __db_txnlist_init(&txninfo)) != 0)
|
||||
return (ret);
|
||||
|
||||
/*
|
||||
* Read forward through the log opening the appropriate files
|
||||
* so that we can call recovery routines. In general, we start
|
||||
* at the last checkpoint prior to the last checkpointed LSN.
|
||||
* For catastrophic recovery, we begin at the first LSN that
|
||||
* appears in any log file (log figures this out for us when
|
||||
* we pass it the DB_FIRST flag).
|
||||
* Read forward through the log, opening the appropriate files so that
|
||||
* we can call recovery routines. In general, we start at the last
|
||||
* checkpoint prior to the last checkpointed LSN. For catastrophic
|
||||
* recovery, we begin at the first LSN that appears in any log file
|
||||
* (log_get figures this out for us when we pass it the DB_FIRST flag).
|
||||
*/
|
||||
lp = dbenv->lg_info;
|
||||
if (LF_ISSET(DB_RECOVER_FATAL))
|
||||
first_flag = DB_FIRST;
|
||||
else
|
||||
first_flag = __log_findckp(lp, &lsn) != 0 ? DB_FIRST : DB_SET;
|
||||
else {
|
||||
if ((ret = __log_findckp(lp, &lsn)) == DB_NOTFOUND)
|
||||
return (0);
|
||||
first_flag = DB_SET;
|
||||
}
|
||||
|
||||
/* If we're a threaded application, we have to allocate space. */
|
||||
memset(&data, 0, sizeof(data));
|
||||
if (F_ISSET(lp, DB_AM_THREAD))
|
||||
F_SET(&data, DB_DBT_MALLOC);
|
||||
|
||||
if ((ret = log_get(lp, &lsn, &data, first_flag)) != 0) {
|
||||
__db_err(dbenv, "Failure: unable to get log record");
|
||||
if (first_flag == DB_SET)
|
||||
@ -80,35 +91,55 @@ __db_apprec(dbenv, flags)
|
||||
}
|
||||
|
||||
first_lsn = lsn;
|
||||
for (; ret == 0;
|
||||
ret = log_get(dbenv->lg_info, &lsn, &data, DB_NEXT))
|
||||
if ((tret = __db_dispatch(lp,
|
||||
&data, &lsn, TXN_OPENFILES, txninfo)) < 0) {
|
||||
ret = tret;
|
||||
for (;;) {
|
||||
ret = __db_dispatch(lp, &data, &lsn, TXN_OPENFILES, txninfo);
|
||||
FREE_DBT(lp, data);
|
||||
if (ret != 0 && ret != DB_TXN_CKP)
|
||||
goto msgerr;
|
||||
if ((ret =
|
||||
log_get(dbenv->lg_info, &lsn, &data, DB_NEXT)) != 0) {
|
||||
if (ret != DB_NOTFOUND)
|
||||
goto err;
|
||||
break;
|
||||
}
|
||||
}
|
||||
FREE_DBT(lp, data);
|
||||
|
||||
/*
|
||||
* Initialize the ckp_lsn to 0,0. If we never find a valid
|
||||
* checkpoint in the log, then leaving ckp_lsn at 0,0 is correct.
|
||||
*/
|
||||
ZERO_LSN(ckp_lsn);
|
||||
for (ret = log_get(lp, &lsn, &data, DB_LAST);
|
||||
ret == 0 && log_compare(&lsn, &first_lsn) > 0;
|
||||
ret = log_get(lp,&lsn, &data, DB_PREV)) {
|
||||
tmp_lsn = lsn;
|
||||
tret =
|
||||
__db_dispatch(lp, &data, &lsn, TXN_BACKWARD_ROLL, txninfo);
|
||||
if (IS_ZERO_LSN(ckp_lsn) && tret > 0)
|
||||
ckp_lsn = tmp_lsn;
|
||||
if (tret < 0) {
|
||||
ret = tret;
|
||||
ret = __db_dispatch(lp,
|
||||
&data, &lsn, TXN_BACKWARD_ROLL, txninfo);
|
||||
FREE_DBT(lp, data);
|
||||
if (ret == DB_TXN_CKP) {
|
||||
if (IS_ZERO_LSN(ckp_lsn))
|
||||
ckp_lsn = tmp_lsn;
|
||||
ret = 0;
|
||||
} else if (ret != 0)
|
||||
goto msgerr;
|
||||
}
|
||||
}
|
||||
FREE_DBT(lp, data);
|
||||
if (ret != 0 && ret != DB_NOTFOUND)
|
||||
goto err;
|
||||
|
||||
for (ret = log_get(lp, &lsn, &data, DB_NEXT);
|
||||
ret == 0; ret = log_get(lp, &lsn, &data, DB_NEXT))
|
||||
if ((tret = __db_dispatch(lp,
|
||||
&data, &lsn, TXN_FORWARD_ROLL, txninfo)) < 0) {
|
||||
ret = tret;
|
||||
ret == 0; ret = log_get(lp, &lsn, &data, DB_NEXT)) {
|
||||
ret = __db_dispatch(lp, &data, &lsn, TXN_FORWARD_ROLL, txninfo);
|
||||
FREE_DBT(lp, data);
|
||||
if (ret == DB_TXN_CKP)
|
||||
ret = 0;
|
||||
else if (ret != 0)
|
||||
goto msgerr;
|
||||
}
|
||||
}
|
||||
FREE_DBT(lp, data);
|
||||
if (ret != DB_NOTFOUND)
|
||||
goto err;
|
||||
|
||||
/* Now close all the db files that are open. */
|
||||
__log_close_files(lp);
|
||||
@ -118,11 +149,11 @@ __db_apprec(dbenv, flags)
|
||||
* and the current time. Then take a checkpoint.
|
||||
*/
|
||||
(void)time(&now);
|
||||
|
||||
dbenv->tx_info->region->last_txnid = ((__db_txnhead *)txninfo)->maxid;
|
||||
dbenv->tx_info->region->last_ckp = ckp_lsn;
|
||||
dbenv->tx_info->region->time_ckp = (u_int32_t) now;
|
||||
txn_checkpoint(dbenv->tx_info, 0, 0);
|
||||
dbenv->tx_info->region->time_ckp = (u_int32_t)now;
|
||||
if ((ret = txn_checkpoint(dbenv->tx_info, 0, 0)) != 0)
|
||||
goto err;
|
||||
|
||||
if (dbenv->db_verbose) {
|
||||
__db_err(lp->dbenv, "Recovery complete at %s", ctime(&now));
|
||||
@ -139,5 +170,6 @@ __db_apprec(dbenv, flags)
|
||||
msgerr: __db_err(dbenv, "Recovery function for LSN %lu %lu failed",
|
||||
(u_long)lsn.file, (u_long)lsn.offset);
|
||||
|
||||
err: return (ret);
|
||||
err: FREE_DBT(lp, data);
|
||||
return (ret);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user