8:04 a.m.
Author: kpvdr
Date: 2009-06-04 09:04:40 -0400 (Thu, 04 Jun 2009)
New Revision: 3414
Modified:
store/trunk/cpp/rhel4-support/rhel4.patch
Log:
Revised valgrind suppressions for the latest RHEL4 update
Modified: store/trunk/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/trunk/cpp/rhel4-support/rhel4.patch 2009-06-03 20:56:37 UTC (rev 3413)
+++ store/trunk/cpp/rhel4-support/rhel4.patch 2009-06-04 13:04:40 UTC (rev 3414)
@@ -1,8 +1,8 @@
Index: tests/.valgrind.supp
===================================================================
---- tests/.valgrind.supp (revision 2259)
+--- tests/.valgrind.supp (revision 3413)
+++ tests/.valgrind.supp (working copy)
-@@ -1,32 +1,207 @@
+@@ -1,32 +1,88 @@
{
- Benign error in libcpg.
- Memcheck:Param
@@ -16,6 +16,8 @@
+ obj:/usr/lib64/libstdc++.so.6.0.3
+ fun:_ZNSsC1EPKcRKSaIcE
+
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log5posix11SinkOptionsC1ERKSs
++ fun:_ZN4qpid3log11SinkOptions6createERKSs
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
}
@@ -28,9 +30,10 @@
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwm
-+
fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
-+ fun:_ZN4qpid7Options14register_namesESs
++
fun:_ZN5boost15program_options29options_description_easy_initclEPKcPKNS0_14value_semanticES3_
+
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log5posix11SinkOptionsC1ERKSs
++ fun:_ZN4qpid3log11SinkOptions6createERKSs
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
}
@@ -45,46 +48,11 @@
- fun:_ZNSsC1EPKcRKSaIcE
- obj:/usr/lib/libboost_program_options.so.1.33.1
+ fun:_Znwm
-+
fun:_ZN5boost15program_options29options_description_easy_initclEPKcPKNS0_14value_semanticES3_
-+
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN5boost15program_options19options_description3addERKS1_
+ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
+ fun:_ZN4qpid3log6LoggerC1Ev
}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
-+ fun:calloc
-+ fun:_dl_allocate_tls
-+ fun:pthread_create@@GLIBC_2.2.5
-+ fun:_ZN3rhm3jtt13jrnl_instance6run_tcEv
-+ fun:_Z13constructor_1v
-+ fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv
-+ obj:/usr/lib64/libboost_unit_test_framework.so.1.32.0
-+ fun:_ZN5boost17execution_monitor7executeEbi
-+
fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor21execute_and_translateEPNS0_9test_caseEMS3_FvvEi
-+ fun:_ZN5boost9unit_test9test_case3runEv
-+ fun:_ZN5boost9unit_test10test_suite6do_runEv
-+ fun:_ZN5boost9unit_test9test_case3runEv
-+ fun:main
-+}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
-+ fun:_Znwm
-+ fun:_ZN5boost9unit_test9test_caseC2ENS0_13basic_cstringIKcEEbmb
-+}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
-+ fun:calloc
-+ fun:_dl_allocate_tls
-+ fun:pthread_create@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
-+ fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
-+ fun:_ZN4qpid6broker5Timer5startEv
-+ fun:_ZN4qpid6broker5TimerC1Ev
-+}
-
+-
{
- Bogus epoll_ctl error on i386
- Memcheck:Param
@@ -92,148 +60,62 @@
- fun:epoll_ctl
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:malloc
-+ fun:decompose_rpath
-+ fun:_dl_map_object
-+ fun:openaux
-+ fun:_dl_catch_error
-+ fun:_dl_map_object_deps
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
++ fun:_Znwm
++
fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
++ fun:_ZN4qpid7Options14register_namesESs
++
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:calloc
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
++ fun:_Znwm
++ fun:_ZN5boost15program_options19options_description3addERKS1_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:malloc
-+ fun:_dl_map_object
-+ fun:openaux
-+ fun:_dl_catch_error
-+ fun:_dl_map_object_deps
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
++ fun:_Znwm
++
fun:_ZNSt6vectorISsSaISsEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPSsS1_EERKSs
++ fun:_ZN4qpid7Options14register_namesESs
++
fun:_ZN4qpid34options_description_less_easy_initclEPKcPKN5boost15program_options14value_semanticES2_
++ fun:_ZN4qpid3log7OptionsC1ERKSsS3_
++ fun:_ZN4qpid3log6LoggerC1Ev
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:malloc
-+ fun:expand_dynamic_string_token
-+ fun:_dl_map_object
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
-+}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
-+ fun:malloc
-+ fun:_dl_new_object
-+ fun:_dl_map_object_from_fd
-+ fun:_dl_map_object
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
-+}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
+ fun:calloc
-+ fun:_dl_new_object
-+ fun:_dl_map_object_from_fd
-+ fun:_dl_map_object
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
++ fun:_dl_allocate_tls
++ fun:pthread_create@@GLIBC_2.2.5
++ fun:_ZN3mrg3jtt13jrnl_instance6run_tcEv
++ fun:_Z13constructor_1v
++ fun:_ZN5boost9unit_test9ut_detail17unit_test_monitor8functionEv
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
-+ fun:malloc
-+ fun:_dl_map_object_deps
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
-+}
-+{
-+ <insert a suppression name here>
-+ Memcheck:Leak
+ fun:calloc
-+ fun:_dl_check_map_versions
-+ fun:dl_open_worker
-+ fun:_dl_catch_error
-+ fun:_dl_open
-+ fun:dlopen_doit
-+ fun:_dl_catch_error
-+ fun:_dlerror_run
-+ fun:dlopen@@GLIBC_2.2.5
-+ fun:_ZN4qpid3sys5Shlib4loadEPKc
-+ fun:_Z8tryShlibPKcb
-+ fun:main
++ fun:_dl_allocate_tls
++ fun:pthread_create@@GLIBC_2.2.5
++ fun:_ZN4qpid3sys13ThreadPrivateC1EPNS0_8RunnableE
++ fun:_ZN4qpid3sys6ThreadC1EPNS0_8RunnableE
++ fun:_ZN4qpid6broker5Timer5startEv
++ fun:_ZN4qpid6broker5TimerC1Ev
+}
+{
+ <insert a suppression name here>
+ Memcheck:Leak
+ fun:_Znwm
-+ fun:_ZN5boost15program_options19options_description3addERKS1_
-+ fun:main
++ fun:_ZN5boost9unit_test9test_caseC2ENS0_13basic_cstringIKcEEbmb
+}
Index: configure.ac
===================================================================
---- configure.ac (revision 2259)
+--- configure.ac (revision 3413)
+++ configure.ac (working copy)
@@ -54,7 +54,6 @@
# -Wshadow - warns about boost headers.
@@ -253,11 +135,11 @@
AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
Index: lib/MessageStoreImpl.cpp
===================================================================
---- lib/MessageStoreImpl.cpp (revision 2693)
+--- lib/MessageStoreImpl.cpp (revision 3413)
+++ lib/MessageStoreImpl.cpp (working copy)
-@@ -282,10 +282,6 @@
- env.set_lg_regionmax(256000); // default = 65000
- env.open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
+@@ -304,10 +304,6 @@
+ dbenv->set_lg_regionmax(256000); // default = 65000
+ dbenv->open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
} catch (const DbException& e) {
- if (e.get_errno() == DB_VERSION_MISMATCH)
- THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of
bd4 does not match that which created the store database. "
@@ -265,4 +147,3 @@
- "db_upgrade or using db_recover - but the
db4-utils package must also be installed to use these utilities.)", e);
THROW_STORE_EXCEPTION_2("Error opening environment", e);
}
-