[rhmessaging-commits] rhmessaging commits: r2201 - in store/branches/mrg-1.0/cpp: lib and 1 other directory.

Author: kpvdr Date: 2008-07-16 15:12:28 -0400 (Wed, 16 Jul 2008) New Revision: 2201 Modified: store/branches/mrg-1.0/cpp/Makefile.am store/branches/mrg-1.0/cpp/configure.ac store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp Log: Fixed thread sync problem on creation of prepared list journal; also added checks for rpmlint in makefile.am Modified: store/branches/mrg-1.0/cpp/Makefile.am =================================================================== --- store/branches/mrg-1.0/cpp/Makefile.am 2008-07-14 18:05:24 UTC (rev 2200) +++ store/branches/mrg-1.0/cpp/Makefile.am 2008-07-16 19:12:28 UTC (rev 2201) @@ -27,4 +27,8 @@ rpmbuild: $(SPEC) dist-gzip mkdir -p $(RPMDIRS) rpmbuild $(RPMMACROS) $(RPMOPTS) rhm.spec +if HAS_RPMLINT rpmlint `find rpm -name '*.rpm'` +else + @echo "WARNING: rpmlint not found, could not validate RPMs." +endif Modified: store/branches/mrg-1.0/cpp/configure.ac =================================================================== --- store/branches/mrg-1.0/cpp/configure.ac 2008-07-14 18:05:24 UTC (rev 2200) +++ store/branches/mrg-1.0/cpp/configure.ac 2008-07-16 19:12:28 UTC (rev 2201) @@ -175,6 +175,10 @@ # We use valgrind for the tests. See if it's available. AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind]) +# If rpmlint is available we'll run it when building RPMs. +AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint]) +AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) + # Also doxygen for documentation... AC_CHECK_PROG([do_doxygen], [doxygen], [yes]) AM_CONDITIONAL([DOXYGEN], [test x$do_doxygen = xyes]) Modified: store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp =================================================================== --- store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp 2008-07-14 18:05:24 UTC (rev 2200) +++ store/branches/mrg-1.0/cpp/lib/BdbMessageStore.cpp 2008-07-16 19:12:28 UTC (rev 2201) @@ -171,6 +171,7 @@ void BdbMessageStore::chkInitPreparedXidStore() { + qpid::sys::Mutex::ScopedLock sl(jrnlCreateLock); if (!preparedXidStorePtr->is_ready()) { u_int32_t defTotWCacheSize = JRNL_WMGR_DEF_PAGE_SIZE * JRNL_WMGR_DEF_PAGES; // in sblks. Currently 2014 sblks (1 MiB). preparedXidStorePtr->initialize(defXidStoreNumJrnlFiles, defXidStoreJrnlFileSizePgs * JRNL_RMGR_PAGE_SIZE, defTotWCacheSize / wcache_pgsize_sblks, defXidStoreWCachePageSize);