diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /build_vxworks/util | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'build_vxworks/util')
39 files changed, 513 insertions, 4269 deletions
diff --git a/build_vxworks/util/db_archive.c b/build_vxworks/util/db_archive.c index b2ceda2f..91e96b7f 100644 --- a/build_vxworks/util/db_archive.c +++ b/build_vxworks/util/db_archive.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_archive_main __P((int, char *[])); @@ -142,7 +142,7 @@ db_archive_main(argc, argv) * private one and try again. */ if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); diff --git a/build_vxworks/util/db_archive20.wpj b/build_vxworks/util/db_archive20.wpj deleted file mode 100755 index 519c406d..00000000 --- a/build_vxworks/util/db_archive20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_archive20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_archive20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_archive20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_archive -<END> diff --git a/build_vxworks/util/db_archive22.wpj b/build_vxworks/util/db_archive22.wpj deleted file mode 100755 index 62bc503b..00000000 --- a/build_vxworks/util/db_archive22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_archive22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_archive22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_archive22.out - -<END> - -<BEGIN> BUILD_RULE_db_archive22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_archive -<END> diff --git a/build_vxworks/util/db_checkpoint.c b/build_vxworks/util/db_checkpoint.c index ff2fdc86..b0cff91d 100644 --- a/build_vxworks/util/db_checkpoint.c +++ b/build_vxworks/util/db_checkpoint.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_checkpoint_main __P((int, char *[])); @@ -171,7 +171,7 @@ db_checkpoint_main(argc, argv) #define ENV_FLAGS DB_USE_ENVIRON #endif if ((ret = dbenv->open(dbenv, home, ENV_FLAGS, 0)) != 0 && - (!once || ret == DB_VERSION_MISMATCH || + (!once || ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); diff --git a/build_vxworks/util/db_checkpoint20.wpj b/build_vxworks/util/db_checkpoint20.wpj deleted file mode 100755 index feeb0915..00000000 --- a/build_vxworks/util/db_checkpoint20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_checkpoint20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_checkpoint20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_checkpoint20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_checkpoint -<END> diff --git a/build_vxworks/util/db_checkpoint22.wpj b/build_vxworks/util/db_checkpoint22.wpj deleted file mode 100755 index 07608201..00000000 --- a/build_vxworks/util/db_checkpoint22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_checkpoint22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_checkpoint22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_checkpoint22.out - -<END> - -<BEGIN> BUILD_RULE_db_checkpoint22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_checkpoint -<END> diff --git a/build_vxworks/util/db_deadlock.c b/build_vxworks/util/db_deadlock.c index 74494298..92414ca4 100644 --- a/build_vxworks/util/db_deadlock.c +++ b/build_vxworks/util/db_deadlock.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_deadlock_main __P((int, char *[])); diff --git a/build_vxworks/util/db_deadlock20.wpj b/build_vxworks/util/db_deadlock20.wpj deleted file mode 100755 index faeec4f7..00000000 --- a/build_vxworks/util/db_deadlock20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_deadlock20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_deadlock20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_deadlock20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_deadlock -<END> diff --git a/build_vxworks/util/db_deadlock22.wpj b/build_vxworks/util/db_deadlock22.wpj deleted file mode 100755 index 13d895c1..00000000 --- a/build_vxworks/util/db_deadlock22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_deadlock22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_deadlock22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_deadlock22.out - -<END> - -<BEGIN> BUILD_RULE_db_deadlock22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_deadlock -<END> diff --git a/build_vxworks/util/db_dump.c b/build_vxworks/util/db_dump.c index b8170cb4..e7276ff2 100644 --- a/build_vxworks/util/db_dump.c +++ b/build_vxworks/util/db_dump.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -14,7 +14,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_dump_db_init __P((DB_ENV *, char *, int, u_int32_t, int *)); @@ -54,7 +54,7 @@ db_dump_main(argc, argv) int ch; int exitval, keyflag, lflag, mflag, nflag, pflag, sflag, private; int ret, Rflag, rflag, resize; - char *data_len, *dbname, *dopt, *filename, *home, *passwd; + char *blob_dir, *data_len, *dbname, *dopt, *filename, *home, *passwd; if ((progname = __db_rpath(argv[0])) == NULL) progname = argv[0]; @@ -71,10 +71,19 @@ db_dump_main(argc, argv) keyflag = 0; cache = MEGABYTE; private = 0; - data_len = dbname = dopt = filename = home = passwd = NULL; + blob_dir = data_len = dbname = dopt = filename = home = passwd = NULL; __db_getopt_reset = 1; - while ((ch = getopt(argc, argv, "d:D:f:F:h:klL:m:NpP:rRs:V")) != EOF) + while ((ch = getopt(argc, argv, "b:d:D:f:F:h:klL:m:NpP:rRs:V")) != EOF) switch (ch) { + case 'b': + if (blob_dir!= NULL) { + fprintf(stderr, DB_STR("5144", + "Blob directory may not be specified twice")); + goto err; + } + blob_dir = strdup(optarg); + memset(optarg, 0, strlen(optarg)); + break; case 'd': dopt = optarg; break; @@ -86,7 +95,7 @@ db_dump_main(argc, argv) fprintf(stderr, DB_STR_A("5108", "%s: %s: reopen: %s\n", "%s %s %s\n"), progname, optarg, strerror(errno)); - return (EXIT_FAILURE); + goto err; } break; case 'F': @@ -115,8 +124,7 @@ db_dump_main(argc, argv) if (passwd != NULL) { fprintf(stderr, DB_STR("5130", "Password may not be specified twice")); - free(passwd); - return (EXIT_FAILURE); + goto err; } passwd = strdup(optarg); memset(optarg, 0, strlen(optarg)); @@ -124,7 +132,7 @@ db_dump_main(argc, argv) fprintf(stderr, DB_STR_A("5109", "%s: strdup: %s\n", "%s %s\n"), progname, strerror(errno)); - return (EXIT_FAILURE); + goto err; } break; case 'p': @@ -143,10 +151,11 @@ db_dump_main(argc, argv) break; case 'V': printf("%s\n", db_version(NULL, NULL, NULL)); - return (EXIT_SUCCESS); + goto done; case '?': default: - return (db_dump_usage()); + (void)db_dump_usage(); + goto err; } argc -= optind; argv += optind; @@ -159,40 +168,42 @@ db_dump_main(argc, argv) filename = NULL; else if (argc == 1 && !mflag) filename = argv[0]; - else - return (db_dump_usage()); + else { + (void)db_dump_usage(); + goto err; + } if (dopt != NULL && pflag) { fprintf(stderr, DB_STR_A("5110", "%s: the -d and -p options may not both be specified\n", "%s\n"), progname); - return (EXIT_FAILURE); + goto err; } if (lflag && sflag) { fprintf(stderr, DB_STR_A("5111", "%s: the -l and -s options may not both be specified\n", "%s\n"), progname); - return (EXIT_FAILURE); + goto err; } if ((lflag || sflag) && mflag) { fprintf(stderr, DB_STR_A("5112", "%s: the -m option may not be specified with -l or -s\n", "%s\n"), progname); - return (EXIT_FAILURE); + goto err; } if (keyflag && rflag) { fprintf(stderr, DB_STR_A("5113", "%s: the -k and -r or -R options may not both be specified\n", "%s\n"), progname); - return (EXIT_FAILURE); + goto err; } if (sflag && rflag) { fprintf(stderr, DB_STR_A("5114", "%s: the -r or R options may not be specified with -s\n", "%s\n"), progname); - return (EXIT_FAILURE); + goto err; } /* Handle possible interruptions. */ @@ -210,8 +221,6 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) { dbenv->set_errfile(dbenv, stderr); dbenv->set_errpfx(dbenv, progname); - if (data_len != NULL) - (void)dbenv->set_data_len(dbenv, (u_int32_t)atol(data_len)); if (nflag) { if ((ret = dbenv->set_flags(dbenv, DB_NOLOCKING, 1)) != 0) { @@ -229,10 +238,28 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) { goto err; } + /* Set the directory in which blob files are stored. */ + if (blob_dir != NULL) { + if ((ret = dbenv->set_blob_dir(dbenv, blob_dir)) != 0) { + dbenv->err(dbenv, ret, "set_blob_dir"); + goto err; + } + } + /* Initialize the environment. */ if (db_dump_db_init(dbenv, home, rflag, cache, &private) != 0) goto err; + /* + * Set data_len after environment opens. The value passed + * by -D takes priority. + */ + if (data_len != NULL && (ret = dbenv->set_data_len(dbenv, + (u_int32_t)atol(data_len))) != 0) { + dbenv->err(dbenv, ret, "set_data_len"); + goto err; + } + /* Create the DB object and open the file. */ if ((ret = db_create(&dbp, dbenv, 0)) != 0) { dbenv->err(dbenv, ret, "db_create"); @@ -325,6 +352,9 @@ done: if (dbp != NULL && (ret = dbp->close(dbp, 0)) != 0) { if (passwd != NULL) free(passwd); + if (blob_dir != NULL) + free(blob_dir); + /* Resend any caught signal. */ __db_util_sigresend(); @@ -367,7 +397,7 @@ db_dump_db_init(dbenv, home, is_salvage, cache, is_privatep) if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON | (is_salvage ? DB_INIT_MPOOL : 0), 0)) == 0) return (0); - if (ret == DB_VERSION_MISMATCH) + if (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT) goto err; /* @@ -498,7 +528,7 @@ db_dump_show_subs(dbp) while ((ret = dbcp->get(dbcp, &key, &data, DB_IGNORE_LEASE | DB_NEXT)) == 0) { if ((ret = dbp->dbenv->prdbt( - &key, 1, NULL, stdout, __db_pr_callback, 0, 0)) != 0) { + &key, 1, NULL, stdout, __db_pr_callback, 0, 0, 0)) != 0) { dbp->errx(dbp, NULL); return (1); } @@ -522,11 +552,13 @@ db_dump_show_subs(dbp) int db_dump_usage() { - (void)fprintf(stderr, "usage: %s [-klNprRV]\n\t%s\n", + (void)fprintf(stderr, "usage: %s [-bklNprRV]\n\t%s%s\n", progname, - "[-d ahr] [-f output] [-h home] [-P password] [-s database] db_file"); + "[-b blob_dir] [-d ahr] [-f output] [-h home] ", + "[-P password] [-s database] db_file"); (void)fprintf(stderr, "usage: %s [-kNpV] %s\n", - progname, "[-d ahr] [-f output] [-h home] -m database"); + progname, + "[-d ahr] [-D data_len] [-f output] [-h home] -m database"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_dump20.wpj b/build_vxworks/util/db_dump20.wpj deleted file mode 100755 index 4566352a..00000000 --- a/build_vxworks/util/db_dump20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_dump20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_dump20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_dump20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_dump -<END> diff --git a/build_vxworks/util/db_dump22.wpj b/build_vxworks/util/db_dump22.wpj deleted file mode 100755 index e908faa4..00000000 --- a/build_vxworks/util/db_dump22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_dump22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_dump22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_dump22.out - -<END> - -<BEGIN> BUILD_RULE_db_dump22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_dump -<END> diff --git a/build_vxworks/util/db_hotbackup.c b/build_vxworks/util/db_hotbackup.c index a58c7b58..77e391e0 100644 --- a/build_vxworks/util/db_hotbackup.c +++ b/build_vxworks/util/db_hotbackup.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -15,19 +15,27 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif enum which_open { OPEN_ORIGINAL, OPEN_HOT_BACKUP }; int db_hotbackup_env_init __P((DB_ENV **, - char *, char **, char ***, char *, enum which_open, int)); + char *, char *, char **, char ***, char *, enum which_open, int)); int db_hotbackup_main __P((int, char *[])); int db_hotbackup_usage __P((void)); int db_hotbackup_version_check __P((void)); void __db_util_msg __P((const DB_ENV *, const char *)); +void handle_event __P((DB_ENV *, u_int32_t, void *)); const char *progname; +/* + * Hot backup returns DB_EXIT_FAILCHK (3) if it detects that a panic was due to + * another process having crashed or exited from the environment uncleanly. That + * value can be used to indicate that the error is "expected", or at least, not + * due to a problem with db_hotbackup itself. + */ +int failchk_count; void __db_util_msg(dbenv, msgstr) const DB_ENV *dbenv; @@ -37,6 +45,35 @@ void __db_util_msg(dbenv, msgstr) printf("%s: %s\n", progname, msgstr); } +void handle_event(dbenv, event, info) + DB_ENV *dbenv; + u_int32_t event; + void *info; +{ + DB_EVENT_MUTEX_DIED_INFO *mtxdied; + DB_EVENT_FAILCHK_INFO *crash; + + switch (event) { + case DB_EVENT_MUTEX_DIED: + mtxdied = info; + dbenv->errx(dbenv, "DB_EVENT_MUTEX_DIED %.*s", + sizeof(mtxdied->desc), mtxdied->desc); + failchk_count++; + break; + + case DB_EVENT_FAILCHK_PANIC: + crash = info; + dbenv->errx(dbenv, "DB_EVENT_FAILCHK_PANIC %s %.*s", + db_strerror(crash->error), + sizeof(crash->symptom), crash->symptom); + failchk_count++; + break; + default: + break; + } + COMPQUIET(dbenv, NULL); +} + int db_hotbackup(args) char *args; @@ -63,7 +100,8 @@ db_hotbackup_main(argc, argv) u_int data_cnt, data_next; int ch, checkpoint, db_config, debug, env_copy, exitval; int ret, update, verbose; - char *backup_dir, **data_dir, *home, *log_dir, *passwd; + char *backup_dir, **data_dir; + char *home, *home_blob_dir, *log_dir, *passwd; char home_buf[DB_MAXPATHLEN], time_buf[CTIME_BUFLEN]; u_int32_t flags; @@ -77,12 +115,13 @@ db_hotbackup_main(argc, argv) * don't want to care about. There isn't enough output for the calls * to matter. */ - setbuf(stdout, NULL); + (void)setvbuf(stdout, NULL, _IONBF, 0); if ((progname = __db_rpath(argv[0])) == NULL) progname = argv[0]; else ++progname; + failchk_count = 0; if ((ret = db_hotbackup_version_check()) != 0) return (ret); @@ -93,10 +132,10 @@ db_hotbackup_main(argc, argv) checkpoint = db_config = data_cnt = data_next = debug = exitval = update = verbose = 0; data_dir = NULL; - backup_dir = home = passwd = NULL; + backup_dir = home = home_blob_dir = passwd = NULL; log_dir = NULL; __db_getopt_reset = 1; - while ((ch = getopt(argc, argv, "b:cDd:Fgh:l:P:uVv")) != EOF) + while ((ch = getopt(argc, argv, "b:cDd:Fgh:i:l:P:uVv")) != EOF) switch (ch) { case 'b': backup_dir = optarg; @@ -134,6 +173,9 @@ db_hotbackup_main(argc, argv) case 'h': home = optarg; break; + case 'i': + home_blob_dir = optarg; + break; case 'l': log_dir = optarg; break; @@ -235,8 +277,7 @@ db_hotbackup_main(argc, argv) } if (backup_dir == NULL) { fprintf(stderr, "%s: %s", DB_STR("5031", - "no target backup directory specified\n"), - progname); + "no target backup directory specified\n"), progname); exitval = db_hotbackup_usage(); goto clean; } @@ -249,7 +290,7 @@ db_hotbackup_main(argc, argv) } /* Open the source environment. */ - if (db_hotbackup_env_init(&dbenv, home, + if (db_hotbackup_env_init(&dbenv, home, home_blob_dir, (db_config || log_dir != NULL) ? &log_dir : NULL, &data_dir, passwd, OPEN_ORIGINAL, verbose) != 0) goto err; @@ -258,8 +299,8 @@ db_hotbackup_main(argc, argv) if ((ret = dbenv->get_open_flags(dbenv, &flags)) != 0) goto err; if (flags & DB_PRIVATE) { - fprintf(stderr, "%s: %s", progname, DB_STR("5129", - "Cannot copy data from a PRIVATE environment\n")); + fprintf(stderr, "%s: %s", progname, DB_STR("5140", +"The environment does not exist or cannot be opened. \"-F\" is required.\n")); goto err; } } @@ -267,8 +308,7 @@ db_hotbackup_main(argc, argv) if (log_dir != NULL) { if (db_config && __os_abspath(log_dir)) { fprintf(stderr, "%s: %s", progname, DB_STR("5033", - "DB_CONFIG must not contain an absolute " - "path for the log directory\n")); + "DB_CONFIG must not contain an absolute path for the log directory\n")); goto err; } } @@ -325,8 +365,8 @@ db_hotbackup_main(argc, argv) printf(DB_STR_A("5040", "%s: run catastrophic recovery\n", "%s"), backup_dir); } - if (db_hotbackup_env_init(&dbenv, - backup_dir, NULL, NULL, passwd, OPEN_HOT_BACKUP, verbose) != 0) + if (db_hotbackup_env_init(&dbenv, backup_dir, NULL, + NULL, NULL, passwd, OPEN_HOT_BACKUP, verbose) != 0) goto err; /* @@ -352,7 +392,7 @@ db_hotbackup_main(argc, argv) err: exitval = 1; } - if (dbenv != NULL && (ret = dbenv->close(dbenv, 0)) != 0) { + if (dbenv != NULL && ret == 0 && (ret = dbenv->close(dbenv, 0)) != 0) { exitval = 1; fprintf(stderr, "%s: dbenv->close: %s\n", progname, db_strerror(ret)); @@ -380,7 +420,8 @@ clean: if (passwd != NULL) free(passwd); - return (exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE); + return (failchk_count != 0 ? DB_EXIT_FAILCHK : + exitval == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } /* @@ -388,9 +429,9 @@ clean: * Open a database environment. */ int -db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which, verbose) +db_hotbackup_env_init(dbenvp, home, blob_dir, log_dirp, data_dirp, passwd, which, verbose) DB_ENV **dbenvp; - char *home, **log_dirp, ***data_dirp, *passwd; + char *home, *blob_dir, **log_dirp, ***data_dirp, *passwd; enum which_open which; int verbose; { @@ -410,20 +451,38 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which, verbose) return (1); } + if ((ret = dbenv->set_event_notify(dbenv, handle_event)) != 0) { + fprintf(stderr, "%s: DB_ENV->set_event_notify: %s\n", + progname, db_strerror(ret)); + return (1); + } if (verbose) { (void)dbenv->set_verbose(dbenv, DB_VERB_BACKUP, 1); dbenv->set_msgcall(dbenv, __db_util_msg); } dbenv->set_errfile(dbenv, stderr); - setbuf(stderr, NULL); + (void)setvbuf(stderr, NULL, _IONBF, 0); dbenv->set_errpfx(dbenv, progname); + /* Always enable logging blobs. */ + if ((ret = dbenv->log_set_config(dbenv, DB_LOG_BLOB, 1)) != 0) { + dbenv->err(dbenv, ret, "DB_ENV->log_set_config"); + return (1); + } + /* Any created intermediate directories are created private. */ if ((ret = dbenv->set_intermediate_dir_mode(dbenv, "rwx------")) != 0) { dbenv->err(dbenv, ret, "DB_ENV->set_intermediate_dir_mode"); return (1); } + /* Set the blob directory. */ + if (blob_dir != NULL && + (ret = dbenv->set_blob_dir(dbenv, blob_dir)) != 0) { + dbenv->err(dbenv, ret, "DB_ENV->set_blob-dir"); + return (1); + } + /* * If a log directory has been specified, and it's not the same as the * home directory, set it for the environment. @@ -452,7 +511,8 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which, verbose) * trim the home directory from the data directory * passed in. */ - (void) sprintf(buf, "%s/%s", home, home); + (void) snprintf(buf, sizeof(buf), "%s/%s", + home, home); homehome = 0; (void)__os_exists(dbenv->env, buf, &homehome); @@ -484,9 +544,9 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which, verbose) * fails, we create a private environment and try again. */ if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || - (ret = dbenv->open(dbenv, home, DB_CREATE | - DB_INIT_LOG | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || + (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_LOG | + DB_INIT_MPOOL | DB_INIT_TXN | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open: %s", home); return (1); @@ -501,9 +561,19 @@ db_hotbackup_env_init(dbenvp, home, log_dirp, data_dirp, passwd, which, verbose) "%s\n"), progname); return (db_hotbackup_usage()); } else { - fprintf(stderr, "%s: %s", DB_STR("5058", + /* + * Do we have -l and an existing DB_CONFIG? + * That is a usage problem, but for backward + * compatibility, keep going if log_dir happens + * to be the same as the DB_CONFIG path. + */ + (void)snprintf(buf, sizeof(buf), "%s%c%s", + home, PATH_SEPARATOR[0], "DB_CONFIG"); + if (__os_exists(dbenv->env, buf, NULL) == 0) + fprintf(stderr, + "%s: %s", DB_STR("5141", "use of -l with DB_CONFIG file is deprecated\n"), - progname); + progname); } } if (data_dirp != NULL && *data_dirp == NULL) @@ -542,7 +612,8 @@ int db_hotbackup_usage() { (void)fprintf(stderr, "usage: %s [-cDuVv]\n\t%s\n", progname, - "[-d data_dir ...] [-h home] [-l log_dir] [-P password] -b backup_dir"); + "[-d data_dir ...] [-i home_blob_dir] [-h home] [-l log_dir] " + "[-P password] -b backup_dir"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_hotbackup20.wpj b/build_vxworks/util/db_hotbackup20.wpj deleted file mode 100755 index 095576a0..00000000 --- a/build_vxworks/util/db_hotbackup20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_hotbackup20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_hotbackup20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_hotbackup20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_hotbackup -<END> diff --git a/build_vxworks/util/db_hotbackup22.wpj b/build_vxworks/util/db_hotbackup22.wpj deleted file mode 100755 index 8200706c..00000000 --- a/build_vxworks/util/db_hotbackup22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_hotbackup22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_hotbackup22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_hotbackup22.out - -<END> - -<BEGIN> BUILD_RULE_db_hotbackup22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_hotbackup -<END> diff --git a/build_vxworks/util/db_load.c b/build_vxworks/util/db_load.c index 232b72f2..4530d565 100644 --- a/build_vxworks/util/db_load.c +++ b/build_vxworks/util/db_load.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -14,7 +14,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif typedef struct { /* XXX: Globals. */ @@ -25,10 +25,12 @@ typedef struct { /* XXX: Globals. */ int endodata; /* Reached the end of a database. */ int endofile; /* Reached the end of the input. */ int version; /* Input version. */ + char *blob_dir; /* Blob directory. */ char *home; /* Env home. */ char *passwd; /* Env passwd. */ int private; /* Private env. */ u_int32_t cache; /* Env cache size. */ + u_int32_t blob_threshold; /* Blob threshold. */ } LDG; int db_load_badend __P((DB_ENV *)); @@ -36,7 +38,7 @@ void db_load_badnum __P((DB_ENV *)); int db_load_configure __P((DB_ENV *, DB *, char **, char **, int *)); int db_load_convprintable __P((DB_ENV *, char *, char **)); int db_load_db_init __P((DB_ENV *, char *, u_int32_t, int *)); -int db_load_dbt_rdump __P((DB_ENV *, DBT *)); +int db_load_dbt_rdump __P((DB_ENV *, DBT *, u_int32_t, int *)); int db_load_dbt_rprint __P((DB_ENV *, DBT *)); int db_load_dbt_rrecno __P((DB_ENV *, DBT *, int)); int db_load_dbt_to_recno __P((DB_ENV *, DBT *, db_recno_t *)); @@ -44,6 +46,7 @@ int db_load_env_create __P((DB_ENV **, LDG *)); void free_keys __P((DBT *part_keys)); int db_load_load __P((DB_ENV *, char *, DBTYPE, char **, u_int, LDG *, int *)); int db_load_main __P((int, char *[])); +int db_load_putdata __P((DB *, DBC *, DB_TXN *, DBT *, DBT *, u_int32_t, int)); int db_load_rheader __P((DB_ENV *, DB *, DBTYPE *, char **, int *, int *, DBT **)); int db_load_usage __P((void)); int db_load_version_check __P((void)); @@ -56,6 +59,7 @@ const char *progname; #define LDF_NOHEADER 0x01 /* No dump header. */ #define LDF_NOOVERWRITE 0x02 /* Don't overwrite existing rows. */ #define LDF_PASSWORD 0x04 /* Encrypt created databases. */ +#define BLOB_LOADING_SIZE 1048576 /* Load blob files X bytes at a time.*/ int db_load(args) @@ -100,6 +104,8 @@ db_load_main(argc, argv) ldg.hdrbuf = NULL; ldg.home = NULL; ldg.passwd = NULL; + ldg.blob_dir = NULL; + ldg.blob_threshold = 0; if ((exitval = db_load_version_check()) != 0) goto done; @@ -109,6 +115,17 @@ db_load_main(argc, argv) exitval = existed = 0; dbtype = DB_UNKNOWN; + /* + * We will allocate (argc + 1) bytes memory. + * Check if (argc + 1) will introduce interger overflow error. + */ + if (argc == INT_MAX) { + fprintf(stderr, "%s: %s\n", ldg.progname, "The number of\ + arguments exceeds the maximum unsigned integer value"); + exitval = 1; + goto done; + } + /* Allocate enough room for configuration arguments. */ if ((clp = clist = (char **)calloc((size_t)argc + 1, sizeof(char *))) == NULL) { @@ -125,8 +142,11 @@ db_load_main(argc, argv) * don't want to create a new utility for just that functionality. */ __db_getopt_reset = 1; - while ((ch = getopt(argc, argv, "c:f:h:nP:r:Tt:V")) != EOF) + while ((ch = getopt(argc, argv, "b:c:f:h:o:nP:r:Tt:V")) != EOF) switch (ch) { + case 'b': + ldg.blob_dir = optarg; + break; case 'c': if (mode != NOTSET && mode != STANDARD_LOAD) { exitval = db_load_usage(); @@ -163,6 +183,9 @@ db_load_main(argc, argv) ldf |= LDF_NOOVERWRITE; break; + case 'o': + ldg.blob_threshold = (u_int32_t)atoi(optarg); + break; case 'P': ldg.passwd = strdup(optarg); memset(optarg, 0, strlen(optarg)); @@ -318,7 +341,8 @@ db_load_load(dbenv, name, argtype, clist, flags, ldg, existedp) DB_TXN *ctxn, *txn; db_recno_t recno, datarecno; u_int32_t put_flags; - int ascii_recno, checkprint, hexkeys, keyflag, keys, resize, ret, rval; + int ascii_recno, checkprint, hexkeys; + int keyflag, keys, resize, ret, rval, streaming; char *subdb; put_flags = LF_ISSET(LDF_NOOVERWRITE) ? DB_NOOVERWRITE : 0; @@ -328,6 +352,7 @@ db_load_load(dbenv, name, argtype, clist, flags, ldg, existedp) subdb = NULL; ctxn = txn = NULL; part_keys = NULL; + streaming = 0; memset(&key, 0, sizeof(DBT)); memset(&data, 0, sizeof(DBT)); memset(&rkey, 0, sizeof(DBT)); @@ -401,13 +426,19 @@ retry_db: goto err; } - if (dbtype == DB_RECNO || dbtype == DB_QUEUE) + if (dbtype == DB_RECNO || dbtype == DB_QUEUE) { if (keyflag != 1 && argtype != DB_RECNO && argtype != DB_QUEUE) { dbenv->errx(dbenv, DB_STR("5077", "improper database type conversion specified")); goto err; } + if (ldg->blob_threshold != 0) { + dbenv->errx(dbenv, DB_STR("5142", + "Queue and recno databases cannot support blobs")); + goto err; + } + } dbtype = argtype; } @@ -521,12 +552,14 @@ key_data: if ((readp->data = malloc(readp->ulen = 1024)) == NULL) { /* Get each key/data pair and add them to the database. */ for (recno = 1; !__db_util_interrupted(); ++recno) { + streaming = 0; if (!keyflag) { if (checkprint) { if (db_load_dbt_rprint(dbenv, &data)) goto err; } else { - if (db_load_dbt_rdump(dbenv, &data)) + if (db_load_dbt_rdump(dbenv, + &data, ldg->blob_threshold, &streaming)) goto err; } } else { @@ -544,10 +577,12 @@ key_data: if ((readp->data = malloc(readp->ulen = 1024)) == NULL) { if (db_load_dbt_rrecno(dbenv, readp, hexkeys)) goto err; } else - if (db_load_dbt_rdump(dbenv, readp)) + if (db_load_dbt_rdump( + dbenv, readp, 0, &streaming)) goto err; - if (!G(endodata) && db_load_dbt_rdump(dbenv, &data)) { + if (!G(endodata) && db_load_dbt_rdump(dbenv, + &data, ldg->blob_threshold, &streaming)) { odd_count: dbenv->errx(dbenv, DB_STR("5079", "odd number of key/data pairs")); goto err; @@ -560,9 +595,9 @@ retry: if (put_flags != 0 && txn != NULL) if ((ret = dbenv->txn_begin(dbenv, txn, &ctxn, 0)) != 0) goto err; - switch (ret = ((put_flags == 0) ? - dbc->put(dbc, writep, &data, DB_KEYLAST) : - dbp->put(dbp, ctxn, writep, &data, put_flags))) { + ret = db_load_putdata(dbp, + dbc, ctxn, writep, &data, put_flags, streaming); + switch (ret) { case 0: if (ctxn != NULL) { if ((ret = @@ -579,7 +614,7 @@ retry: !keyflag ? recno : recno * 2 - 1); (void)dbenv->prdbt(&key, - checkprint, 0, stderr, __db_pr_callback, 0, 0); + checkprint, 0, stderr, __db_pr_callback, 0, 0, 0); break; case DB_LOCK_DEADLOCK: /* If we have a child txn, retry--else it's fatal. */ @@ -645,6 +680,94 @@ err: rval = 1; } /* + * putdata -- + * Put data read from the load file into the database. + */ +int +db_load_putdata(dbp, dbc, txn, writep, data, put_flags, streaming) + DB *dbp; + DBC *dbc; + DB_TXN *txn; + DBT *writep; + DBT *data; + u_int32_t put_flags; + int streaming; +{ + DBC *local; + DBT partial; + DB_ENV *dbenv; + DB_STREAM *dbs; + db_off_t offset; + int ret, t_ret; + u_int32_t flags; + + local = NULL; + dbenv = dbp->dbenv; + dbs = NULL; + offset = data->size; + flags = 0; + ret = t_ret = 0; + memset(&partial, 0, sizeof(DBT)); + partial.flags |= DB_DBT_PARTIAL; + + if (streaming != 0) + data->flags |= DB_DBT_BLOB; + + ret = ((put_flags == 0) ? + dbc->put(dbc, writep, data, DB_KEYLAST | flags) : + dbp->put(dbp, txn, writep, data, put_flags | flags)); + + if (ret != 0 || streaming == 0) + return (ret); + + /* Stream the rest of the data into the data item. */ + F_CLR(data, DB_DBT_BLOB); + if (dbc != NULL) + local = dbc; + else { + if ((ret = dbp->cursor(dbp, txn, &local, 0)) != 0) + goto err; + if ((ret = local->get(local, writep, &partial, DB_SET)) != 0) + goto err; + } + + if (data->ulen < MEGABYTE) { + if ((data->data = realloc( + data->data, data->ulen = MEGABYTE)) == NULL) { + dbp->dbenv->err(dbp->dbenv, ENOMEM, NULL); + goto err; + } + } + + if ((ret = local->db_stream(local, &dbs, DB_STREAM_WRITE)) != 0) + goto err; + + /* Load the blob piecemeal into the database. */ + while (streaming != 0 && !G(endodata)) { + if (db_load_dbt_rdump(dbenv, data, data->ulen, &streaming)) { + ret = EIO; + goto err; + } + + if ((ret = dbs->write(dbs, data, offset, 0)) != 0) + goto err; + + offset += data->size; + } + +err: if (dbs != NULL){ + if ((t_ret = dbs->close(dbs, 0)) != 0 && ret == 0) + ret = t_ret; + } + if (local != NULL && local != dbc) { + if ((t_ret = local->close(local)) != 0 && ret == 0) + ret = t_ret; + } + + return (ret); +} + +/* * env_create -- * Create the environment and initialize it for error reporting. */ @@ -669,6 +792,20 @@ db_load_env_create(dbenvp, ldg) dbenv->err(dbenv, ret, "set_passwd"); return (ret); } + + /* Configure blobs. */ + if (ldg->blob_threshold != 0 && + (ret = dbenv->set_blob_threshold( + dbenv, ldg->blob_threshold, 0)) != 0) { + dbenv->err(dbenv, ret, "set_blob_threshold"); + return (ret); + } + if (ldg->blob_dir != NULL && + (ret = dbenv->set_blob_dir(dbenv, ldg->blob_dir)) != 0) { + dbenv->err(dbenv, ret, "set_blob_dir"); + return (ret); + } + if ((ret = db_load_db_init(dbenv, ldg->home, ldg->cache, &ldg->private)) != 0) return (ret); dbenv->app_private = ldg; @@ -696,7 +833,7 @@ db_load_db_init(dbenv, home, cache, is_private) DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN; if ((ret = dbenv->open(dbenv, home, flags, 0)) == 0) return (0); - if (ret == DB_VERSION_MISMATCH) + if (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT) goto err; /* @@ -896,7 +1033,7 @@ db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp, part_keyp) DBT *keys, *kp; size_t buflen, linelen, start; long val; - int ch, first, hdr, ret; + int ch, first, hdr, ret, streaming; char *buf, *name, *p, *value; u_int32_t heap_bytes, heap_gbytes, i, nparts; @@ -1072,13 +1209,14 @@ db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp, part_keyp) } nparts = (u_int32_t) val; if ((keys = - malloc(nparts * sizeof(DBT))) == NULL) { + calloc(nparts, sizeof(DBT))) == NULL) { dbenv->err(dbenv, ENOMEM, NULL); goto err; } keys[nparts - 1].data = NULL; kp = keys; for (i = 1; i < nparts; kp++, i++) { + streaming = 0; if ((kp->data = malloc(kp->ulen = 1024)) == NULL) { dbenv->err(dbenv, ENOMEM, NULL); @@ -1088,7 +1226,7 @@ db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp, part_keyp) if (db_load_dbt_rprint(dbenv, kp)) goto err; } else { - if (db_load_dbt_rdump(dbenv, kp)) + if (db_load_dbt_rdump(dbenv, kp, 0, &streaming)) goto err; } } @@ -1109,12 +1247,14 @@ db_load_rheader(dbenv, dbp, dbtypep, subdbp, checkprintp, keysp, part_keyp) NULL, value, 0, LONG_MAX, &val)) != 0) goto nameerr; heap_bytes = (u_int32_t)val; + continue; } if (strcmp(name, "heap_gbytes") == 0) { if ((ret = __db_getlong(dbenv, NULL, value, 0, LONG_MAX, &val)) != 0) goto nameerr; heap_gbytes = (u_int32_t)val; + continue; } dbp->errx(dbp, DB_STR_A("5086", @@ -1150,10 +1290,8 @@ err: ret = 1; } if (name != NULL) free(name); - if (ret != 0) { - *part_keyp = NULL; - free_keys(keys); - } + *part_keyp = NULL; + free_keys(keys); return (ret); } @@ -1336,9 +1474,11 @@ db_load_dbt_rprint(dbenv, dbtp) * Read a byte dump line into a DBT structure. */ int -db_load_dbt_rdump(dbenv, dbtp) +db_load_dbt_rdump(dbenv, dbtp, blob_threshold, streaming) DB_ENV *dbenv; DBT *dbtp; + u_int32_t blob_threshold; + int *streaming; { u_int32_t len; u_int8_t *p; @@ -1347,7 +1487,11 @@ db_load_dbt_rdump(dbenv, dbtp) ++G(lineno); - first = 1; + if (*streaming != 0) + first = 0; + else + first = 1; + *streaming = 0; for (p = dbtp->data, len = 0; (c1 = getchar()) != '\n';) { if (c1 == EOF) { if (len == 0) { @@ -1374,7 +1518,16 @@ db_load_dbt_rdump(dbenv, dbtp) if ((c2 = getchar()) == EOF) return (db_load_badend(dbenv)); if (len >= dbtp->ulen - 10) { - dbtp->ulen *= 2; + if (dbtp->ulen == UINT32_MAX) { + dbenv->errx(dbenv, DB_STR("5143", + "Encountered a data item too large to store in the database. " + "Enable blob_threshold to store it.")); + return (DB_BUFFER_SMALL); + } + if (dbtp->ulen > UINT32_MAX/2) + dbtp->ulen = UINT32_MAX; + else + dbtp->ulen *= 2; if ((dbtp->data = realloc(dbtp->data, dbtp->ulen)) == NULL) { dbenv->err(dbenv, ENOMEM, NULL); @@ -1384,6 +1537,10 @@ db_load_dbt_rdump(dbenv, dbtp) } ++len; DIGITIZE(*p++, c1, c2); + if (blob_threshold != 0 && len > BLOB_LOADING_SIZE) { + *streaming = 1; + break; + } } dbtp->size = len; @@ -1501,6 +1658,8 @@ db_load_usage() "[-h home] [-P password] [-t btree | hash | recno | queue] db_file"); (void)fprintf(stderr, "usage: %s %s\n", progname, "-r lsn | fileid [-h home] [-P password] db_file"); + (void)fprintf(stderr, "usage: %s %s\n", + progname, "-b [blob_dir] -o [blob_threshold] db_file"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_load20.wpj b/build_vxworks/util/db_load20.wpj deleted file mode 100755 index f27c514c..00000000 --- a/build_vxworks/util/db_load20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_load20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_load20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_load20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_load -<END> diff --git a/build_vxworks/util/db_load22.wpj b/build_vxworks/util/db_load22.wpj deleted file mode 100755 index 16689b3c..00000000 --- a/build_vxworks/util/db_load22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_load22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_load22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_load22.out - -<END> - -<BEGIN> BUILD_RULE_db_load22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_load -<END> diff --git a/build_vxworks/util/db_log_verify.c b/build_vxworks/util/db_log_verify.c index 90d76d54..ec6d65d5 100644 --- a/build_vxworks/util/db_log_verify.c +++ b/build_vxworks/util/db_log_verify.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: db_log_verify.c,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/build_vxworks/util/db_log_verify20.wpj b/build_vxworks/util/db_log_verify20.wpj deleted file mode 100755 index 7f17075d..00000000 --- a/build_vxworks/util/db_log_verify20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_log_verify20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_log_verify20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_log_verify20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_log_verify -<END> diff --git a/build_vxworks/util/db_log_verify22.wpj b/build_vxworks/util/db_log_verify22.wpj deleted file mode 100755 index ed6d25e9..00000000 --- a/build_vxworks/util/db_log_verify22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_log_verify22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_log_verify22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_log_verify22.out - -<END> - -<BEGIN> BUILD_RULE_db_log_verify22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_log_verify -<END> diff --git a/build_vxworks/util/db_printlog.c b/build_vxworks/util/db_printlog.c index 3cd0d673..6d67f4d6 100644 --- a/build_vxworks/util/db_printlog.c +++ b/build_vxworks/util/db_printlog.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -21,7 +21,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_printlog_print_app_record __P((DB_ENV *, DBT *, DB_LSN *, db_recops)); @@ -30,6 +30,9 @@ int db_printlog_env_init_print_42 __P((ENV *, DB_DISTAB *)); int db_printlog_env_init_print_43 __P((ENV *, DB_DISTAB *)); int db_printlog_env_init_print_47 __P((ENV *, DB_DISTAB *)); int db_printlog_env_init_print_48 __P((ENV *, DB_DISTAB *)); +int db_printlog_env_init_print_53 __P((ENV *, DB_DISTAB *)); +int db_printlog_env_init_print_60 __P((ENV *, DB_DISTAB *)); +int db_printlog_env_init_print_61 __P((ENV *, DB_DISTAB *)); int db_printlog_lsn_arg __P((char *, DB_LSN *)); int db_printlog_main __P((int, char *[])); int db_printlog_open_rep_db __P((DB_ENV *, DB **, DBC **)); @@ -167,9 +170,6 @@ db_printlog_main(argc, argv) dbenv->set_errpfx(dbenv, progname); dbenv->set_msgfile(dbenv, stdout); - if (data_len != NULL) - (void)dbenv->set_data_len(dbenv, (u_int32_t)atol(data_len)); - if (nflag) { if ((ret = dbenv->set_flags(dbenv, DB_NOLOCKING, 1)) != 0) { dbenv->err(dbenv, ret, "set_flags: DB_NOLOCKING"); @@ -207,7 +207,7 @@ db_printlog_main(argc, argv) if (repflag) { if ((ret = dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { @@ -215,12 +215,23 @@ db_printlog_main(argc, argv) goto err; } } else if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_LOG | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open"); goto err; } + + /* + * Set data_len after environment opens. The value passed + * by -D takes priority. + */ + if (data_len != NULL && (ret = dbenv->set_data_len(dbenv, + (u_int32_t)atol(data_len))) != 0) { + dbenv->err(dbenv, ret, "set_data_len"); + goto err; + } + env = dbenv->env; /* Allocate a log cursor. */ @@ -363,6 +374,8 @@ err: exitval = 1; /* * env_init_print -- + * + * Fill the dispatch table for printing this log version's records. */ int db_printlog_env_init_print(env, version, dtabp) @@ -406,11 +419,25 @@ db_printlog_env_init_print(env, version, dtabp) if ((ret = __txn_init_print(env, dtabp)) != 0) goto err; + if (version == DB_LOGVERSION) + goto done; + + /* DB_LOGVERSION_60p1 changed the fop_write_file log. */ + if (version > DB_LOGVERSION_60) + goto done; + if ((ret = db_printlog_env_init_print_60(env, dtabp)) != 0) + goto err; + + /* DB_LOGVERSION_53 changed the heap addrem log record. */ + if (version > DB_LOGVERSION_53) + goto done; + if ((ret = db_printlog_env_init_print_53(env, dtabp)) != 0) + goto err; /* - * There are no log differences between 5.0 and 5.2, but 5.2 - * is a superset of 5.0. Patch 2 of 4.8 added __db_pg_trunc - * but didn't alter any log records so we want the same - * override as 4.8 + * Since DB_LOGVERSION_53 is a strict superset of DB_LOGVERSION_50, + * there is no need to check for log version between them; so only + * check > DB_LOGVERSION_48p2. Patch 2 of 4.8 added __db_pg_trunc but + * didn't alter any log records so we want the same override as 4.8. */ if (version > DB_LOGVERSION_48p2) goto done; @@ -572,10 +599,79 @@ err: } int +db_printlog_env_init_print_53(env, dtabp) + ENV *env; + DB_DISTAB *dtabp; +{ + int ret; +#ifdef HAVE_HEAP + ret = __db_add_recovery_int(env, + dtabp,__heap_addrem_50_print, DB___heap_addrem_50); +#else + COMPQUIET(env, NULL); + COMPQUIET(dtabp, NULL); + COMPQUIET(ret, 0); +#endif + return (ret); +} + +int +db_printlog_env_init_print_60(env, dtabp) + ENV *env; + DB_DISTAB *dtabp; +{ + int ret; + + if ((ret = __db_add_recovery_int(env, &env->recover_dtab, + __fop_create_60_print, DB___fop_create_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_remove_60_print, DB___fop_remove_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_rename_60_print, DB___fop_rename_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_rename_60_print, DB___fop_rename_noundo_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_file_remove_60_print, DB___fop_file_remove_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_write_60_print, DB___fop_write_60)) != 0) + goto err; + + if ((ret = __db_add_recovery_int(env, dtabp, + __fop_write_file_60_print, DB___fop_write_file_60)) != 0) + goto err; + +err: return (ret); +} + +int +db_printlog_env_init_print_61(env, dtabp) + ENV *env; + DB_DISTAB *dtabp; +{ + int ret; + + ret = __db_add_recovery_int(env, + dtabp,__dbreg_register_42_print, DB___dbreg_register_42); + + return (ret); +} + +int db_printlog_usage() { - fprintf(stderr, "usage: %s %s\n", progname, - "[-NrV] [-b file/offset] [-e file/offset] [-h home] [-P password]"); + fprintf(stderr, "usage: %s %s%s\n", progname, + "[-NrV] [-b file/offset] [-D data_len] ", + "[-e file/offset] [-h home] [-P password]"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_printlog20.wpj b/build_vxworks/util/db_printlog20.wpj deleted file mode 100755 index b9be26ca..00000000 --- a/build_vxworks/util/db_printlog20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_printlog20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_printlog20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_printlog20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_printlog -<END> diff --git a/build_vxworks/util/db_printlog22.wpj b/build_vxworks/util/db_printlog22.wpj deleted file mode 100755 index 24f3ab7f..00000000 --- a/build_vxworks/util/db_printlog22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_printlog22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_printlog22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_printlog22.out - -<END> - -<BEGIN> BUILD_RULE_db_printlog22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_printlog -<END> diff --git a/build_vxworks/util/db_recover.c b/build_vxworks/util/db_recover.c index 0a8f30e4..5aa25707 100644 --- a/build_vxworks/util/db_recover.c +++ b/build_vxworks/util/db_recover.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif void db_recover_feedback __P((DB_ENV *, int, int)); @@ -49,7 +49,7 @@ db_recover_main(argc, argv) time_t timestamp; u_int32_t flags; int ch, exitval, fatal_recover, ret, retain_env, set_feedback, verbose; - char *home, *passwd; + char *blob_dir, *home, *passwd; if ((progname = __db_rpath(argv[0])) == NULL) progname = argv[0]; @@ -59,12 +59,15 @@ db_recover_main(argc, argv) if ((ret = db_recover_version_check()) != 0) return (ret); - home = passwd = NULL; + blob_dir = home = passwd = NULL; timestamp = 0; exitval = fatal_recover = retain_env = set_feedback = verbose = 0; __db_getopt_reset = 1; - while ((ch = getopt(argc, argv, "cefh:P:t:Vv")) != EOF) + while ((ch = getopt(argc, argv, "b:cefh:P:t:Vv")) != EOF) switch (ch) { + case 'b': + blob_dir = optarg; + break; case 'c': fatal_recover = 1; break; @@ -137,6 +140,12 @@ db_recover_main(argc, argv) goto err; } + if (blob_dir != NULL && + (ret = dbenv->set_blob_dir(dbenv, blob_dir)) != 0) { + dbenv->err(dbenv, ret, "set_blob_dir"); + goto err; + } + if (passwd != NULL && (ret = dbenv->set_encrypt(dbenv, passwd, DB_ENCRYPT_AES)) != 0) { dbenv->err(dbenv, ret, "set_passwd"); @@ -314,7 +323,7 @@ int db_recover_usage() { (void)fprintf(stderr, "usage: %s %s\n", progname, - "[-cefVv] [-h home] [-P password] [-t [[CC]YY]MMDDhhmm[.SS]]"); +"[-cefVv] [-h home] [-b blob_dir] [-P password] [-t [[CC]YY]MMDDhhmm[.SS]]"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_recover20.wpj b/build_vxworks/util/db_recover20.wpj deleted file mode 100755 index b271e15b..00000000 --- a/build_vxworks/util/db_recover20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_recover20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_recover20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_recover20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_recover -<END> diff --git a/build_vxworks/util/db_recover22.wpj b/build_vxworks/util/db_recover22.wpj deleted file mode 100755 index e661496e..00000000 --- a/build_vxworks/util/db_recover22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_recover22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_recover22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_recover22.out - -<END> - -<BEGIN> BUILD_RULE_db_recover22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_recover -<END> diff --git a/build_vxworks/util/db_stat.c b/build_vxworks/util/db_stat.c index c7411467..39f48b14 100644 --- a/build_vxworks/util/db_stat.c +++ b/build_vxworks/util/db_stat.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif typedef enum { T_NOTSET, T_DB, @@ -475,7 +475,7 @@ db_stat_usage() "-d file [-fN] [-h home] [-P password] [-s database]"); fprintf(stderr, "usage: %s %s\n\t%s\n", progname, "[-cEelmrtVx] [-C Aclop]", - "[-h home] [-L A] [-M A] [-P password] [-R A] [-X A] [-aNZ]"); + "[-h home] [-L A] [-M Ah] [-P password] [-R A] [-X A] [-aNZ]"); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_stat20.wpj b/build_vxworks/util/db_stat20.wpj deleted file mode 100755 index 3b53c635..00000000 --- a/build_vxworks/util/db_stat20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_stat20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_stat20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_stat20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_stat -<END> diff --git a/build_vxworks/util/db_stat22.wpj b/build_vxworks/util/db_stat22.wpj deleted file mode 100755 index 5cba4e62..00000000 --- a/build_vxworks/util/db_stat22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_stat22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_stat22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_stat22.out - -<END> - -<BEGIN> BUILD_RULE_db_stat22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_stat -<END> diff --git a/build_vxworks/util/db_tuner.c b/build_vxworks/util/db_tuner.c index e78f04a7..9a8bf442 100644 --- a/build_vxworks/util/db_tuner.c +++ b/build_vxworks/util/db_tuner.c @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ * @@ -54,7 +54,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif /* @@ -123,8 +123,8 @@ static int db_tuner___tuner_record_leaf_pg __P((int, TUNER_FF_STAT *)); static int db_tuner___tuner_record_ovfl_pg __P((u_int32_t, int, TUNER_FF_STAT *)); static int db_tuner_get_opd_size __P((DBC*, PAGE*, u_int32_t*)); -static int db_tuner_item_size __P((DB *, PAGE *, db_indx_t)); -static int db_tuner_item_space __P((DB *, PAGE *, db_indx_t)); +static int db_tuner_item_size __P((DB *, PAGE *, int)); +static int db_tuner_item_space __P((DB *, PAGE *, int)); int db_tuner_main __P((int, char *[])); static int db_tuner_open_db __P((DB **, DB_ENV *, char *, char *)); static int db_tuner_sum_opd_page_data_entries __P((DB *, PAGE *)); @@ -153,6 +153,7 @@ db_tuner_main(argc, argv) char *argv[]; { extern char *optarg; + extern int optind, __db_getopt_reset; DB *dbp; DB_ENV *dbenv; DBTYPE dbtype; @@ -192,6 +193,8 @@ db_tuner_main(argc, argv) default: db_tuner_usage(); } + argc -= optind; + argv += optind; /* Handle possible interruptions. */ __db_util_siginit(); @@ -219,7 +222,8 @@ db_tuner_main(argc, argv) * private one and try again. */ if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || (ret = dbenv->open(dbenv, home, + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || + (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_PRIVATE, 0)) != 0)) { dbenv->err(dbenv, ret, "DB_ENV->open:"); @@ -681,7 +685,6 @@ db_tuner___tuner_opd_data(dbc, h, indx_pgsz, is_opd, cookie) DB_MPOOLFILE *mpf; PAGE *p; db_pgno_t next_pgno; - u_int32_t pgsize; int ret; dbp = dbc->dbp; @@ -689,7 +692,6 @@ db_tuner___tuner_opd_data(dbc, h, indx_pgsz, is_opd, cookie) mpf = dbp->mpf; p = h; - pgsize = (1 << indx_pgsz) * DB_MIN_PGSIZE; /* * __tuner_leaf_page has inserted one key for each opd already, @@ -1126,7 +1128,7 @@ static int db_tuner_item_space(dbp, h, indx) DB *dbp; PAGE *h; - db_indx_t indx; + int indx; { return (B_TYPE(GET_BKEYDATA(dbp, h, indx)->type) == B_KEYDATA ? BKEYDATA_PSIZE(GET_BKEYDATA(dbp, h, indx)->len) : @@ -1138,7 +1140,7 @@ static int db_tuner_item_size(dbp, h, indx) DB *dbp; PAGE *h; - db_indx_t indx; + int indx; { return (B_TYPE(GET_BKEYDATA(dbp, h, indx)->type) == B_KEYDATA ? GET_BKEYDATA(dbp, h, indx)->len : GET_BOVERFLOW(dbp, h, diff --git a/build_vxworks/util/db_tuner20.wpj b/build_vxworks/util/db_tuner20.wpj deleted file mode 100755 index 9b582c3a..00000000 --- a/build_vxworks/util/db_tuner20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_tuner20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_tuner20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_tuner20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_tuner -<END> diff --git a/build_vxworks/util/db_tuner22.wpj b/build_vxworks/util/db_tuner22.wpj deleted file mode 100755 index 4ff9f9bc..00000000 --- a/build_vxworks/util/db_tuner22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_tuner22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_tuner22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_tuner22.out - -<END> - -<BEGIN> BUILD_RULE_db_tuner22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_tuner -<END> diff --git a/build_vxworks/util/db_upgrade.c b/build_vxworks/util/db_upgrade.c index 936be742..e840ebc7 100644 --- a/build_vxworks/util/db_upgrade.c +++ b/build_vxworks/util/db_upgrade.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_upgrade_main __P((int, char *[])); @@ -142,7 +142,7 @@ db_upgrade_main(argc, argv) * private one and try again. */ if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 && - (ret == DB_VERSION_MISMATCH || + (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT || (ret = dbenv->open(dbenv, home, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON, 0)) != 0)) { diff --git a/build_vxworks/util/db_upgrade20.wpj b/build_vxworks/util/db_upgrade20.wpj deleted file mode 100755 index cb1c17d5..00000000 --- a/build_vxworks/util/db_upgrade20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_upgrade20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_upgrade20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_upgrade20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_upgrade -<END> diff --git a/build_vxworks/util/db_upgrade22.wpj b/build_vxworks/util/db_upgrade22.wpj deleted file mode 100755 index 8ed700fd..00000000 --- a/build_vxworks/util/db_upgrade22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_upgrade22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_upgrade22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_upgrade22.out - -<END> - -<BEGIN> BUILD_RULE_db_upgrade22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_upgrade -<END> diff --git a/build_vxworks/util/db_verify.c b/build_vxworks/util/db_verify.c index 58993272..43ac681f 100644 --- a/build_vxworks/util/db_verify.c +++ b/build_vxworks/util/db_verify.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -12,7 +12,7 @@ #ifndef lint static const char copyright[] = - "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n"; + "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n"; #endif int db_verify_main __P((int, char *[])); @@ -47,7 +47,7 @@ db_verify_main(argc, argv) u_int32_t flags, cache; int ch, exitval, mflag, nflag, private; int quiet, resize, ret; - char *dname, *fname, *home, *passwd; + char *blob_dir, *dname, *fname, *home, *passwd; if ((progname = __db_rpath(argv[0])) == NULL) progname = argv[0]; @@ -62,10 +62,13 @@ db_verify_main(argc, argv) cache = MEGABYTE; exitval = mflag = nflag = quiet = 0; flags = 0; - home = passwd = NULL; + blob_dir = home = passwd = NULL; __db_getopt_reset = 1; - while ((ch = getopt(argc, argv, "h:mNoP:quV")) != EOF) + while ((ch = getopt(argc, argv, "b:h:mNoP:quV")) != EOF) switch (ch) { + case 'b': + blob_dir = optarg; + break; case 'h': home = optarg; break; @@ -112,14 +115,6 @@ db_verify_main(argc, argv) if (argc <= 0) return (db_verify_usage()); - if (mflag) { - dname = argv[0]; - fname = NULL; - } else { - fname = argv[0]; - dname = NULL; - } - /* Handle possible interruptions. */ __db_util_siginit(); @@ -138,6 +133,12 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) { dbenv->set_errpfx(dbenv, progname); } + if (blob_dir != NULL && + (ret = dbenv->set_blob_dir(dbenv, blob_dir)) != 0) { + dbenv->err(dbenv, ret, "set_blob_dir"); + goto err; + } + if (nflag) { if ((ret = dbenv->set_flags(dbenv, DB_NOLOCKING, 1)) != 0) { dbenv->err(dbenv, ret, "set_flags: DB_NOLOCKING"); @@ -162,7 +163,7 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) { private = 0; if ((ret = dbenv->open(dbenv, home, DB_INIT_MPOOL | DB_USE_ENVIRON, 0)) != 0) { - if (ret != DB_VERSION_MISMATCH) { + if (ret != DB_VERSION_MISMATCH && ret != DB_REP_LOCKOUT) { if ((ret = dbenv->set_cachesize(dbenv, 0, cache, 1)) != 0) { dbenv->err(dbenv, ret, "set_cachesize"); @@ -184,6 +185,14 @@ retry: if ((ret = db_env_create(&dbenv, 0)) != 0) { * enabled. */ for (; !__db_util_interrupted() && argv[0] != NULL; ++argv) { + if (mflag) { + dname = argv[0]; + fname = NULL; + } else { + fname = argv[0]; + dname = NULL; + } + if ((ret = db_create(&dbp, dbenv, 0)) != 0) { dbenv->err(dbenv, ret, "%s: db_create", progname); goto err; @@ -282,7 +291,7 @@ int db_verify_usage() { fprintf(stderr, "usage: %s %s\n", progname, - "[-NoqV] [-h home] [-P password] db_file ..."); + "[-mNoqV] [-b blob_dir] [-h home] [-P password] db_file ..."); return (EXIT_FAILURE); } diff --git a/build_vxworks/util/db_verify20.wpj b/build_vxworks/util/db_verify20.wpj deleted file mode 100755 index 2dd5f151..00000000 --- a/build_vxworks/util/db_verify20.wpj +++ /dev/null @@ -1,142 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUMgnu_BUILDRULE -db_verify20.out -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AR -ar386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUMgnu/db_verify20.a -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_AS -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CC -cc386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CFLAGS_AS --g \ - -mpentium \ - -ansi \ - -nostdinc \ - -fvolatile \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -x \ - assembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_CPP -cc386 -E -P -xc -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD -ld386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDDEPS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_NM -nm386 -g -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUMgnu_MACRO_SIZE -size386 -<END> - -<BEGIN> BUILD_PENTIUMgnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUMgnu_TC -::tc_PENTIUMgnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_verify20.out - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUMgnu -<END> - -<BEGIN> BUILD__LIST -PENTIUMgnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.0 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_verify -<END> diff --git a/build_vxworks/util/db_verify22.wpj b/build_vxworks/util/db_verify22.wpj deleted file mode 100755 index c2b58f8c..00000000 --- a/build_vxworks/util/db_verify22.wpj +++ /dev/null @@ -1,176 +0,0 @@ -Document file - DO NOT EDIT - -<BEGIN> BUILD_PENTIUM2gnu_BUILDRULE -db_verify22.out -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AR -arpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_ARCHIVE -$(PRJ_DIR)/PENTIUM2gnu/db_verify22.a -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_AS -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC -ccpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CC_ARCH_SPEC --mcpu=pentiumpro -march=pentiumpro -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -DRW_MULTI_THREAD \ - -D_REENTRANT \ - -fvolatile \ - -fno-builtin \ - -fno-defer-pop \ - -I$(PRJ_DIR)/.. \ - -I$(PRJ_DIR)/../.. \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CFLAGS_AS --g \ - -mcpu=pentiumpro \ - -march=pentiumpro \ - -ansi \ - -nostdlib \ - -fno-builtin \ - -fno-defer-pop \ - -P \ - -xassembler-with-cpp \ - -I$(WIND_BASE)/target/h \ - -DCPU=PENTIUM2 \ - -DTOOL_FAMILY=gnu \ - -DTOOL=gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_CPP -ccpentium -E -P -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_HEX_FLAGS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD -ldpentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LDFLAGS --X -N -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL -ccpentium -r -nostdlib -Wl,-X -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_LD_PARTIAL_FLAGS --X -r -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_NM -nmpentium -g -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEFINE_MACRO --D -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_DEPEND --M -w -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_GENERATE_DEPENDENCY_FILE --MD -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_INCLUDE_DIR --I -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_LANG_C --xc -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_OPTION_UNDEFINE_MACRO --U -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_POST_BUILD_RULE - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_PRJ_LIBS - -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_SIZE -sizepentium -<END> - -<BEGIN> BUILD_PENTIUM2gnu_MACRO_TOOL_FAMILY -gnu -<END> - -<BEGIN> BUILD_PENTIUM2gnu_RO_DEPEND_PATH -{$(WIND_BASE)/target/h/} \ - {$(WIND_BASE)/target/src/} \ - {$(WIND_BASE)/target/config/} -<END> - -<BEGIN> BUILD_PENTIUM2gnu_TC -::tc_PENTIUM2gnu -<END> - -<BEGIN> BUILD_RULE_archive - -<END> - -<BEGIN> BUILD_RULE_db_verify22.out - -<END> - -<BEGIN> BUILD_RULE_db_verify22.pl - -<END> - -<BEGIN> BUILD_RULE_objects - -<END> - -<BEGIN> BUILD__CURRENT -PENTIUM2gnu -<END> - -<BEGIN> BUILD__LIST -PENTIUM2gnu -<END> - -<BEGIN> CORE_INFO_TYPE -::prj_vxApp -<END> - -<BEGIN> CORE_INFO_VERSION -2.2 -<END> -<BEGIN> PROJECT_FILES -<END> - -<BEGIN> userComments -db_verify -<END> |