mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
af69217fea
1998-01-26 00:57 Ulrich Drepper <drepper@cygnus.com> * db2/Makefile (routines): Add os_alloc. * db2/db.h: Update from db-2.3.16. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/btree/bt_close.c: Likewise. * db2/btree/bt_cursor.c: Likewise. * db2/btree/bt_delete.c: Likewise. * db2/btree/bt_open.c: Likewise. * db2/btree/bt_page.c: Likewise. * db2/btree/bt_put.c: Likewise. * db2/btree/bt_rec.c: Likewise. * db2/btree/bt_recno.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/common/db_shash.c: Likewise. * db2/db/db.c: Likewise. * db2/db/db_auto.c: Likewise. * db2/db/db_conv.c: Likewise. * db2/db/db_dispatch.c: Likewise. * db2/db/db_dup.c: Likewise. * db2/db/db_pr.c: Likewise. * db2/db/db_rec.c: Likewise. * db2/db185/db185.c: Likewise. * db2/dbm/dbm.c: Likewise. * db2/hash/hash.c: Likewise. * db2/hash/hash_auto.c: Likewise. * db2/hash/hash_dup.c: Likewise. * db2/hash/hash_page.c: Likewise. * db2/hash/hash_rec.c: Likewise. * db2/include/btree_ext.h: Likewise. * db2/include/clib_ext.h: Likewise. * db2/include/common_ext.h: Likewise. * db2/include/db.h.src: Likewise. * db2/include/db_185.h.src: Likewise. * db2/include/db_am.h: Likewise. * db2/include/db_ext.h: Likewise. * db2/include/db_int.h.src: Likewise. * db2/include/hash_ext.h: Likewise. * db2/include/lock_ext.h: Likewise. * db2/include/log.h: Likewise. * db2/include/log_auto.h: Likewise. * db2/include/log_ext.h: Likewise. * db2/include/mp.h: Likewise. * db2/include/mp_ext.h: Likewise. * db2/include/mutex_ext.h: Likewise. * db2/include/os_ext.h: Likewise. * db2/include/os_func.h: Likewise. * db2/include/txn_ext.h: Likewise. * db2/lock/lock.c: Likewise. * db2/lock/lock_util.c: Likewise. * db2/log/log.c: Likewise. * db2/log/log.src: 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_rec.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_pr.c: Likewise. * db2/mp/mp_sync.c: Likewise. * db2/mutex/mutex.c: Likewise. * db2/os/os_alloc.c: Likewise. * db2/os/os_config.c: Likewise. * db2/os/os_stat.c: Likewise. * db2/progs/db_checkpoint/db_checkpoint.c: Likewise. * db2/progs/db_deadlock/db_deadlock.c: Likewise. * db2/progs/db_load/db_load.c: Likewise. * db2/progs/db_printlog/db_printlog.c: Likewise. * db2/progs/db_recover/db_recover.c: Likewise. * db2/progs/db_stat/db_stat.c: Likewise. * db2/txn/txn.c: Likewise. * elf/dl-close.c (_dl_close): Rename inner variable named map to imap. Unmap memory blocks in reverse order of allocation. Call munmap with load address added to offset. Bug reported by Miguel de Icaza. * locale/programs/ld-collate.c (collate_end_weight): Correctly fill up weight array. * localedata/locales/cs_CZ: Update by Michael Mraka <michael@informatics.muni.cz>. * misc/sys/syslog.h: Reformat a bit. Don't declare vsyslog unless __USE_BSD. * nis/nss_compat/compat-grp.c: Correctly handle buffer overflow while reading line with fgets. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * shadow/fgetspent_r.c: Likewise. * string/strerror_r.c: Correct comment. Patch by Andreas Jaeger. * sysdeps/unix/sysv/linux/bits/stat.h: Define _STATBUF_ST_RDEV. * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Allocate room for FP register content in ucontext_t. 1998-01-22 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_modfl.c (modf): Correct calculation. Patch by Markus Schoder <Markus.Schoder@dresdner-bank.de>. * math/libm-test.c (modf_test): Add more tests for modf. * sysdeps/unix/sysv/linux/sys/mman.h: Add const to mlock and munlock according to Unix98. 1998-01-25 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-network.c (LINE_PARSER): Set n_addrtype to AF_INET. 1998-01-21 07:22 H.J. Lu <hjl@gnu.org> * sysdeps/posix/ttyname.c: Handle symbolic links. * sysdeps/posix/ttyname_r.c: Ditto. 1998-01-25 19:39 Ulrich Drepper <drepper@cygnus.com> * db2/makedb.c (process_input): Write terminating \0 for value. (print_database): Simply print value string, don't use length. 1998-01-24 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nsswitch.c (__nss_configure_lookup): Correct test for early exit of loop. 1998-01-25 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/ypclnt.c: Don't set dom_client to NULL, or we will not close all sockets. 1998-01-25 14:54 Ulrich Drepper <drepper@cygnus.com> * signal/Makefile (routines): Add sighold, sigrelse, sigignore, and sigset. * signal/sighold.c: New file. * signal/sigrelse.c: New file. * sysdeps/generic/sigignore.c: New file. * sysdeps/generic/sigset.c: New file. * sysdeps/posix/sigignore.c: New file. * sysdeps/posix/sigset.c: New file. * signal/signal.h: Add prototypes for new functions. * sysdeps/unix/sysv/linux/alpha/bits/signum.h: Define SIG_HOLD. * sysdeps/unix/sysv/linux/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/signum.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/signum.h: Likewise. 1998-01-23 00:16 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp.c: Added IFS field-splitting in parameter and command substitution. Fixed an IFS-related bug that caused an infinite loop. 1998-01-25 12:38 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getcontext, setcontext, makecontext, and swapcontext. * stdlib/ucontext.h: Correct prototypes. * sysdeps/generic/getcontext.c: New file. * sysdeps/generic/setcontext.c: New file. * sysdeps/generic/makecontext.c: New file. * sysdeps/generic/swapcontext.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile: Removed. 1998-01-25 04:07 Ulrich Drepper <drepper@cygnus.com> * resource/sys/resource.h: Remove #include of ulimit.h which is not allowed by SUSv2 and not available on other systems. * sysdeps/unix/sysv/linux/ulimit.c: Include ulimit.h. * streams/Makefile: New file. * streams/stropts.h: New file. * sysdeps/generic/bits/stropts.h: New file. * sysdeps/generic/isastream.c: New file. * sysdeps/generic/getmsg.c: New file. * sysdeps/generic/getpmsg.c: New file. * sysdeps/generic/putmsg.c: New file. * sysdeps/generic/putpmsg.c: New file. * sysdeps/generic/fattach.c: New file. * sysdeps/generic/fdetach.c: New file. * sysdeps/unix/inet/Subdirs: Add streams. * sysdeps/generic/bits/types.h: Add definition of __t_scalar_t and __t_uscalar_t. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/mach/_strerror.c: Follow changes of generic version to handle small buffers correctly. 1998-01-24 17:31 H.J. Lu <hjl@gnu.org> * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Remove the 3rd arg and add declaration for _dl_runtime_resolve and _dl_runtime_profile. 1998-01-25 02:42 Ulrich Drepper <drepper@cygnus.com> * include/cpio.h: New file. Mainly copied from GNU cpio. * posix/Makefile (headers): Add cpio.h.
341 lines
7.8 KiB
C
341 lines
7.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[] = "@(#)log_get.c 10.24 (Sleepycat) 1/17/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.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_page.h"
|
|
#include "log.h"
|
|
#include "hash.h"
|
|
#include "common_ext.h"
|
|
|
|
/*
|
|
* log_get --
|
|
* Get a log record.
|
|
*/
|
|
int
|
|
log_get(dblp, alsn, dbt, flags)
|
|
DB_LOG *dblp;
|
|
DB_LSN *alsn;
|
|
DBT *dbt;
|
|
int flags;
|
|
{
|
|
LOG *lp;
|
|
int ret;
|
|
|
|
/* Validate arguments. */
|
|
#define OKFLAGS (DB_CHECKPOINT | \
|
|
DB_CURRENT | DB_FIRST | DB_LAST | DB_NEXT | DB_PREV | DB_SET)
|
|
if ((ret = __db_fchk(dblp->dbenv, "log_get", flags, OKFLAGS)) != 0)
|
|
return (ret);
|
|
switch (flags) {
|
|
case DB_CHECKPOINT:
|
|
case DB_CURRENT:
|
|
case DB_FIRST:
|
|
case DB_LAST:
|
|
case DB_NEXT:
|
|
case DB_PREV:
|
|
case DB_SET:
|
|
break;
|
|
default:
|
|
return (__db_ferr(dblp->dbenv, "log_get", 1));
|
|
}
|
|
|
|
if (F_ISSET(dblp, DB_AM_THREAD)) {
|
|
if (LF_ISSET(DB_NEXT | DB_PREV | DB_CURRENT))
|
|
return (__db_ferr(dblp->dbenv, "log_get", 1));
|
|
if (!F_ISSET(dbt, DB_DBT_USERMEM | DB_DBT_MALLOC))
|
|
return (__db_ferr(dblp->dbenv, "threaded data", 1));
|
|
}
|
|
|
|
lp = dblp->lp;
|
|
|
|
LOCK_LOGREGION(dblp);
|
|
|
|
/*
|
|
* If we get one of the log's header records, repeat the operation.
|
|
* This assumes that applications don't ever request the log header
|
|
* records by LSN, but that seems reasonable to me.
|
|
*/
|
|
ret = __log_get(dblp, alsn, dbt, flags, 0);
|
|
if (ret == 0 && alsn->offset == 0) {
|
|
switch (flags) {
|
|
case DB_FIRST:
|
|
flags = DB_NEXT;
|
|
break;
|
|
case DB_LAST:
|
|
flags = DB_PREV;
|
|
break;
|
|
}
|
|
ret = __log_get(dblp, alsn, dbt, flags, 0);
|
|
}
|
|
|
|
UNLOCK_LOGREGION(dblp);
|
|
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* __log_get --
|
|
* Get a log record; internal version.
|
|
*
|
|
* PUBLIC: int __log_get __P((DB_LOG *, DB_LSN *, DBT *, int, int));
|
|
*/
|
|
int
|
|
__log_get(dblp, alsn, dbt, flags, silent)
|
|
DB_LOG *dblp;
|
|
DB_LSN *alsn;
|
|
DBT *dbt;
|
|
int flags, silent;
|
|
{
|
|
DB_LSN nlsn;
|
|
HDR hdr;
|
|
LOG *lp;
|
|
size_t len;
|
|
ssize_t nr;
|
|
int cnt, ret;
|
|
char *np, *tbuf;
|
|
const char *fail;
|
|
void *p, *shortp;
|
|
|
|
lp = dblp->lp;
|
|
fail = np = tbuf = NULL;
|
|
|
|
nlsn = dblp->c_lsn;
|
|
switch (flags) {
|
|
case DB_CHECKPOINT:
|
|
nlsn = lp->c_lsn;
|
|
if (IS_ZERO_LSN(nlsn)) {
|
|
__db_err(dblp->dbenv,
|
|
"log_get: unable to find checkpoint record: no checkpoint set.");
|
|
ret = ENOENT;
|
|
goto err2;
|
|
}
|
|
break;
|
|
case DB_NEXT: /* Next log record. */
|
|
if (!IS_ZERO_LSN(nlsn)) {
|
|
/* Increment the cursor by the cursor record size. */
|
|
nlsn.offset += dblp->c_len;
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case DB_FIRST: /* Find the first log record. */
|
|
/* Find the first log file. */
|
|
if ((ret = __log_find(dblp, 1, &cnt)) != 0)
|
|
goto err2;
|
|
|
|
/*
|
|
* We may have only entered records in the buffer, and not
|
|
* yet written a log file. If no log files were found and
|
|
* there's anything in the buffer, it belongs to file 1.
|
|
*/
|
|
if (cnt == 0)
|
|
cnt = 1;
|
|
|
|
nlsn.file = cnt;
|
|
nlsn.offset = 0;
|
|
break;
|
|
case DB_CURRENT: /* Current log record. */
|
|
break;
|
|
case DB_PREV: /* Previous log record. */
|
|
if (!IS_ZERO_LSN(nlsn)) {
|
|
/* If at start-of-file, move to the previous file. */
|
|
if (nlsn.offset == 0) {
|
|
if (nlsn.file == 1 ||
|
|
__log_valid(dblp, NULL, nlsn.file - 1) != 0)
|
|
return (DB_NOTFOUND);
|
|
|
|
--nlsn.file;
|
|
nlsn.offset = dblp->c_off;
|
|
} else
|
|
nlsn.offset = dblp->c_off;
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
case DB_LAST: /* Last log record. */
|
|
nlsn.file = lp->lsn.file;
|
|
nlsn.offset = lp->lsn.offset - lp->len;
|
|
break;
|
|
case DB_SET: /* Set log record. */
|
|
nlsn = *alsn;
|
|
break;
|
|
}
|
|
|
|
retry:
|
|
/* Return 1 if the request is past end-of-file. */
|
|
if (nlsn.file > lp->lsn.file ||
|
|
(nlsn.file == lp->lsn.file && nlsn.offset >= lp->lsn.offset))
|
|
return (DB_NOTFOUND);
|
|
|
|
/* If we've switched files, discard the current fd. */
|
|
if (dblp->c_lsn.file != nlsn.file && dblp->c_fd != -1) {
|
|
(void)__db_close(dblp->c_fd);
|
|
dblp->c_fd = -1;
|
|
}
|
|
|
|
/* If the entire record is in the in-memory buffer, copy it out. */
|
|
if (nlsn.file == lp->lsn.file && nlsn.offset >= lp->w_off) {
|
|
/* Copy the header. */
|
|
p = lp->buf + (nlsn.offset - lp->w_off);
|
|
memcpy(&hdr, p, sizeof(HDR));
|
|
|
|
/* Copy the record. */
|
|
len = hdr.len - sizeof(HDR);
|
|
if ((ret = __db_retcopy(dbt, (u_int8_t *)p + sizeof(HDR),
|
|
len, &dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
goto cksum;
|
|
}
|
|
|
|
/* Acquire a file descriptor. */
|
|
if (dblp->c_fd == -1) {
|
|
if ((ret = __log_name(dblp, nlsn.file, &np)) != 0)
|
|
goto err1;
|
|
if ((ret = __db_open(np, DB_RDONLY | DB_SEQUENTIAL,
|
|
DB_RDONLY | DB_SEQUENTIAL, 0, &dblp->c_fd)) != 0) {
|
|
fail = np;
|
|
goto err1;
|
|
}
|
|
__db_free(np);
|
|
np = NULL;
|
|
}
|
|
|
|
/* Seek to the header offset and read the header. */
|
|
if ((ret = __db_seek(dblp->c_fd, 0, 0, nlsn.offset, SEEK_SET)) != 0) {
|
|
fail = "seek";
|
|
goto err1;
|
|
}
|
|
if ((ret = __db_read(dblp->c_fd, &hdr, sizeof(HDR), &nr)) != 0) {
|
|
fail = "read";
|
|
goto err1;
|
|
}
|
|
if (nr == sizeof(HDR))
|
|
shortp = NULL;
|
|
else {
|
|
/* If read returns EOF, try the next file. */
|
|
if (nr == 0) {
|
|
if (flags != DB_NEXT || nlsn.file == lp->lsn.file)
|
|
goto corrupt;
|
|
|
|
/* Move to the next file. */
|
|
++nlsn.file;
|
|
nlsn.offset = 0;
|
|
goto retry;
|
|
}
|
|
|
|
/*
|
|
* If read returns a short count the rest of the record has
|
|
* to be in the in-memory buffer.
|
|
*/
|
|
if (lp->b_off < sizeof(HDR) - nr)
|
|
goto corrupt;
|
|
|
|
/* Get the rest of the header from the in-memory buffer. */
|
|
memcpy((u_int8_t *)&hdr + nr, lp->buf, sizeof(HDR) - nr);
|
|
shortp = lp->buf + (sizeof(HDR) - nr);
|
|
}
|
|
|
|
/*
|
|
* Check for buffers of 0's, that's what we usually see during
|
|
* recovery, although it's certainly not something on which we
|
|
* can depend.
|
|
*/
|
|
if (hdr.len <= sizeof(HDR))
|
|
goto corrupt;
|
|
len = hdr.len - sizeof(HDR);
|
|
|
|
/* If we've already moved to the in-memory buffer, fill from there. */
|
|
if (shortp != NULL) {
|
|
if (lp->b_off < ((u_int8_t *)shortp - lp->buf) + len)
|
|
goto corrupt;
|
|
if ((ret = __db_retcopy(dbt, shortp, len,
|
|
&dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
goto cksum;
|
|
}
|
|
|
|
/* Allocate temporary memory to hold the record. */
|
|
if ((tbuf = (char *)__db_malloc(len)) == NULL) {
|
|
ret = ENOMEM;
|
|
goto err1;
|
|
}
|
|
|
|
/*
|
|
* Read the record into the buffer. If read returns a short count,
|
|
* there was an error or the rest of the record is in the in-memory
|
|
* buffer. Note, the information may be garbage if we're in recovery,
|
|
* so don't read past the end of the buffer's memory.
|
|
*/
|
|
if ((ret = __db_read(dblp->c_fd, tbuf, len, &nr)) != 0) {
|
|
fail = "read";
|
|
goto err1;
|
|
}
|
|
if (len - nr > sizeof(lp->buf))
|
|
goto corrupt;
|
|
if (nr != (ssize_t)len) {
|
|
if (lp->b_off < len - nr)
|
|
goto corrupt;
|
|
|
|
/* Get the rest of the record from the in-memory buffer. */
|
|
memcpy((u_int8_t *)tbuf + nr, lp->buf, len - nr);
|
|
}
|
|
|
|
/* Copy the record into the user's DBT. */
|
|
if ((ret = __db_retcopy(dbt, tbuf, len,
|
|
&dblp->c_dbt.data, &dblp->c_dbt.ulen, NULL)) != 0)
|
|
goto err1;
|
|
__db_free(tbuf);
|
|
tbuf = NULL;
|
|
|
|
cksum: if (hdr.cksum != __ham_func4(dbt->data, dbt->size)) {
|
|
if (!silent)
|
|
__db_err(dblp->dbenv, "log_get: checksum mismatch");
|
|
goto corrupt;
|
|
}
|
|
|
|
/* Update the cursor and the return lsn. */
|
|
dblp->c_off = hdr.prev;
|
|
dblp->c_len = hdr.len;
|
|
dblp->c_lsn = *alsn = nlsn;
|
|
|
|
return (0);
|
|
|
|
corrupt:/*
|
|
* This is the catchall -- for some reason we didn't find enough
|
|
* information or it wasn't reasonable information, and it wasn't
|
|
* because a system call failed.
|
|
*/
|
|
ret = EIO;
|
|
fail = "read";
|
|
|
|
err1: if (!silent)
|
|
if (fail == NULL)
|
|
__db_err(dblp->dbenv, "log_get: %s", strerror(ret));
|
|
else
|
|
__db_err(dblp->dbenv,
|
|
"log_get: %s: %s", fail, strerror(ret));
|
|
err2: if (np != NULL)
|
|
__db_free(np);
|
|
if (tbuf != NULL)
|
|
__db_free(tbuf);
|
|
return (ret);
|
|
}
|