[Firebird-checkins] CVS: firebird2/src/jrd GlobalRWLock.cpp, 1.4, 1.4.2.1 GlobalRWLock.h, 1.5, 1.5.2.1

[Adriano d. S. F. <asf...@us...>]

Build Version :  T2.1.0.17410 Firebird 2.1 Beta 2

(writeBuildNum.sh,v 1.17568 2007/11/30 17:33:13 asfernandes )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22528/src/jrd

Modified Files:
      Tag: B3_0_Transition
	GlobalRWLock.cpp GlobalRWLock.h 
Log Message:
Misc

Index: GlobalRWLock.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/GlobalRWLock.cpp,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -b -U3 -r1.4 -r1.4.2.1
--- GlobalRWLock.cpp	24 May 2007 12:30:41 -0000	1.4
+++ GlobalRWLock.cpp	30 Nov 2007 17:33:09 -0000	1.4.2.1
@@ -44,7 +44,7 @@
 
 int GlobalRWLock::blocking_ast_cached_lock(void* ast_object)
 {
-	Jrd::GlobalRWLock *GlobalRWLock = 
+	Jrd::GlobalRWLock* globalRWLock = 
 		static_cast<Jrd::GlobalRWLock*>(ast_object);
 
 	ISC_ast_enter();
@@ -55,7 +55,7 @@
 	JRD_set_thread_data(tdbb, thd_context);
 
 	ISC_STATUS_ARRAY ast_status;
-	Jrd::Database* dbb = GlobalRWLock->cached_lock->lck_dbb;
+	Jrd::Database* dbb = globalRWLock->cached_lock->lck_dbb;
 
 	tdbb->tdbb_database = dbb;
 	tdbb->tdbb_attachment = NULL;
@@ -64,7 +64,7 @@
 	tdbb->tdbb_transaction = NULL;
 	tdbb->tdbb_status_vector = ast_status;
 
-	GlobalRWLock->blockingAstHandler(tdbb);
+	globalRWLock->blockingAstHandler(tdbb);
 
 	/* Restore the prior thread context */
 

Index: GlobalRWLock.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/GlobalRWLock.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -b -U3 -r1.5 -r1.5.2.1
--- GlobalRWLock.h	24 May 2007 12:49:06 -0000	1.5
+++ GlobalRWLock.h	30 Nov 2007 17:33:09 -0000	1.5.2.1
@@ -118,9 +118,10 @@
 	}
 	void setLockData(SLONG lck_data);
 
-	// Release phisical lock if possible. Use to force refetch
+	// Release physical lock if possible. Use to force refetch
 	// Returns true if lock was released
 	bool tryReleaseLock(thread_db* tdbb);
+
 protected:
 	Lock* cached_lock;
 	// Flag to indicate that somebody is waiting via lock manager.
@@ -136,6 +137,7 @@
 	virtual void invalidate(thread_db* tdbb, bool ast_handler) {}
 
 	virtual void blockingAstHandler(thread_db* tdbb);
+
 private:
 	Firebird::Mutex lockMutex;	// Protects status of logical lock, counters and blocking flag
 	lck_owner_t		physicalLockOwner;	// Holds cached lock