bk commit into 6.0 tree (jas:1.2662)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-17 11:36:57-04:00, jas@rowvwade. +4 -0
  Track reporting of forced writes and flush writes as separate
  activities.

  storage/falcon/Cache.cpp@stripped, 2007-10-17 11:36:49-04:00, jas@rowvwade. +3 -3
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/Dbb.cpp@stripped, 2007-10-17 11:36:50-04:00, jas@rowvwade. +4 -2
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/IO.cpp@stripped, 2007-10-17 11:36:50-04:00, jas@rowvwade. +5 -4
    Track reporting of forced writes and flush writes as separate
    activities.

  storage/falcon/IOx.h@stripped, 2007-10-17 11:36:50-04:00, jas@rowvwade. +5 -2
    Track reporting of forced writes and flush writes as separate
    activities.

diff -Nrup a/storage/falcon/Cache.cpp b/storage/falcon/Cache.cpp
--- a/storage/falcon/Cache.cpp	2007-10-17 11:11:23 -04:00
+++ b/storage/falcon/Cache.cpp	2007-10-17 11:36:49 -04:00
@@ -426,7 +426,7 @@ void Cache::flush(int64 arg)
 		sync.unlock();
 		bdb->addRef(Shared  COMMA_ADD_HISTORY);
 		bdb->decrementUseCount(REL_HISTORY);
-		writePage(bdb, WRITE_TYPE_FLUSH);
+		writePage(bdb, WRITE_TYPE_FORCE);
 		Dbb *dbb = bdb->dbb;
 		bdb->release(REL_HISTORY);
 		
@@ -852,7 +852,7 @@ void Cache::flush(Dbb *dbb)
 		if (bdb->dbb == dbb)
 			{
 			if (bdb->flags & (BDB_dirty | BDB_new))
-				writePage(bdb, WRITE_TYPE_FLUSH);
+				writePage(bdb, WRITE_TYPE_FORCE);
 
 			bdb->dbb = NULL;
 			}
@@ -1047,7 +1047,7 @@ void Cache::ioThread(void)
 				
 				if (writes > 0)
 					Log::log(LogInfo, "%d: Cache flush: %d pages, %d writes in %d seconds (%d pps)\n",
-								database->deltaTime, pages, writes, delta, writes / MAX(delta, 1));
+								database->deltaTime, pages, writes, delta, pages / MAX(delta, 1));
 
 				database->pageCacheFlushed(flushArg);
 				}
diff -Nrup a/storage/falcon/Dbb.cpp b/storage/falcon/Dbb.cpp
--- a/storage/falcon/Dbb.cpp	2007-10-16 15:40:05 -04:00
+++ b/storage/falcon/Dbb.cpp	2007-10-17 11:36:50 -04:00
@@ -1098,19 +1098,21 @@ void Dbb::reportStatistics()
 {
 	int deltaReads = reads - priorReads;
 	int deltaWrites = writes - priorWrites;
+	int deltaFlushWrites = flushWrites - priorFlushWrites;
 	int deltaFetches = fetches - priorFetches;
 	//int deltaFakes = reads - priorFakes;
 
 	if (!deltaReads && !deltaWrites && !deltaFetches)
 		return;
 
-	Log::log (LogInfo, "%d: Activity on %s: %d fetches, %d reads, %d writes\n", database->deltaTime,
-				(const char*) fileName, deltaFetches, deltaReads, deltaWrites);
+	Log::log (LogInfo, "%d: Activity on %s: %d fetches, %d reads, %d writes, %d flushWrites\n", database->deltaTime,
+				(const char*) fileName, deltaFetches, deltaReads, deltaWrites, deltaFlushWrites);
 	
 	priorReads = reads;
 	priorWrites = writes;
 	priorFetches = fetches;
 	priorFakes = fakes;
+	priorFlushWrites = flushWrites;
 }
 
 void Dbb::commit(Transaction *transaction)
diff -Nrup a/storage/falcon/IO.cpp b/storage/falcon/IO.cpp
--- a/storage/falcon/IO.cpp	2007-10-16 13:29:31 -04:00
+++ b/storage/falcon/IO.cpp	2007-10-17 11:36:50 -04:00
@@ -100,8 +100,8 @@ static const char THIS_FILE[]=__FILE__;
 IO::IO()
 {
 	fileId = -1;
-	reads = writes = fetches = fakes = 0;
-	priorReads = priorWrites = priorFetches = priorFakes = 0;
+	reads = writes = fetches = fakes = flushWrites = 0;
+	priorReads = priorWrites = priorFetches = priorFakes = priorFlushWrites = 0;
 	dbb = NULL;
 	fatalError = false;
 	memset(writeTypes, 0, sizeof(writeTypes));
@@ -254,7 +254,7 @@ void IO::writePages(int32 pageNumber, in
 				(const char*) fileName, strerror (errno), errno);
 		}
 
-	++writes;
+	++flushWrites;
 	++writesSinceSync;
 	++writeTypes[type];
 }
@@ -584,8 +584,9 @@ void IO::traceOperation(int operation)
 
 void IO::reportWrites(void)
 {
-	Log::debug("%s flush : %d, prec %d, reuse %d, pgwrt %d\n",
+	Log::debug("%s force %d, flush %d, prec %d, reuse %d, pgwrt %d\n",
 		(const char*) fileName,
+		writeTypes[WRITE_TYPE_FORCE],
 		writeTypes[WRITE_TYPE_FLUSH],
 		writeTypes[WRITE_TYPE_PRECEDENCE],
 		writeTypes[WRITE_TYPE_REUSE],
diff -Nrup a/storage/falcon/IOx.h b/storage/falcon/IOx.h
--- a/storage/falcon/IOx.h	2007-10-16 13:29:31 -04:00
+++ b/storage/falcon/IOx.h	2007-10-17 11:36:50 -04:00
@@ -31,13 +31,14 @@
 #define PATH_MAX		256
 #endif
 
-static const int WRITE_TYPE_FLUSH		= 0;
+static const int WRITE_TYPE_FORCE		= 0;
 static const int WRITE_TYPE_PRECEDENCE	= 1;
 static const int WRITE_TYPE_REUSE		= 2;
 static const int WRITE_TYPE_SHUTDOWN	= 3;
 static const int WRITE_TYPE_PAGE_WRITER	= 4;
 static const int WRITE_TYPE_CLONE		= 5;
-static const int WRITE_TYPE_MAX			= 6;
+static const int WRITE_TYPE_FLUSH		= 6;
+static const int WRITE_TYPE_MAX			= 7;
 
 class Bdb;
 class Hdr;
@@ -90,11 +91,13 @@ public:
 	int			pageSize;
 	uint		reads;
 	uint		writes;
+	uint		flushWrites;
 	uint		writesSinceSync;
 	uint		fetches;
 	uint		fakes;
 	uint		priorReads;
 	uint		priorWrites;
+	uint		priorFlushWrites;
 	uint		priorFetches;
 	uint		priorFakes;
 	uint		writeTypes[WRITE_TYPE_MAX];