1997-08-27 20:26:10 +00:00
|
|
|
/* Do not edit: automatically built by dist/db_gen.sh. */
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "db_int.h"
|
|
|
|
#include "shqueue.h"
|
|
|
|
#include "db_page.h"
|
|
|
|
#include "db_dispatch.h"
|
|
|
|
#include "btree.h"
|
|
|
|
#include "db_am.h"
|
|
|
|
#include "common_ext.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_alloc_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, DB_LSN *, DB_LSN *, db_pgno_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t));
|
|
|
|
*/
|
|
|
|
int __bam_pg_alloc_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, meta_lsn, page_lsn, pgno, ptype, next)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
DB_LSN * meta_lsn;
|
|
|
|
DB_LSN * page_lsn;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
u_int32_t ptype;
|
|
|
|
db_pgno_t next;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_pg_alloc;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(*meta_lsn)
|
|
|
|
+ sizeof(*page_lsn)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(ptype)
|
|
|
|
+ sizeof(next);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
if (meta_lsn != NULL)
|
|
|
|
memcpy(bp, meta_lsn, sizeof(*meta_lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*meta_lsn));
|
|
|
|
bp += sizeof(*meta_lsn);
|
|
|
|
if (page_lsn != NULL)
|
|
|
|
memcpy(bp, page_lsn, sizeof(*page_lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*page_lsn));
|
|
|
|
bp += sizeof(*page_lsn);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
memcpy(bp, &ptype, sizeof(ptype));
|
|
|
|
bp += sizeof(ptype);
|
|
|
|
memcpy(bp, &next, sizeof(next));
|
|
|
|
bp += sizeof(next);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_alloc_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_pg_alloc_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_pg_alloc_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_pg_alloc_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_pg_alloc: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tmeta_lsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->meta_lsn.file, (u_long)argp->meta_lsn.offset);
|
|
|
|
printf("\tpage_lsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->page_lsn.file, (u_long)argp->page_lsn.offset);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tptype: %lu\n", (u_long)argp->ptype);
|
|
|
|
printf("\tnext: %lu\n", (u_long)argp->next);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_alloc_read __P((void *, __bam_pg_alloc_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_pg_alloc_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_pg_alloc_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_pg_alloc_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_pg_alloc_args *)malloc(sizeof(__bam_pg_alloc_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->meta_lsn, bp, sizeof(argp->meta_lsn));
|
|
|
|
bp += sizeof(argp->meta_lsn);
|
|
|
|
memcpy(&argp->page_lsn, bp, sizeof(argp->page_lsn));
|
|
|
|
bp += sizeof(argp->page_lsn);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->ptype, bp, sizeof(argp->ptype));
|
|
|
|
bp += sizeof(argp->ptype);
|
|
|
|
memcpy(&argp->next, bp, sizeof(argp->next));
|
|
|
|
bp += sizeof(argp->next);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_free_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, DBT *,
|
|
|
|
* PUBLIC: db_pgno_t));
|
|
|
|
*/
|
|
|
|
int __bam_pg_free_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, pgno, meta_lsn, header, next)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
DB_LSN * meta_lsn;
|
|
|
|
DBT *header;
|
|
|
|
db_pgno_t next;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t zero;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_pg_free;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(*meta_lsn)
|
|
|
|
+ sizeof(u_int32_t) + (header == NULL ? 0 : header->size)
|
|
|
|
+ sizeof(next);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
if (meta_lsn != NULL)
|
|
|
|
memcpy(bp, meta_lsn, sizeof(*meta_lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*meta_lsn));
|
|
|
|
bp += sizeof(*meta_lsn);
|
|
|
|
if (header == NULL) {
|
|
|
|
zero = 0;
|
|
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
} else {
|
|
|
|
memcpy(bp, &header->size, sizeof(header->size));
|
|
|
|
bp += sizeof(header->size);
|
|
|
|
memcpy(bp, header->data, header->size);
|
|
|
|
bp += header->size;
|
|
|
|
}
|
|
|
|
memcpy(bp, &next, sizeof(next));
|
|
|
|
bp += sizeof(next);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_free_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_pg_free_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_pg_free_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_pg_free_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_pg_free: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tmeta_lsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->meta_lsn.file, (u_long)argp->meta_lsn.offset);
|
|
|
|
printf("\theader: ");
|
|
|
|
for (i = 0; i < argp->header.size; i++) {
|
|
|
|
c = ((char *)argp->header.data)[i];
|
|
|
|
if (isprint(c) || c == 0xa)
|
|
|
|
putchar(c);
|
|
|
|
else
|
|
|
|
printf("%#x ", c);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
printf("\tnext: %lu\n", (u_long)argp->next);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_pg_free_read __P((void *, __bam_pg_free_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_pg_free_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_pg_free_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_pg_free_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_pg_free_args *)malloc(sizeof(__bam_pg_free_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->meta_lsn, bp, sizeof(argp->meta_lsn));
|
|
|
|
bp += sizeof(argp->meta_lsn);
|
|
|
|
memcpy(&argp->header.size, bp, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
argp->header.data = bp;
|
|
|
|
bp += argp->header.size;
|
|
|
|
memcpy(&argp->next, bp, sizeof(argp->next));
|
|
|
|
bp += sizeof(argp->next);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_split_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t,
|
|
|
|
* PUBLIC: DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *,
|
|
|
|
* PUBLIC: DBT *));
|
|
|
|
*/
|
|
|
|
int __bam_split_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, left, llsn, right, rlsn, indx,
|
|
|
|
npgno, nlsn, pg)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t left;
|
|
|
|
DB_LSN * llsn;
|
|
|
|
db_pgno_t right;
|
|
|
|
DB_LSN * rlsn;
|
|
|
|
u_int32_t indx;
|
|
|
|
db_pgno_t npgno;
|
|
|
|
DB_LSN * nlsn;
|
|
|
|
DBT *pg;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t zero;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_split;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(left)
|
|
|
|
+ sizeof(*llsn)
|
|
|
|
+ sizeof(right)
|
|
|
|
+ sizeof(*rlsn)
|
|
|
|
+ sizeof(indx)
|
|
|
|
+ sizeof(npgno)
|
|
|
|
+ sizeof(*nlsn)
|
|
|
|
+ sizeof(u_int32_t) + (pg == NULL ? 0 : pg->size);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &left, sizeof(left));
|
|
|
|
bp += sizeof(left);
|
|
|
|
if (llsn != NULL)
|
|
|
|
memcpy(bp, llsn, sizeof(*llsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*llsn));
|
|
|
|
bp += sizeof(*llsn);
|
|
|
|
memcpy(bp, &right, sizeof(right));
|
|
|
|
bp += sizeof(right);
|
|
|
|
if (rlsn != NULL)
|
|
|
|
memcpy(bp, rlsn, sizeof(*rlsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*rlsn));
|
|
|
|
bp += sizeof(*rlsn);
|
|
|
|
memcpy(bp, &indx, sizeof(indx));
|
|
|
|
bp += sizeof(indx);
|
|
|
|
memcpy(bp, &npgno, sizeof(npgno));
|
|
|
|
bp += sizeof(npgno);
|
|
|
|
if (nlsn != NULL)
|
|
|
|
memcpy(bp, nlsn, sizeof(*nlsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*nlsn));
|
|
|
|
bp += sizeof(*nlsn);
|
|
|
|
if (pg == NULL) {
|
|
|
|
zero = 0;
|
|
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
} else {
|
|
|
|
memcpy(bp, &pg->size, sizeof(pg->size));
|
|
|
|
bp += sizeof(pg->size);
|
|
|
|
memcpy(bp, pg->data, pg->size);
|
|
|
|
bp += pg->size;
|
|
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_split_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_split_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_split_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_split_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_split: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tleft: %lu\n", (u_long)argp->left);
|
|
|
|
printf("\tllsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->llsn.file, (u_long)argp->llsn.offset);
|
|
|
|
printf("\tright: %lu\n", (u_long)argp->right);
|
|
|
|
printf("\trlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->rlsn.file, (u_long)argp->rlsn.offset);
|
|
|
|
printf("\tindx: %lu\n", (u_long)argp->indx);
|
|
|
|
printf("\tnpgno: %lu\n", (u_long)argp->npgno);
|
|
|
|
printf("\tnlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->nlsn.file, (u_long)argp->nlsn.offset);
|
|
|
|
printf("\tpg: ");
|
|
|
|
for (i = 0; i < argp->pg.size; i++) {
|
|
|
|
c = ((char *)argp->pg.data)[i];
|
|
|
|
if (isprint(c) || c == 0xa)
|
|
|
|
putchar(c);
|
|
|
|
else
|
|
|
|
printf("%#x ", c);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_split_read __P((void *, __bam_split_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_split_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_split_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_split_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_split_args *)malloc(sizeof(__bam_split_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->left, bp, sizeof(argp->left));
|
|
|
|
bp += sizeof(argp->left);
|
|
|
|
memcpy(&argp->llsn, bp, sizeof(argp->llsn));
|
|
|
|
bp += sizeof(argp->llsn);
|
|
|
|
memcpy(&argp->right, bp, sizeof(argp->right));
|
|
|
|
bp += sizeof(argp->right);
|
|
|
|
memcpy(&argp->rlsn, bp, sizeof(argp->rlsn));
|
|
|
|
bp += sizeof(argp->rlsn);
|
|
|
|
memcpy(&argp->indx, bp, sizeof(argp->indx));
|
|
|
|
bp += sizeof(argp->indx);
|
|
|
|
memcpy(&argp->npgno, bp, sizeof(argp->npgno));
|
|
|
|
bp += sizeof(argp->npgno);
|
|
|
|
memcpy(&argp->nlsn, bp, sizeof(argp->nlsn));
|
|
|
|
bp += sizeof(argp->nlsn);
|
|
|
|
memcpy(&argp->pg.size, bp, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
argp->pg.data = bp;
|
|
|
|
bp += argp->pg.size;
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_rsplit_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DBT *, DBT *,
|
|
|
|
* PUBLIC: DB_LSN *));
|
|
|
|
*/
|
|
|
|
int __bam_rsplit_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, pgno, pgdbt, rootent, rootlsn)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
DBT *pgdbt;
|
|
|
|
DBT *rootent;
|
|
|
|
DB_LSN * rootlsn;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t zero;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_rsplit;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(u_int32_t) + (pgdbt == NULL ? 0 : pgdbt->size)
|
|
|
|
+ sizeof(u_int32_t) + (rootent == NULL ? 0 : rootent->size)
|
|
|
|
+ sizeof(*rootlsn);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
if (pgdbt == NULL) {
|
|
|
|
zero = 0;
|
|
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
} else {
|
|
|
|
memcpy(bp, &pgdbt->size, sizeof(pgdbt->size));
|
|
|
|
bp += sizeof(pgdbt->size);
|
|
|
|
memcpy(bp, pgdbt->data, pgdbt->size);
|
|
|
|
bp += pgdbt->size;
|
|
|
|
}
|
|
|
|
if (rootent == NULL) {
|
|
|
|
zero = 0;
|
|
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
} else {
|
|
|
|
memcpy(bp, &rootent->size, sizeof(rootent->size));
|
|
|
|
bp += sizeof(rootent->size);
|
|
|
|
memcpy(bp, rootent->data, rootent->size);
|
|
|
|
bp += rootent->size;
|
|
|
|
}
|
|
|
|
if (rootlsn != NULL)
|
|
|
|
memcpy(bp, rootlsn, sizeof(*rootlsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*rootlsn));
|
|
|
|
bp += sizeof(*rootlsn);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_rsplit_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_rsplit_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_rsplit_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_rsplit_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_rsplit: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tpgdbt: ");
|
|
|
|
for (i = 0; i < argp->pgdbt.size; i++) {
|
|
|
|
c = ((char *)argp->pgdbt.data)[i];
|
|
|
|
if (isprint(c) || c == 0xa)
|
|
|
|
putchar(c);
|
|
|
|
else
|
|
|
|
printf("%#x ", c);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
printf("\trootent: ");
|
|
|
|
for (i = 0; i < argp->rootent.size; i++) {
|
|
|
|
c = ((char *)argp->rootent.data)[i];
|
|
|
|
if (isprint(c) || c == 0xa)
|
|
|
|
putchar(c);
|
|
|
|
else
|
|
|
|
printf("%#x ", c);
|
|
|
|
}
|
|
|
|
printf("\n");
|
|
|
|
printf("\trootlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->rootlsn.file, (u_long)argp->rootlsn.offset);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_rsplit_read __P((void *, __bam_rsplit_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_rsplit_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_rsplit_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_rsplit_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_rsplit_args *)malloc(sizeof(__bam_rsplit_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->pgdbt.size, bp, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
argp->pgdbt.data = bp;
|
|
|
|
bp += argp->pgdbt.size;
|
|
|
|
memcpy(&argp->rootent.size, bp, sizeof(u_int32_t));
|
|
|
|
bp += sizeof(u_int32_t);
|
|
|
|
argp->rootent.data = bp;
|
|
|
|
bp += argp->rootent.size;
|
|
|
|
memcpy(&argp->rootlsn, bp, sizeof(argp->rootlsn));
|
|
|
|
bp += sizeof(argp->rootlsn);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_adj_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, u_int32_t));
|
|
|
|
*/
|
|
|
|
int __bam_adj_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, pgno, lsn, indx, indx_copy, is_insert)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
DB_LSN * lsn;
|
|
|
|
u_int32_t indx;
|
|
|
|
u_int32_t indx_copy;
|
|
|
|
u_int32_t is_insert;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_adj;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(*lsn)
|
|
|
|
+ sizeof(indx)
|
|
|
|
+ sizeof(indx_copy)
|
|
|
|
+ sizeof(is_insert);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
if (lsn != NULL)
|
|
|
|
memcpy(bp, lsn, sizeof(*lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*lsn));
|
|
|
|
bp += sizeof(*lsn);
|
|
|
|
memcpy(bp, &indx, sizeof(indx));
|
|
|
|
bp += sizeof(indx);
|
|
|
|
memcpy(bp, &indx_copy, sizeof(indx_copy));
|
|
|
|
bp += sizeof(indx_copy);
|
|
|
|
memcpy(bp, &is_insert, sizeof(is_insert));
|
|
|
|
bp += sizeof(is_insert);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_adj_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_adj_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_adj_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_adj_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_adj: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->lsn.file, (u_long)argp->lsn.offset);
|
|
|
|
printf("\tindx: %lu\n", (u_long)argp->indx);
|
|
|
|
printf("\tindx_copy: %lu\n", (u_long)argp->indx_copy);
|
|
|
|
printf("\tis_insert: %lu\n", (u_long)argp->is_insert);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_adj_read __P((void *, __bam_adj_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_adj_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_adj_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_adj_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_adj_args *)malloc(sizeof(__bam_adj_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->lsn, bp, sizeof(argp->lsn));
|
|
|
|
bp += sizeof(argp->lsn);
|
|
|
|
memcpy(&argp->indx, bp, sizeof(argp->indx));
|
|
|
|
bp += sizeof(argp->indx);
|
|
|
|
memcpy(&argp->indx_copy, bp, sizeof(argp->indx_copy));
|
|
|
|
bp += sizeof(argp->indx_copy);
|
|
|
|
memcpy(&argp->is_insert, bp, sizeof(argp->is_insert));
|
|
|
|
bp += sizeof(argp->is_insert);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cadjust_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: int32_t, int32_t));
|
|
|
|
*/
|
|
|
|
int __bam_cadjust_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, pgno, lsn, indx, adjust, total)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
DB_LSN * lsn;
|
|
|
|
u_int32_t indx;
|
|
|
|
int32_t adjust;
|
|
|
|
int32_t total;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_cadjust;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(*lsn)
|
|
|
|
+ sizeof(indx)
|
|
|
|
+ sizeof(adjust)
|
|
|
|
+ sizeof(total);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
if (lsn != NULL)
|
|
|
|
memcpy(bp, lsn, sizeof(*lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*lsn));
|
|
|
|
bp += sizeof(*lsn);
|
|
|
|
memcpy(bp, &indx, sizeof(indx));
|
|
|
|
bp += sizeof(indx);
|
|
|
|
memcpy(bp, &adjust, sizeof(adjust));
|
|
|
|
bp += sizeof(adjust);
|
|
|
|
memcpy(bp, &total, sizeof(total));
|
|
|
|
bp += sizeof(total);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cadjust_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_cadjust_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_cadjust_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_cadjust_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_cadjust: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->lsn.file, (u_long)argp->lsn.offset);
|
|
|
|
printf("\tindx: %lu\n", (u_long)argp->indx);
|
|
|
|
printf("\tadjust: %ld\n", (long)argp->adjust);
|
|
|
|
printf("\ttotal: %ld\n", (long)argp->total);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cadjust_read __P((void *, __bam_cadjust_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_cadjust_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_cadjust_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_cadjust_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_cadjust_args *)malloc(sizeof(__bam_cadjust_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->lsn, bp, sizeof(argp->lsn));
|
|
|
|
bp += sizeof(argp->lsn);
|
|
|
|
memcpy(&argp->indx, bp, sizeof(argp->indx));
|
|
|
|
bp += sizeof(argp->indx);
|
|
|
|
memcpy(&argp->adjust, bp, sizeof(argp->adjust));
|
|
|
|
bp += sizeof(argp->adjust);
|
|
|
|
memcpy(&argp->total, bp, sizeof(argp->total));
|
|
|
|
bp += sizeof(argp->total);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cdel_log
|
|
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
|
|
* PUBLIC: u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
|
|
|
|
*/
|
|
|
|
int __bam_cdel_log(logp, txnid, ret_lsnp, flags,
|
|
|
|
fileid, pgno, lsn, indx)
|
|
|
|
DB_LOG *logp;
|
|
|
|
DB_TXN *txnid;
|
|
|
|
DB_LSN *ret_lsnp;
|
|
|
|
u_int32_t flags;
|
|
|
|
u_int32_t fileid;
|
|
|
|
db_pgno_t pgno;
|
|
|
|
DB_LSN * lsn;
|
|
|
|
u_int32_t indx;
|
|
|
|
{
|
|
|
|
DBT logrec;
|
|
|
|
DB_LSN *lsnp, null_lsn;
|
|
|
|
u_int32_t rectype, txn_num;
|
|
|
|
int ret;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
rectype = DB_bam_cdel;
|
|
|
|
txn_num = txnid == NULL ? 0 : txnid->txnid;
|
|
|
|
if (txnid == NULL) {
|
|
|
|
null_lsn.file = 0;
|
|
|
|
null_lsn.offset = 0;
|
|
|
|
lsnp = &null_lsn;
|
|
|
|
} else
|
|
|
|
lsnp = &txnid->last_lsn;
|
|
|
|
logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
|
|
|
|
+ sizeof(fileid)
|
|
|
|
+ sizeof(pgno)
|
|
|
|
+ sizeof(*lsn)
|
|
|
|
+ sizeof(indx);
|
|
|
|
if ((logrec.data = (void *)malloc(logrec.size)) == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
|
|
|
|
bp = logrec.data;
|
|
|
|
memcpy(bp, &rectype, sizeof(rectype));
|
|
|
|
bp += sizeof(rectype);
|
|
|
|
memcpy(bp, &txn_num, sizeof(txn_num));
|
|
|
|
bp += sizeof(txn_num);
|
|
|
|
memcpy(bp, lsnp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(bp, &fileid, sizeof(fileid));
|
|
|
|
bp += sizeof(fileid);
|
|
|
|
memcpy(bp, &pgno, sizeof(pgno));
|
|
|
|
bp += sizeof(pgno);
|
|
|
|
if (lsn != NULL)
|
|
|
|
memcpy(bp, lsn, sizeof(*lsn));
|
|
|
|
else
|
|
|
|
memset(bp, 0, sizeof(*lsn));
|
|
|
|
bp += sizeof(*lsn);
|
|
|
|
memcpy(bp, &indx, sizeof(indx));
|
|
|
|
bp += sizeof(indx);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if ((u_int32_t)(bp - (u_int8_t *)logrec.data) != logrec.size)
|
|
|
|
fprintf(stderr, "Error in log record length");
|
|
|
|
#endif
|
|
|
|
ret = log_put(logp, ret_lsnp, (DBT *)&logrec, flags);
|
|
|
|
if (txnid != NULL)
|
|
|
|
txnid->last_lsn = *ret_lsnp;
|
|
|
|
free(logrec.data);
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cdel_print
|
|
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
__bam_cdel_print(notused1, dbtp, lsnp, notused3, notused4)
|
|
|
|
DB_LOG *notused1;
|
|
|
|
DBT *dbtp;
|
|
|
|
DB_LSN *lsnp;
|
|
|
|
int notused3;
|
|
|
|
void *notused4;
|
|
|
|
{
|
|
|
|
__bam_cdel_args *argp;
|
|
|
|
u_int32_t i;
|
|
|
|
int c, ret;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
c = 0;
|
|
|
|
notused1 = NULL;
|
|
|
|
notused3 = 0;
|
|
|
|
notused4 = NULL;
|
|
|
|
|
Update.
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>.
1997-09-30 17:10:40 +00:00
|
|
|
if ((ret = __bam_cdel_read(dbtp->data, &argp)) != 0)
|
1997-08-27 20:26:10 +00:00
|
|
|
return (ret);
|
|
|
|
printf("[%lu][%lu]bam_cdel: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
|
|
|
|
(u_long)lsnp->file,
|
|
|
|
(u_long)lsnp->offset,
|
|
|
|
(u_long)argp->type,
|
|
|
|
(u_long)argp->txnid->txnid,
|
|
|
|
(u_long)argp->prev_lsn.file,
|
|
|
|
(u_long)argp->prev_lsn.offset);
|
|
|
|
printf("\tfileid: %lu\n", (u_long)argp->fileid);
|
|
|
|
printf("\tpgno: %lu\n", (u_long)argp->pgno);
|
|
|
|
printf("\tlsn: [%lu][%lu]\n",
|
|
|
|
(u_long)argp->lsn.file, (u_long)argp->lsn.offset);
|
|
|
|
printf("\tindx: %lu\n", (u_long)argp->indx);
|
|
|
|
printf("\n");
|
|
|
|
free(argp);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_cdel_read __P((void *, __bam_cdel_args **));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_cdel_read(recbuf, argpp)
|
|
|
|
void *recbuf;
|
|
|
|
__bam_cdel_args **argpp;
|
|
|
|
{
|
|
|
|
__bam_cdel_args *argp;
|
|
|
|
u_int8_t *bp;
|
|
|
|
|
|
|
|
argp = (__bam_cdel_args *)malloc(sizeof(__bam_cdel_args) +
|
|
|
|
sizeof(DB_TXN));
|
|
|
|
if (argp == NULL)
|
|
|
|
return (ENOMEM);
|
|
|
|
argp->txnid = (DB_TXN *)&argp[1];
|
|
|
|
bp = recbuf;
|
|
|
|
memcpy(&argp->type, bp, sizeof(argp->type));
|
|
|
|
bp += sizeof(argp->type);
|
|
|
|
memcpy(&argp->txnid->txnid, bp, sizeof(argp->txnid->txnid));
|
|
|
|
bp += sizeof(argp->txnid->txnid);
|
|
|
|
memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
|
|
|
|
bp += sizeof(DB_LSN);
|
|
|
|
memcpy(&argp->fileid, bp, sizeof(argp->fileid));
|
|
|
|
bp += sizeof(argp->fileid);
|
|
|
|
memcpy(&argp->pgno, bp, sizeof(argp->pgno));
|
|
|
|
bp += sizeof(argp->pgno);
|
|
|
|
memcpy(&argp->lsn, bp, sizeof(argp->lsn));
|
|
|
|
bp += sizeof(argp->lsn);
|
|
|
|
memcpy(&argp->indx, bp, sizeof(argp->indx));
|
|
|
|
bp += sizeof(argp->indx);
|
|
|
|
*argpp = argp;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_init_print __P((DB_ENV *));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_init_print(dbenv)
|
|
|
|
DB_ENV *dbenv;
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_pg_alloc_print, DB_bam_pg_alloc)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_pg_free_print, DB_bam_pg_free)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_split_print, DB_bam_split)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_rsplit_print, DB_bam_rsplit)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_adj_print, DB_bam_adj)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_cadjust_print, DB_bam_cadjust)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_cdel_print, DB_bam_cdel)) != 0)
|
|
|
|
return (ret);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PUBLIC: int __bam_init_recover __P((DB_ENV *));
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
__bam_init_recover(dbenv)
|
|
|
|
DB_ENV *dbenv;
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_pg_alloc_recover, DB_bam_pg_alloc)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_pg_free_recover, DB_bam_pg_free)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_split_recover, DB_bam_split)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_rsplit_recover, DB_bam_rsplit)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_adj_recover, DB_bam_adj)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_cadjust_recover, DB_bam_cadjust)) != 0)
|
|
|
|
return (ret);
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
|
|
__bam_cdel_recover, DB_bam_cdel)) != 0)
|
|
|
|
return (ret);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|