diff options
Diffstat (limited to 'db/txn/txn.src')
| -rw-r--r-- | db/txn/txn.src | 86 |
1 files changed, 39 insertions, 47 deletions
diff --git a/db/txn/txn.src b/db/txn/txn.src index b1e131c2b..11afb4004 100644 --- a/db/txn/txn.src +++ b/db/txn/txn.src @@ -1,39 +1,45 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 1997, 1998, 1999, 2000 + * Copyright (c) 1996-2003 * Sleepycat Software. All rights reserved. * - * $Id: txn.src,v 11.10 2001/01/02 00:58:33 margo Exp $ + * $Id: txn.src,v 11.24 2003/11/14 05:32:33 ubell Exp $ */ -PREFIX txn +PREFIX __txn +DBPRIVATE INCLUDE #include "db_config.h" INCLUDE INCLUDE #ifndef NO_SYSTEM_INCLUDES INCLUDE #include <sys/types.h> INCLUDE +INCLUDE #if TIME_WITH_SYS_TIME +INCLUDE #include <sys/time.h> +INCLUDE #include <time.h> +INCLUDE #else +INCLUDE #if HAVE_SYS_TIME_H +INCLUDE #include <sys/time.h> +INCLUDE #else +INCLUDE #include <time.h> +INCLUDE #endif /* HAVE_SYS_TIME_H */ +INCLUDE #endif /* TIME_WITH SYS_TIME */ +INCLUDE INCLUDE #include <ctype.h> -INCLUDE #include <errno.h> INCLUDE #include <string.h> INCLUDE #endif INCLUDE INCLUDE #include "db_int.h" -INCLUDE #include "db_page.h" -INCLUDE #include "db_dispatch.h" -INCLUDE #include "db_am.h" -INCLUDE #include "txn.h" +INCLUDE #include "dbinc/crypto.h" +INCLUDE #include "dbinc/db_page.h" +INCLUDE #include "dbinc/db_dispatch.h" +INCLUDE #include "dbinc/db_am.h" +INCLUDE #include "dbinc/log.h" +INCLUDE #include "dbinc/txn.h" INCLUDE /* - * DEPRECATED in 3.1 to add timestamps. - */ -DEPRECATED old_regop 6 -ARG opcode u_int32_t lu -END - -/* * This is the standard log operation for commit. * Note that we are using an int32_t for the timestamp. This means that * in 2039 we will need to deprecate this log record and create one that @@ -41,12 +47,8 @@ END */ BEGIN regop 10 ARG opcode u_int32_t lu -ARG timestamp int32_t ld -END - -DEPRECATED old_ckp 7 -POINTER ckp_lsn DB_LSN * lu -POINTER last_ckp DB_LSN * lu +TIME timestamp int32_t ld +DBT locks DBT s END /* @@ -66,24 +68,24 @@ END BEGIN ckp 11 POINTER ckp_lsn DB_LSN * lu POINTER last_ckp DB_LSN * lu -ARG timestamp int32_t ld +TIME timestamp int32_t ld +ARG rep_gen u_int32_t ld END /* - * This is the standard log operation for prepare (since right now - * we only use prepare in an XA environment). + * This is the (new) log operation for a child commit. It is + * logged as a record in the PARENT. The child field contains + * the transaction ID of the child committing and the c_lsn is + * the last LSN of the child's log trail. */ -DEPRECATED xa_regop_old 8 -ARG opcode u_int32_t lu -DBT xid DBT s -ARG formatID int32_t ld -ARG gtrid u_int32_t u -ARG bqual u_int32_t u +BEGIN child 12 +ARG child u_int32_t lx +POINTER c_lsn DB_LSN * lu END + /* - * This is the standard log operation for prepare (since right now - * we only use prepare in an XA environment). + * This is the standard log operation for prepare. */ BEGIN xa_regop 13 ARG opcode u_int32_t lu @@ -92,23 +94,13 @@ ARG formatID int32_t ld ARG gtrid u_int32_t u ARG bqual u_int32_t u POINTER begin_lsn DB_LSN * lu +DBT locks DBT s END /* - * This is the log operation for a child commit. - */ -DEPRECATED child_old 9 -ARG opcode u_int32_t lu -ARG parent u_int32_t lx -END - -/* - * This is the (new) log operation for a child commit. It is - * logged as a record in the PARENT. The child field contains - * the transaction ID of the child committing and the c_lsn is - * the last LSN of the child's log trail. + * Log the fact that we are recycling txnids. */ -BEGIN child 12 -ARG child u_int32_t lx -POINTER c_lsn DB_LSN * lu +BEGIN recycle 14 +ARG min u_int32_t u +ARG max u_int32_t u END |