[rhmessaging-commits] rhmessaging commits: r1431 - store/trunk/cpp/tests/jrnl.

Author: kpvdr Date: 2007-12-05 10:26:25 -0500 (Wed, 05 Dec 2007) New Revision: 1431 Modified: store/trunk/cpp/tests/jrnl/janalyze.py store/trunk/cpp/tests/jrnl/jtest.cpp store/trunk/cpp/tests/jrnl/jtest.hpp store/trunk/cpp/tests/jrnl/msg_producer.cpp Log: Updated non-compiling tests to keep up with recent changes to the values of transient and external masks as well as adding file geometry parameters to the journal constructor. Modified: store/trunk/cpp/tests/jrnl/janalyze.py =================================================================== --- store/trunk/cpp/tests/jrnl/janalyze.py 2007-12-05 03:18:17 UTC (rev 1430) +++ store/trunk/cpp/tests/jrnl/janalyze.py 2007-12-05 15:26:25 UTC (rev 1431) @@ -43,8 +43,8 @@ EXTERN_COL = 13 COMMENT_COL = 20 -transient_mask = 0x1 -extern_mask = 0x2 +transient_mask = 0x10 +extern_mask = 0x20 def load(f, klass): args = load_args(f, klass) Modified: store/trunk/cpp/tests/jrnl/jtest.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtest.cpp 2007-12-05 03:18:17 UTC (rev 1430) +++ store/trunk/cpp/tests/jrnl/jtest.cpp 2007-12-05 15:26:25 UTC (rev 1431) @@ -278,7 +278,8 @@ msg_consumer::_c_args* jtest::c_args = NULL; msg_producer jtest::_mp(_dtok_master_list, _dtok_wr_aio_list); msg_consumer jtest::_mc(_dtok_master_list, _dtok_rd_aio_list); -rhm::journal::jcntl jtest::_jc(JOURNAL_ID, JOURNAL_DIR, JOURNAL_BASE_FILENAME); +rhm::journal::jcntl jtest::_jc(JOURNAL_ID, JOURNAL_DIR, JOURNAL_BASE_FILENAME, NUM_JFILES, + JFSIZE_SBLKS); // static method void @@ -498,11 +499,6 @@ cout << "JRNL_DBLK_SIZE = " << JRNL_DBLK_SIZE << " bytes" << endl; cout << "JRNL_SBLK_SIZE = " << JRNL_SBLK_SIZE << " dblks (" << (JRNL_DBLK_SIZE * JRNL_SBLK_SIZE) << " bytes)" << endl; - cout << "JRNL_FILE_SIZE = " << JRNL_FILE_SIZE << " dblks (" << - (JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_FILE_SIZE / 1024.0 / 1024.0) << " MiB)" << endl; - cout << "JRNL_NUM_FILES = " << JRNL_NUM_FILES << " (Total capacity: " << - (JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_FILE_SIZE * JRNL_NUM_FILES / 1024.0 / 1024.0) << - " MiB)" << endl; cout << "JRNL_RMGR_PAGE_SIZE = " << JRNL_RMGR_PAGE_SIZE << " sblocks (" << (JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_RMGR_PAGE_SIZE / 1024.0) << " KiB)" << endl; cout << "JRNL_RMGR_PAGES = " << JRNL_RMGR_PAGES << " pages (" << Modified: store/trunk/cpp/tests/jrnl/jtest.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtest.hpp 2007-12-05 03:18:17 UTC (rev 1430) +++ store/trunk/cpp/tests/jrnl/jtest.hpp 2007-12-05 15:26:25 UTC (rev 1431) @@ -39,7 +39,8 @@ #define JOURNAL_ID "Test Journal" #define JOURNAL_DIR "jdata" #define JOURNAL_BASE_FILENAME "test" - +#define NUM_JFILES 8 +#define JFSIZE_SBLKS 3072 #define MAX_LINE_LEN 1024 using namespace std; Modified: store/trunk/cpp/tests/jrnl/msg_producer.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/msg_producer.cpp 2007-12-05 03:18:17 UTC (rev 1430) +++ store/trunk/cpp/tests/jrnl/msg_producer.cpp 2007-12-05 15:26:25 UTC (rev 1431) @@ -519,7 +519,7 @@ }; u_int16_t msg_producer::instance_cnt = 0; -const size_t msg_producer::_msg_buff_size = JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_FILE_SIZE * JRNL_NUM_FILES; +const size_t msg_producer::_msg_buff_size = 0x1000000; char msg_producer::_msg_buff[msg_producer::_msg_buff_size]; bool msg_producer::_interrupt_flag = false;