From: Dmitry Y. <di...@us...> - 2007-11-30 14:33:35
|
Build Version : T2.1.0.17408 Firebird 2.1 Beta 2 (writeBuildNum.sh,v 1.17566 2007/11/30 14:33:37 dimitr Exp ) Update of /cvsroot/firebird/firebird2/src/lock In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7215 Modified Files: Tag: B3_0_Transition print.cpp Log Message: Misc (style). Index: print.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/lock/print.cpp,v retrieving revision 1.54.2.9 retrieving revision 1.54.2.10 diff -b -U3 -r1.54.2.9 -r1.54.2.10 --- print.cpp 30 Nov 2007 06:02:46 -0000 1.54.2.9 +++ print.cpp 30 Nov 2007 14:33:34 -0000 1.54.2.10 @@ -79,7 +79,7 @@ static void prt_lock_activity(OUTFILE, const lhb*, USHORT, USHORT, USHORT); static void prt_lock_init(void*, sh_mem*, bool); static void prt_history(OUTFILE, const lhb*, SRQ_PTR, const SCHAR*); -static void prt_lock(OUTFILE, const lhb*, LBL, USHORT); +static void prt_lock(OUTFILE, const lhb*, lbl*, USHORT); static void prt_owner(OUTFILE, const lhb*, const own*, bool, bool); static void prt_owner_wait_cycle(OUTFILE, const lhb*, const own*, USHORT, waitque*); static void prt_request(OUTFILE, const lhb*, const lrq*); @@ -485,9 +485,9 @@ prt_que(outfile, LOCK_header, "\tFree owners", &LOCK_header->lhb_free_owners, OFFSET(own*, own_lhb_owners)); prt_que(outfile, LOCK_header, "\tFree locks", - &LOCK_header->lhb_free_locks, OFFSET(LBL, lbl_lhb_hash)); + &LOCK_header->lhb_free_locks, OFFSET(lbl*, lbl_lhb_hash)); prt_que(outfile, LOCK_header, "\tFree requests", - &LOCK_header->lhb_free_requests, OFFSET(LRQ, lrq_lbl_requests)); + &LOCK_header->lhb_free_requests, OFFSET(lrq*, lrq_lbl_requests)); /* Print lock ordering option */ @@ -544,7 +544,7 @@ que_inst = (SRQ) SRQ_ABS_PTR(que_inst->srq_forward)) { prt_lock(outfile, LOCK_header, - (LBL) ((UCHAR *) que_inst - OFFSET(LBL, lbl_lhb_hash)), + (lbl*) ((UCHAR *) que_inst - OFFSET(lbl*, lbl_lhb_hash)), sw_series); } } @@ -824,8 +824,8 @@ **************************************/ FPRINTF(outfile, "%s:\n", title); - for (const his* history = (HIS) SRQ_ABS_PTR(history_header); true; - history = (HIS) SRQ_ABS_PTR(history->his_next)) + for (const his* history = (his*) SRQ_ABS_PTR(history_header); true; + history = (his*) SRQ_ABS_PTR(history->his_next)) { if (history->his_operation) FPRINTF(outfile, @@ -842,7 +842,7 @@ static void prt_lock( OUTFILE outfile, - const lhb* LOCK_header, LBL lock, USHORT sw_series) + const lhb* LOCK_header, lbl* lock, USHORT sw_series) { /************************************** * @@ -898,14 +898,14 @@ lock->lbl_flags, lock->lbl_pending_lrq_count); prt_que(outfile, LOCK_header, "\tHash que", &lock->lbl_lhb_hash, - OFFSET(LBL, lbl_lhb_hash)); + OFFSET(lbl*, lbl_lhb_hash)); prt_que(outfile, LOCK_header, "\tRequests", &lock->lbl_requests, - OFFSET(LRQ, lrq_lbl_requests)); + OFFSET(lrq*, lrq_lbl_requests)); const srq* que_inst; SRQ_LOOP(lock->lbl_requests, que_inst) { - const lrq* request = (lrq*) ((UCHAR*) que_inst - OFFSET(LRQ, lrq_lbl_requests)); + const lrq* request = (lrq*) ((UCHAR*) que_inst - OFFSET(lrq*, lrq_lbl_requests)); FPRINTF(outfile, "\t\tRequest %6"SLONGFORMAT", Owner: %6"SLONGFORMAT ", State: %d (%d), Flags: 0x%02X\n", @@ -962,9 +962,9 @@ } prt_que(outfile, LOCK_header, "\tRequests", &owner->own_requests, - OFFSET(LRQ, lrq_own_requests)); + OFFSET(lrq*, lrq_own_requests)); prt_que(outfile, LOCK_header, "\tBlocks", &owner->own_blocks, - OFFSET(LRQ, lrq_own_blocks)); + OFFSET(lrq*, lrq_own_blocks)); if (sw_waitlist) { waitque owner_list; @@ -978,8 +978,8 @@ const srq* que_inst; SRQ_LOOP(owner->own_requests, que_inst) prt_request(outfile, LOCK_header, - (LRQ) ((UCHAR *) que_inst - - OFFSET(LRQ, lrq_own_requests))); + (lrq*) ((UCHAR *) que_inst - + OFFSET(lrq*, lrq_own_requests))); } } @@ -1032,11 +1032,11 @@ waiters->waitque_entry[waiters->waitque_depth++] = SRQ_REL_PTR(owner); FPRINTF(outfile, "\n"); - const lrq* owner_request = (LRQ) SRQ_ABS_PTR(owner->own_pending_request); + const lrq* owner_request = (lrq*) SRQ_ABS_PTR(owner->own_pending_request); fb_assert(owner_request->lrq_type == type_lrq); const bool owner_conversion = (owner_request->lrq_state > LCK_null); - const lbl* lock = (LBL) SRQ_ABS_PTR(owner_request->lrq_lock); + const lbl* lock = (lbl*) SRQ_ABS_PTR(owner_request->lrq_lock); fb_assert(lock->lbl_type == type_lbl); int counter = 0; @@ -1052,7 +1052,7 @@ } const lrq* lock_request = - (LRQ) ((UCHAR *) que_inst - OFFSET(LRQ, lrq_lbl_requests)); + (lrq*) ((UCHAR *) que_inst - OFFSET(lrq*, lrq_lbl_requests)); fb_assert(lock_request->lrq_type == type_lrq); @@ -1107,11 +1107,11 @@ FPRINTF(outfile, "\tAST: 0x%p, argument: 0x%p\n", request->lrq_ast_routine, request->lrq_ast_argument); prt_que2(outfile, LOCK_header, "\tlrq_own_requests", - &request->lrq_own_requests, OFFSET(LRQ, lrq_own_requests)); + &request->lrq_own_requests, OFFSET(lrq*, lrq_own_requests)); prt_que2(outfile, LOCK_header, "\tlrq_lbl_requests", - &request->lrq_lbl_requests, OFFSET(LRQ, lrq_lbl_requests)); + &request->lrq_lbl_requests, OFFSET(lrq*, lrq_lbl_requests)); prt_que2(outfile, LOCK_header, "\tlrq_own_blocks ", - &request->lrq_own_blocks, OFFSET(LRQ, lrq_own_blocks)); + &request->lrq_own_blocks, OFFSET(lrq*, lrq_own_blocks)); FPRINTF(outfile, "\n"); } |