[rhmessaging-commits] rhmessaging commits: r3085 - store/trunk/cpp/lib/jrnl.

Author: kpvdr Date: 2009-01-30 11:28:22 -0500 (Fri, 30 Jan 2009) New Revision: 3085 Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp Log: reverting checkin 3081 - this is a regression and breaks some tests. Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-01-30 15:11:14 UTC (rev 3084) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2009-01-30 16:28:22 UTC (rev 3085) @@ -288,22 +288,19 @@ } else // File header reads have no pcb { - if (!_rrfc.subm_cnt_dblks() >= JRNL_SBLK_SIZE) - { - std::memcpy(&_fhdr, _fhdr_buffer, sizeof(file_hdr)); - _rrfc.add_cmpl_cnt_dblks(JRNL_SBLK_SIZE); + std::memcpy(&_fhdr, _fhdr_buffer, sizeof(file_hdr)); + _rrfc.add_cmpl_cnt_dblks(JRNL_SBLK_SIZE); - u_int32_t fro_dblks = (_fhdr._fro / JRNL_DBLK_SIZE) - JRNL_SBLK_SIZE; - _pg_cntr = fro_dblks / (JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE); - u_int32_t tot_pg_offs_dblks = _pg_cntr * JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE; - _pg_index = _pg_cntr % JRNL_RMGR_PAGES; - _pg_offset_dblks = fro_dblks - tot_pg_offs_dblks; - _rrfc.add_subm_cnt_dblks(tot_pg_offs_dblks); - _rrfc.add_cmpl_cnt_dblks(tot_pg_offs_dblks); + u_int32_t fro_dblks = (_fhdr._fro / JRNL_DBLK_SIZE) - JRNL_SBLK_SIZE; + _pg_cntr = fro_dblks / (JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE); + u_int32_t tot_pg_offs_dblks = _pg_cntr * JRNL_RMGR_PAGE_SIZE * JRNL_SBLK_SIZE; + _pg_index = _pg_cntr % JRNL_RMGR_PAGES; + _pg_offset_dblks = fro_dblks - tot_pg_offs_dblks; + _rrfc.add_subm_cnt_dblks(tot_pg_offs_dblks); + _rrfc.add_cmpl_cnt_dblks(tot_pg_offs_dblks); - _fhdr_rd_outstanding = false; - _rrfc.set_valid(); - } + _fhdr_rd_outstanding = false; + _rrfc.set_valid(); } }