mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 16:50:07 +00:00
bf7997b65c
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
233 lines
5.3 KiB
C
233 lines
5.3 KiB
C
/* 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 "log.h"
|
|
#include "db_am.h"
|
|
/*
|
|
* PUBLIC: int __log_register_log
|
|
* PUBLIC: __P((DB_LOG *, DB_TXN *, DB_LSN *, u_int32_t,
|
|
* PUBLIC: u_int32_t, const DBT *, const DBT *, u_int32_t,
|
|
* PUBLIC: DBTYPE));
|
|
*/
|
|
int __log_register_log(logp, txnid, ret_lsnp, flags,
|
|
opcode, name, uid, id, ftype)
|
|
DB_LOG *logp;
|
|
DB_TXN *txnid;
|
|
DB_LSN *ret_lsnp;
|
|
u_int32_t flags;
|
|
u_int32_t opcode;
|
|
const DBT *name;
|
|
const DBT *uid;
|
|
u_int32_t id;
|
|
DBTYPE ftype;
|
|
{
|
|
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_log_register;
|
|
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(opcode)
|
|
+ sizeof(u_int32_t) + (name == NULL ? 0 : name->size)
|
|
+ sizeof(u_int32_t) + (uid == NULL ? 0 : uid->size)
|
|
+ sizeof(id)
|
|
+ sizeof(ftype);
|
|
if ((logrec.data = (void *)__db_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, &opcode, sizeof(opcode));
|
|
bp += sizeof(opcode);
|
|
if (name == NULL) {
|
|
zero = 0;
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
bp += sizeof(u_int32_t);
|
|
} else {
|
|
memcpy(bp, &name->size, sizeof(name->size));
|
|
bp += sizeof(name->size);
|
|
memcpy(bp, name->data, name->size);
|
|
bp += name->size;
|
|
}
|
|
if (uid == NULL) {
|
|
zero = 0;
|
|
memcpy(bp, &zero, sizeof(u_int32_t));
|
|
bp += sizeof(u_int32_t);
|
|
} else {
|
|
memcpy(bp, &uid->size, sizeof(uid->size));
|
|
bp += sizeof(uid->size);
|
|
memcpy(bp, uid->data, uid->size);
|
|
bp += uid->size;
|
|
}
|
|
memcpy(bp, &id, sizeof(id));
|
|
bp += sizeof(id);
|
|
memcpy(bp, &ftype, sizeof(ftype));
|
|
bp += sizeof(ftype);
|
|
#ifdef DIAGNOSTIC
|
|
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;
|
|
__db_free(logrec.data);
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* PUBLIC: int __log_register_print
|
|
* PUBLIC: __P((DB_LOG *, DBT *, DB_LSN *, int, void *));
|
|
*/
|
|
int
|
|
__log_register_print(notused1, dbtp, lsnp, notused2, notused3)
|
|
DB_LOG *notused1;
|
|
DBT *dbtp;
|
|
DB_LSN *lsnp;
|
|
int notused2;
|
|
void *notused3;
|
|
{
|
|
__log_register_args *argp;
|
|
u_int32_t i;
|
|
u_int ch;
|
|
int ret;
|
|
|
|
i = 0;
|
|
ch = 0;
|
|
notused1 = NULL;
|
|
notused2 = 0;
|
|
notused3 = NULL;
|
|
|
|
if ((ret = __log_register_read(dbtp->data, &argp)) != 0)
|
|
return (ret);
|
|
printf("[%lu][%lu]log_register: 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("\topcode: %lu\n", (u_long)argp->opcode);
|
|
printf("\tname: ");
|
|
for (i = 0; i < argp->name.size; i++) {
|
|
ch = ((u_int8_t *)argp->name.data)[i];
|
|
if (isprint(ch) || ch == 0xa)
|
|
putchar(ch);
|
|
else
|
|
printf("%#x ", ch);
|
|
}
|
|
printf("\n");
|
|
printf("\tuid: ");
|
|
for (i = 0; i < argp->uid.size; i++) {
|
|
ch = ((u_int8_t *)argp->uid.data)[i];
|
|
if (isprint(ch) || ch == 0xa)
|
|
putchar(ch);
|
|
else
|
|
printf("%#x ", ch);
|
|
}
|
|
printf("\n");
|
|
printf("\tid: %lu\n", (u_long)argp->id);
|
|
printf("\tftype: 0x%lx\n", (u_long)argp->ftype);
|
|
printf("\n");
|
|
__db_free(argp);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* PUBLIC: int __log_register_read __P((void *, __log_register_args **));
|
|
*/
|
|
int
|
|
__log_register_read(recbuf, argpp)
|
|
void *recbuf;
|
|
__log_register_args **argpp;
|
|
{
|
|
__log_register_args *argp;
|
|
u_int8_t *bp;
|
|
|
|
argp = (__log_register_args *)__db_malloc(sizeof(__log_register_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->opcode, bp, sizeof(argp->opcode));
|
|
bp += sizeof(argp->opcode);
|
|
memcpy(&argp->name.size, bp, sizeof(u_int32_t));
|
|
bp += sizeof(u_int32_t);
|
|
argp->name.data = bp;
|
|
bp += argp->name.size;
|
|
memcpy(&argp->uid.size, bp, sizeof(u_int32_t));
|
|
bp += sizeof(u_int32_t);
|
|
argp->uid.data = bp;
|
|
bp += argp->uid.size;
|
|
memcpy(&argp->id, bp, sizeof(argp->id));
|
|
bp += sizeof(argp->id);
|
|
memcpy(&argp->ftype, bp, sizeof(argp->ftype));
|
|
bp += sizeof(argp->ftype);
|
|
*argpp = argp;
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* PUBLIC: int __log_init_print __P((DB_ENV *));
|
|
*/
|
|
int
|
|
__log_init_print(dbenv)
|
|
DB_ENV *dbenv;
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
__log_register_print, DB_log_register)) != 0)
|
|
return (ret);
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* PUBLIC: int __log_init_recover __P((DB_ENV *));
|
|
*/
|
|
int
|
|
__log_init_recover(dbenv)
|
|
DB_ENV *dbenv;
|
|
{
|
|
int ret;
|
|
|
|
if ((ret = __db_add_recovery(dbenv,
|
|
__log_register_recover, DB_log_register)) != 0)
|
|
return (ret);
|
|
return (0);
|
|
}
|
|
|