diff options
Diffstat (limited to 'src/dbinc_auto')
26 files changed, 946 insertions, 118 deletions
diff --git a/src/dbinc_auto/api_flags.in b/src/dbinc_auto/api_flags.in index 9727ede2..a10b6b62 100644 --- a/src/dbinc_auto/api_flags.in +++ b/src/dbinc_auto/api_flags.in @@ -36,6 +36,7 @@ #define DB_FLUSH 0x00000002 #define DB_FORCE 0x00000001 #define DB_FORCESYNC 0x00000001 +#define DB_FORCESYNCENV 0x00000002 #define DB_FOREIGN_ABORT 0x00000001 #define DB_FOREIGN_CASCADE 0x00000002 #define DB_FOREIGN_NULLIFY 0x00000004 @@ -53,8 +54,9 @@ #define DB_INIT_REP 0x00001000 #define DB_INIT_TXN 0x00002000 #define DB_INORDER 0x00000020 -#define DB_INTERNAL_PERSISTENT_DB 0x00001000 -#define DB_INTERNAL_TEMPORARY_DB 0x00002000 +#define DB_INTERNAL_BLOB_DB 0x00001000 +#define DB_INTERNAL_PERSISTENT_DB 0x00002000 +#define DB_INTERNAL_TEMPORARY_DB 0x00004000 #define DB_JOIN_NOSORT 0x00000001 #define DB_LEGACY 0x00000004 #define DB_LOCAL_SITE 0x00000008 @@ -67,12 +69,14 @@ #define DB_LOCK_SWITCH 0x00000020 #define DB_LOCK_UPGRADE 0x00000040 #define DB_LOG_AUTO_REMOVE 0x00000001 +#define DB_LOG_BLOB 0x00000002 #define DB_LOG_CHKPNT 0x00000001 #define DB_LOG_COMMIT 0x00000004 -#define DB_LOG_DIRECT 0x00000002 -#define DB_LOG_DSYNC 0x00000004 -#define DB_LOG_IN_MEMORY 0x00000008 +#define DB_LOG_DIRECT 0x00000004 +#define DB_LOG_DSYNC 0x00000008 +#define DB_LOG_IN_MEMORY 0x00000010 #define DB_LOG_NOCOPY 0x00000008 +#define DB_LOG_NOSYNC 0x00000020 #define DB_LOG_NOT_DURABLE 0x00000010 #define DB_LOG_NO_DATA 0x00000002 #define DB_LOG_VERIFY_CAF 0x00000001 @@ -84,7 +88,7 @@ #define DB_LOG_VERIFY_VERBOSE 0x00000040 #define DB_LOG_VERIFY_WARNING 0x00000080 #define DB_LOG_WRNOSYNC 0x00000020 -#define DB_LOG_ZERO 0x00000010 +#define DB_LOG_ZERO 0x00000040 #define DB_MPOOL_CREATE 0x00000001 #define DB_MPOOL_DIRTY 0x00000002 #define DB_MPOOL_DISCARD 0x00000001 @@ -102,17 +106,18 @@ #define DB_MUTEX_ALLOCATED 0x00000001 #define DB_MUTEX_LOCKED 0x00000002 #define DB_MUTEX_LOGICAL_LOCK 0x00000004 +#define DB_MUTEX_OWNER_DEAD 0x00000020 #define DB_MUTEX_PROCESS_ONLY 0x00000008 #define DB_MUTEX_SELF_BLOCK 0x00000010 -#define DB_MUTEX_SHARED 0x00000020 -#define DB_NOERROR 0x00004000 +#define DB_MUTEX_SHARED 0x00000040 +#define DB_NOERROR 0x00008000 #define DB_NOFLUSH 0x00001000 #define DB_NOLOCKING 0x00002000 #define DB_NOMMAP 0x00000010 #define DB_NOORDERCHK 0x00000002 #define DB_NOPANIC 0x00004000 #define DB_NOSYNC 0x00000001 -#define DB_NO_AUTO_COMMIT 0x00008000 +#define DB_NO_AUTO_COMMIT 0x00010000 #define DB_NO_CHECKPOINT 0x00008000 #define DB_ODDFILESIZE 0x00000080 #define DB_ORDERCHKONLY 0x00000004 @@ -123,7 +128,7 @@ #define DB_PR_PAGE 0x00000010 #define DB_PR_RECOVERYTEST 0x00000020 #define DB_RDONLY 0x00000400 -#define DB_RDWRMASTER 0x00010000 +#define DB_RDWRMASTER 0x00020000 #define DB_READ_COMMITTED 0x00000400 #define DB_READ_UNCOMMITTED 0x00000200 #define DB_RECNUM 0x00000040 @@ -134,17 +139,20 @@ #define DB_RENUMBER 0x00000080 #define DB_REPMGR_CONF_2SITE_STRICT 0x00000001 #define DB_REPMGR_CONF_ELECTIONS 0x00000002 +#define DB_REPMGR_CONF_PREFMAS_CLIENT 0x00000004 +#define DB_REPMGR_CONF_PREFMAS_MASTER 0x00000008 #define DB_REPMGR_NEED_RESPONSE 0x00000001 #define DB_REPMGR_PEER 0x00000010 #define DB_REP_ANYWHERE 0x00000001 #define DB_REP_CLIENT 0x00000001 -#define DB_REP_CONF_AUTOINIT 0x00000004 -#define DB_REP_CONF_AUTOROLLBACK 0x00000008 -#define DB_REP_CONF_BULK 0x00000010 -#define DB_REP_CONF_DELAYCLIENT 0x00000020 -#define DB_REP_CONF_INMEM 0x00000040 -#define DB_REP_CONF_LEASE 0x00000080 -#define DB_REP_CONF_NOWAIT 0x00000100 +#define DB_REP_CONF_AUTOINIT 0x00000010 +#define DB_REP_CONF_AUTOROLLBACK 0x00000020 +#define DB_REP_CONF_BULK 0x00000040 +#define DB_REP_CONF_DELAYCLIENT 0x00000080 +#define DB_REP_CONF_ELECT_LOGLENGTH 0x00000100 +#define DB_REP_CONF_INMEM 0x00000200 +#define DB_REP_CONF_LEASE 0x00000400 +#define DB_REP_CONF_NOWAIT 0x00000800 #define DB_REP_ELECTION 0x00000004 #define DB_REP_MASTER 0x00000002 #define DB_REP_NOBUFFER 0x00000002 @@ -161,8 +169,9 @@ #define DB_SEQ_WRAP 0x00000008 #define DB_SEQ_WRAPPED 0x00000010 #define DB_SET_LOCK_TIMEOUT 0x00000001 -#define DB_SET_REG_TIMEOUT 0x00000004 -#define DB_SET_TXN_NOW 0x00000008 +#define DB_SET_MUTEX_FAILCHK_TIMEOUT 0x00000004 +#define DB_SET_REG_TIMEOUT 0x00000008 +#define DB_SET_TXN_NOW 0x00000010 #define DB_SET_TXN_TIMEOUT 0x00000002 #define DB_SHALLOW_DUP 0x00000100 #define DB_SNAPSHOT 0x00000200 @@ -188,7 +197,7 @@ #define DB_SYSTEM_MEM 0x00080000 #define DB_THREAD 0x00000020 #define DB_TIME_NOTGRANTED 0x00040000 -#define DB_TRUNCATE 0x00020000 +#define DB_TRUNCATE 0x00040000 #define DB_TXN_BULK 0x00000010 #define DB_TXN_FAMILY 0x00000040 #define DB_TXN_NOSYNC 0x00000001 @@ -206,23 +215,24 @@ #define DB_VERB_DEADLOCK 0x00000002 #define DB_VERB_FILEOPS 0x00000004 #define DB_VERB_FILEOPS_ALL 0x00000008 -#define DB_VERB_RECOVERY 0x00000010 -#define DB_VERB_REGISTER 0x00000020 -#define DB_VERB_REPLICATION 0x00000040 -#define DB_VERB_REPMGR_CONNFAIL 0x00000080 -#define DB_VERB_REPMGR_MISC 0x00000100 -#define DB_VERB_REP_ELECT 0x00000200 -#define DB_VERB_REP_LEASE 0x00000400 -#define DB_VERB_REP_MISC 0x00000800 -#define DB_VERB_REP_MSGS 0x00001000 -#define DB_VERB_REP_SYNC 0x00002000 -#define DB_VERB_REP_SYSTEM 0x00004000 -#define DB_VERB_REP_TEST 0x00008000 -#define DB_VERB_WAITSFOR 0x00010000 +#define DB_VERB_MVCC 0x00000010 +#define DB_VERB_RECOVERY 0x00000020 +#define DB_VERB_REGISTER 0x00000040 +#define DB_VERB_REPLICATION 0x00000080 +#define DB_VERB_REPMGR_CONNFAIL 0x00000100 +#define DB_VERB_REPMGR_MISC 0x00000200 +#define DB_VERB_REP_ELECT 0x00000400 +#define DB_VERB_REP_LEASE 0x00000800 +#define DB_VERB_REP_MISC 0x00001000 +#define DB_VERB_REP_MSGS 0x00002000 +#define DB_VERB_REP_SYNC 0x00004000 +#define DB_VERB_REP_SYSTEM 0x00008000 +#define DB_VERB_REP_TEST 0x00010000 +#define DB_VERB_WAITSFOR 0x00020000 #define DB_VERIFY 0x00000002 #define DB_VERIFY_PARTITION 0x00040000 #define DB_WRITECURSOR 0x00000010 #define DB_WRITELOCK 0x00000020 -#define DB_WRITEOPEN 0x00040000 +#define DB_WRITEOPEN 0x00080000 #define DB_XA_CREATE 0x00000001 #define DB_YIELDCPU 0x00080000 diff --git a/src/dbinc_auto/blob_ext.h b/src/dbinc_auto/blob_ext.h new file mode 100644 index 00000000..3eac5c8d --- /dev/null +++ b/src/dbinc_auto/blob_ext.h @@ -0,0 +1,41 @@ +/* DO NOT EDIT: automatically built by dist/s_include. */ +#ifndef _blob_ext_h_ +#define _blob_ext_h_ + +#if defined(__cplusplus) +extern "C" { +#endif + +int __blob_file_create __P ((DBC *, DB_FH **, db_seq_t *)); +int __blob_file_close __P ((DBC *, DB_FH *, u_int32_t)); +int __blob_file_delete __P((DBC *, db_seq_t)); +int __blob_file_open __P((DB *, DB_FH **, db_seq_t, u_int32_t, int)); +int __blob_file_read __P((ENV *, DB_FH *, DBT *, off_t, u_int32_t)); +int __blob_file_write __P((DBC *, DB_FH *, DBT *, off_t, db_seq_t, off_t *, u_int32_t)); +int __blob_bulk __P((DBC *, u_int32_t, db_seq_t, u_int8_t *)); +int __blob_get __P((DBC *, DBT *, db_seq_t, off_t, void **, u_int32_t *)); +int __blob_put __P(( DBC *, DBT *, db_seq_t *, off_t *size, DB_LSN *)); +int __blob_repl __P((DBC *, DBT *, db_seq_t, db_seq_t *,off_t *)); +int __blob_del __P((DBC *, db_seq_t)); +int __db_stream_init __P((DBC *, DB_STREAM **, u_int32_t)); +int __db_stream_close_int __P ((DB_STREAM *)); +int __blob_make_sub_dir __P((ENV *, char **, db_seq_t, db_seq_t)); +int __blob_make_meta_fname __P((ENV *, DB *, char **)); +int __blob_get_dir __P((DB *, char **)); +int __blob_generate_dir_ids __P((DB *, DB_TXN *, db_seq_t *)); +int __blob_generate_id __P((DB *, DB_TXN *, db_seq_t *)); +int __blob_highest_id __P((DB *, DB_TXN *, db_seq_t *)); +void __blob_calculate_dirs __P((db_seq_t, char *, int *, int *)); +int __blob_id_to_path __P((ENV *, const char *, db_seq_t, char **)); +int __blob_str_to_id __P((ENV *, const char **, db_seq_t *)); +int __blob_path_to_dir_ids __P((ENV *, const char *, db_seq_t *, db_seq_t *)); +int __blob_salvage __P((ENV *, db_seq_t, off_t, size_t, db_seq_t, db_seq_t, DBT *)); +int __blob_vrfy __P((ENV *, db_seq_t, off_t, db_seq_t, db_seq_t, db_pgno_t, u_int32_t)); +int __blob_del_hierarchy __P((ENV *)); +int __blob_del_all __P((DB *, DB_TXN *, int)); +int __blob_copy_all __P((DB*, const char *, u_int32_t)); + +#if defined(__cplusplus) +} +#endif +#endif /* !_blob_ext_h_ */ diff --git a/src/dbinc_auto/btree_ext.h b/src/dbinc_auto/btree_ext.h index c90f5b80..bdd95750 100644 --- a/src/dbinc_auto/btree_ext.h +++ b/src/dbinc_auto/btree_ext.h @@ -8,11 +8,11 @@ extern "C" { int __bam_compact_int __P((DBC *, DBT *, DBT *, u_int32_t, int *, DB_COMPACT *, int *)); int __bam_compact_opd __P((DBC *, db_pgno_t, PAGE **, u_int32_t, DB_COMPACT *, int *)); -int __bam_truncate_ipages __P((DB *, DB_THREAD_INFO *, DB_TXN *, DB_COMPACT *)); -int __bam_cmp __P((DBC *, const DBT *, PAGE *, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *)); -int __bam_defcmp __P((DB *, const DBT *, const DBT *)); +int __bam_truncate_ipages __P((DB *, DB_THREAD_INFO *, DB_TXN *, DB_COMPACT *, int *)); +int __bam_cmp __P((DBC *, const DBT *, PAGE *, u_int32_t, int (*)(DB *, const DBT *, const DBT *, size_t *), int *, size_t *)); +int __bam_defcmp __P((DB *, const DBT *, const DBT *, size_t *)); size_t __bam_defpfx __P((DB *, const DBT *, const DBT *)); -int __bam_compress_dupcmp __P((DB *, const DBT *, const DBT *)); +int __bam_compress_dupcmp __P((DB *, const DBT *, const DBT *, size_t *)); int __bam_defcompress __P((DB *, const DBT *, const DBT *, const DBT *, const DBT *, DBT *)); int __bam_defdecompress __P((DB *, const DBT *, const DBT *, DBT *, DBT *, DBT *)); int __bamc_compress_get __P((DBC *, DBT *, DBT *, u_int32_t)); @@ -52,7 +52,7 @@ int __bam_db_create __P((DB *)); int __bam_db_close __P((DB *)); void __bam_map_flags __P((DB *, u_int32_t *, u_int32_t *)); int __bam_set_flags __P((DB *, u_int32_t *flagsp)); -int __bam_set_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *))); +int __bam_set_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int __bam_set_bt_compress __P((DB *, int (*)(DB *, const DBT *, const DBT *, const DBT *, const DBT *, DBT *), int (*)(DB *, const DBT *, const DBT *, DBT *, DBT *, DBT *))); int __bam_get_bt_minkey __P((DB *, u_int32_t *)); void __bam_copy_config __P((DB *, DB*, u_int32_t)); @@ -115,6 +115,8 @@ int __bam_traverse __P((DBC *, db_lockmode_t, db_pgno_t, int (*)(DBC *, PAGE *, int __bam_30_btreemeta __P((DB *, char *, u_int8_t *)); int __bam_31_btreemeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __bam_31_lbtree __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); +int __bam_60_btreemeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); +int __bam_60_lbtree __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *, db_pgno_t, u_int32_t)); int __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); int __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); diff --git a/src/dbinc_auto/common_ext.h b/src/dbinc_auto/common_ext.h index ac16e9db..1a94d3a1 100644 --- a/src/dbinc_auto/common_ext.h +++ b/src/dbinc_auto/common_ext.h @@ -25,6 +25,7 @@ int __db_pgfmt __P((ENV *, db_pgno_t)); #ifdef DIAGNOSTIC void __db_assert __P((ENV *, const char *, const char *, int)); #endif +void __env_panic_event __P((ENV *, int)); int __env_panic_msg __P((ENV *)); int __env_panic __P((ENV *, int)); char *__db_unknown_error __P((int)); @@ -33,9 +34,10 @@ void __db_err __P((const ENV *, int, const char *, ...)) __attribute__ ((__forma void __db_errx __P((const ENV *, const char *, ...)) __attribute__ ((__format__ (__printf__, 2, 3))); void __db_errcall __P((const DB_ENV *, int, db_error_set_t, const char *, va_list)); void __db_errfile __P((const DB_ENV *, int, db_error_set_t, const char *, va_list)); -void __db_msgadd __P((ENV *, DB_MSGBUF *, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4))); -void __db_msgadd_ap __P((ENV *, DB_MSGBUF *, const char *, va_list)); +void __db_msgadd __P((const ENV *, DB_MSGBUF *, const char *, ...)) __attribute__ ((__format__ (__printf__, 3, 4))); +void __db_msgadd_ap __P((const ENV *, DB_MSGBUF *, const char *, va_list)); void __db_msg __P((const ENV *, const char *, ...)) __attribute__ ((__format__ (__printf__, 2, 3))); +void __db_debug_msg __P((const ENV *, const char *, ...)); void __db_repmsg __P((const ENV *, const char *, ...)) __attribute__ ((__format__ (__printf__, 2, 3))); int __db_unknown_flag __P((ENV *, char *, u_int32_t)); int __db_unknown_type __P((ENV *, char *, DBTYPE)); @@ -50,6 +52,24 @@ int __db_check_lsn __P((ENV *, DB_LSN *, DB_LSN *)); int __db_rdonly __P((const ENV *, const char *)); int __db_space_err __P((const DB *)); int __db_failed __P((const ENV *, const char *, pid_t, db_threadid_t)); +int __env_failure_remember __P((const ENV *, const char *)); +#ifdef HAVE_ERROR_HISTORY +void __db_thread_init __P((void)); +#endif +#ifdef HAVE_ERROR_HISTORY +int __db_diags __P((const ENV *, int)); +#endif +#ifdef HAVE_ERROR_HISTORY +DB_MSGBUF *__db_deferred_get __P((void)); +#endif +#ifdef HAVE_ERROR_HISTORY +void __db_deferred_discard __P((void)); +#endif +#ifdef HAVE_ERROR_HISTORY +int __db_remember_context __P((const ENV *, DB_MSGBUF *, int)); +#endif +char * __db_ctimespec __P((const db_timespec *, char *)); +char *__db_fmt_quote __P((char *, size_t, const char *)); int __db_getlong __P((DB_ENV *, const char *, char *, long, long, long *)); int __db_getulong __P((DB_ENV *, const char *, char *, u_long, u_long, u_long *)); void __db_idspace __P((u_int32_t *, int, u_int32_t *, u_int32_t *)); diff --git a/src/dbinc_auto/db_ext.h b/src/dbinc_auto/db_ext.h index de2a6ce4..719fc0c5 100644 --- a/src/dbinc_auto/db_ext.h +++ b/src/dbinc_auto/db_ext.h @@ -62,14 +62,19 @@ int __db_merge_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_pgno_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_init_print __P((ENV *, DB_DISTAB *)); int __db_dbbackup_pp __P((DB_ENV *, const char *, const char *, u_int32_t)); -int __db_dbbackup __P((DB_ENV *, DB_THREAD_INFO *, const char *, const char *, u_int32_t)); -int __db_backup __P((DB_ENV *, const char *, u_int32_t)); +int __db_dbbackup __P((DB_ENV *, DB_THREAD_INFO *, const char *, const char *, u_int32_t, u_int32_t, const char *)); +int backup_data_copy __P(( DB_ENV *, const char *, const char *, const char *, int)); +int __db_backup_pp __P((DB_ENV *, const char *, u_int32_t)); int __dbc_close __P((DBC *)); int __dbc_destroy __P((DBC *)); int __dbc_cmp __P((DBC *, DBC *, int *)); int __dbc_count __P((DBC *, db_recno_t *)); int __dbc_del __P((DBC *, u_int32_t)); int __dbc_idel __P((DBC *, u_int32_t)); +int __dbc_db_stream __P((DBC *, DB_STREAM **, u_int32_t)); +int __dbc_get_blob_id __P((DBC *, db_seq_t *)); +int __dbc_get_blob_size __P((DBC *, off_t *)); +int __dbc_set_blob_size __P((DBC *, off_t)); #ifdef HAVE_COMPRESSION int __dbc_bulk_del __P((DBC *, DBT *, u_int32_t)); #endif @@ -93,15 +98,16 @@ u_int32_t __db_partsize __P((u_int32_t, DBT *)); #ifdef DIAGNOSTIC void __db_check_skeyset __P((DB *, DBT *)); #endif +int __dbc_diags __P((DBC *, int)); int __cdsgroup_begin __P((ENV *, DB_TXN **)); int __cdsgroup_begin_pp __P((DB_ENV *, DB_TXN **)); int __db_compact_int __P((DB *, DB_THREAD_INFO *, DB_TXN *, DBT *, DBT *, DB_COMPACT *, u_int32_t, DBT *)); -int __db_exchange_page __P((DBC *, PAGE **, PAGE *, db_pgno_t, int)); -int __db_truncate_overflow __P((DBC *, db_pgno_t, PAGE **, DB_COMPACT *)); -int __db_truncate_root __P((DBC *, PAGE *, u_int32_t, db_pgno_t *, u_int32_t)); +int __db_exchange_page __P((DBC *, PAGE **, PAGE *, db_pgno_t, int, int *)); +int __db_truncate_overflow __P((DBC *, db_pgno_t, PAGE **, DB_COMPACT *, int *)); +int __db_truncate_root __P((DBC *, PAGE *, u_int32_t, db_pgno_t *, u_int32_t, int *)); int __db_find_free __P((DBC *, u_int32_t, u_int32_t, db_pgno_t, db_pgno_t *)); int __db_relink __P((DBC *, PAGE *, PAGE *, db_pgno_t)); -int __db_move_metadata __P((DBC *, DBMETA **, DB_COMPACT *)); +int __db_move_metadata __P((DBC *, DBMETA **, DB_COMPACT *, int *)); int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *)); int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *)); int __db_decrypt_pg __P((ENV *, DB *, PAGE *)); @@ -185,6 +191,10 @@ int __db_has_pagelock __P((ENV *, DB_LOCKER *, DB_MPOOLFILE *, PAGE *, db_lockmo int __db_lput __P((DBC *, DB_LOCK *)); int __db_create_internal __P((DB **, ENV *, u_int32_t)); int __dbh_am_chk __P((DB *, u_int32_t)); +int __db_get_blob_threshold __P((DB *, u_int32_t *)); +int __db_set_blob_threshold __P((DB *, u_int32_t, u_int32_t)); +int __db_blobs_enabled __P((DB *)); +int __db_set_dup_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int __db_get_flags __P((DB *, u_int32_t *)); int __db_set_flags __P((DB *, u_int32_t)); int __db_get_lorder __P((DB *, int *)); @@ -197,12 +207,13 @@ int __db_init_subdb __P((DB *, DB *, const char *, DB_THREAD_INFO *, DB_TXN *)); int __db_chk_meta __P((ENV *, DB *, DBMETA *, u_int32_t)); int __db_meta_setup __P((ENV *, DB *, const char *, DBMETA *, u_int32_t, u_int32_t)); int __db_reopen __P((DBC *)); +int __db_alloc_dbt __P((ENV *, DBT *, u_int32_t, u_int32_t *, u_int32_t *, void **, u_int32_t *)); int __db_goff __P((DBC *, DBT *, u_int32_t, db_pgno_t, void **, u_int32_t *)); int __db_poff __P((DBC *, const DBT *, db_pgno_t *)); int __db_ovref __P((DBC *, db_pgno_t)); int __db_doff __P((DBC *, db_pgno_t)); -int __db_moff __P((DBC *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *)); -int __db_coff __P((DBC *, const DBT *, const DBT *, int (*)(DB *, const DBT *, const DBT *), int *)); +int __db_moff __P((DBC *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *, size_t *), int *, size_t *)); +int __db_coff __P((DBC *, const DBT *, const DBT *, int (*)(DB *, const DBT *, const DBT *, size_t *), int *)); int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); int __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t)); int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void *, u_int32_t *, u_int32_t)); @@ -221,11 +232,12 @@ int __db_name_to_val __P((FN const *, char *)); const char *__db_pagetype_to_string __P((u_int32_t)); int __db_dump_pp __P((DB *, const char *, int (*)(void *, const void *), void *, int, int)); int __db_dump __P((DB *, const char *, int (*)(void *, const void *), void *, int, int)); -int __db_prdbt __P((DBT *, int, const char *, void *, int (*)(void *, const void *), int, int)); +int __db_prdbt __P((DBT *, int, const char *, void *, int (*)(void *, const void *), int, int, int)); int __db_prheader __P((DB *, const char *, int, int, void *, int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t)); int __db_prfooter __P((void *, int (*)(void *, const void *))); int __db_pr_callback __P((void *, const void *)); const char * __db_dbtype_to_string __P((DBTYPE)); +char *__db_tohex __P((const void *, size_t, char *)); int __db_addrem_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_addrem_42_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_big_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); @@ -263,6 +275,8 @@ int __db_rename_pp __P((DB *, const char *, const char *, const char *, u_int32_ int __db_rename_int __P((DB *, DB_THREAD_INFO *, DB_TXN *, const char *, const char *, const char *, u_int32_t)); int __db_ret __P((DBC *, PAGE *, u_int32_t, DBT *, void **, u_int32_t *)); int __db_retcopy __P((ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *)); +int __db_dbt_clone __P((ENV *, DBT *, const DBT *)); +int __db_dbt_clone_free __P((ENV *, DBT *)); int __env_fileid_reset_pp __P((DB_ENV *, const char *, u_int32_t)); int __env_fileid_reset __P((ENV *, DB_THREAD_INFO *, const char *, int)); int __env_lsn_reset_pp __P((DB_ENV *, const char *, u_int32_t)); @@ -329,6 +343,7 @@ int __part_fileid_reset __P((ENV *, DB_THREAD_INFO *, const char *, u_int32_t, i int __part_key_range __P((DBC *, DBT *, DB_KEY_RANGE *, u_int32_t)); int __part_remove __P((DB *, DB_THREAD_INFO *, DB_TXN *, const char *, const char *, u_int32_t)); int __part_rename __P((DB *, DB_THREAD_INFO *, DB_TXN *, const char *, const char *, const char *)); +int __partc_dup __P((DBC *, DBC *)); int __part_verify __P((DB *, VRFY_DBINFO *, const char *, void *, int (*)(void *, const void *), u_int32_t)); int __part_testdocopy __P((DB *, const char *)); int __db_no_partition __P((ENV *)); diff --git a/src/dbinc_auto/dbreg_auto.h b/src/dbinc_auto/dbreg_auto.h index 63ad0cd3..22f1e84c 100644 --- a/src/dbinc_auto/dbreg_auto.h +++ b/src/dbinc_auto/dbreg_auto.h @@ -3,6 +3,28 @@ #ifndef __dbreg_AUTO_H #define __dbreg_AUTO_H #include "dbinc/log.h" +#define DB___dbreg_register_42 2 +typedef struct ___dbreg_register_42_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + u_int32_t opcode; + DBT name; + DBT uid; + int32_t fileid; + DBTYPE ftype; + db_pgno_t meta_pgno; + u_int32_t id; +} __dbreg_register_42_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __dbreg_register_42_desc[]; +static inline int __dbreg_register_42_read(ENV *env, + void *data, __dbreg_register_42_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __dbreg_register_42_desc, sizeof(__dbreg_register_42_args), (void**)arg)); +} #define DB___dbreg_register 2 typedef struct ___dbreg_register_args { u_int32_t type; @@ -15,22 +37,25 @@ typedef struct ___dbreg_register_args { DBTYPE ftype; db_pgno_t meta_pgno; u_int32_t id; + u_int32_t blob_fid_lo; + u_int32_t blob_fid_hi; } __dbreg_register_args; extern __DB_IMPORT DB_LOG_RECSPEC __dbreg_register_desc[]; static inline int __dbreg_register_log(ENV *env, DB_TXN *txnp, DB_LSN *ret_lsnp, u_int32_t flags, u_int32_t opcode, const DBT *name, const DBT *uid, int32_t fileid, DBTYPE ftype, - db_pgno_t meta_pgno, u_int32_t id) + db_pgno_t meta_pgno, u_int32_t id, u_int32_t blob_fid_lo, u_int32_t blob_fid_hi) { return (__log_put_record(env, NULL, txnp, ret_lsnp, flags, DB___dbreg_register, 0, sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(DB_LSN) + sizeof(u_int32_t) + LOG_DBT_SIZE(name) + LOG_DBT_SIZE(uid) + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_int32_t) + - sizeof(u_int32_t), + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_int32_t), __dbreg_register_desc, - opcode, name, uid, fileid, ftype, meta_pgno, id)); + opcode, name, uid, fileid, ftype, meta_pgno, id, blob_fid_lo, + blob_fid_hi)); } static inline int __dbreg_register_read(ENV *env, diff --git a/src/dbinc_auto/dbreg_ext.h b/src/dbinc_auto/dbreg_ext.h index 0f495c33..421c7989 100644 --- a/src/dbinc_auto/dbreg_ext.h +++ b/src/dbinc_auto/dbreg_ext.h @@ -20,9 +20,11 @@ int __dbreg_failchk __P((ENV *)); int __dbreg_log_close __P((ENV *, FNAME *, DB_TXN *, u_int32_t)); int __dbreg_log_id __P((DB *, DB_TXN *, int32_t, int)); int __dbreg_init_recover __P((ENV *, DB_DISTAB *)); +int __dbreg_register_42_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __dbreg_register_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __dbreg_init_print __P((ENV *, DB_DISTAB *)); int __dbreg_register_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __dbreg_register_42_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __dbreg_stat_print __P((ENV *, u_int32_t)); void __dbreg_print_fname __P((ENV *, FNAME *)); int __dbreg_add_dbentry __P((ENV *, DB_LOG *, DB *, int32_t)); @@ -36,8 +38,9 @@ int __dbreg_invalidate_files __P((ENV *, int)); int __dbreg_id_to_db __P((ENV *, DB_TXN *, DB **, int32_t, int)); int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **)); int __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **)); +int __dbreg_blob_file_to_fname __P((DB_LOG *, db_seq_t, int, FNAME **)); int __dbreg_get_name __P((ENV *, u_int8_t *, char **, char **)); -int __dbreg_do_open __P((ENV *, DB_TXN *, DB_LOG *, u_int8_t *, char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t, u_int32_t)); +int __dbreg_do_open __P((ENV *, DB_TXN *, DB_LOG *, u_int8_t *, char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t, u_int32_t, db_seq_t)); int __dbreg_lazy_id __P((DB *)); #if defined(__cplusplus) diff --git a/src/dbinc_auto/env_ext.h b/src/dbinc_auto/env_ext.h index 55dbcba4..7df61ea9 100644 --- a/src/dbinc_auto/env_ext.h +++ b/src/dbinc_auto/env_ext.h @@ -36,9 +36,13 @@ void __db_env_destroy __P((DB_ENV *)); int __env_get_alloc __P((DB_ENV *, void *(**)(size_t), void *(**)(void *, size_t), void (**)(void *))); int __env_set_alloc __P((DB_ENV *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *))); int __env_get_memory_init __P((DB_ENV *, DB_MEM_CONFIG, u_int32_t *)); +int __env_get_blob_threshold_pp __P ((DB_ENV *, u_int32_t *)); +int __env_get_blob_threshold_int __P ((ENV *, u_int32_t *)); +int __env_set_blob_threshold __P((DB_ENV *, u_int32_t, u_int32_t)); int __env_set_memory_init __P((DB_ENV *, DB_MEM_CONFIG, u_int32_t)); int __env_get_memory_max __P((DB_ENV *, u_int32_t *, u_int32_t *)); int __env_set_memory_max __P((DB_ENV *, u_int32_t, u_int32_t)); +int __env_set_blob_dir __P((DB_ENV *, const char *)); int __env_get_encrypt_flags __P((DB_ENV *, u_int32_t *)); int __env_set_encrypt __P((DB_ENV *, const char *, u_int32_t)); void __env_map_flags __P((const FLAG_MAP *, u_int, u_int32_t *, u_int32_t *)); @@ -91,6 +95,7 @@ void __env_panic_set __P((ENV *, int)); int __env_ref_increment __P((ENV *)); int __env_ref_decrement __P((ENV *)); int __env_ref_get __P((DB_ENV *, u_int32_t *)); +int __env_region_cleanup __P((ENV *)); int __env_detach __P((ENV *, int)); int __env_remove_env __P((ENV *)); int __env_region_attach __P((ENV *, REGINFO *, size_t, size_t)); @@ -102,6 +107,7 @@ int __envreg_xunlock __P((ENV *)); int __envreg_isalive __P((DB_ENV *, pid_t, db_threadid_t, u_int32_t)); u_int32_t __env_struct_sig __P((void)); int __env_stat_print_pp __P((DB_ENV *, u_int32_t)); +int __env_print_thread __P((ENV *)); void __db_print_fh __P((ENV *, const char *, DB_FH *, u_int32_t)); void __db_print_fileid __P((ENV *, u_int8_t *, const char *)); void __db_dl __P((ENV *, const char *, u_long)); @@ -119,6 +125,18 @@ int __repmgr_get_ack_policy __P((DB_ENV *, int *)); int __repmgr_set_ack_policy __P((DB_ENV *, int)); #endif #ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_max __P((DB_ENV *, u_int32_t *, u_int32_t *)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_set_incoming_queue_max __P((DB_ENV *, u_int32_t, u_int32_t)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_redzone __P((DB_ENV *, u_int32_t *, u_int32_t *)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_fullevent __P((DB_ENV *, int *)); +#endif +#ifndef HAVE_REPLICATION_THREADS int __repmgr_site __P((DB_ENV *, const char *, u_int, DB_SITE **, u_int32_t)); #endif #ifndef HAVE_REPLICATION_THREADS @@ -128,10 +146,10 @@ int __repmgr_site_by_eid __P((DB_ENV *, int, DB_SITE **)); int __repmgr_local_site __P((DB_ENV *, DB_SITE **)); #endif #ifndef HAVE_REPLICATION_THREADS -int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); +int __repmgr_site_list_pp __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); #endif #ifndef HAVE_REPLICATION_THREADS -int __repmgr_start __P((DB_ENV *, int, u_int32_t)); +int __repmgr_start_pp __P((DB_ENV *, int, u_int32_t)); #endif #ifndef HAVE_REPLICATION_THREADS int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t)); diff --git a/src/dbinc_auto/fileops_auto.h b/src/dbinc_auto/fileops_auto.h index 59385c88..3894c23d 100644 --- a/src/dbinc_auto/fileops_auto.h +++ b/src/dbinc_auto/fileops_auto.h @@ -21,6 +21,25 @@ static inline int __fop_create_42_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_create_42_desc, sizeof(__fop_create_42_args), (void**)arg)); } +#define DB___fop_create_60 143 +typedef struct ___fop_create_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT name; + DBT dirname; + u_int32_t appname; + u_int32_t mode; +} __fop_create_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_create_60_desc[]; +static inline int __fop_create_60_read(ENV *env, + void *data, __fop_create_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_create_60_desc, sizeof(__fop_create_60_args), (void**)arg)); +} #define DB___fop_create 143 typedef struct ___fop_create_args { u_int32_t type; @@ -53,6 +72,24 @@ static inline int __fop_create_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_create_desc, sizeof(__fop_create_args), (void**)arg)); } +#define DB___fop_remove_60 144 +typedef struct ___fop_remove_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT name; + DBT fid; + u_int32_t appname; +} __fop_remove_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_remove_60_desc[]; +static inline int __fop_remove_60_read(ENV *env, + void *data, __fop_remove_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_remove_60_desc, sizeof(__fop_remove_60_args), (void**)arg)); +} #define DB___fop_remove 144 typedef struct ___fop_remove_args { u_int32_t type; @@ -105,6 +142,29 @@ static inline int __fop_write_42_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_write_42_desc, sizeof(__fop_write_42_args), (void**)arg)); } +#define DB___fop_write_60 145 +typedef struct ___fop_write_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT name; + DBT dirname; + u_int32_t appname; + u_int32_t pgsize; + db_pgno_t pageno; + u_int32_t offset; + DBT page; + u_int32_t flag; +} __fop_write_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_write_60_desc[]; +static inline int __fop_write_60_read(ENV *env, + void *data, __fop_write_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_write_60_desc, sizeof(__fop_write_60_args), (void**)arg)); +} #define DB___fop_write 145 typedef struct ___fop_write_args { u_int32_t type; @@ -143,6 +203,66 @@ static inline int __fop_write_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_write_desc, sizeof(__fop_write_args), (void**)arg)); } +#define DB___fop_write_file_60 86 +typedef struct ___fop_write_file_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT name; + DBT dirname; + u_int32_t appname; + u_int32_t offset_lo; + u_int32_t offset_hi; + DBT old_data; + DBT new_data; + u_int32_t flag; +} __fop_write_file_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_write_file_60_desc[]; +static inline int __fop_write_file_60_read(ENV *env, + void *data, __fop_write_file_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_write_file_60_desc, sizeof(__fop_write_file_60_args), (void**)arg)); +} +#define DB___fop_write_file 86 +typedef struct ___fop_write_file_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT name; + DBT dirname; + u_int32_t appname; + u_int64_t offset; + DBT old_data; + DBT new_data; + u_int32_t flag; +} __fop_write_file_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_write_file_desc[]; +static inline int +__fop_write_file_log(ENV *env, DB_TXN *txnp, DB_LSN *ret_lsnp, u_int32_t flags, + const DBT *name, const DBT *dirname, u_int32_t appname, u_int64_t offset, const DBT *old_data, + const DBT *new_data, u_int32_t flag) +{ + return (__log_put_record(env, NULL, txnp, ret_lsnp, + flags, DB___fop_write_file, 0, + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(DB_LSN) + + LOG_DBT_SIZE(name) + LOG_DBT_SIZE(dirname) + sizeof(u_int32_t) + + sizeof(u_int64_t) + LOG_DBT_SIZE(old_data) + LOG_DBT_SIZE(new_data) + + sizeof(u_int32_t), + __fop_write_file_desc, + name, dirname, appname, offset, old_data, new_data, flag)); +} + +static inline int __fop_write_file_read(ENV *env, + void *data, __fop_write_file_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_write_file_desc, sizeof(__fop_write_file_args), (void**)arg)); +} #define DB___fop_rename_42 146 #define DB___fop_rename_noundo_46 150 typedef struct ___fop_rename_42_args { @@ -171,6 +291,35 @@ static inline int __fop_rename_noundo_46_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_rename_noundo_46_desc, sizeof(__fop_rename_42_args), (void**)arg)); } +#define DB___fop_rename_60 146 +#define DB___fop_rename_noundo_60 150 +typedef struct ___fop_rename_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT oldname; + DBT newname; + DBT dirname; + DBT fileid; + u_int32_t appname; +} __fop_rename_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_rename_60_desc[]; +static inline int __fop_rename_60_read(ENV *env, + void *data, __fop_rename_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_rename_60_desc, sizeof(__fop_rename_60_args), (void**)arg)); +} +extern __DB_IMPORT DB_LOG_RECSPEC __fop_rename_noundo_60_desc[]; +static inline int __fop_rename_noundo_60_read(ENV *env, + void *data, __fop_rename_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_rename_noundo_60_desc, sizeof(__fop_rename_60_args), (void**)arg)); +} #define DB___fop_rename 146 #define DB___fop_rename_noundo 150 typedef struct ___fop_rename_args { @@ -226,6 +375,26 @@ static inline int __fop_rename_noundo_read(ENV *env, return (__log_read_record(env, NULL, NULL, data, __fop_rename_noundo_desc, sizeof(__fop_rename_args), (void**)arg)); } +#define DB___fop_file_remove_60 141 +typedef struct ___fop_file_remove_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + DBT real_fid; + DBT tmp_fid; + DBT name; + u_int32_t appname; + u_int32_t child; +} __fop_file_remove_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __fop_file_remove_60_desc[]; +static inline int __fop_file_remove_60_read(ENV *env, + void *data, __fop_file_remove_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + NULL, NULL, data, __fop_file_remove_60_desc, sizeof(__fop_file_remove_60_args), (void**)arg)); +} #define DB___fop_file_remove 141 typedef struct ___fop_file_remove_args { u_int32_t type; diff --git a/src/dbinc_auto/fileops_ext.h b/src/dbinc_auto/fileops_ext.h index 0aa6c1e1..89306183 100644 --- a/src/dbinc_auto/fileops_ext.h +++ b/src/dbinc_auto/fileops_ext.h @@ -8,35 +8,51 @@ extern "C" { int __fop_init_recover __P((ENV *, DB_DISTAB *)); int __fop_create_42_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_create_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_create_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_remove_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_remove_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_42_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_42_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_rename_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_file_remove_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_file_remove_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_init_print __P((ENV *, DB_DISTAB *)); int __fop_create __P((ENV *, DB_TXN *, DB_FH **, const char *, const char **, APPNAME, int, u_int32_t)); int __fop_remove __P((ENV *, DB_TXN *, u_int8_t *, const char *, const char **, APPNAME, u_int32_t)); int __fop_write __P((ENV *, DB_TXN *, const char *, const char *, APPNAME, DB_FH *, u_int32_t, db_pgno_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t)); +int __fop_write_file __P((ENV *, DB_TXN *, const char *, const char *, APPNAME, DB_FH *, off_t, void *, size_t, u_int32_t)); int __fop_rename __P((ENV *, DB_TXN *, const char *, const char *, const char **, u_int8_t *, APPNAME, int, u_int32_t)); int __fop_create_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_create_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_create_42_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_remove_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_remove_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_42_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_noundo_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_rename_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_rename_noundo_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_42_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_noundo_46_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_file_remove_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_file_remove_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_lock_handle __P((ENV *, DB *, DB_LOCKER *, db_lockmode_t, DB_LOCK *, u_int32_t)); int __fop_file_setup __P((DB *, DB_THREAD_INFO *ip, DB_TXN *, const char *, int, u_int32_t, u_int32_t *)); int __fop_subdb_setup __P((DB *, DB_THREAD_INFO *, DB_TXN *, const char *, const char *, int, u_int32_t)); int __fop_remove_setup __P((DB *, DB_TXN *, const char *, u_int32_t)); int __fop_read_meta __P((ENV *, const char *, u_int8_t *, size_t, DB_FH *, int, size_t *)); -int __fop_dummy __P((DB *, DB_TXN *, const char *, const char *)); -int __fop_dbrename __P((DB *, const char *, const char *)); +int __fop_dummy __P((DB *, DB_TXN *, const char *, const char *, APPNAME)); +int __fop_dbrename __P((DB *, const char *, const char *, APPNAME)); #if defined(__cplusplus) } diff --git a/src/dbinc_auto/hash_ext.h b/src/dbinc_auto/hash_ext.h index e83fe817..4d7c2e9c 100644 --- a/src/dbinc_auto/hash_ext.h +++ b/src/dbinc_auto/hash_ext.h @@ -57,7 +57,7 @@ int __ham_return_meta __P((DBC *, u_int32_t, DBMETA **)); int __ham_db_create __P((DB *)); int __ham_db_close __P((DB *)); int __ham_get_h_ffactor __P((DB *, u_int32_t *)); -int __ham_set_h_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *))); +int __ham_set_h_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *, size_t *))); int __ham_get_h_nelem __P((DB *, u_int32_t *)); void __ham_copy_config __P((DB *, DB*, u_int32_t)); int __ham_open __P((DB *, DB_THREAD_INFO *, DB_TXN *, const char * name, db_pgno_t, u_int32_t)); @@ -116,6 +116,8 @@ int __ham_31_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __ham_31_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __ham_46_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __ham_46_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); +int __ham_60_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); +int __ham_60_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t)); int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t)); diff --git a/src/dbinc_auto/heap_auto.h b/src/dbinc_auto/heap_auto.h index bf288627..f91cacfe 100644 --- a/src/dbinc_auto/heap_auto.h +++ b/src/dbinc_auto/heap_auto.h @@ -26,7 +26,7 @@ __heap_addrem_log(DB *dbp, DB_TXN *txnp, DB_LSN *ret_lsnp, u_int32_t flags, const DBT *hdr, const DBT *dbt, DB_LSN * pagelsn) { return (__log_put_record((dbp)->env, dbp, txnp, ret_lsnp, - flags, DB___heap_addrem, 0, + flags, DB___heap_addrem, 1, sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(DB_LSN) + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_int32_t) + LOG_DBT_SIZE(hdr) + @@ -42,6 +42,52 @@ static inline int __heap_addrem_read(ENV *env, return (__log_read_record(env, dbpp, td, data, __heap_addrem_desc, sizeof(__heap_addrem_args), (void**)arg)); } +#define DB___heap_addrem_60 151 +typedef struct ___heap_addrem_60_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + u_int32_t opcode; + int32_t fileid; + db_pgno_t pgno; + u_int32_t indx; + u_int32_t nbytes; + DBT hdr; + DBT dbt; + DB_LSN pagelsn; +} __heap_addrem_60_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __heap_addrem_60_desc[]; +static inline int __heap_addrem_60_read(ENV *env, + DB **dbpp, void *td, void *data, __heap_addrem_60_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + dbpp, td, data, __heap_addrem_60_desc, sizeof(__heap_addrem_60_args), (void**)arg)); +} +#define DB___heap_addrem_50 151 +typedef struct ___heap_addrem_50_args { + u_int32_t type; + DB_TXN *txnp; + DB_LSN prev_lsn; + u_int32_t opcode; + int32_t fileid; + db_pgno_t pgno; + u_int32_t indx; + u_int32_t nbytes; + DBT hdr; + DBT dbt; + DB_LSN pagelsn; +} __heap_addrem_50_args; + +extern __DB_IMPORT DB_LOG_RECSPEC __heap_addrem_50_desc[]; +static inline int __heap_addrem_50_read(ENV *env, + DB **dbpp, void *td, void *data, __heap_addrem_50_args **arg) +{ + *arg = NULL; + return (__log_read_record(env, + dbpp, td, data, __heap_addrem_50_desc, sizeof(__heap_addrem_50_args), (void**)arg)); +} #define DB___heap_pg_alloc 152 typedef struct ___heap_pg_alloc_args { u_int32_t type; diff --git a/src/dbinc_auto/heap_ext.h b/src/dbinc_auto/heap_ext.h index 8bc24b61..e886d6c9 100644 --- a/src/dbinc_auto/heap_ext.h +++ b/src/dbinc_auto/heap_ext.h @@ -15,6 +15,8 @@ int __heapc_gsplit __P((DBC *, DBT *, void **, u_int32_t *)); int __heapc_refresh __P((DBC *)); int __heap_init_recover __P((ENV *, DB_DISTAB *)); int __heap_addrem_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __heap_addrem_60_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __heap_addrem_50_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_pg_alloc_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_meta_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_page_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); @@ -39,6 +41,8 @@ int __heap_addrem_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_pg_alloc_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_meta_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_page_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __heap_addrem_60_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __heap_addrem_50_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_truncate __P((DBC *, u_int32_t *)); int __heap_stat __P((DBC *, void *, u_int32_t)); int __heap_stat_print __P((DBC *, u_int32_t)); @@ -46,6 +50,8 @@ void __heap_print_cursor __P((DBC *)); int __heap_stat_callback __P((DBC *, PAGE *, void *, int *)); int __heap_traverse __P((DBC *, int (*)(DBC *, PAGE *, void *, int *), void *)); int __db_no_heap_am __P((ENV *)); +int __heap_60_heapmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); +int __heap_60_heap __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *)); int __heap_vrfy_meta __P((DB *, VRFY_DBINFO *, HEAPMETA *, db_pgno_t, u_int32_t)); int __heap_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); int __heap_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t)); diff --git a/src/dbinc_auto/int_def.in b/src/dbinc_auto/int_def.in index dce2831c..5042dfd0 100644 --- a/src/dbinc_auto/int_def.in +++ b/src/dbinc_auto/int_def.in @@ -85,13 +85,18 @@ #define __db_init_print __db_init_print@DB_VERSION_UNIQUE_NAME@ #define __db_dbbackup_pp __db_dbbackup_pp@DB_VERSION_UNIQUE_NAME@ #define __db_dbbackup __db_dbbackup@DB_VERSION_UNIQUE_NAME@ -#define __db_backup __db_backup@DB_VERSION_UNIQUE_NAME@ +#define backup_data_copy backup_data_copy@DB_VERSION_UNIQUE_NAME@ +#define __db_backup_pp __db_backup_pp@DB_VERSION_UNIQUE_NAME@ #define __dbc_close __dbc_close@DB_VERSION_UNIQUE_NAME@ #define __dbc_destroy __dbc_destroy@DB_VERSION_UNIQUE_NAME@ #define __dbc_cmp __dbc_cmp@DB_VERSION_UNIQUE_NAME@ #define __dbc_count __dbc_count@DB_VERSION_UNIQUE_NAME@ #define __dbc_del __dbc_del@DB_VERSION_UNIQUE_NAME@ #define __dbc_idel __dbc_idel@DB_VERSION_UNIQUE_NAME@ +#define __dbc_db_stream __dbc_db_stream@DB_VERSION_UNIQUE_NAME@ +#define __dbc_get_blob_id __dbc_get_blob_id@DB_VERSION_UNIQUE_NAME@ +#define __dbc_get_blob_size __dbc_get_blob_size@DB_VERSION_UNIQUE_NAME@ +#define __dbc_set_blob_size __dbc_set_blob_size@DB_VERSION_UNIQUE_NAME@ #ifdef HAVE_COMPRESSION #define __dbc_bulk_del __dbc_bulk_del@DB_VERSION_UNIQUE_NAME@ #endif @@ -115,6 +120,7 @@ #ifdef DIAGNOSTIC #define __db_check_skeyset __db_check_skeyset@DB_VERSION_UNIQUE_NAME@ #endif +#define __dbc_diags __dbc_diags@DB_VERSION_UNIQUE_NAME@ #define __cdsgroup_begin __cdsgroup_begin@DB_VERSION_UNIQUE_NAME@ #define __cdsgroup_begin_pp __cdsgroup_begin_pp@DB_VERSION_UNIQUE_NAME@ #define __db_compact_int __db_compact_int@DB_VERSION_UNIQUE_NAME@ @@ -207,6 +213,10 @@ #define __db_lput __db_lput@DB_VERSION_UNIQUE_NAME@ #define __db_create_internal __db_create_internal@DB_VERSION_UNIQUE_NAME@ #define __dbh_am_chk __dbh_am_chk@DB_VERSION_UNIQUE_NAME@ +#define __db_get_blob_threshold __db_get_blob_threshold@DB_VERSION_UNIQUE_NAME@ +#define __db_set_blob_threshold __db_set_blob_threshold@DB_VERSION_UNIQUE_NAME@ +#define __db_blobs_enabled __db_blobs_enabled@DB_VERSION_UNIQUE_NAME@ +#define __db_set_dup_compare __db_set_dup_compare@DB_VERSION_UNIQUE_NAME@ #define __db_get_flags __db_get_flags@DB_VERSION_UNIQUE_NAME@ #define __db_set_flags __db_set_flags@DB_VERSION_UNIQUE_NAME@ #define __db_get_lorder __db_get_lorder@DB_VERSION_UNIQUE_NAME@ @@ -219,6 +229,7 @@ #define __db_chk_meta __db_chk_meta@DB_VERSION_UNIQUE_NAME@ #define __db_meta_setup __db_meta_setup@DB_VERSION_UNIQUE_NAME@ #define __db_reopen __db_reopen@DB_VERSION_UNIQUE_NAME@ +#define __db_alloc_dbt __db_alloc_dbt@DB_VERSION_UNIQUE_NAME@ #define __db_goff __db_goff@DB_VERSION_UNIQUE_NAME@ #define __db_poff __db_poff@DB_VERSION_UNIQUE_NAME@ #define __db_ovref __db_ovref@DB_VERSION_UNIQUE_NAME@ @@ -248,6 +259,7 @@ #define __db_prfooter __db_prfooter@DB_VERSION_UNIQUE_NAME@ #define __db_pr_callback __db_pr_callback@DB_VERSION_UNIQUE_NAME@ #define __db_dbtype_to_string __db_dbtype_to_string@DB_VERSION_UNIQUE_NAME@ +#define __db_tohex __db_tohex@DB_VERSION_UNIQUE_NAME@ #define __db_addrem_recover __db_addrem_recover@DB_VERSION_UNIQUE_NAME@ #define __db_addrem_42_recover __db_addrem_42_recover@DB_VERSION_UNIQUE_NAME@ #define __db_big_recover __db_big_recover@DB_VERSION_UNIQUE_NAME@ @@ -285,6 +297,8 @@ #define __db_rename_int __db_rename_int@DB_VERSION_UNIQUE_NAME@ #define __db_ret __db_ret@DB_VERSION_UNIQUE_NAME@ #define __db_retcopy __db_retcopy@DB_VERSION_UNIQUE_NAME@ +#define __db_dbt_clone __db_dbt_clone@DB_VERSION_UNIQUE_NAME@ +#define __db_dbt_clone_free __db_dbt_clone_free@DB_VERSION_UNIQUE_NAME@ #define __env_fileid_reset_pp __env_fileid_reset_pp@DB_VERSION_UNIQUE_NAME@ #define __env_fileid_reset __env_fileid_reset@DB_VERSION_UNIQUE_NAME@ #define __env_lsn_reset_pp __env_lsn_reset_pp@DB_VERSION_UNIQUE_NAME@ @@ -351,6 +365,7 @@ #define __part_key_range __part_key_range@DB_VERSION_UNIQUE_NAME@ #define __part_remove __part_remove@DB_VERSION_UNIQUE_NAME@ #define __part_rename __part_rename@DB_VERSION_UNIQUE_NAME@ +#define __partc_dup __partc_dup@DB_VERSION_UNIQUE_NAME@ #define __part_verify __part_verify@DB_VERSION_UNIQUE_NAME@ #define __part_testdocopy __part_testdocopy@DB_VERSION_UNIQUE_NAME@ #define __db_no_partition __db_no_partition@DB_VERSION_UNIQUE_NAME@ @@ -361,6 +376,34 @@ #define __partition_init __partition_init@DB_VERSION_UNIQUE_NAME@ #define __part_fileid_reset __part_fileid_reset@DB_VERSION_UNIQUE_NAME@ #define __partition_set_dirs __partition_set_dirs@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_create __blob_file_create@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_close __blob_file_close@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_delete __blob_file_delete@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_open __blob_file_open@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_read __blob_file_read@DB_VERSION_UNIQUE_NAME@ +#define __blob_file_write __blob_file_write@DB_VERSION_UNIQUE_NAME@ +#define __blob_bulk __blob_bulk@DB_VERSION_UNIQUE_NAME@ +#define __blob_get __blob_get@DB_VERSION_UNIQUE_NAME@ +#define __blob_put __blob_put@DB_VERSION_UNIQUE_NAME@ +#define __blob_repl __blob_repl@DB_VERSION_UNIQUE_NAME@ +#define __blob_del __blob_del@DB_VERSION_UNIQUE_NAME@ +#define __db_stream_init __db_stream_init@DB_VERSION_UNIQUE_NAME@ +#define __db_stream_close_int __db_stream_close_int@DB_VERSION_UNIQUE_NAME@ +#define __blob_make_sub_dir __blob_make_sub_dir@DB_VERSION_UNIQUE_NAME@ +#define __blob_make_meta_fname __blob_make_meta_fname@DB_VERSION_UNIQUE_NAME@ +#define __blob_get_dir __blob_get_dir@DB_VERSION_UNIQUE_NAME@ +#define __blob_generate_dir_ids __blob_generate_dir_ids@DB_VERSION_UNIQUE_NAME@ +#define __blob_generate_id __blob_generate_id@DB_VERSION_UNIQUE_NAME@ +#define __blob_highest_id __blob_highest_id@DB_VERSION_UNIQUE_NAME@ +#define __blob_calculate_dirs __blob_calculate_dirs@DB_VERSION_UNIQUE_NAME@ +#define __blob_id_to_path __blob_id_to_path@DB_VERSION_UNIQUE_NAME@ +#define __blob_str_to_id __blob_str_to_id@DB_VERSION_UNIQUE_NAME@ +#define __blob_path_to_dir_ids __blob_path_to_dir_ids@DB_VERSION_UNIQUE_NAME@ +#define __blob_salvage __blob_salvage@DB_VERSION_UNIQUE_NAME@ +#define __blob_vrfy __blob_vrfy@DB_VERSION_UNIQUE_NAME@ +#define __blob_del_hierarchy __blob_del_hierarchy@DB_VERSION_UNIQUE_NAME@ +#define __blob_del_all __blob_del_all@DB_VERSION_UNIQUE_NAME@ +#define __blob_copy_all __blob_copy_all@DB_VERSION_UNIQUE_NAME@ #define __bam_compact_int __bam_compact_int@DB_VERSION_UNIQUE_NAME@ #define __bam_compact_opd __bam_compact_opd@DB_VERSION_UNIQUE_NAME@ #define __bam_truncate_ipages __bam_truncate_ipages@DB_VERSION_UNIQUE_NAME@ @@ -470,6 +513,8 @@ #define __bam_30_btreemeta __bam_30_btreemeta@DB_VERSION_UNIQUE_NAME@ #define __bam_31_btreemeta __bam_31_btreemeta@DB_VERSION_UNIQUE_NAME@ #define __bam_31_lbtree __bam_31_lbtree@DB_VERSION_UNIQUE_NAME@ +#define __bam_60_btreemeta __bam_60_btreemeta@DB_VERSION_UNIQUE_NAME@ +#define __bam_60_lbtree __bam_60_lbtree@DB_VERSION_UNIQUE_NAME@ #define __bam_vrfy_meta __bam_vrfy_meta@DB_VERSION_UNIQUE_NAME@ #define __ram_vrfy_leaf __ram_vrfy_leaf@DB_VERSION_UNIQUE_NAME@ #define __bam_vrfy __bam_vrfy@DB_VERSION_UNIQUE_NAME@ @@ -628,6 +673,7 @@ #ifdef DIAGNOSTIC #define __db_assert __db_assert@DB_VERSION_UNIQUE_NAME@ #endif +#define __env_panic_event __env_panic_event@DB_VERSION_UNIQUE_NAME@ #define __env_panic_msg __env_panic_msg@DB_VERSION_UNIQUE_NAME@ #define __env_panic __env_panic@DB_VERSION_UNIQUE_NAME@ #define __db_unknown_error __db_unknown_error@DB_VERSION_UNIQUE_NAME@ @@ -639,6 +685,7 @@ #define __db_msgadd __db_msgadd@DB_VERSION_UNIQUE_NAME@ #define __db_msgadd_ap __db_msgadd_ap@DB_VERSION_UNIQUE_NAME@ #define __db_msg __db_msg@DB_VERSION_UNIQUE_NAME@ +#define __db_debug_msg __db_debug_msg@DB_VERSION_UNIQUE_NAME@ #define __db_repmsg __db_repmsg@DB_VERSION_UNIQUE_NAME@ #define __db_unknown_flag __db_unknown_flag@DB_VERSION_UNIQUE_NAME@ #define __db_unknown_type __db_unknown_type@DB_VERSION_UNIQUE_NAME@ @@ -653,6 +700,24 @@ #define __db_rdonly __db_rdonly@DB_VERSION_UNIQUE_NAME@ #define __db_space_err __db_space_err@DB_VERSION_UNIQUE_NAME@ #define __db_failed __db_failed@DB_VERSION_UNIQUE_NAME@ +#define __env_failure_remember __env_failure_remember@DB_VERSION_UNIQUE_NAME@ +#ifdef HAVE_ERROR_HISTORY +#define __db_thread_init __db_thread_init@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef HAVE_ERROR_HISTORY +#define __db_diags __db_diags@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef HAVE_ERROR_HISTORY +#define __db_deferred_get __db_deferred_get@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef HAVE_ERROR_HISTORY +#define __db_deferred_discard __db_deferred_discard@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef HAVE_ERROR_HISTORY +#define __db_remember_context __db_remember_context@DB_VERSION_UNIQUE_NAME@ +#endif +#define __db_ctimespec __db_ctimespec@DB_VERSION_UNIQUE_NAME@ +#define __db_fmt_quote __db_fmt_quote@DB_VERSION_UNIQUE_NAME@ #define __db_getlong __db_getlong@DB_VERSION_UNIQUE_NAME@ #define __db_getulong __db_getulong@DB_VERSION_UNIQUE_NAME@ #define __db_idspace __db_idspace@DB_VERSION_UNIQUE_NAME@ @@ -709,11 +774,14 @@ #define __dbreg_failchk __dbreg_failchk@DB_VERSION_UNIQUE_NAME@ #define __dbreg_log_close __dbreg_log_close@DB_VERSION_UNIQUE_NAME@ #define __dbreg_log_id __dbreg_log_id@DB_VERSION_UNIQUE_NAME@ +#define __dbreg_register_42_desc __dbreg_register_42_desc@DB_VERSION_UNIQUE_NAME@ #define __dbreg_register_desc __dbreg_register_desc@DB_VERSION_UNIQUE_NAME@ #define __dbreg_init_recover __dbreg_init_recover@DB_VERSION_UNIQUE_NAME@ +#define __dbreg_register_42_print __dbreg_register_42_print@DB_VERSION_UNIQUE_NAME@ #define __dbreg_register_print __dbreg_register_print@DB_VERSION_UNIQUE_NAME@ #define __dbreg_init_print __dbreg_init_print@DB_VERSION_UNIQUE_NAME@ #define __dbreg_register_recover __dbreg_register_recover@DB_VERSION_UNIQUE_NAME@ +#define __dbreg_register_42_recover __dbreg_register_42_recover@DB_VERSION_UNIQUE_NAME@ #define __dbreg_stat_print __dbreg_stat_print@DB_VERSION_UNIQUE_NAME@ #define __dbreg_print_fname __dbreg_print_fname@DB_VERSION_UNIQUE_NAME@ #define __dbreg_add_dbentry __dbreg_add_dbentry@DB_VERSION_UNIQUE_NAME@ @@ -727,6 +795,7 @@ #define __dbreg_id_to_db __dbreg_id_to_db@DB_VERSION_UNIQUE_NAME@ #define __dbreg_id_to_fname __dbreg_id_to_fname@DB_VERSION_UNIQUE_NAME@ #define __dbreg_fid_to_fname __dbreg_fid_to_fname@DB_VERSION_UNIQUE_NAME@ +#define __dbreg_blob_file_to_fname __dbreg_blob_file_to_fname@DB_VERSION_UNIQUE_NAME@ #define __dbreg_get_name __dbreg_get_name@DB_VERSION_UNIQUE_NAME@ #define __dbreg_do_open __dbreg_do_open@DB_VERSION_UNIQUE_NAME@ #define __dbreg_lazy_id __dbreg_lazy_id@DB_VERSION_UNIQUE_NAME@ @@ -760,9 +829,13 @@ #define __env_get_alloc __env_get_alloc@DB_VERSION_UNIQUE_NAME@ #define __env_set_alloc __env_set_alloc@DB_VERSION_UNIQUE_NAME@ #define __env_get_memory_init __env_get_memory_init@DB_VERSION_UNIQUE_NAME@ +#define __env_get_blob_threshold_pp __env_get_blob_threshold_pp@DB_VERSION_UNIQUE_NAME@ +#define __env_get_blob_threshold_int __env_get_blob_threshold_int@DB_VERSION_UNIQUE_NAME@ +#define __env_set_blob_threshold __env_set_blob_threshold@DB_VERSION_UNIQUE_NAME@ #define __env_set_memory_init __env_set_memory_init@DB_VERSION_UNIQUE_NAME@ #define __env_get_memory_max __env_get_memory_max@DB_VERSION_UNIQUE_NAME@ #define __env_set_memory_max __env_set_memory_max@DB_VERSION_UNIQUE_NAME@ +#define __env_set_blob_dir __env_set_blob_dir@DB_VERSION_UNIQUE_NAME@ #define __env_get_encrypt_flags __env_get_encrypt_flags@DB_VERSION_UNIQUE_NAME@ #define __env_set_encrypt __env_set_encrypt@DB_VERSION_UNIQUE_NAME@ #define __env_map_flags __env_map_flags@DB_VERSION_UNIQUE_NAME@ @@ -815,6 +888,7 @@ #define __env_ref_increment __env_ref_increment@DB_VERSION_UNIQUE_NAME@ #define __env_ref_decrement __env_ref_decrement@DB_VERSION_UNIQUE_NAME@ #define __env_ref_get __env_ref_get@DB_VERSION_UNIQUE_NAME@ +#define __env_region_cleanup __env_region_cleanup@DB_VERSION_UNIQUE_NAME@ #define __env_detach __env_detach@DB_VERSION_UNIQUE_NAME@ #define __env_remove_env __env_remove_env@DB_VERSION_UNIQUE_NAME@ #define __env_region_attach __env_region_attach@DB_VERSION_UNIQUE_NAME@ @@ -826,6 +900,7 @@ #define __envreg_isalive __envreg_isalive@DB_VERSION_UNIQUE_NAME@ #define __env_struct_sig __env_struct_sig@DB_VERSION_UNIQUE_NAME@ #define __env_stat_print_pp __env_stat_print_pp@DB_VERSION_UNIQUE_NAME@ +#define __env_print_thread __env_print_thread@DB_VERSION_UNIQUE_NAME@ #define __db_print_fh __db_print_fh@DB_VERSION_UNIQUE_NAME@ #define __db_print_fileid __db_print_fileid@DB_VERSION_UNIQUE_NAME@ #define __db_dl __db_dl@DB_VERSION_UNIQUE_NAME@ @@ -843,6 +918,18 @@ #define __repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_max __repmgr_get_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_set_incoming_queue_max __repmgr_set_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_redzone __repmgr_get_incoming_queue_redzone@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_fullevent __repmgr_get_incoming_queue_fullevent@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS #define __repmgr_site __repmgr_site@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS @@ -852,10 +939,10 @@ #define __repmgr_local_site __repmgr_local_site@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS -#define __repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_list_pp __repmgr_site_list_pp@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS -#define __repmgr_start __repmgr_start@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_start_pp __repmgr_start_pp@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS #define __repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@ @@ -876,39 +963,63 @@ #define __repmgr_init_recover __repmgr_init_recover@DB_VERSION_UNIQUE_NAME@ #endif #define __fop_create_42_desc __fop_create_42_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_create_60_desc __fop_create_60_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_create_desc __fop_create_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_remove_60_desc __fop_remove_60_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_remove_desc __fop_remove_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_write_42_desc __fop_write_42_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_60_desc __fop_write_60_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_write_desc __fop_write_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_60_desc __fop_write_file_60_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_desc __fop_write_file_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_42_desc __fop_rename_42_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_noundo_46_desc __fop_rename_noundo_46_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_60_desc __fop_rename_60_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_noundo_60_desc __fop_rename_noundo_60_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_desc __fop_rename_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_noundo_desc __fop_rename_noundo_desc@DB_VERSION_UNIQUE_NAME@ +#define __fop_file_remove_60_desc __fop_file_remove_60_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_file_remove_desc __fop_file_remove_desc@DB_VERSION_UNIQUE_NAME@ #define __fop_init_recover __fop_init_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_create_42_print __fop_create_42_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_create_60_print __fop_create_60_print@DB_VERSION_UNIQUE_NAME@ #define __fop_create_print __fop_create_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_remove_60_print __fop_remove_60_print@DB_VERSION_UNIQUE_NAME@ #define __fop_remove_print __fop_remove_print@DB_VERSION_UNIQUE_NAME@ #define __fop_write_42_print __fop_write_42_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_60_print __fop_write_60_print@DB_VERSION_UNIQUE_NAME@ #define __fop_write_print __fop_write_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_60_print __fop_write_file_60_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_print __fop_write_file_print@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_42_print __fop_rename_42_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_60_print __fop_rename_60_print@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_print __fop_rename_print@DB_VERSION_UNIQUE_NAME@ +#define __fop_file_remove_60_print __fop_file_remove_60_print@DB_VERSION_UNIQUE_NAME@ #define __fop_file_remove_print __fop_file_remove_print@DB_VERSION_UNIQUE_NAME@ #define __fop_init_print __fop_init_print@DB_VERSION_UNIQUE_NAME@ #define __fop_create __fop_create@DB_VERSION_UNIQUE_NAME@ #define __fop_remove __fop_remove@DB_VERSION_UNIQUE_NAME@ #define __fop_write __fop_write@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file __fop_write_file@DB_VERSION_UNIQUE_NAME@ #define __fop_rename __fop_rename@DB_VERSION_UNIQUE_NAME@ #define __fop_create_recover __fop_create_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_create_60_recover __fop_create_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_create_42_recover __fop_create_42_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_remove_recover __fop_remove_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_remove_60_recover __fop_remove_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_write_recover __fop_write_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_60_recover __fop_write_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_write_42_recover __fop_write_42_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_recover __fop_write_file_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_60_recover __fop_write_file_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_recover __fop_rename_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_noundo_recover __fop_rename_noundo_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_60_recover __fop_rename_60_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_noundo_60_recover __fop_rename_noundo_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_42_recover __fop_rename_42_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_noundo_46_recover __fop_rename_noundo_46_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_file_remove_recover __fop_file_remove_recover@DB_VERSION_UNIQUE_NAME@ +#define __fop_file_remove_60_recover __fop_file_remove_60_recover@DB_VERSION_UNIQUE_NAME@ #define __fop_lock_handle __fop_lock_handle@DB_VERSION_UNIQUE_NAME@ #define __fop_file_setup __fop_file_setup@DB_VERSION_UNIQUE_NAME@ #define __fop_subdb_setup __fop_subdb_setup@DB_VERSION_UNIQUE_NAME@ @@ -1041,6 +1152,8 @@ #define __ham_31_hash __ham_31_hash@DB_VERSION_UNIQUE_NAME@ #define __ham_46_hashmeta __ham_46_hashmeta@DB_VERSION_UNIQUE_NAME@ #define __ham_46_hash __ham_46_hash@DB_VERSION_UNIQUE_NAME@ +#define __ham_60_hashmeta __ham_60_hashmeta@DB_VERSION_UNIQUE_NAME@ +#define __ham_60_hash __ham_60_hash@DB_VERSION_UNIQUE_NAME@ #define __ham_vrfy_meta __ham_vrfy_meta@DB_VERSION_UNIQUE_NAME@ #define __ham_vrfy __ham_vrfy@DB_VERSION_UNIQUE_NAME@ #define __ham_vrfy_structure __ham_vrfy_structure@DB_VERSION_UNIQUE_NAME@ @@ -1055,11 +1168,15 @@ #define __heapc_gsplit __heapc_gsplit@DB_VERSION_UNIQUE_NAME@ #define __heapc_refresh __heapc_refresh@DB_VERSION_UNIQUE_NAME@ #define __heap_addrem_desc __heap_addrem_desc@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_60_desc __heap_addrem_60_desc@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_50_desc __heap_addrem_50_desc@DB_VERSION_UNIQUE_NAME@ #define __heap_pg_alloc_desc __heap_pg_alloc_desc@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_meta_desc __heap_trunc_meta_desc@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_page_desc __heap_trunc_page_desc@DB_VERSION_UNIQUE_NAME@ #define __heap_init_recover __heap_init_recover@DB_VERSION_UNIQUE_NAME@ #define __heap_addrem_print __heap_addrem_print@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_60_print __heap_addrem_60_print@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_50_print __heap_addrem_50_print@DB_VERSION_UNIQUE_NAME@ #define __heap_pg_alloc_print __heap_pg_alloc_print@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_meta_print __heap_trunc_meta_print@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_page_print __heap_trunc_page_print@DB_VERSION_UNIQUE_NAME@ @@ -1084,6 +1201,8 @@ #define __heap_pg_alloc_recover __heap_pg_alloc_recover@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_meta_recover __heap_trunc_meta_recover@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_page_recover __heap_trunc_page_recover@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_60_recover __heap_addrem_60_recover@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_50_recover __heap_addrem_50_recover@DB_VERSION_UNIQUE_NAME@ #define __heap_truncate __heap_truncate@DB_VERSION_UNIQUE_NAME@ #define __heap_stat __heap_stat@DB_VERSION_UNIQUE_NAME@ #define __heap_stat_print __heap_stat_print@DB_VERSION_UNIQUE_NAME@ @@ -1091,6 +1210,8 @@ #define __heap_stat_callback __heap_stat_callback@DB_VERSION_UNIQUE_NAME@ #define __heap_traverse __heap_traverse@DB_VERSION_UNIQUE_NAME@ #define __db_no_heap_am __db_no_heap_am@DB_VERSION_UNIQUE_NAME@ +#define __heap_60_heapmeta __heap_60_heapmeta@DB_VERSION_UNIQUE_NAME@ +#define __heap_60_heap __heap_60_heap@DB_VERSION_UNIQUE_NAME@ #define __heap_vrfy_meta __heap_vrfy_meta@DB_VERSION_UNIQUE_NAME@ #define __heap_vrfy __heap_vrfy@DB_VERSION_UNIQUE_NAME@ #define __heap_vrfy_structure __heap_vrfy_structure@DB_VERSION_UNIQUE_NAME@ @@ -1129,6 +1250,7 @@ #define __lock_addfamilylocker __lock_addfamilylocker@DB_VERSION_UNIQUE_NAME@ #define __lock_freelocker __lock_freelocker@DB_VERSION_UNIQUE_NAME@ #define __lock_familyremove __lock_familyremove@DB_VERSION_UNIQUE_NAME@ +#define __lock_local_locker_invalidate __lock_local_locker_invalidate@DB_VERSION_UNIQUE_NAME@ #define __lock_fix_list __lock_fix_list@DB_VERSION_UNIQUE_NAME@ #define __lock_get_list __lock_get_list@DB_VERSION_UNIQUE_NAME@ #define __lock_list_print __lock_list_print@DB_VERSION_UNIQUE_NAME@ @@ -1154,6 +1276,7 @@ #define __lock_set_env_timeout __lock_set_env_timeout@DB_VERSION_UNIQUE_NAME@ #define __lock_open __lock_open@DB_VERSION_UNIQUE_NAME@ #define __lock_env_refresh __lock_env_refresh@DB_VERSION_UNIQUE_NAME@ +#define __lock_region_detach __lock_region_detach@DB_VERSION_UNIQUE_NAME@ #define __lock_region_mutex_count __lock_region_mutex_count@DB_VERSION_UNIQUE_NAME@ #define __lock_region_mutex_max __lock_region_mutex_max@DB_VERSION_UNIQUE_NAME@ #define __lock_region_max __lock_region_max@DB_VERSION_UNIQUE_NAME@ @@ -1162,6 +1285,7 @@ #define __lock_stat_print_pp __lock_stat_print_pp@DB_VERSION_UNIQUE_NAME@ #define __lock_stat_print __lock_stat_print@DB_VERSION_UNIQUE_NAME@ #define __lock_printlock __lock_printlock@DB_VERSION_UNIQUE_NAME@ +#define __lock_dump_locker __lock_dump_locker@DB_VERSION_UNIQUE_NAME@ #define __lock_set_timeout __lock_set_timeout@DB_VERSION_UNIQUE_NAME@ #define __lock_set_timeout_internal __lock_set_timeout_internal@DB_VERSION_UNIQUE_NAME@ #define __lock_inherit_timeout __lock_inherit_timeout@DB_VERSION_UNIQUE_NAME@ @@ -1169,6 +1293,7 @@ #define __lock_lhash __lock_lhash@DB_VERSION_UNIQUE_NAME@ #define __lock_nomem __lock_nomem@DB_VERSION_UNIQUE_NAME@ #define __log_open __log_open@DB_VERSION_UNIQUE_NAME@ +#define __log_region_detach __log_region_detach@DB_VERSION_UNIQUE_NAME@ #define __log_find __log_find@DB_VERSION_UNIQUE_NAME@ #define __log_valid __log_valid@DB_VERSION_UNIQUE_NAME@ #define __log_env_refresh __log_env_refresh@DB_VERSION_UNIQUE_NAME@ @@ -1234,6 +1359,7 @@ #define __log_file_pp __log_file_pp@DB_VERSION_UNIQUE_NAME@ #define __log_name __log_name@DB_VERSION_UNIQUE_NAME@ #define __log_rep_put __log_rep_put@DB_VERSION_UNIQUE_NAME@ +#define __log_rep_write __log_rep_write@DB_VERSION_UNIQUE_NAME@ #define __log_put_record_pp __log_put_record_pp@DB_VERSION_UNIQUE_NAME@ #define __log_put_record __log_put_record@DB_VERSION_UNIQUE_NAME@ #define __log_stat_pp __log_stat_pp@DB_VERSION_UNIQUE_NAME@ @@ -1277,6 +1403,7 @@ #define __db_merge_verify __db_merge_verify@DB_VERSION_UNIQUE_NAME@ #define __db_pgno_verify __db_pgno_verify@DB_VERSION_UNIQUE_NAME@ #define __dbreg_register_verify __dbreg_register_verify@DB_VERSION_UNIQUE_NAME@ +#define __dbreg_register_42_verify __dbreg_register_42_verify@DB_VERSION_UNIQUE_NAME@ #define __bam_split_verify __bam_split_verify@DB_VERSION_UNIQUE_NAME@ #define __bam_split_42_verify __bam_split_42_verify@DB_VERSION_UNIQUE_NAME@ #define __bam_rsplit_verify __bam_rsplit_verify@DB_VERSION_UNIQUE_NAME@ @@ -1291,12 +1418,19 @@ #define __bam_relink_43_verify __bam_relink_43_verify@DB_VERSION_UNIQUE_NAME@ #define __bam_merge_44_verify __bam_merge_44_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_create_42_verify __fop_create_42_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_create_60_verify __fop_create_60_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_create_verify __fop_create_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_remove_60_verify __fop_remove_60_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_remove_verify __fop_remove_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_write_42_verify __fop_write_42_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_60_verify __fop_write_60_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_write_verify __fop_write_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_60_verify __fop_write_file_60_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_write_file_verify __fop_write_file_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_42_verify __fop_rename_42_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_rename_60_verify __fop_rename_60_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_rename_verify __fop_rename_verify@DB_VERSION_UNIQUE_NAME@ +#define __fop_file_remove_60_verify __fop_file_remove_60_verify@DB_VERSION_UNIQUE_NAME@ #define __fop_file_remove_verify __fop_file_remove_verify@DB_VERSION_UNIQUE_NAME@ #define __ham_insdel_verify __ham_insdel_verify@DB_VERSION_UNIQUE_NAME@ #define __ham_newpage_verify __ham_newpage_verify@DB_VERSION_UNIQUE_NAME@ @@ -1312,6 +1446,7 @@ #define __ham_curadj_verify __ham_curadj_verify@DB_VERSION_UNIQUE_NAME@ #define __ham_chgpg_verify __ham_chgpg_verify@DB_VERSION_UNIQUE_NAME@ #define __heap_addrem_verify __heap_addrem_verify@DB_VERSION_UNIQUE_NAME@ +#define __heap_addrem_60_verify __heap_addrem_60_verify@DB_VERSION_UNIQUE_NAME@ #define __heap_pg_alloc_verify __heap_pg_alloc_verify@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_meta_verify __heap_trunc_meta_verify@DB_VERSION_UNIQUE_NAME@ #define __heap_trunc_page_verify __heap_trunc_page_verify@DB_VERSION_UNIQUE_NAME@ @@ -1363,6 +1498,7 @@ #define __del_txn_pages __del_txn_pages@DB_VERSION_UNIQUE_NAME@ #define __is_ancestor_txn __is_ancestor_txn@DB_VERSION_UNIQUE_NAME@ #define __return_txn_pages __return_txn_pages@DB_VERSION_UNIQUE_NAME@ +#define __memp_bh_unreachable __memp_bh_unreachable@DB_VERSION_UNIQUE_NAME@ #define __memp_alloc __memp_alloc@DB_VERSION_UNIQUE_NAME@ #define __memp_free __memp_free@DB_VERSION_UNIQUE_NAME@ #define __memp_backup_open __memp_backup_open@DB_VERSION_UNIQUE_NAME@ @@ -1375,6 +1511,7 @@ #define __memp_bhfree __memp_bhfree@DB_VERSION_UNIQUE_NAME@ #define __memp_fget_pp __memp_fget_pp@DB_VERSION_UNIQUE_NAME@ #define __memp_fget __memp_fget@DB_VERSION_UNIQUE_NAME@ +#define __memp_find_obsolete_version __memp_find_obsolete_version@DB_VERSION_UNIQUE_NAME@ #define __memp_fcreate_pp __memp_fcreate_pp@DB_VERSION_UNIQUE_NAME@ #define __memp_fcreate __memp_fcreate@DB_VERSION_UNIQUE_NAME@ #define __memp_set_clear_len __memp_set_clear_len@DB_VERSION_UNIQUE_NAME@ @@ -1385,6 +1522,7 @@ #define __memp_get_ftype __memp_get_ftype@DB_VERSION_UNIQUE_NAME@ #define __memp_set_ftype __memp_set_ftype@DB_VERSION_UNIQUE_NAME@ #define __memp_set_lsn_offset __memp_set_lsn_offset@DB_VERSION_UNIQUE_NAME@ +#define __memp_set_maxpgno __memp_set_maxpgno@DB_VERSION_UNIQUE_NAME@ #define __memp_get_pgcookie __memp_get_pgcookie@DB_VERSION_UNIQUE_NAME@ #define __memp_set_pgcookie __memp_set_pgcookie@DB_VERSION_UNIQUE_NAME@ #define __memp_get_priority __memp_get_priority@DB_VERSION_UNIQUE_NAME@ @@ -1432,10 +1570,12 @@ #define __memp_bh_freeze __memp_bh_freeze@DB_VERSION_UNIQUE_NAME@ #define __memp_bh_thaw __memp_bh_thaw@DB_VERSION_UNIQUE_NAME@ #define __memp_open __memp_open@DB_VERSION_UNIQUE_NAME@ +#define __memp_region_detach __memp_region_detach@DB_VERSION_UNIQUE_NAME@ #define __memp_init __memp_init@DB_VERSION_UNIQUE_NAME@ #define __memp_max_regions __memp_max_regions@DB_VERSION_UNIQUE_NAME@ #define __memp_region_mutex_count __memp_region_mutex_count@DB_VERSION_UNIQUE_NAME@ #define __memp_env_refresh __memp_env_refresh@DB_VERSION_UNIQUE_NAME@ +#define __memp_region_bhfree __memp_region_bhfree@DB_VERSION_UNIQUE_NAME@ #define __memp_register_pp __memp_register_pp@DB_VERSION_UNIQUE_NAME@ #define __memp_register __memp_register@DB_VERSION_UNIQUE_NAME@ #define __memp_get_bucket __memp_get_bucket@DB_VERSION_UNIQUE_NAME@ @@ -1460,13 +1600,13 @@ #define __mutex_alloc_int __mutex_alloc_int@DB_VERSION_UNIQUE_NAME@ #define __mutex_free __mutex_free@DB_VERSION_UNIQUE_NAME@ #define __mutex_free_int __mutex_free_int@DB_VERSION_UNIQUE_NAME@ +#define __mutex_died __mutex_died@DB_VERSION_UNIQUE_NAME@ #define __mutex_refresh __mutex_refresh@DB_VERSION_UNIQUE_NAME@ -#define __mut_failchk __mut_failchk@DB_VERSION_UNIQUE_NAME@ -#define __db_fcntl_mutex_init __db_fcntl_mutex_init@DB_VERSION_UNIQUE_NAME@ -#define __db_fcntl_mutex_lock __db_fcntl_mutex_lock@DB_VERSION_UNIQUE_NAME@ -#define __db_fcntl_mutex_trylock __db_fcntl_mutex_trylock@DB_VERSION_UNIQUE_NAME@ -#define __db_fcntl_mutex_unlock __db_fcntl_mutex_unlock@DB_VERSION_UNIQUE_NAME@ -#define __db_fcntl_mutex_destroy __db_fcntl_mutex_destroy@DB_VERSION_UNIQUE_NAME@ +#define __mutex_record_lock __mutex_record_lock@DB_VERSION_UNIQUE_NAME@ +#define __mutex_record_unlock __mutex_record_unlock@DB_VERSION_UNIQUE_NAME@ +#define __mutex_record_print __mutex_record_print@DB_VERSION_UNIQUE_NAME@ +#define __mutex_failchk __mutex_failchk@DB_VERSION_UNIQUE_NAME@ +#define __mutex_failchk_thread __mutex_failchk_thread@DB_VERSION_UNIQUE_NAME@ #define __mutex_alloc_pp __mutex_alloc_pp@DB_VERSION_UNIQUE_NAME@ #define __mutex_free_pp __mutex_free_pp@DB_VERSION_UNIQUE_NAME@ #define __mutex_lock_pp __mutex_lock_pp@DB_VERSION_UNIQUE_NAME@ @@ -1481,6 +1621,9 @@ #define __mutex_set_max __mutex_set_max@DB_VERSION_UNIQUE_NAME@ #define __mutex_get_tas_spins __mutex_get_tas_spins@DB_VERSION_UNIQUE_NAME@ #define __mutex_set_tas_spins __mutex_set_tas_spins@DB_VERSION_UNIQUE_NAME@ +#ifdef HAVE_ERROR_HISTORY +#define __mutex_diags __mutex_diags@DB_VERSION_UNIQUE_NAME@ +#endif #if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT) #define __atomic_inc __atomic_inc@DB_VERSION_UNIQUE_NAME@ #endif @@ -1503,6 +1646,7 @@ #define __db_pthread_mutex_unlock __db_pthread_mutex_unlock@DB_VERSION_UNIQUE_NAME@ #define __db_pthread_mutex_destroy __db_pthread_mutex_destroy@DB_VERSION_UNIQUE_NAME@ #define __mutex_open __mutex_open@DB_VERSION_UNIQUE_NAME@ +#define __mutex_region_detach __mutex_region_detach@DB_VERSION_UNIQUE_NAME@ #define __mutex_env_refresh __mutex_env_refresh@DB_VERSION_UNIQUE_NAME@ #define __mutex_resource_return __mutex_resource_return@DB_VERSION_UNIQUE_NAME@ #define __mutex_stat_pp __mutex_stat_pp@DB_VERSION_UNIQUE_NAME@ @@ -1512,6 +1656,7 @@ #define __mutex_print_debug_stats __mutex_print_debug_stats@DB_VERSION_UNIQUE_NAME@ #define __mutex_set_wait_info __mutex_set_wait_info@DB_VERSION_UNIQUE_NAME@ #define __mutex_clear __mutex_clear@DB_VERSION_UNIQUE_NAME@ +#define __mutex_describe __mutex_describe@DB_VERSION_UNIQUE_NAME@ #define __db_tas_mutex_init __db_tas_mutex_init@DB_VERSION_UNIQUE_NAME@ #define __db_tas_mutex_lock __db_tas_mutex_lock@DB_VERSION_UNIQUE_NAME@ #define __db_tas_mutex_trylock __db_tas_mutex_trylock@DB_VERSION_UNIQUE_NAME@ @@ -1582,6 +1727,7 @@ #define __os_concat_path __os_concat_path@DB_VERSION_UNIQUE_NAME@ #define __os_id __os_id@DB_VERSION_UNIQUE_NAME@ #define __os_rename __os_rename@DB_VERSION_UNIQUE_NAME@ +#define __os_rmdir __os_rmdir@DB_VERSION_UNIQUE_NAME@ #define __os_isroot __os_isroot@DB_VERSION_UNIQUE_NAME@ #define __db_rpath __db_rpath@DB_VERSION_UNIQUE_NAME@ #define __os_io __os_io@DB_VERSION_UNIQUE_NAME@ @@ -1590,16 +1736,37 @@ #define __os_physwrite __os_physwrite@DB_VERSION_UNIQUE_NAME@ #define __os_seek __os_seek@DB_VERSION_UNIQUE_NAME@ #define __os_stack __os_stack@DB_VERSION_UNIQUE_NAME@ +#define __os_stack_top __os_stack_top@DB_VERSION_UNIQUE_NAME@ +#define __os_stack_text __os_stack_text@DB_VERSION_UNIQUE_NAME@ +#define __os_stack_save __os_stack_save@DB_VERSION_UNIQUE_NAME@ +#define __os_stack_msgadd __os_stack_msgadd@DB_VERSION_UNIQUE_NAME@ #define __os_exists __os_exists@DB_VERSION_UNIQUE_NAME@ #define __os_ioinfo __os_ioinfo@DB_VERSION_UNIQUE_NAME@ #define __os_tmpdir __os_tmpdir@DB_VERSION_UNIQUE_NAME@ #define __os_truncate __os_truncate@DB_VERSION_UNIQUE_NAME@ #define __os_unique_id __os_unique_id@DB_VERSION_UNIQUE_NAME@ +#define __os_srandom __os_srandom@DB_VERSION_UNIQUE_NAME@ +#define __os_random __os_random@DB_VERSION_UNIQUE_NAME@ #define __os_unlink __os_unlink@DB_VERSION_UNIQUE_NAME@ #define __os_yield __os_yield@DB_VERSION_UNIQUE_NAME@ #ifdef HAVE_QNX #define __os_qnx_region_open __os_qnx_region_open@DB_VERSION_UNIQUE_NAME@ #endif +#ifdef DB_WINCE +#define __ce_freopen __ce_freopen@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef DB_WINCE +#define __ce_gmtime __ce_gmtime@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef DB_WINCE +#define localtime localtime@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef DB_WINCE +#define __ce_mktime __ce_mktime@DB_VERSION_UNIQUE_NAME@ +#endif +#ifdef DB_WINCE +#define __ce_remove __ce_remove@DB_VERSION_UNIQUE_NAME@ +#endif #define __os_is_winnt __os_is_winnt@DB_VERSION_UNIQUE_NAME@ #define __os_cpu_count __os_cpu_count@DB_VERSION_UNIQUE_NAME@ #ifdef HAVE_REPLICATION_THREADS @@ -1673,6 +1840,8 @@ #define __rep_egen_unmarshal __rep_egen_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __rep_fileinfo_marshal __rep_fileinfo_marshal@DB_VERSION_UNIQUE_NAME@ #define __rep_fileinfo_unmarshal __rep_fileinfo_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_fileinfo_v7_marshal __rep_fileinfo_v7_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_fileinfo_v7_unmarshal __rep_fileinfo_v7_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __rep_fileinfo_v6_marshal __rep_fileinfo_v6_marshal@DB_VERSION_UNIQUE_NAME@ #define __rep_fileinfo_v6_unmarshal __rep_fileinfo_v6_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __rep_grant_info_marshal __rep_grant_info_marshal@DB_VERSION_UNIQUE_NAME@ @@ -1691,13 +1860,29 @@ #define __rep_lsn_hist_key_unmarshal __rep_lsn_hist_key_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __rep_lsn_hist_data_marshal __rep_lsn_hist_data_marshal@DB_VERSION_UNIQUE_NAME@ #define __rep_lsn_hist_data_unmarshal __rep_lsn_hist_data_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update_req_marshal __rep_blob_update_req_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update_req_unmarshal __rep_blob_update_req_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update_marshal __rep_blob_update_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update_unmarshal __rep_blob_update_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_file_marshal __rep_blob_file_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_file_unmarshal __rep_blob_file_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk_marshal __rep_blob_chunk_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk_unmarshal __rep_blob_chunk_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk_req_marshal __rep_blob_chunk_req_marshal@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk_req_unmarshal __rep_blob_chunk_req_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __rep_update_req __rep_update_req@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update_req __rep_blob_update_req@DB_VERSION_UNIQUE_NAME@ #define __rep_page_req __rep_page_req@DB_VERSION_UNIQUE_NAME@ #define __rep_update_setup __rep_update_setup@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_update __rep_blob_update@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_allreq __rep_blob_allreq@DB_VERSION_UNIQUE_NAME@ #define __rep_bulk_page __rep_bulk_page@DB_VERSION_UNIQUE_NAME@ #define __rep_page __rep_page@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk __rep_blob_chunk@DB_VERSION_UNIQUE_NAME@ #define __rep_init_cleanup __rep_init_cleanup@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_chunk_req __rep_blob_chunk_req@DB_VERSION_UNIQUE_NAME@ #define __rep_pggap_req __rep_pggap_req@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_rereq __rep_blob_rereq@DB_VERSION_UNIQUE_NAME@ #define __rep_finfo_alloc __rep_finfo_alloc@DB_VERSION_UNIQUE_NAME@ #define __rep_remove_init_file __rep_remove_init_file@DB_VERSION_UNIQUE_NAME@ #define __rep_reset_init __rep_reset_init@DB_VERSION_UNIQUE_NAME@ @@ -1727,24 +1912,32 @@ #define __rep_start_int __rep_start_int@DB_VERSION_UNIQUE_NAME@ #define __rep_open_sysdb __rep_open_sysdb@DB_VERSION_UNIQUE_NAME@ #define __rep_client_dbinit __rep_client_dbinit@DB_VERSION_UNIQUE_NAME@ +#define __rep_blob_cmp __rep_blob_cmp@DB_VERSION_UNIQUE_NAME@ +#define __rep_offset_cmp __rep_offset_cmp@DB_VERSION_UNIQUE_NAME@ #define __rep_get_limit __rep_get_limit@DB_VERSION_UNIQUE_NAME@ #define __rep_set_limit __rep_set_limit@DB_VERSION_UNIQUE_NAME@ #define __rep_set_nsites_pp __rep_set_nsites_pp@DB_VERSION_UNIQUE_NAME@ #define __rep_set_nsites_int __rep_set_nsites_int@DB_VERSION_UNIQUE_NAME@ #define __rep_get_nsites __rep_get_nsites@DB_VERSION_UNIQUE_NAME@ -#define __rep_set_priority __rep_set_priority@DB_VERSION_UNIQUE_NAME@ +#define __rep_set_priority_pp __rep_set_priority_pp@DB_VERSION_UNIQUE_NAME@ +#define __rep_set_priority_int __rep_set_priority_int@DB_VERSION_UNIQUE_NAME@ #define __rep_get_priority __rep_get_priority@DB_VERSION_UNIQUE_NAME@ -#define __rep_set_timeout __rep_set_timeout@DB_VERSION_UNIQUE_NAME@ +#define __rep_set_timeout_pp __rep_set_timeout_pp@DB_VERSION_UNIQUE_NAME@ +#define __rep_set_timeout_int __rep_set_timeout_int@DB_VERSION_UNIQUE_NAME@ #define __rep_get_timeout __rep_get_timeout@DB_VERSION_UNIQUE_NAME@ #define __rep_get_request __rep_get_request@DB_VERSION_UNIQUE_NAME@ #define __rep_set_request __rep_set_request@DB_VERSION_UNIQUE_NAME@ +#define __rep_set_view __rep_set_view@DB_VERSION_UNIQUE_NAME@ +#define __rep_call_partial __rep_call_partial@DB_VERSION_UNIQUE_NAME@ #define __rep_set_transport_pp __rep_set_transport_pp@DB_VERSION_UNIQUE_NAME@ #define __rep_set_transport_int __rep_set_transport_int@DB_VERSION_UNIQUE_NAME@ #define __rep_get_clockskew __rep_get_clockskew@DB_VERSION_UNIQUE_NAME@ #define __rep_set_clockskew __rep_set_clockskew@DB_VERSION_UNIQUE_NAME@ -#define __rep_flush __rep_flush@DB_VERSION_UNIQUE_NAME@ +#define __rep_flush_pp __rep_flush_pp@DB_VERSION_UNIQUE_NAME@ +#define __rep_flush_int __rep_flush_int@DB_VERSION_UNIQUE_NAME@ #define __rep_sync __rep_sync@DB_VERSION_UNIQUE_NAME@ #define __rep_txn_applied __rep_txn_applied@DB_VERSION_UNIQUE_NAME@ +#define __rep_read_lsn_history __rep_read_lsn_history@DB_VERSION_UNIQUE_NAME@ #define __rep_process_message_pp __rep_process_message_pp@DB_VERSION_UNIQUE_NAME@ #define __rep_process_message_int __rep_process_message_int@DB_VERSION_UNIQUE_NAME@ #define __rep_apply __rep_apply@DB_VERSION_UNIQUE_NAME@ @@ -1760,6 +1953,7 @@ #define __rep_closefiles __rep_closefiles@DB_VERSION_UNIQUE_NAME@ #define __rep_write_egen __rep_write_egen@DB_VERSION_UNIQUE_NAME@ #define __rep_write_gen __rep_write_gen@DB_VERSION_UNIQUE_NAME@ +#define __rep_check_view __rep_check_view@DB_VERSION_UNIQUE_NAME@ #define __rep_stat_pp __rep_stat_pp@DB_VERSION_UNIQUE_NAME@ #define __rep_stat_print_pp __rep_stat_print_pp@DB_VERSION_UNIQUE_NAME@ #define __rep_stat_print __rep_stat_print@DB_VERSION_UNIQUE_NAME@ @@ -1798,6 +1992,8 @@ #define __rep_get_maxpermlsn __rep_get_maxpermlsn@DB_VERSION_UNIQUE_NAME@ #define __rep_is_internal_rep_file __rep_is_internal_rep_file@DB_VERSION_UNIQUE_NAME@ #define __rep_get_datagen __rep_get_datagen@DB_VERSION_UNIQUE_NAME@ +#define __rep_become_readonly_master __rep_become_readonly_master@DB_VERSION_UNIQUE_NAME@ +#define __rep_get_lsnhist_data __rep_get_lsnhist_data@DB_VERSION_UNIQUE_NAME@ #define __rep_verify __rep_verify@DB_VERSION_UNIQUE_NAME@ #define __rep_verify_fail __rep_verify_fail@DB_VERSION_UNIQUE_NAME@ #define __rep_verify_req __rep_verify_req@DB_VERSION_UNIQUE_NAME@ @@ -1827,6 +2023,8 @@ #define __repmgr_membership_key_unmarshal __repmgr_membership_key_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_membership_data_marshal __repmgr_membership_data_marshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_membership_data_unmarshal __repmgr_membership_data_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4membership_data_marshal __repmgr_v4membership_data_marshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4membership_data_unmarshal __repmgr_v4membership_data_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_member_metadata_marshal __repmgr_member_metadata_marshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_member_metadata_unmarshal __repmgr_member_metadata_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_gm_fwd_marshal __repmgr_gm_fwd_marshal@DB_VERSION_UNIQUE_NAME@ @@ -1835,21 +2033,34 @@ #define __repmgr_membr_vers_unmarshal __repmgr_membr_vers_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_site_info_marshal __repmgr_site_info_marshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_site_info_unmarshal __repmgr_site_info_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4site_info_marshal __repmgr_v4site_info_marshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4site_info_unmarshal __repmgr_v4site_info_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_connect_reject_marshal __repmgr_connect_reject_marshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_connect_reject_unmarshal __repmgr_connect_reject_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4connect_reject_marshal __repmgr_v4connect_reject_marshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_v4connect_reject_unmarshal __repmgr_v4connect_reject_unmarshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_lsnhist_match_marshal __repmgr_lsnhist_match_marshal@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_lsnhist_match_unmarshal __repmgr_lsnhist_match_unmarshal@DB_VERSION_UNIQUE_NAME@ #define __repmgr_member_print __repmgr_member_print@DB_VERSION_UNIQUE_NAME@ #define __repmgr_init_print __repmgr_init_print@DB_VERSION_UNIQUE_NAME@ #define __repmgr_init_election __repmgr_init_election@DB_VERSION_UNIQUE_NAME@ #define __repmgr_claim_victory __repmgr_claim_victory@DB_VERSION_UNIQUE_NAME@ #define __repmgr_turn_on_elections __repmgr_turn_on_elections@DB_VERSION_UNIQUE_NAME@ -#define __repmgr_start __repmgr_start@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_start_pp __repmgr_start_pp@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_start_int __repmgr_start_int@DB_VERSION_UNIQUE_NAME@ #define __repmgr_valid_config __repmgr_valid_config@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_prefmas_auto_config __repmgr_prefmas_auto_config@DB_VERSION_UNIQUE_NAME@ #define __repmgr_autostart __repmgr_autostart@DB_VERSION_UNIQUE_NAME@ #define __repmgr_start_selector __repmgr_start_selector@DB_VERSION_UNIQUE_NAME@ #define __repmgr_close __repmgr_close@DB_VERSION_UNIQUE_NAME@ #define __repmgr_stop __repmgr_stop@DB_VERSION_UNIQUE_NAME@ #define __repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@ #define __repmgr_get_ack_policy __repmgr_get_ack_policy@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_set_incoming_queue_max __repmgr_set_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_get_incoming_queue_max __repmgr_get_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_set_incoming_queue_redzone __repmgr_set_incoming_queue_redzone@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_get_incoming_queue_redzone __repmgr_get_incoming_queue_redzone@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_get_incoming_queue_fullevent __repmgr_get_incoming_queue_fullevent@DB_VERSION_UNIQUE_NAME@ #define __repmgr_env_create __repmgr_env_create@DB_VERSION_UNIQUE_NAME@ #define __repmgr_env_destroy __repmgr_env_destroy@DB_VERSION_UNIQUE_NAME@ #define __repmgr_stop_threads __repmgr_stop_threads@DB_VERSION_UNIQUE_NAME@ @@ -1870,7 +2081,8 @@ #define __repmgr_get_site_address __repmgr_get_site_address@DB_VERSION_UNIQUE_NAME@ #define __repmgr_get_eid __repmgr_get_eid@DB_VERSION_UNIQUE_NAME@ #define __repmgr_get_config __repmgr_get_config@DB_VERSION_UNIQUE_NAME@ -#define __repmgr_site_config __repmgr_site_config@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_config_pp __repmgr_site_config_pp@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_config_int __repmgr_site_config_int@DB_VERSION_UNIQUE_NAME@ #define __repmgr_site_close __repmgr_site_close@DB_VERSION_UNIQUE_NAME@ #define __repmgr_msg_thread __repmgr_msg_thread@DB_VERSION_UNIQUE_NAME@ #define __repmgr_send_err_resp __repmgr_send_err_resp@DB_VERSION_UNIQUE_NAME@ @@ -1930,7 +2142,6 @@ #define __repmgr_queue_destroy __repmgr_queue_destroy@DB_VERSION_UNIQUE_NAME@ #define __repmgr_queue_get __repmgr_queue_get@DB_VERSION_UNIQUE_NAME@ #define __repmgr_queue_put __repmgr_queue_put@DB_VERSION_UNIQUE_NAME@ -#define __repmgr_queue_size __repmgr_queue_size@DB_VERSION_UNIQUE_NAME@ #define __repmgr_member_recover __repmgr_member_recover@DB_VERSION_UNIQUE_NAME@ #define __repmgr_select_thread __repmgr_select_thread@DB_VERSION_UNIQUE_NAME@ #define __repmgr_bow_out __repmgr_bow_out@DB_VERSION_UNIQUE_NAME@ @@ -1938,6 +2149,7 @@ #define __repmgr_compute_timeout __repmgr_compute_timeout@DB_VERSION_UNIQUE_NAME@ #define __repmgr_connected_master __repmgr_connected_master@DB_VERSION_UNIQUE_NAME@ #define __repmgr_check_timeouts __repmgr_check_timeouts@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_refresh_selector __repmgr_refresh_selector@DB_VERSION_UNIQUE_NAME@ #define __repmgr_first_try_connections __repmgr_first_try_connections@DB_VERSION_UNIQUE_NAME@ #define __repmgr_send_v1_handshake __repmgr_send_v1_handshake@DB_VERSION_UNIQUE_NAME@ #define __repmgr_read_from_site __repmgr_read_from_site@DB_VERSION_UNIQUE_NAME@ @@ -1949,7 +2161,8 @@ #define __repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@ #define __repmgr_stat_print_pp __repmgr_stat_print_pp@DB_VERSION_UNIQUE_NAME@ #define __repmgr_stat_print __repmgr_stat_print@DB_VERSION_UNIQUE_NAME@ -#define __repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_list_pp __repmgr_site_list_pp@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_list_int __repmgr_site_list_int@DB_VERSION_UNIQUE_NAME@ #ifndef HAVE_REPLICATION_THREADS #define __repmgr_close __repmgr_close@DB_VERSION_UNIQUE_NAME@ #endif @@ -1960,6 +2173,18 @@ #define __repmgr_set_ack_policy __repmgr_set_ack_policy@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_max __repmgr_get_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_set_incoming_queue_max __repmgr_set_incoming_queue_max@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_redzone __repmgr_get_incoming_queue_redzone@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS +#define __repmgr_get_incoming_queue_fullevent __repmgr_get_incoming_queue_fullevent@DB_VERSION_UNIQUE_NAME@ +#endif +#ifndef HAVE_REPLICATION_THREADS #define __repmgr_site __repmgr_site@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS @@ -1969,10 +2194,10 @@ #define __repmgr_local_site __repmgr_local_site@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS -#define __repmgr_site_list __repmgr_site_list@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_site_list_pp __repmgr_site_list_pp@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS -#define __repmgr_start __repmgr_start@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_start_pp __repmgr_start_pp@DB_VERSION_UNIQUE_NAME@ #endif #ifndef HAVE_REPLICATION_THREADS #define __repmgr_stat_pp __repmgr_stat_pp@DB_VERSION_UNIQUE_NAME@ @@ -2023,7 +2248,14 @@ #define __repmgr_failchk __repmgr_failchk@DB_VERSION_UNIQUE_NAME@ #define __repmgr_master_is_known __repmgr_master_is_known@DB_VERSION_UNIQUE_NAME@ #define __repmgr_stable_lsn __repmgr_stable_lsn@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_make_request_conn __repmgr_make_request_conn@DB_VERSION_UNIQUE_NAME@ #define __repmgr_send_sync_msg __repmgr_send_sync_msg@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_read_own_msg __repmgr_read_own_msg@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_prefmas_connected __repmgr_prefmas_connected@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_restart_site_as_client __repmgr_restart_site_as_client@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_make_site_readonly_master __repmgr_make_site_readonly_master@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_lsnhist_match __repmgr_lsnhist_match@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_prefmas_get_wait __repmgr_prefmas_get_wait@DB_VERSION_UNIQUE_NAME@ #define __repmgr_marshal_member_list __repmgr_marshal_member_list@DB_VERSION_UNIQUE_NAME@ #define __repmgr_refresh_membership __repmgr_refresh_membership@DB_VERSION_UNIQUE_NAME@ #define __repmgr_reload_gmdb __repmgr_reload_gmdb@DB_VERSION_UNIQUE_NAME@ @@ -2040,10 +2272,15 @@ #define __repmgr_bcast_parm_refresh __repmgr_bcast_parm_refresh@DB_VERSION_UNIQUE_NAME@ #define __repmgr_chg_prio __repmgr_chg_prio@DB_VERSION_UNIQUE_NAME@ #define __repmgr_bcast_own_msg __repmgr_bcast_own_msg@DB_VERSION_UNIQUE_NAME@ +#define __repmgr_bcast_member_list __repmgr_bcast_member_list@DB_VERSION_UNIQUE_NAME@ #define __seq_stat __seq_stat@DB_VERSION_UNIQUE_NAME@ #define __seq_stat_print __seq_stat_print@DB_VERSION_UNIQUE_NAME@ #define __db_get_seq_flags_fn __db_get_seq_flags_fn@DB_VERSION_UNIQUE_NAME@ #define __db_get_seq_flags_fn __db_get_seq_flags_fn@DB_VERSION_UNIQUE_NAME@ +#define __seq_open __seq_open@DB_VERSION_UNIQUE_NAME@ +#define __seq_initial_value __seq_initial_value@DB_VERSION_UNIQUE_NAME@ +#define __seq_get __seq_get@DB_VERSION_UNIQUE_NAME@ +#define __seq_close __seq_close@DB_VERSION_UNIQUE_NAME@ #define bdb_HCommand bdb_HCommand@DB_VERSION_UNIQUE_NAME@ #if DB_DBM_HSEARCH != 0 #define bdb_NdbmOpen bdb_NdbmOpen@DB_VERSION_UNIQUE_NAME@ @@ -2057,9 +2294,12 @@ #define tcl_CompactStat tcl_CompactStat@DB_VERSION_UNIQUE_NAME@ #define tcl_rep_send tcl_rep_send@DB_VERSION_UNIQUE_NAME@ #define dbc_Cmd dbc_Cmd@DB_VERSION_UNIQUE_NAME@ +#define dbstream_Cmd dbstream_Cmd@DB_VERSION_UNIQUE_NAME@ #define env_Cmd env_Cmd@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvRemove tcl_EnvRemove@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvClose tcl_EnvClose@DB_VERSION_UNIQUE_NAME@ +#define tcl_EnvBackup tcl_EnvBackup@DB_VERSION_UNIQUE_NAME@ +#define tcl_EnvDbBackup tcl_EnvDbBackup@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvIdReset tcl_EnvIdReset@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvLsnReset tcl_EnvLsnReset@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvVerbose tcl_EnvVerbose@DB_VERSION_UNIQUE_NAME@ @@ -2069,6 +2309,7 @@ #define tcl_EnvGetEncryptFlags tcl_EnvGetEncryptFlags@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvSetErrfile tcl_EnvSetErrfile@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvSetMsgfile tcl_EnvSetMsgfile@DB_VERSION_UNIQUE_NAME@ +#define tcl_EnvCloseMsgfile tcl_EnvCloseMsgfile@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvSetErrpfx tcl_EnvSetErrpfx@DB_VERSION_UNIQUE_NAME@ #define tcl_EnvStatPrint tcl_EnvStatPrint@DB_VERSION_UNIQUE_NAME@ #define _NewInfo _NewInfo@DB_VERSION_UNIQUE_NAME@ @@ -2111,9 +2352,11 @@ #define tcl_LogPut tcl_LogPut@DB_VERSION_UNIQUE_NAME@ #define tcl_LogStat tcl_LogStat@DB_VERSION_UNIQUE_NAME@ #define tcl_LogStatPrint tcl_LogStatPrint@DB_VERSION_UNIQUE_NAME@ +#define tcl_LogVerify tcl_LogVerify@DB_VERSION_UNIQUE_NAME@ #define logc_Cmd logc_Cmd@DB_VERSION_UNIQUE_NAME@ #define tcl_LogConfig tcl_LogConfig@DB_VERSION_UNIQUE_NAME@ #define tcl_LogGetConfig tcl_LogGetConfig@DB_VERSION_UNIQUE_NAME@ +#define tcl_LogSetMax tcl_LogSetMax@DB_VERSION_UNIQUE_NAME@ #define _MpInfoDelete _MpInfoDelete@DB_VERSION_UNIQUE_NAME@ #define tcl_MpSync tcl_MpSync@DB_VERSION_UNIQUE_NAME@ #define tcl_MpTrickle tcl_MpTrickle@DB_VERSION_UNIQUE_NAME@ @@ -2121,6 +2364,7 @@ #define tcl_MpStat tcl_MpStat@DB_VERSION_UNIQUE_NAME@ #define tcl_MpStatPrint tcl_MpStatPrint@DB_VERSION_UNIQUE_NAME@ #define tcl_Mutex tcl_Mutex@DB_VERSION_UNIQUE_NAME@ +#define tcl_MutexFailchkTimeout tcl_MutexFailchkTimeout@DB_VERSION_UNIQUE_NAME@ #define tcl_MutFree tcl_MutFree@DB_VERSION_UNIQUE_NAME@ #define tcl_MutGet tcl_MutGet@DB_VERSION_UNIQUE_NAME@ #define tcl_MutLock tcl_MutLock@DB_VERSION_UNIQUE_NAME@ @@ -2227,6 +2471,7 @@ #define __txn_get_prepared __txn_get_prepared@DB_VERSION_UNIQUE_NAME@ #define __txn_openfiles __txn_openfiles@DB_VERSION_UNIQUE_NAME@ #define __txn_open __txn_open@DB_VERSION_UNIQUE_NAME@ +#define __txn_region_detach __txn_region_detach@DB_VERSION_UNIQUE_NAME@ #define __txn_findlastckp __txn_findlastckp@DB_VERSION_UNIQUE_NAME@ #define __txn_env_refresh __txn_env_refresh@DB_VERSION_UNIQUE_NAME@ #define __txn_region_mutex_count __txn_region_mutex_count@DB_VERSION_UNIQUE_NAME@ @@ -2234,7 +2479,7 @@ #define __txn_region_size __txn_region_size@DB_VERSION_UNIQUE_NAME@ #define __txn_region_max __txn_region_max@DB_VERSION_UNIQUE_NAME@ #define __txn_id_set __txn_id_set@DB_VERSION_UNIQUE_NAME@ -#define __txn_oldest_reader __txn_oldest_reader@DB_VERSION_UNIQUE_NAME@ +#define __txn_get_readers __txn_get_readers@DB_VERSION_UNIQUE_NAME@ #define __txn_add_buffer __txn_add_buffer@DB_VERSION_UNIQUE_NAME@ #define __txn_remove_buffer __txn_remove_buffer@DB_VERSION_UNIQUE_NAME@ #define __txn_stat_pp __txn_stat_pp@DB_VERSION_UNIQUE_NAME@ diff --git a/src/dbinc_auto/lock_ext.h b/src/dbinc_auto/lock_ext.h index d5981e18..3d2c37a3 100644 --- a/src/dbinc_auto/lock_ext.h +++ b/src/dbinc_auto/lock_ext.h @@ -28,10 +28,11 @@ int __lock_id_free_pp __P((DB_ENV *, u_int32_t)); int __lock_id_free __P((ENV *, DB_LOCKER *)); int __lock_id_set __P((ENV *, u_int32_t, u_int32_t)); int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, int, DB_LOCKER **)); -int __lock_getlocker_int __P((DB_LOCKTAB *, u_int32_t, int, DB_LOCKER **)); +int __lock_getlocker_int __P((DB_LOCKTAB *, u_int32_t, int, DB_THREAD_INFO *, DB_LOCKER **)); int __lock_addfamilylocker __P((ENV *, u_int32_t, u_int32_t, u_int32_t)); int __lock_freelocker __P((DB_LOCKTAB *, DB_LOCKER *)); int __lock_familyremove __P((DB_LOCKTAB *, DB_LOCKER *)); +int __lock_local_locker_invalidate __P((ENV *, db_mutex_t)); int __lock_fix_list __P((ENV *, DBT *, u_int32_t)); int __lock_get_list __P((ENV *, DB_LOCKER *, u_int32_t, db_lockmode_t, DBT *)); void __lock_list_print __P((ENV *, DB_MSGBUF *, DBT *)); @@ -57,6 +58,7 @@ int __lock_get_env_timeout __P((DB_ENV *, db_timeout_t *, u_int32_t)); int __lock_set_env_timeout __P((DB_ENV *, db_timeout_t, u_int32_t)); int __lock_open __P((ENV *)); int __lock_env_refresh __P((ENV *)); +int __lock_region_detach __P((ENV *, DB_LOCKTAB *)); u_int32_t __lock_region_mutex_count __P((ENV *)); u_int32_t __lock_region_mutex_max __P((ENV *)); size_t __lock_region_max __P((ENV *)); @@ -65,6 +67,7 @@ int __lock_stat_pp __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t)); int __lock_stat_print_pp __P((DB_ENV *, u_int32_t)); int __lock_stat_print __P((ENV *, u_int32_t)); void __lock_printlock __P((DB_LOCKTAB *, DB_MSGBUF *mbp, struct __db_lock *, int)); +int __lock_dump_locker __P((ENV *, DB_MSGBUF *, DB_LOCKTAB *, DB_LOCKER *)); int __lock_set_timeout __P((ENV *, DB_LOCKER *, db_timeout_t, u_int32_t)); int __lock_set_timeout_internal __P((ENV *, DB_LOCKER *, db_timeout_t, u_int32_t)); int __lock_inherit_timeout __P((ENV *, DB_LOCKER *, DB_LOCKER *)); diff --git a/src/dbinc_auto/log_ext.h b/src/dbinc_auto/log_ext.h index dde6742d..769643fa 100644 --- a/src/dbinc_auto/log_ext.h +++ b/src/dbinc_auto/log_ext.h @@ -7,6 +7,7 @@ extern "C" { #endif int __log_open __P((ENV *)); +int __log_region_detach __P((ENV *, DB_LOG *)); int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *)); int __log_valid __P((DB_LOG *, u_int32_t, int, DB_FH **, u_int32_t, logfile_validity *, u_int32_t *)); int __log_env_refresh __P((ENV *)); @@ -72,6 +73,7 @@ int __log_flush_int __P((DB_LOG *, const DB_LSN *, int)); int __log_file_pp __P((DB_ENV *, const DB_LSN *, char *, size_t)); int __log_name __P((DB_LOG *, u_int32_t, char **, DB_FH **, u_int32_t)); int __log_rep_put __P((ENV *, DB_LSN *, const DBT *, u_int32_t)); +int __log_rep_write __P((ENV *)); int __log_put_record_pp __P((DB_ENV *, DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, DB_LOG_RECSPEC *, ...)); int __log_put_record __P((ENV *, DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, DB_LOG_RECSPEC *, ...)); int __log_stat_pp __P((DB_ENV *, DB_LOG_STAT **, u_int32_t)); @@ -115,6 +117,7 @@ int __db_relink_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_merge_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __db_pgno_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __dbreg_register_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __dbreg_register_42_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __bam_split_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __bam_split_42_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __bam_rsplit_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); @@ -129,12 +132,19 @@ int __bam_rcuradj_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __bam_relink_43_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __bam_merge_44_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_create_42_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_create_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_create_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_remove_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_remove_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_42_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_write_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_write_file_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_42_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_rename_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_rename_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __fop_file_remove_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __fop_file_remove_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __ham_insdel_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __ham_newpage_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); @@ -150,6 +160,7 @@ int __ham_contract_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __ham_curadj_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __ham_chgpg_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_addrem_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); +int __heap_addrem_60_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_pg_alloc_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_meta_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __heap_trunc_page_verify __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); diff --git a/src/dbinc_auto/mp_ext.h b/src/dbinc_auto/mp_ext.h index d142b584..3f5a397b 100644 --- a/src/dbinc_auto/mp_ext.h +++ b/src/dbinc_auto/mp_ext.h @@ -6,6 +6,7 @@ extern "C" { #endif +int __memp_bh_unreachable __P((ENV *, BH *, DB_LSN *, int)); int __memp_alloc __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, size_t, roff_t *, void *)); void __memp_free __P((REGINFO *, void *)); int __memp_backup_open __P((ENV *, DB_MPOOLFILE *, const char *, const char *, u_int32_t, DB_FH **, void**)); @@ -18,6 +19,7 @@ int __memp_pg __P((DB_MPOOLFILE *, db_pgno_t, void *, int)); int __memp_bhfree __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, DB_MPOOL_HASH *, BH *, u_int32_t)); int __memp_fget_pp __P((DB_MPOOLFILE *, db_pgno_t *, DB_TXN *, u_int32_t, void *)); int __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, DB_THREAD_INFO *, DB_TXN *, u_int32_t, void *)); +int __memp_find_obsolete_version __P((ENV *, BH *, DB_MPOOL_HASH *, BH **)); int __memp_fcreate_pp __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t)); int __memp_fcreate __P((ENV *, DB_MPOOLFILE **)); int __memp_set_clear_len __P((DB_MPOOLFILE *, u_int32_t)); @@ -28,6 +30,7 @@ int __memp_set_flags __P((DB_MPOOLFILE *, u_int32_t, int)); int __memp_get_ftype __P((DB_MPOOLFILE *, int *)); int __memp_set_ftype __P((DB_MPOOLFILE *, int)); int __memp_set_lsn_offset __P((DB_MPOOLFILE *, int32_t)); +void __memp_set_maxpgno __P((MPOOLFILE *, u_int32_t, u_int32_t)); int __memp_get_pgcookie __P((DB_MPOOLFILE *, DBT *)); int __memp_set_pgcookie __P((DB_MPOOLFILE *, DBT *)); int __memp_get_priority __P((DB_MPOOLFILE *, DB_CACHE_PRIORITY *)); @@ -75,10 +78,12 @@ int __memp_skip_curadj __P((DBC *, db_pgno_t)); int __memp_bh_freeze __P((DB_MPOOL *, REGINFO *, DB_MPOOL_HASH *, BH *, int *)); int __memp_bh_thaw __P((DB_MPOOL *, REGINFO *, DB_MPOOL_HASH *, BH *, BH *)); int __memp_open __P((ENV *, int)); +int __memp_region_detach __P((ENV *, DB_MPOOL *)); int __memp_init __P((ENV *, DB_MPOOL *, u_int, u_int32_t, u_int)); u_int32_t __memp_max_regions __P((ENV *)); u_int32_t __memp_region_mutex_count __P((ENV *)); int __memp_env_refresh __P((ENV *)); +int __memp_region_bhfree __P((REGINFO *)); int __memp_register_pp __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *))); int __memp_register __P((ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *))); int __memp_get_bucket __P((ENV *, MPOOLFILE *, db_pgno_t, REGINFO **, DB_MPOOL_HASH **, u_int32_t *)); diff --git a/src/dbinc_auto/mutex_ext.h b/src/dbinc_auto/mutex_ext.h index 1a2a1b2b..673c18d0 100644 --- a/src/dbinc_auto/mutex_ext.h +++ b/src/dbinc_auto/mutex_ext.h @@ -10,13 +10,13 @@ int __mutex_alloc __P((ENV *, int, u_int32_t, db_mutex_t *)); int __mutex_alloc_int __P((ENV *, int, int, u_int32_t, db_mutex_t *)); int __mutex_free __P((ENV *, db_mutex_t *)); int __mutex_free_int __P((ENV *, int, db_mutex_t *)); +int __mutex_died __P((ENV *, db_mutex_t)); int __mutex_refresh __P((ENV *, db_mutex_t)); -int __mut_failchk __P((ENV *)); -int __db_fcntl_mutex_init __P((ENV *, db_mutex_t, u_int32_t)); -int __db_fcntl_mutex_lock __P((ENV *, db_mutex_t, db_timeout_t)); -int __db_fcntl_mutex_trylock __P((ENV *, db_mutex_t)); -int __db_fcntl_mutex_unlock __P((ENV *, db_mutex_t)); -int __db_fcntl_mutex_destroy __P((ENV *, db_mutex_t)); +int __mutex_record_lock __P((ENV *, db_mutex_t, MUTEX_ACTION, MUTEX_STATE **)); +int __mutex_record_unlock __P((ENV *, db_mutex_t)); +int __mutex_record_print __P((ENV *, DB_THREAD_INFO *)); +int __mutex_failchk __P((ENV *)); +int __mutex_failchk_thread __P((ENV *, DB_THREAD_INFO *)); int __mutex_alloc_pp __P((DB_ENV *, u_int32_t, db_mutex_t *)); int __mutex_free_pp __P((DB_ENV *, db_mutex_t)); int __mutex_lock_pp __P((DB_ENV *, db_mutex_t)); @@ -31,6 +31,9 @@ int __mutex_get_max __P((DB_ENV *, u_int32_t *)); int __mutex_set_max __P((DB_ENV *, u_int32_t)); int __mutex_get_tas_spins __P((DB_ENV *, u_int32_t *)); int __mutex_set_tas_spins __P((DB_ENV *, u_int32_t)); +#ifdef HAVE_ERROR_HISTORY +int __mutex_diags __P((ENV *, db_mutex_t, int)); +#endif #if !defined(HAVE_ATOMIC_SUPPORT) && defined(HAVE_MUTEX_SUPPORT) atomic_value_t __atomic_inc __P((ENV *, db_atomic_t *)); #endif @@ -53,6 +56,7 @@ int __db_hybrid_mutex_suspend __P((ENV *, db_mutex_t, db_timespec *, int)); int __db_pthread_mutex_unlock __P((ENV *, db_mutex_t)); int __db_pthread_mutex_destroy __P((ENV *, db_mutex_t)); int __mutex_open __P((ENV *, int)); +int __mutex_region_detach __P((ENV *, DB_MUTEXMGR *)); int __mutex_env_refresh __P((ENV *)); void __mutex_resource_return __P((ENV *, REGINFO *)); int __mutex_stat_pp __P((DB_ENV *, DB_MUTEX_STAT **, u_int32_t)); @@ -62,6 +66,7 @@ void __mutex_print_debug_single __P((ENV *, const char *, db_mutex_t, u_int32_t) void __mutex_print_debug_stats __P((ENV *, DB_MSGBUF *, db_mutex_t, u_int32_t)); void __mutex_set_wait_info __P((ENV *, db_mutex_t, uintmax_t *, uintmax_t *)); void __mutex_clear __P((ENV *, db_mutex_t)); +char *__mutex_describe __P((ENV *, db_mutex_t, char *)); int __db_tas_mutex_init __P((ENV *, db_mutex_t, u_int32_t)); int __db_tas_mutex_lock __P((ENV *, db_mutex_t, db_timeout_t)); int __db_tas_mutex_trylock __P((ENV *, db_mutex_t)); diff --git a/src/dbinc_auto/os_ext.h b/src/dbinc_auto/os_ext.h index a0a7b791..26cf2127 100644 --- a/src/dbinc_auto/os_ext.h +++ b/src/dbinc_auto/os_ext.h @@ -6,7 +6,7 @@ extern "C" { #endif -void __os_abort __P((ENV *)); +void __os_abort __P((const ENV *)); int __os_abspath __P((const char *)); #if defined(HAVE_REPLICATION_THREADS) int __os_getaddrinfo __P((ENV *, const char *, u_int, const char *, const ADDRINFO *, ADDRINFO **)); @@ -18,12 +18,12 @@ int __os_umalloc __P((ENV *, size_t, void *)); int __os_urealloc __P((ENV *, size_t, void *)); void __os_ufree __P((ENV *, void *)); int __os_strdup __P((ENV *, const char *, void *)); -int __os_calloc __P((ENV *, size_t, size_t, void *)); -int __os_malloc __P((ENV *, size_t, void *)); -int __os_realloc __P((ENV *, size_t, void *)); -void __os_free __P((ENV *, void *)); +int __os_calloc __P((const ENV *, size_t, size_t, void *)); +int __os_malloc __P((const ENV *, size_t, void *)); +int __os_realloc __P((const ENV *, size_t, void *)); +void __os_free __P((const ENV *, void *)); void *__ua_memcpy __P((void *, const void *, size_t)); -void __os_gettime __P((ENV *, db_timespec *, int)); +void __os_gettime __P((const ENV *, db_timespec *, int)); int __os_fs_notzero __P((void)); int __os_support_direct_io __P((void)); int __os_support_db_register __P((void)); @@ -54,6 +54,7 @@ int __os_open __P((ENV *, const char *, u_int32_t, u_int32_t, int, DB_FH **)); int __os_concat_path __P((char *, size_t, const char *, const char *)); void __os_id __P((DB_ENV *, pid_t *, db_threadid_t*)); int __os_rename __P((ENV *, const char *, const char *, u_int32_t)); +int __os_rmdir __P((ENV *, const char *)); int __os_isroot __P((void)); char *__db_rpath __P((const char *)); int __os_io __P((ENV *, int, DB_FH *, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, u_int8_t *, size_t *)); @@ -61,17 +62,38 @@ int __os_read __P((ENV *, DB_FH *, void *, size_t, size_t *)); int __os_write __P((ENV *, DB_FH *, void *, size_t, size_t *)); int __os_physwrite __P((ENV *, DB_FH *, void *, size_t, size_t *)); int __os_seek __P((ENV *, DB_FH *, db_pgno_t, u_int32_t, off_t)); -void __os_stack __P((ENV *)); +void __os_stack __P((const ENV *)); +void __os_stack_top __P((const ENV *, unsigned, unsigned)); +void __os_stack_text __P((const ENV *, char *, size_t, unsigned, unsigned)); +int __os_stack_save __P((const ENV *, unsigned, void **)); +void __os_stack_msgadd __P((const ENV *, DB_MSGBUF *, unsigned, unsigned, void **)); int __os_exists __P((ENV *, const char *, int *)); int __os_ioinfo __P((ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *)); int __os_tmpdir __P((ENV *, u_int32_t)); -int __os_truncate __P((ENV *, DB_FH *, db_pgno_t, u_int32_t)); +int __os_truncate __P((ENV *, DB_FH *, db_pgno_t, u_int32_t, off_t)); void __os_unique_id __P((ENV *, u_int32_t *)); +void __os_srandom __P((u_int)); +u_int __os_random __P((void)); int __os_unlink __P((ENV *, const char *, int)); void __os_yield __P((ENV *, u_long, u_long)); #ifdef HAVE_QNX int __os_qnx_region_open __P((ENV *, const char *, int, int, DB_FH **)); #endif +#ifdef DB_WINCE +FILE * __ce_freopen __P((const char *, const char *, FILE *)); +#endif +#ifdef DB_WINCE +struct tm * __ce_gmtime __P((const time_t *)); +#endif +#ifdef DB_WINCE +struct tm * localtime __P((const time_t *)); +#endif +#ifdef DB_WINCE +time_t __ce_mktime __P((struct tm *)); +#endif +#ifdef DB_WINCE +int __ce_remove __P((const char *path)); +#endif int __os_is_winnt __P((void)); u_int32_t __os_cpu_count __P((void)); #ifdef HAVE_REPLICATION_THREADS diff --git a/src/dbinc_auto/rep_automsg.h b/src/dbinc_auto/rep_automsg.h index 584040cf..f52c8907 100644 --- a/src/dbinc_auto/rep_automsg.h +++ b/src/dbinc_auto/rep_automsg.h @@ -32,7 +32,7 @@ typedef struct ___rep_egen_args { u_int32_t egen; } __rep_egen_args; -#define __REP_FILEINFO_SIZE 40 +#define __REP_FILEINFO_SIZE 48 typedef struct ___rep_fileinfo_args { u_int32_t pgsize; db_pgno_t pgno; @@ -44,8 +44,24 @@ typedef struct ___rep_fileinfo_args { DBT uid; DBT info; DBT dir; + u_int32_t blob_fid_lo; + u_int32_t blob_fid_hi; } __rep_fileinfo_args; +#define __REP_FILEINFO_V7_SIZE 40 +typedef struct ___rep_fileinfo_v7_args { + u_int32_t pgsize; + db_pgno_t pgno; + db_pgno_t max_pgno; + u_int32_t filenum; + u_int32_t finfo_flags; + u_int32_t type; + u_int32_t db_flags; + DBT uid; + DBT info; + DBT dir; +} __rep_fileinfo_v7_args; + #define __REP_FILEINFO_V6_SIZE 36 typedef struct ___rep_fileinfo_v6_args { u_int32_t pgsize; @@ -116,5 +132,46 @@ typedef struct ___rep_lsn_hist_data_args { u_int32_t hist_nsec; } __rep_lsn_hist_data_args; -#define __REP_MAXMSG_SIZE 40 +#define __REP_BLOB_UPDATE_REQ_SIZE 32 +typedef struct ___rep_blob_update_req_args { + u_int64_t blob_fid; + u_int64_t blob_sid; + u_int64_t blob_id; + u_int64_t highest_id; +} __rep_blob_update_req_args; + +#define __REP_BLOB_UPDATE_SIZE 24 +typedef struct ___rep_blob_update_args { + u_int64_t blob_fid; + u_int64_t highest_id; + u_int32_t flags; + u_int32_t num_blobs; +} __rep_blob_update_args; + +#define __REP_BLOB_FILE_SIZE 24 +typedef struct ___rep_blob_file_args { + u_int64_t blob_sid; + u_int64_t blob_id; + u_int64_t blob_size; +} __rep_blob_file_args; + +#define __REP_BLOB_CHUNK_SIZE 40 +typedef struct ___rep_blob_chunk_args { + u_int32_t flags; + u_int64_t blob_fid; + u_int64_t blob_sid; + u_int64_t blob_id; + u_int64_t offset; + DBT data; +} __rep_blob_chunk_args; + +#define __REP_BLOB_CHUNK_REQ_SIZE 32 +typedef struct ___rep_blob_chunk_req_args { + u_int64_t blob_fid; + u_int64_t blob_sid; + u_int64_t blob_id; + u_int64_t offset; +} __rep_blob_chunk_req_args; + +#define __REP_MAXMSG_SIZE 48 #endif diff --git a/src/dbinc_auto/rep_ext.h b/src/dbinc_auto/rep_ext.h index 89bdc797..97740acf 100644 --- a/src/dbinc_auto/rep_ext.h +++ b/src/dbinc_auto/rep_ext.h @@ -14,6 +14,8 @@ int __rep_egen_marshal __P((ENV *, __rep_egen_args *, u_int8_t *, size_t, size_t int __rep_egen_unmarshal __P((ENV *, __rep_egen_args *, u_int8_t *, size_t, u_int8_t **)); int __rep_fileinfo_marshal __P((ENV *, u_int32_t, __rep_fileinfo_args *, u_int8_t *, size_t, size_t *)); int __rep_fileinfo_unmarshal __P((ENV *, u_int32_t, __rep_fileinfo_args **, u_int8_t *, size_t, u_int8_t **)); +int __rep_fileinfo_v7_marshal __P((ENV *, u_int32_t, __rep_fileinfo_v7_args *, u_int8_t *, size_t, size_t *)); +int __rep_fileinfo_v7_unmarshal __P((ENV *, u_int32_t, __rep_fileinfo_v7_args **, u_int8_t *, size_t, u_int8_t **)); int __rep_fileinfo_v6_marshal __P((ENV *, u_int32_t, __rep_fileinfo_v6_args *, u_int8_t *, size_t, size_t *)); int __rep_fileinfo_v6_unmarshal __P((ENV *, u_int32_t, __rep_fileinfo_v6_args **, u_int8_t *, size_t, u_int8_t **)); int __rep_grant_info_marshal __P((ENV *, __rep_grant_info_args *, u_int8_t *, size_t, size_t *)); @@ -32,13 +34,29 @@ void __rep_lsn_hist_key_marshal __P((ENV *, __rep_lsn_hist_key_args *, u_int8_t int __rep_lsn_hist_key_unmarshal __P((ENV *, __rep_lsn_hist_key_args *, u_int8_t *, size_t, u_int8_t **)); void __rep_lsn_hist_data_marshal __P((ENV *, __rep_lsn_hist_data_args *, u_int8_t *)); int __rep_lsn_hist_data_unmarshal __P((ENV *, __rep_lsn_hist_data_args *, u_int8_t *, size_t, u_int8_t **)); +void __rep_blob_update_req_marshal __P((ENV *, __rep_blob_update_req_args *, u_int8_t *)); +int __rep_blob_update_req_unmarshal __P((ENV *, __rep_blob_update_req_args *, u_int8_t *, size_t, u_int8_t **)); +void __rep_blob_update_marshal __P((ENV *, __rep_blob_update_args *, u_int8_t *)); +int __rep_blob_update_unmarshal __P((ENV *, __rep_blob_update_args *, u_int8_t *, size_t, u_int8_t **)); +void __rep_blob_file_marshal __P((ENV *, __rep_blob_file_args *, u_int8_t *)); +int __rep_blob_file_unmarshal __P((ENV *, __rep_blob_file_args *, u_int8_t *, size_t, u_int8_t **)); +void __rep_blob_chunk_marshal __P((ENV *, __rep_blob_chunk_args *, u_int8_t *)); +int __rep_blob_chunk_unmarshal __P((ENV *, __rep_blob_chunk_args *, u_int8_t *, size_t, u_int8_t **)); +void __rep_blob_chunk_req_marshal __P((ENV *, __rep_blob_chunk_req_args *, u_int8_t *)); +int __rep_blob_chunk_req_unmarshal __P((ENV *, __rep_blob_chunk_req_args *, u_int8_t *, size_t, u_int8_t **)); int __rep_update_req __P((ENV *, __rep_control_args *)); +int __rep_blob_update_req __P((ENV *, DB_THREAD_INFO *, DBT *)); int __rep_page_req __P((ENV *, DB_THREAD_INFO *, int, __rep_control_args *, DBT *)); int __rep_update_setup __P((ENV *, int, __rep_control_args *, DBT *, time_t, DB_LSN *)); +int __rep_blob_update __P((ENV *, int, DB_THREAD_INFO *, DBT *)); +int __rep_blob_allreq __P((ENV *, int, DBT *)); int __rep_bulk_page __P((ENV *, DB_THREAD_INFO *, int, __rep_control_args *, DBT *)); int __rep_page __P((ENV *, DB_THREAD_INFO *, int, __rep_control_args *, DBT *)); +int __rep_blob_chunk __P((ENV *, int, DB_THREAD_INFO *, DBT *)); int __rep_init_cleanup __P((ENV *, REP *, int)); +int __rep_blob_chunk_req __P((ENV *, int, DBT *)); int __rep_pggap_req __P((ENV *, REP *, __rep_fileinfo_args *, u_int32_t)); +int __rep_blob_rereq __P((ENV *, REP *)); int __rep_finfo_alloc __P((ENV *, __rep_fileinfo_args *, __rep_fileinfo_args **)); int __rep_remove_init_file __P((ENV *)); int __rep_reset_init __P((ENV *)); @@ -65,27 +83,35 @@ void __rep_env_destroy __P((DB_ENV *)); int __rep_get_config __P((DB_ENV *, u_int32_t, int *)); int __rep_set_config __P((DB_ENV *, u_int32_t, int)); int __rep_start_pp __P((DB_ENV *, DBT *, u_int32_t)); -int __rep_start_int __P((ENV *, DBT *, u_int32_t)); +int __rep_start_int __P((ENV *, DBT *, u_int32_t, u_int32_t)); int __rep_open_sysdb __P((ENV *, DB_THREAD_INFO *, DB_TXN *, const char *, u_int32_t, DB **)); int __rep_client_dbinit __P((ENV *, int, repdb_t)); +int __rep_blob_cmp __P((DB *, const DBT *, const DBT *, size_t *)); +int __rep_offset_cmp __P((DB *, const DBT *, const DBT *, size_t *)); int __rep_get_limit __P((DB_ENV *, u_int32_t *, u_int32_t *)); int __rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t)); int __rep_set_nsites_pp __P((DB_ENV *, u_int32_t)); int __rep_set_nsites_int __P((ENV *, u_int32_t)); int __rep_get_nsites __P((DB_ENV *, u_int32_t *)); -int __rep_set_priority __P((DB_ENV *, u_int32_t)); +int __rep_set_priority_pp __P((DB_ENV *, u_int32_t)); +int __rep_set_priority_int __P((ENV *, u_int32_t)); int __rep_get_priority __P((DB_ENV *, u_int32_t *)); -int __rep_set_timeout __P((DB_ENV *, int, db_timeout_t)); +int __rep_set_timeout_pp __P((DB_ENV *, int, db_timeout_t)); +int __rep_set_timeout_int __P((ENV *, int, db_timeout_t)); int __rep_get_timeout __P((DB_ENV *, int, db_timeout_t *)); int __rep_get_request __P((DB_ENV *, db_timeout_t *, db_timeout_t *)); int __rep_set_request __P((DB_ENV *, db_timeout_t, db_timeout_t)); +int __rep_set_view __P((DB_ENV *, int (*)(DB_ENV *, const char *, int *, u_int32_t))); +int __rep_call_partial __P((ENV *, const char *, int *, u_int32_t, DELAYED_BLOB_LIST **)); int __rep_set_transport_pp __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t))); int __rep_set_transport_int __P((ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t))); int __rep_get_clockskew __P((DB_ENV *, u_int32_t *, u_int32_t *)); int __rep_set_clockskew __P((DB_ENV *, u_int32_t, u_int32_t)); -int __rep_flush __P((DB_ENV *)); +int __rep_flush_pp __P((DB_ENV *)); +int __rep_flush_int __P((ENV *)); int __rep_sync __P((DB_ENV *, u_int32_t)); int __rep_txn_applied __P((ENV *, DB_THREAD_INFO *, DB_COMMIT_INFO *, db_timeout_t)); +int __rep_read_lsn_history __P((ENV *, DB_THREAD_INFO *, DB_TXN **, DBC **, u_int32_t, __rep_lsn_hist_data_args *, struct rep_waitgoal *, u_int32_t, int)); int __rep_process_message_pp __P((DB_ENV *, DBT *, DBT *, int, DB_LSN *)); int __rep_process_message_int __P((ENV *, DBT *, DBT *, int, DB_LSN *)); int __rep_apply __P((ENV *, DB_THREAD_INFO *, __rep_control_args *, DBT *, DB_LSN *, int *, DB_LSN *)); @@ -101,6 +127,7 @@ int __rep_preclose __P((ENV *)); int __rep_closefiles __P((ENV *)); int __rep_write_egen __P((ENV *, REP *, u_int32_t)); int __rep_write_gen __P((ENV *, REP *, u_int32_t)); +int __rep_check_view __P((ENV *)); int __rep_stat_pp __P((DB_ENV *, DB_REP_STAT **, u_int32_t)); int __rep_stat_print_pp __P((DB_ENV *, u_int32_t)); int __rep_stat_print __P((ENV *, u_int32_t)); @@ -139,6 +166,8 @@ int __rep_log_backup __P((ENV *, DB_LOGC *, DB_LSN *, u_int32_t)); int __rep_get_maxpermlsn __P((ENV *, DB_LSN *)); int __rep_is_internal_rep_file __P((char *)); int __rep_get_datagen __P((ENV *, u_int32_t *)); +int __rep_become_readonly_master __P((ENV *, u_int32_t *, DB_LSN *)); +int __rep_get_lsnhist_data __P((ENV *, DB_THREAD_INFO *, u_int32_t, __rep_lsn_hist_data_args *)); int __rep_verify __P((ENV *, __rep_control_args *, DBT *, int, time_t)); int __rep_verify_fail __P((ENV *, __rep_control_args *)); int __rep_verify_req __P((ENV *, __rep_control_args *, int)); diff --git a/src/dbinc_auto/repmgr_automsg.h b/src/dbinc_auto/repmgr_automsg.h index 1b2b928c..17e467e9 100644 --- a/src/dbinc_auto/repmgr_automsg.h +++ b/src/dbinc_auto/repmgr_automsg.h @@ -72,11 +72,17 @@ typedef struct ___repmgr_membership_key_args { u_int16_t port; } __repmgr_membership_key_args; -#define __REPMGR_MEMBERSHIP_DATA_SIZE 4 +#define __REPMGR_MEMBERSHIP_DATA_SIZE 8 typedef struct ___repmgr_membership_data_args { + u_int32_t status; u_int32_t flags; } __repmgr_membership_data_args; +#define __REPMGR_V4MEMBERSHIP_DATA_SIZE 4 +typedef struct ___repmgr_v4membership_data_args { + u_int32_t flags; +} __repmgr_v4membership_data_args; + #define __REPMGR_MEMBER_METADATA_SIZE 8 typedef struct ___repmgr_member_metadata_args { u_int32_t format; @@ -96,18 +102,41 @@ typedef struct ___repmgr_membr_vers_args { u_int32_t gen; } __repmgr_membr_vers_args; -#define __REPMGR_SITE_INFO_SIZE 10 +#define __REPMGR_SITE_INFO_SIZE 14 typedef struct ___repmgr_site_info_args { DBT host; u_int16_t port; + u_int32_t status; u_int32_t flags; } __repmgr_site_info_args; -#define __REPMGR_CONNECT_REJECT_SIZE 8 +#define __REPMGR_V4SITE_INFO_SIZE 10 +typedef struct ___repmgr_v4site_info_args { + DBT host; + u_int16_t port; + u_int32_t flags; +} __repmgr_v4site_info_args; + +#define __REPMGR_CONNECT_REJECT_SIZE 12 typedef struct ___repmgr_connect_reject_args { u_int32_t version; u_int32_t gen; + u_int32_t status; } __repmgr_connect_reject_args; -#define __REPMGR_MAXMSG_SIZE 12 +#define __REPMGR_V4CONNECT_REJECT_SIZE 8 +typedef struct ___repmgr_v4connect_reject_args { + u_int32_t version; + u_int32_t gen; +} __repmgr_v4connect_reject_args; + +#define __REPMGR_LSNHIST_MATCH_SIZE 24 +typedef struct ___repmgr_lsnhist_match_args { + DB_LSN lsn; + u_int32_t hist_sec; + u_int32_t hist_nsec; + DB_LSN next_gen_lsn; +} __repmgr_lsnhist_match_args; + +#define __REPMGR_MAXMSG_SIZE 24 #endif diff --git a/src/dbinc_auto/repmgr_ext.h b/src/dbinc_auto/repmgr_ext.h index b1237950..3ff59ffe 100644 --- a/src/dbinc_auto/repmgr_ext.h +++ b/src/dbinc_auto/repmgr_ext.h @@ -29,6 +29,8 @@ int __repmgr_membership_key_marshal __P((ENV *, __repmgr_membership_key_args *, int __repmgr_membership_key_unmarshal __P((ENV *, __repmgr_membership_key_args *, u_int8_t *, size_t, u_int8_t **)); void __repmgr_membership_data_marshal __P((ENV *, __repmgr_membership_data_args *, u_int8_t *)); int __repmgr_membership_data_unmarshal __P((ENV *, __repmgr_membership_data_args *, u_int8_t *, size_t, u_int8_t **)); +void __repmgr_v4membership_data_marshal __P((ENV *, __repmgr_v4membership_data_args *, u_int8_t *)); +int __repmgr_v4membership_data_unmarshal __P((ENV *, __repmgr_v4membership_data_args *, u_int8_t *, size_t, u_int8_t **)); void __repmgr_member_metadata_marshal __P((ENV *, __repmgr_member_metadata_args *, u_int8_t *)); int __repmgr_member_metadata_unmarshal __P((ENV *, __repmgr_member_metadata_args *, u_int8_t *, size_t, u_int8_t **)); int __repmgr_gm_fwd_marshal __P((ENV *, __repmgr_gm_fwd_args *, u_int8_t *, size_t, size_t *)); @@ -37,21 +39,34 @@ void __repmgr_membr_vers_marshal __P((ENV *, __repmgr_membr_vers_args *, u_int8_ int __repmgr_membr_vers_unmarshal __P((ENV *, __repmgr_membr_vers_args *, u_int8_t *, size_t, u_int8_t **)); int __repmgr_site_info_marshal __P((ENV *, __repmgr_site_info_args *, u_int8_t *, size_t, size_t *)); int __repmgr_site_info_unmarshal __P((ENV *, __repmgr_site_info_args *, u_int8_t *, size_t, u_int8_t **)); +int __repmgr_v4site_info_marshal __P((ENV *, __repmgr_v4site_info_args *, u_int8_t *, size_t, size_t *)); +int __repmgr_v4site_info_unmarshal __P((ENV *, __repmgr_v4site_info_args *, u_int8_t *, size_t, u_int8_t **)); void __repmgr_connect_reject_marshal __P((ENV *, __repmgr_connect_reject_args *, u_int8_t *)); int __repmgr_connect_reject_unmarshal __P((ENV *, __repmgr_connect_reject_args *, u_int8_t *, size_t, u_int8_t **)); +void __repmgr_v4connect_reject_marshal __P((ENV *, __repmgr_v4connect_reject_args *, u_int8_t *)); +int __repmgr_v4connect_reject_unmarshal __P((ENV *, __repmgr_v4connect_reject_args *, u_int8_t *, size_t, u_int8_t **)); +void __repmgr_lsnhist_match_marshal __P((ENV *, __repmgr_lsnhist_match_args *, u_int8_t *)); +int __repmgr_lsnhist_match_unmarshal __P((ENV *, __repmgr_lsnhist_match_args *, u_int8_t *, size_t, u_int8_t **)); int __repmgr_member_print __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); int __repmgr_init_print __P((ENV *, DB_DISTAB *)); int __repmgr_init_election __P((ENV *, u_int32_t)); int __repmgr_claim_victory __P((ENV *)); int __repmgr_turn_on_elections __P((ENV *)); -int __repmgr_start __P((DB_ENV *, int, u_int32_t)); +int __repmgr_start_pp __P((DB_ENV *, int, u_int32_t)); +int __repmgr_start_int __P((ENV *, int, u_int32_t)); int __repmgr_valid_config __P((ENV *, u_int32_t)); +int __repmgr_prefmas_auto_config __P((DB_ENV *, u_int32_t *)); int __repmgr_autostart __P((ENV *)); int __repmgr_start_selector __P((ENV *)); int __repmgr_close __P((ENV *)); int __repmgr_stop __P((ENV *)); int __repmgr_set_ack_policy __P((DB_ENV *, int)); int __repmgr_get_ack_policy __P((DB_ENV *, int *)); +int __repmgr_set_incoming_queue_max __P((DB_ENV *, u_int32_t, u_int32_t)); +int __repmgr_get_incoming_queue_max __P((DB_ENV *, u_int32_t *, u_int32_t *)); +void __repmgr_set_incoming_queue_redzone __P((void *, u_int32_t, u_int32_t)); +int __repmgr_get_incoming_queue_redzone __P((DB_ENV *, u_int32_t *, u_int32_t *)); +int __repmgr_get_incoming_queue_fullevent __P((DB_ENV *, int *)); int __repmgr_env_create __P((ENV *, DB_REP *)); void __repmgr_env_destroy __P((ENV *, DB_REP *)); int __repmgr_stop_threads __P((ENV *)); @@ -72,12 +87,13 @@ int __repmgr_site_by_eid __P((DB_ENV *, int, DB_SITE **)); int __repmgr_get_site_address __P((DB_SITE *, const char **, u_int *)); int __repmgr_get_eid __P((DB_SITE *, int *)); int __repmgr_get_config __P((DB_SITE *, u_int32_t, u_int32_t *)); -int __repmgr_site_config __P((DB_SITE *, u_int32_t, u_int32_t)); +int __repmgr_site_config_pp __P((DB_SITE *, u_int32_t, u_int32_t)); +int __repmgr_site_config_int __P((DB_SITE *, u_int32_t, u_int32_t)); int __repmgr_site_close __P((DB_SITE *)); void *__repmgr_msg_thread __P((void *)); int __repmgr_send_err_resp __P((ENV *, CHANNEL *, int)); int __repmgr_handle_event __P((ENV *, u_int32_t, void *)); -int __repmgr_update_membership __P((ENV *, DB_THREAD_INFO *, int, u_int32_t)); +int __repmgr_update_membership __P((ENV *, DB_THREAD_INFO *, int, u_int32_t, u_int32_t)); int __repmgr_set_gm_version __P((ENV *, DB_THREAD_INFO *, DB_TXN *, u_int32_t)); int __repmgr_setup_gmdb_op __P((ENV *, DB_THREAD_INFO *, DB_TXN **, u_int32_t)); int __repmgr_cleanup_gmdb_op __P((ENV *, int)); @@ -132,7 +148,6 @@ int __repmgr_select_loop __P((ENV *)); int __repmgr_queue_destroy __P((ENV *)); int __repmgr_queue_get __P((ENV *, REPMGR_MESSAGE **, REPMGR_RUNNABLE *)); int __repmgr_queue_put __P((ENV *, REPMGR_MESSAGE *)); -int __repmgr_queue_size __P((ENV *)); int __repmgr_member_recover __P((ENV *, DBT *, DB_LSN *, db_recops, void *)); void *__repmgr_select_thread __P((void *)); int __repmgr_bow_out __P((ENV *)); @@ -140,6 +155,7 @@ int __repmgr_accept __P((ENV *)); int __repmgr_compute_timeout __P((ENV *, db_timespec *)); REPMGR_SITE *__repmgr_connected_master __P((ENV *)); int __repmgr_check_timeouts __P((ENV *)); +int __repmgr_refresh_selector __P((ENV *)); int __repmgr_first_try_connections __P((ENV *)); int __repmgr_send_v1_handshake __P((ENV *, REPMGR_CONNECTION *, void *, size_t)); int __repmgr_read_from_site __P((ENV *, REPMGR_CONNECTION *)); @@ -151,7 +167,8 @@ int __repmgr_write_some __P((ENV *, REPMGR_CONNECTION *)); int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t)); int __repmgr_stat_print_pp __P((DB_ENV *, u_int32_t)); int __repmgr_stat_print __P((ENV *, u_int32_t)); -int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); +int __repmgr_site_list_pp __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); +int __repmgr_site_list_int __P((ENV *, u_int *, DB_REPMGR_SITE **)); #ifndef HAVE_REPLICATION_THREADS int __repmgr_close __P((ENV *)); #endif @@ -162,6 +179,18 @@ int __repmgr_get_ack_policy __P((DB_ENV *, int *)); int __repmgr_set_ack_policy __P((DB_ENV *, int)); #endif #ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_max __P((DB_ENV *, u_int32_t *, u_int32_t *)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_set_incoming_queue_max __P((DB_ENV *, u_int32_t, u_int32_t)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_redzone __P((DB_ENV *, u_int32_t *, u_int32_t *)); +#endif +#ifndef HAVE_REPLICATION_THREADS +int __repmgr_get_incoming_queue_fullevent __P((DB_ENV *, int *)); +#endif +#ifndef HAVE_REPLICATION_THREADS int __repmgr_site __P((DB_ENV *, const char *, u_int, DB_SITE **, u_int32_t)); #endif #ifndef HAVE_REPLICATION_THREADS @@ -171,10 +200,10 @@ int __repmgr_site_by_eid __P((DB_ENV *, int, DB_SITE **)); int __repmgr_local_site __P((DB_ENV *, DB_SITE **)); #endif #ifndef HAVE_REPLICATION_THREADS -int __repmgr_site_list __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); +int __repmgr_site_list_pp __P((DB_ENV *, u_int *, DB_REPMGR_SITE **)); #endif #ifndef HAVE_REPLICATION_THREADS -int __repmgr_start __P((DB_ENV *, int, u_int32_t)); +int __repmgr_start_pp __P((DB_ENV *, int, u_int32_t)); #endif #ifndef HAVE_REPLICATION_THREADS int __repmgr_stat_pp __P((DB_ENV *, DB_REPMGR_STAT **, u_int32_t)); @@ -213,8 +242,8 @@ int __repmgr_thread_failure __P((ENV *, int)); char *__repmgr_format_eid_loc __P((DB_REP *, REPMGR_CONNECTION *, char *)); char *__repmgr_format_site_loc __P((REPMGR_SITE *, char *)); char *__repmgr_format_addr_loc __P((repmgr_netaddr_t *, char *)); -int __repmgr_repstart __P((ENV *, u_int32_t)); -int __repmgr_become_master __P((ENV *)); +int __repmgr_repstart __P((ENV *, u_int32_t, u_int32_t)); +int __repmgr_become_master __P((ENV *, u_int32_t)); int __repmgr_each_connection __P((ENV *, CONNECTION_ACTION, void *, int)); int __repmgr_open __P((ENV *, void *)); int __repmgr_join __P((ENV *, void *)); @@ -225,9 +254,16 @@ int __repmgr_init_new_sites __P((ENV *, int, int)); int __repmgr_failchk __P((ENV *)); int __repmgr_master_is_known __P((ENV *)); int __repmgr_stable_lsn __P((ENV *, DB_LSN *)); +int __repmgr_make_request_conn __P((ENV *, repmgr_netaddr_t *, REPMGR_CONNECTION **)); int __repmgr_send_sync_msg __P((ENV *, REPMGR_CONNECTION *, u_int32_t, u_int8_t *, u_int32_t)); -int __repmgr_marshal_member_list __P((ENV *, u_int8_t **, size_t *)); -int __repmgr_refresh_membership __P((ENV *, u_int8_t *, size_t)); +int __repmgr_read_own_msg __P((ENV *, REPMGR_CONNECTION *, u_int32_t *, u_int8_t **, size_t *)); +int __repmgr_prefmas_connected __P((ENV *)); +int __repmgr_restart_site_as_client __P((ENV *, int)); +int __repmgr_make_site_readonly_master __P((ENV *, int, u_int32_t *, DB_LSN *)); +int __repmgr_lsnhist_match __P((ENV *, DB_THREAD_INFO *, int, int *)); +int __repmgr_prefmas_get_wait __P((ENV *, u_int32_t *, u_long *)); +int __repmgr_marshal_member_list __P((ENV *, u_int32_t, u_int8_t **, size_t *)); +int __repmgr_refresh_membership __P((ENV *, u_int8_t *, size_t, u_int32_t)); int __repmgr_reload_gmdb __P((ENV *)); int __repmgr_gmdb_version_cmp __P((ENV *, u_int32_t, u_int32_t)); int __repmgr_init_save __P((ENV *, DBT *)); @@ -238,10 +274,11 @@ void __repmgr_print_conn_err __P((ENV *, repmgr_netaddr_t *, int)); int __repmgr_become_client __P((ENV *)); REPMGR_SITE *__repmgr_lookup_site __P((ENV *, const char *, u_int)); int __repmgr_find_site __P((ENV *, const char *, u_int, int *)); -int __repmgr_set_membership __P((ENV *, const char *, u_int, u_int32_t)); +int __repmgr_set_membership __P((ENV *, const char *, u_int, u_int32_t, u_int32_t)); int __repmgr_bcast_parm_refresh __P((ENV *)); int __repmgr_chg_prio __P((ENV *, u_int32_t, u_int32_t)); int __repmgr_bcast_own_msg __P((ENV *, u_int32_t, u_int8_t *, size_t)); +int __repmgr_bcast_member_list __P((ENV *)); #if defined(__cplusplus) } diff --git a/src/dbinc_auto/sequence_ext.h b/src/dbinc_auto/sequence_ext.h index a2c114cf..8f8b8473 100644 --- a/src/dbinc_auto/sequence_ext.h +++ b/src/dbinc_auto/sequence_ext.h @@ -10,6 +10,10 @@ int __seq_stat __P((DB_SEQUENCE *, DB_SEQUENCE_STAT **, u_int32_t)); int __seq_stat_print __P((DB_SEQUENCE *, u_int32_t)); const FN * __db_get_seq_flags_fn __P((void)); const FN * __db_get_seq_flags_fn __P((void)); +int __seq_open __P((DB_SEQUENCE *, DB_TXN *, DBT *, u_int32_t)); +int __seq_initial_value __P((DB_SEQUENCE *, db_seq_t)); +int __seq_get __P((DB_SEQUENCE *, DB_TXN *, u_int32_t, db_seq_t *, u_int32_t)); +int __seq_close __P((DB_SEQUENCE *, u_int32_t)); #if defined(__cplusplus) } diff --git a/src/dbinc_auto/tcl_ext.h b/src/dbinc_auto/tcl_ext.h index 8b076c8b..4ea037c0 100644 --- a/src/dbinc_auto/tcl_ext.h +++ b/src/dbinc_auto/tcl_ext.h @@ -19,9 +19,12 @@ int db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*)); int tcl_CompactStat __P((Tcl_Interp *, DBTCL_INFO *)); int tcl_rep_send __P((DB_ENV *, const DBT *, const DBT *, const DB_LSN *, int, u_int32_t)); int dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*)); +int dbstream_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*)); int env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*)); int tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*)); int tcl_EnvClose __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *)); +int tcl_EnvBackup __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); +int tcl_EnvDbBackup __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_EnvIdReset __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_EnvLsnReset __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *)); @@ -30,7 +33,8 @@ int tcl_EnvSetFlags __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *)); int tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_EnvGetEncryptFlags __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); void tcl_EnvSetErrfile __P((Tcl_Interp *, DB_ENV *, DBTCL_INFO *, char *)); -void tcl_EnvSetMsgfile __P((Tcl_Interp *, DB_ENV *, DBTCL_INFO *, char *)); +int tcl_EnvSetMsgfile __P((Tcl_Interp *, DB_ENV *, DBTCL_INFO *, char *)); +int tcl_EnvCloseMsgfile __P((Tcl_Interp *, DB_ENV *, DBTCL_INFO *)); int tcl_EnvSetErrpfx __P((Tcl_Interp *, DB_ENV *, DBTCL_INFO *, char *)); int tcl_EnvStatPrint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); DBTCL_INFO *_NewInfo __P((Tcl_Interp *, void *, char *, enum INFOTYPE)); @@ -73,9 +77,11 @@ int tcl_LogGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_LogPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_LogStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_LogStatPrint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); +int tcl_LogVerify __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*)); int tcl_LogConfig __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *)); int tcl_LogGetConfig __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *)); +int tcl_LogSetMax __P((Tcl_Interp *, DB_ENV *,Tcl_Obj *,u_int32_t *,u_int32_t *)); void _MpInfoDelete __P((Tcl_Interp *, DBTCL_INFO *)); int tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_MpTrickle __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); @@ -83,6 +89,7 @@ int tcl_Mp __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *)); int tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_MpStatPrint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); +int tcl_MutexFailchkTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_MutFree __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); int tcl_MutGet __P((Tcl_Interp *, DB_ENV *, int)); int tcl_MutLock __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *)); diff --git a/src/dbinc_auto/txn_ext.h b/src/dbinc_auto/txn_ext.h index 7c21455f..2fbcd147 100644 --- a/src/dbinc_auto/txn_ext.h +++ b/src/dbinc_auto/txn_ext.h @@ -60,6 +60,7 @@ int __txn_recover __P((ENV *, DB_PREPLIST *, long, long *, u_int32_t)); int __txn_get_prepared __P((ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t)); int __txn_openfiles __P((ENV *, DB_THREAD_INFO *, DB_LSN *, int)); int __txn_open __P((ENV *)); +int __txn_region_detach __P((ENV *, DB_TXNMGR *)); int __txn_findlastckp __P((ENV *, DB_LSN *, DB_LSN *)); int __txn_env_refresh __P((ENV *)); u_int32_t __txn_region_mutex_count __P((ENV *)); @@ -67,7 +68,7 @@ u_int32_t __txn_region_mutex_max __P((ENV *)); size_t __txn_region_size __P((ENV *)); size_t __txn_region_max __P((ENV *)); int __txn_id_set __P((ENV *, u_int32_t, u_int32_t)); -int __txn_oldest_reader __P((ENV *, DB_LSN *)); +int __txn_get_readers __P((ENV *, DB_LSN **, int *)); int __txn_add_buffer __P((ENV *, TXN_DETAIL *)); int __txn_remove_buffer __P((ENV *, TXN_DETAIL *, db_mutex_t)); int __txn_stat_pp __P((DB_ENV *, DB_TXN_STAT **, u_int32_t)); |