bk commit into 6.0-falcon tree (jas:1.2527)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-05-30 13:51:57-04:00, jas@rowvwade. +3 -0
  Track max window buffers requires during reporting
  session rather than computing it at end, which
  misses transient worst cases.

  storage/falcon/SerialLog.cpp@stripped, 2007-05-30 13:51:50-04:00, jas@rowvwade. +3 -5
    Track max window buffers requires during reporting
    session rather than computing it at end, which
    misses transient worst cases.

  storage/falcon/SerialLog.h@stripped, 2007-05-30 13:51:50-04:00, jas@rowvwade. +1 -0
    Track max window buffers requires during reporting
    session rather than computing it at end, which
    misses transient worst cases.

  storage/falcon/SerialLogTransaction.cpp@stripped, 2007-05-30 13:51:51-04:00, jas@rowvwade.
+6 -0
    Track max window buffers requires during reporting
    session rather than computing it at end, which
    misses transient worst cases.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.74/storage/falcon/SerialLog.cpp	2007-05-30 13:52:16 -04:00
+++ 1.75/storage/falcon/SerialLog.cpp	2007-05-30 13:52:16 -04:00
@@ -92,6 +92,7 @@
 	priorWindowWrites = 0;
 	windowWrites = 0;
 	priorWindowReads = 0;
+	maxWindows = 0;
 	windowBuffers = MAX(database->configuration->serialLogWindows, 10);
 }
 
@@ -1230,11 +1231,8 @@
 	priorWindowReads = windowReads;
 	int writes = windowWrites - priorWindowWrites;
 	priorWindowWrites = windowWrites;
-	int windows = 0;
-	
-	for (SerialLogWindow *window = minWindow; window; window = window->next)
-		++window;
-	
+	int windows = maxWindows;
+	maxWindows = 0;
 	sync.unlock();
 	windows = MAX(windows, 1);
 

--- 1.37/storage/falcon/SerialLog.h	2007-05-30 13:52:16 -04:00
+++ 1.38/storage/falcon/SerialLog.h	2007-05-30 13:52:16 -04:00
@@ -181,6 +181,7 @@
 	int					priorWindowReads;
 	int					priorWindowWrites;
 	int					windowBuffers;
+	int					maxWindows;
 	int32				tracePage;
 	uint32				chilledRecords;
 	uint64				chilledBytes;

--- 1.17/storage/falcon/SerialLogTransaction.cpp	2007-05-30 13:52:16 -04:00
+++ 1.18/storage/falcon/SerialLogTransaction.cpp	2007-05-30 13:52:16 -04:00
@@ -68,6 +68,12 @@
 	control.setWindow(window, block, recordOffset);
 	window->deactivateWindow();
 	finished = false;
+	int windows = 0;
+	
+	for (SerialLogWindow *w = window; w; w = w->next)
+		++windows;
+	
+	log->maxWindows = MAX(log->maxWindows, windows);
 
 	for (SerialLogRecord *record; !finished && (record = control.nextRecord());)
 		if (record->transactionId == transactionId)