rhmessaging-commits August 2011

rhmessaging-commits@lists.jboss.org

1 participants
4 discussions

rhmessaging commits: r4474 - store/trunk/cpp/perf.

by rhmessaging-commits＠lists.jboss.org

Author: aconway Date: 2011-08-31 10:52:42 -0400 (Wed, 31 Aug 2011) New Revision: 4474 Modified: store/trunk/cpp/perf/ScopedTimer.cpp Log: Fixed trivial inconsistency causing doxygen warnings Modified: store/trunk/cpp/perf/ScopedTimer.cpp =================================================================== --- store/trunk/cpp/perf/ScopedTimer.cpp 2011-08-25 12:36:48 UTC (rev 4473) +++ store/trunk/cpp/perf/ScopedTimer.cpp 2011-08-31 14:52:42 UTC (rev 4474) @@ -54,7 +54,7 @@ } // static - double ScopedTimer::_s_getDoubleTime(const ::timespec& ts) + double ScopedTimer::_s_getDoubleTime(const std::timespec& ts) { return ts.tv_sec + (double(ts.tv_nsec) / 1e9); }

12 years, 9 months

1
0
0 / 0

rhmessaging commits: r4473 - store/tags.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2011-08-25 08:36:48 -0400 (Thu, 25 Aug 2011) New Revision: 4473 Added: store/tags/qpid-0.12-release/ Log: Tag for Qpid 0.12 release

12 years, 9 months

1
0
0 / 0

rhmessaging commits: r4472 - store/trunk/cpp/lib.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2011-08-25 08:12:08 -0400 (Thu, 25 Aug 2011) New Revision: 4472 Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp Log: BZ733168 - Persistent store plugin uses inconsistent kibibyte abbreviations, patch from Paul Colby Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2011-08-19 14:14:33 UTC (rev 4471) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2011-08-25 12:12:08 UTC (rev 4472) @@ -298,11 +298,11 @@ // QPID_LOG(info, "> Auto-expand " << (autoJrnlExpand ? "enabled" : "disabled")); // if (autoJrnlExpand) QPID_LOG(info, "> Max auto-expand journal files: " << autoJrnlExpandMaxFiles); QPID_LOG(info, "> Default journal file size: " << jfileSizePgs << " (wpgs)"); - QPID_LOG(info, "> Default write cache page size: " << wCachePageSizeKib << " (Kib)"); + QPID_LOG(info, "> Default write cache page size: " << wCachePageSizeKib << " (KiB)"); QPID_LOG(info, "> Default number of write cache pages: " << wCacheNumPages); QPID_LOG(info, "> TPL files per journal: " << tplNumJrnlFiles); QPID_LOG(info, "> TPL journal file size: " << tplJfileSizePgs << " (wpgs)"); - QPID_LOG(info, "> TPL write cache page size: " << tplWCachePageSizeKib << " (Kib)"); + QPID_LOG(info, "> TPL write cache page size: " << tplWCachePageSizeKib << " (KiB)"); QPID_LOG(info, "> TPL number of write cache pages: " << tplWCacheNumPages); return isInit; @@ -1688,13 +1688,13 @@ oss1 << "Default number of files for each journal instance (queue). [Allowable values: " << JRNL_MIN_NUM_FILES << " - " << JRNL_MAX_NUM_FILES << "]"; std::ostringstream oss2; - oss2 << "Default size for each journal file in multiples of read pages (1 read page = 64kiB). [Allowable values: " << + oss2 << "Default size for each journal file in multiples of read pages (1 read page = 64KiB). [Allowable values: " << JRNL_MIN_FILE_SIZE / JRNL_RMGR_PAGE_SIZE << " - " << JRNL_MAX_FILE_SIZE / JRNL_RMGR_PAGE_SIZE << "]"; std::ostringstream oss3; oss3 << "Number of files for transaction prepared list journal instance. [Allowable values: " << JRNL_MIN_NUM_FILES << " - " << JRNL_MAX_NUM_FILES << "]"; std::ostringstream oss4; - oss4 << "Size of each transaction prepared list journal file in multiples of read pages (1 read page = 64kiB) [Allowable values: " << + oss4 << "Size of each transaction prepared list journal file in multiples of read pages (1 read page = 64KiB) [Allowable values: " << JRNL_MIN_FILE_SIZE / JRNL_RMGR_PAGE_SIZE << " - " << JRNL_MAX_FILE_SIZE / JRNL_RMGR_PAGE_SIZE << "]"; addOptions() ("store-dir", qpid::optValue(storeDir, "DIR"),

12 years, 9 months

1
0
0 / 0

rhmessaging commits: r4471 - store/trunk/cpp/lib/jrnl.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2011-08-19 10:14:33 -0400 (Fri, 19 Aug 2011) New Revision: 4471 Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp store/trunk/cpp/lib/jrnl/jerrno.hpp store/trunk/cpp/lib/jrnl/jinf.cpp Log: BZ732004: "Improve async store error messages for null .jinf file during recovery". Fixed up formatting error which caused the error message to be truncated, also inserted a new exception JERR_JINF_ZEROLENFILE which is thrown if the .jinf file is zero length. Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.cpp 2011-08-09 14:43:35 UTC (rev 4470) +++ store/trunk/cpp/lib/jrnl/jerrno.cpp 2011-08-19 14:14:33 UTC (rev 4471) @@ -132,6 +132,7 @@ const u_int32_t jerrno::JERR_JINF_NOTREGFILE = 0x0c07; const u_int32_t jerrno::JERR_JINF_BADFILESIZE = 0x0c08; const u_int32_t jerrno::JERR_JINF_OWIBAD = 0x0c09; +const u_int32_t jerrno::JERR_JINF_ZEROLENFILE = 0x0c0a; // Negative returns for some functions const int32_t jerrno::AIO_TIMEOUT = -1; @@ -232,6 +233,7 @@ _err_map[JERR_JINF_NOTREGFILE] = "JERR_JINF_NOTREGFILE: Target journal data file is not a regular file"; _err_map[JERR_JINF_BADFILESIZE] = "JERR_JINF_BADFILESIZE: Journal data file is of incorrect or unexpected size"; _err_map[JERR_JINF_OWIBAD] = "JERR_JINF_OWIBAD: Journal data files have inconsistent OWI flags; >1 transition found in non-auto-expand or min-size journal"; + _err_map[JERR_JINF_ZEROLENFILE] = "JERR_JINF_ZEROLENFILE: Journal info file zero length"; //_err_map[] = ""; Modified: store/trunk/cpp/lib/jrnl/jerrno.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.hpp 2011-08-09 14:43:35 UTC (rev 4470) +++ store/trunk/cpp/lib/jrnl/jerrno.hpp 2011-08-19 14:14:33 UTC (rev 4471) @@ -113,8 +113,8 @@ static const u_int32_t JERR_RRFC_OPENRD; ///< Unable to open file for read // class jrec, enq_rec, deq_rec, txn_rec - static const u_int32_t JERR_JREC_BADRECHDR; ///< Invalid data record header - static const u_int32_t JERR_JREC_BADRECTAIL; ///< Invalid data record tail + static const u_int32_t JERR_JREC_BADRECHDR; ///< Invalid data record header + static const u_int32_t JERR_JREC_BADRECTAIL; ///< Invalid data record tail // class wmgr static const u_int32_t JERR_WMGR_BADPGSTATE; ///< Page buffer in illegal state. @@ -150,6 +150,7 @@ static const u_int32_t JERR_JINF_NOTREGFILE; ///< Target file is not a regular file static const u_int32_t JERR_JINF_BADFILESIZE; ///< File is of incorrect or unexpected size static const u_int32_t JERR_JINF_OWIBAD; ///< OWI inconsistent (>1 transition in non-ae journal) + static const u_int32_t JERR_JINF_ZEROLENFILE; ///< Journal info file is zero length (empty). // Negative returns for some functions static const int32_t AIO_TIMEOUT; ///< Timeout waiting for AIO return Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2011-08-09 14:43:35 UTC (rev 4470) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2011-08-19 14:14:33 UTC (rev 4471) @@ -110,7 +110,7 @@ if (_jver != RHM_JDAT_VERSION) { oss << "File \"" << _filename << "\": "; - oss << "RHM_JDAT_VERSION mismatch: " << _jver; + oss << "RHM_JDAT_VERSION mismatch: found=" << (int)_jver; oss << "; required=" << RHM_JDAT_VERSION << std::endl; err = true; } @@ -155,14 +155,14 @@ if (_sblk_size_dblks != JRNL_SBLK_SIZE) { oss << "File \"" << _filename << "\": "; - oss << "JRNL_SBLK_SIZE mismatch: " << _sblk_size_dblks; + oss << "JRNL_SBLK_SIZE mismatch: found=" << _sblk_size_dblks; oss << "; required=" << JRNL_SBLK_SIZE << std::endl; err = true; } if (_dblk_size != JRNL_DBLK_SIZE) { oss << "File \"" << _filename << "\": "; - oss << "JRNL_DBLK_SIZE mismatch: " << _dblk_size; + oss << "JRNL_DBLK_SIZE mismatch: found=" << _dblk_size; oss << "; required=" << JRNL_DBLK_SIZE << std::endl; err = true; } @@ -421,9 +421,11 @@ std::ifstream jinfs(jinf_filename.c_str()); if (!jinfs.good()) throw jexception(jerrno::JERR__FILEIO, jinf_filename.c_str(), "jinf", "read"); + u_int32_t charcnt = 0; while (jinfs.good()) { jinfs.getline(buff, 1023); + charcnt += std::strlen(buff); if (std::strstr(buff, "journal_version")) _jver = u_int16_value(buff); else if(std::strstr(buff, "id_string")) @@ -461,6 +463,8 @@ } } jinfs.close(); + if (charcnt == 0) + throw jexception(jerrno::JERR_JINF_ZEROLENFILE, jinf_filename.c_str(), "jinf", "read"); } bool

12 years, 9 months

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits August 2011