mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 19:40:06 +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.
197 lines
4.4 KiB
C
197 lines
4.4 KiB
C
/*-
|
|
* See the file LICENSE for redistribution information.
|
|
*
|
|
* Copyright (c) 1996, 1997, 1998
|
|
* Sleepycat Software. All rights reserved.
|
|
*/
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "@(#)log_register.c 10.18 (Sleepycat) 5/3/98";
|
|
#endif /* not lint */
|
|
|
|
#ifndef NO_SYSTEM_INCLUDES
|
|
#include <sys/types.h>
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "db_int.h"
|
|
#include "shqueue.h"
|
|
#include "log.h"
|
|
#include "common_ext.h"
|
|
|
|
/*
|
|
* log_register --
|
|
* Register a file name.
|
|
*/
|
|
int
|
|
log_register(dblp, dbp, name, type, idp)
|
|
DB_LOG *dblp;
|
|
DB *dbp;
|
|
const char *name;
|
|
DBTYPE type;
|
|
u_int32_t *idp;
|
|
{
|
|
DBT fid_dbt, r_name;
|
|
DB_LSN r_unused;
|
|
FNAME *fnp;
|
|
size_t len;
|
|
u_int32_t fid;
|
|
int inserted, ret;
|
|
char *fullname;
|
|
void *namep;
|
|
|
|
fid = 0;
|
|
inserted = 0;
|
|
fullname = NULL;
|
|
fnp = namep = NULL;
|
|
|
|
/* Check the arguments. */
|
|
if (type != DB_BTREE && type != DB_HASH && type != DB_RECNO) {
|
|
__db_err(dblp->dbenv, "log_register: unknown DB file type");
|
|
return (EINVAL);
|
|
}
|
|
|
|
/* Get the log file id. */
|
|
if ((ret = __db_appname(dblp->dbenv,
|
|
DB_APP_DATA, NULL, name, 0, NULL, &fullname)) != 0)
|
|
return (ret);
|
|
|
|
LOCK_LOGREGION(dblp);
|
|
|
|
/*
|
|
* See if we've already got this file in the log, finding the
|
|
* next-to-lowest file id currently in use as we do it.
|
|
*/
|
|
for (fid = 1, fnp = SH_TAILQ_FIRST(&dblp->lp->fq, __fname);
|
|
fnp != NULL; fnp = SH_TAILQ_NEXT(fnp, q, __fname)) {
|
|
if (fid <= fnp->id)
|
|
fid = fnp->id + 1;
|
|
if (!memcmp(dbp->lock.fileid, fnp->ufid, DB_FILE_ID_LEN)) {
|
|
++fnp->ref;
|
|
fid = fnp->id;
|
|
goto found;
|
|
}
|
|
}
|
|
|
|
/* Allocate a new file name structure. */
|
|
if ((ret = __db_shalloc(dblp->addr, sizeof(FNAME), 0, &fnp)) != 0)
|
|
goto err;
|
|
fnp->ref = 1;
|
|
fnp->id = fid;
|
|
fnp->s_type = type;
|
|
memcpy(fnp->ufid, dbp->lock.fileid, DB_FILE_ID_LEN);
|
|
|
|
len = strlen(name) + 1;
|
|
if ((ret = __db_shalloc(dblp->addr, len, 0, &namep)) != 0)
|
|
goto err;
|
|
fnp->name_off = R_OFFSET(dblp, namep);
|
|
memcpy(namep, name, len);
|
|
|
|
SH_TAILQ_INSERT_HEAD(&dblp->lp->fq, fnp, q, __fname);
|
|
inserted = 1;
|
|
|
|
found: /* Log the registry. */
|
|
if (!F_ISSET(dblp, DB_AM_RECOVER)) {
|
|
r_name.data = (void *)name; /* XXX: Yuck! */
|
|
r_name.size = strlen(name) + 1;
|
|
memset(&fid_dbt, 0, sizeof(fid_dbt));
|
|
fid_dbt.data = dbp->lock.fileid;
|
|
fid_dbt.size = DB_FILE_ID_LEN;
|
|
if ((ret = __log_register_log(dblp, NULL, &r_unused,
|
|
0, LOG_OPEN, &r_name, &fid_dbt, fid, type)) != 0)
|
|
goto err;
|
|
if ((ret = __log_add_logid(dblp, dbp, fid)) != 0)
|
|
goto err;
|
|
}
|
|
|
|
if (0) {
|
|
err: /*
|
|
* XXX
|
|
* We should grow the region.
|
|
*/
|
|
if (inserted)
|
|
SH_TAILQ_REMOVE(&dblp->lp->fq, fnp, q, __fname);
|
|
if (namep != NULL)
|
|
__db_shalloc_free(dblp->addr, namep);
|
|
if (fnp != NULL)
|
|
__db_shalloc_free(dblp->addr, fnp);
|
|
}
|
|
|
|
UNLOCK_LOGREGION(dblp);
|
|
|
|
if (fullname != NULL)
|
|
FREES(fullname);
|
|
|
|
if (idp != NULL)
|
|
*idp = fid;
|
|
return (ret);
|
|
}
|
|
|
|
/*
|
|
* log_unregister --
|
|
* Discard a registered file name.
|
|
*/
|
|
int
|
|
log_unregister(dblp, fid)
|
|
DB_LOG *dblp;
|
|
u_int32_t fid;
|
|
{
|
|
DBT fid_dbt, r_name;
|
|
DB_LSN r_unused;
|
|
FNAME *fnp;
|
|
int ret;
|
|
|
|
ret = 0;
|
|
LOCK_LOGREGION(dblp);
|
|
|
|
/* Find the entry in the log. */
|
|
for (fnp = SH_TAILQ_FIRST(&dblp->lp->fq, __fname);
|
|
fnp != NULL; fnp = SH_TAILQ_NEXT(fnp, q, __fname))
|
|
if (fid == fnp->id)
|
|
break;
|
|
if (fnp == NULL) {
|
|
__db_err(dblp->dbenv, "log_unregister: non-existent file id");
|
|
ret = EINVAL;
|
|
goto ret1;
|
|
}
|
|
|
|
/* Unlog the registry. */
|
|
if (!F_ISSET(dblp, DB_AM_RECOVER)) {
|
|
memset(&r_name, 0, sizeof(r_name));
|
|
r_name.data = R_ADDR(dblp, fnp->name_off);
|
|
r_name.size = strlen(r_name.data) + 1;
|
|
memset(&fid_dbt, 0, sizeof(fid_dbt));
|
|
fid_dbt.data = fnp->ufid;
|
|
fid_dbt.size = DB_FILE_ID_LEN;
|
|
if ((ret = __log_register_log(dblp, NULL, &r_unused,
|
|
0, LOG_CLOSE, &r_name, &fid_dbt, fid, fnp->s_type)) != 0)
|
|
goto ret1;
|
|
}
|
|
|
|
/*
|
|
* If more than 1 reference, just decrement the reference and return.
|
|
* Otherwise, free the unique file information, name and structure.
|
|
*/
|
|
if (fnp->ref > 1)
|
|
--fnp->ref;
|
|
else {
|
|
__db_shalloc_free(dblp->addr, R_ADDR(dblp, fnp->name_off));
|
|
SH_TAILQ_REMOVE(&dblp->lp->fq, fnp, q, __fname);
|
|
__db_shalloc_free(dblp->addr, fnp);
|
|
}
|
|
|
|
/*
|
|
* Remove from the process local table. If this operation is taking
|
|
* place during recovery, then the logid was never added to the table,
|
|
* so do not remove it.
|
|
*/
|
|
if (!F_ISSET(dblp, DB_AM_RECOVER))
|
|
__log_rem_logid(dblp, fid);
|
|
|
|
ret1: UNLOCK_LOGREGION(dblp);
|
|
return (ret);
|
|
}
|