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"),