diff options
| author | jbj <devnull@localhost> | 2001-05-13 20:03:09 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-05-13 20:03:09 +0000 |
| commit | a9184b73ecb9bcb5dedb503529a0696cdb5b008a (patch) | |
| tree | 70e1bda1e22569553edaa5a685c8ff75dc85e926 /db/include | |
| parent | 2af040895b279eca8fb5a44240da7e42c8b4ac66 (diff) | |
| download | librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.tar.gz librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.tar.bz2 librpm-tizen-a9184b73ecb9bcb5dedb503529a0696cdb5b008a.zip | |
Resolve conflicts.
CVS patchset: 4783
CVS date: 2001/05/13 20:03:09
Diffstat (limited to 'db/include')
| -rw-r--r-- | db/include/log.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/db/include/log.h b/db/include/log.h index 09465aebd..7c8dd03e7 100644 --- a/db/include/log.h +++ b/db/include/log.h @@ -1,10 +1,10 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997, 1998, 1999, 2000 + * Copyright (c) 1996-2001 * Sleepycat Software. All rights reserved. * - * $Id: log.h,v 11.19 2001/01/11 18:19:52 bostic Exp $ + * Id: log.h,v 11.25 2001/04/25 19:06:39 margo Exp */ #ifndef _LOG_H_ @@ -79,17 +79,6 @@ struct __db_log { DB_ENV *dbenv; /* Reference to error information. */ REGINFO reginfo; /* Region information. */ -/* - * These fields are used by XA; since XA forbids threaded execution, these - * do not have to be protected. - */ - void *xa_info; /* Committed transaction list that - * has to be carried between calls - * to xa_recover. */ - DB_LSN xa_lsn; /* Position of an XA recovery scan. */ - DB_LSN xa_first; /* LSN to which we need to roll back - for this XA recovery scan. */ - #define DBLOG_RECOVER 0x01 /* We are in recovery. */ #define DBLOG_FORCE_OPEN 0x02 /* Force the db open even * if it appears to be deleted. @@ -157,6 +146,12 @@ struct __log { roff_t buffer_off; /* Log buffer offset. */ u_int32_t buffer_size; /* Log buffer size. */ + +#ifdef MUTEX_SYSTEM_RESOURCES +#define LG_MAINT_SIZE (sizeof(roff_t) * DB_MAX_HANDLES) + + roff_t maint_off; /* offset of region maintenance info */ +#endif }; /* @@ -181,6 +176,7 @@ struct __fname { #define LOG_CHECKPOINT 1 /* Checkpoint: file name/id dump. */ #define LOG_CLOSE 2 /* File close. */ #define LOG_OPEN 3 /* File open. */ +#define LOG_RCLOSE 4 /* File close after recovery. */ #define CHECK_LSN(redo, cmp, lsn, prev) \ DB_ASSERT(!DB_REDO(redo) || (cmp) >= 0); \ |