--- a/persistentstorage/sql/OsLayer/FileBuf64.cpp Tue May 11 17:49:39 2010 +0300
+++ b/persistentstorage/sql/OsLayer/FileBuf64.cpp Tue May 25 14:35:19 2010 +0300
@@ -28,7 +28,7 @@
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
++iFileReadCount; iFileReadAmount += (amount); \
- RDebug::Print(_L("[SQL-FBUF]¬RD¬%X¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileReadCount, pos, amount, iFileReadAmount, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Read¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileReadCount, pos, amount, iFileReadAmount, err); \
} \
} while(0)
@@ -38,7 +38,7 @@
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
++iFileWriteCount; iFileWriteAmount += (amount); \
- RDebug::Print(_L("[SQL-FBUF]¬WR¬%X¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileWriteCount, pos, amount, iFileWriteAmount, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Write¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileWriteCount, pos, amount, iFileWriteAmount, err); \
} \
} while(0)
@@ -48,7 +48,7 @@
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
++iFileSizeCount; \
- RDebug::Print(_L("[SQL-FBUF]¬SZ¬%X¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileSizeCount, size, 0, 0LL, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Size¬%d¬%ld¬¬¬%d\r\n"), (TUint32)this, iFileSizeCount, size, err); \
} \
} while(0)
@@ -58,7 +58,7 @@
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
++iFileSetSizeCount; \
- RDebug::Print(_L("[SQL-FBUF]¬SS¬%X¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileSetSizeCount, size, 0, 0LL, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬SetSize¬%d¬%ld¬¬¬%d\r\n"), (TUint32)this, iFileSetSizeCount, size, err); \
} \
} while(0)
@@ -68,7 +68,7 @@
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
++iFileFlushCount; \
- RDebug::Print(_L("[SQL-FBUF]¬SY¬%X¬%d¬%ld¬%d¬%ld¬%d\r\n"), (TUint32)this, iFileFlushCount, 0LL, 0, 0LL, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Flush¬%d¬¬¬¬%d\r\n"), (TUint32)this, iFileFlushCount, err); \
} \
} while(0)
@@ -77,7 +77,7 @@
{ \
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
- RDebug::Print(_L("[SQL-FBUF]¬CR¬%X¬%S¬%d\r\n"), (TUint32)this, &fname, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Create¬¬¬¬¬%d¬%S\r\n"), (TUint32)this, err, &fname); \
} \
} while(0)
@@ -86,7 +86,7 @@
{ \
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
- RDebug::Print(_L("[SQL-FBUF]¬OP¬%X¬%S¬%d\r\n"), (TUint32)this, &fname, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Open¬¬¬¬¬%d¬%S\r\n"), (TUint32)this, err, &fname); \
} \
} while(0)
@@ -95,7 +95,7 @@
{ \
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
- RDebug::Print(_L("[SQL-FBUF]¬TP¬%X¬%S¬%d\r\n"), (TUint32)this, &fname, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Temp¬¬¬¬¬%d¬%S\r\n"), (TUint32)this, err, &fname); \
} \
} while(0)
@@ -104,7 +104,7 @@
{ \
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
- RDebug::Print(_L("[SQL-FBUF]¬AT¬%X¬%S¬%d\r\n"), (TUint32)this, &fname, err); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Adopt¬¬¬¬¬%d¬%S\r\n"), (TUint32)this, err, &fname); \
} \
} while(0)
@@ -113,7 +113,7 @@
{ \
if(TheOsCallTimeDetailedProfileEnabled) \
{ \
- RDebug::Print(_L("[SQL-FBUF]¬CL¬%X\r\n"), (TUint32)this); \
+ RDebug::Print(_L("[SQL-FBUF]¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬¬\"%X\"¬Close¬¬¬¬¬¬\r\n"), (TUint32)this); \
} \
} while(0)
@@ -195,6 +195,7 @@
EFBufPanicNextReadFilePos,
EFBufPanicNextReadFilePosHits,
EFBufPanicFileBlockSize, //15
+ EFBufPanicRwDataLength,
};
/**
@@ -249,15 +250,16 @@
/**
Initializes RFileBuf64 data members with their default values.
-@param aSize Max file buffer size (capacity) in bytes.
+@param aMinCapacity Minimal file buffer size (capacity) in bytes.
-@panic FBuf64 1 In _DEBUG mode - aSize is 0 or negative.
+@panic FBuf64 1 In _DEBUG mode - aMinCapacity is 0 or negative.
*/
-RFileBuf64::RFileBuf64(TInt aSize) :
- iCapacity(aSize),
- iReadAheadSize(RFileBuf64::KDefaultReadAheadSize)
+RFileBuf64::RFileBuf64(TInt aMinCapacity) :
+ iCapacity(aMinCapacity),
+ iReadAheadSize(RFileBuf64::KDefaultReadAheadSize),
+ iOptimized(EFalse)
{
- __FBUF64_ASSERT(aSize > 0, EFBufPanicCapacity);
+ __FBUF64_ASSERT(aMinCapacity > 0, EFBufPanicCapacity);
}
/**
@@ -473,21 +475,26 @@
__FBUF64_ASSERT(aFilePos >= 0, EFBufPanicFilePos);
__FILEBUF64_INVARIANT();
aDes.SetLength(0);
- //1. The output buffer max len is 0
+ //0. The output buffer max len is 0
if(aDes.MaxLength() == 0)
{
__FILEBUF64_INVARIANT();
return KErrNone;
}
- //2. Initialize the "iFileSize" if it is not initialized yet
+ //1. Initialize the "iFileSize" if it is not initialized yet
TInt err = DoFileSize();
if(err != KErrNone)
{
__FILEBUF64_INVARIANT();
return err;
}
+ //2. Optimize the buffer capacity
+ TInt len = aDes.MaxLength();
+ if((err = DoSetCapacity(len)) != KErrNone)
+ {
+ return err;
+ }
//3. Too big "read" request - read directly from the file
- TInt len = aDes.MaxLength();
if(len > iCapacity)
{
if((aFilePos + len) > iFilePos && aFilePos < (iFilePos + iLength))
@@ -537,7 +544,7 @@
break;
}
//The guessed from the previous "file read" operation file pos is correct. Start reading-ahead.
- const TInt KMaxReadFilePosHits = 8;//The max read-ahead buffer size can be up to 2^8 times the iReadAheadSize
+ const TInt KMaxReadFilePosHits = 4;//The max read-ahead buffer size can be up to 2^4 times the iReadAheadSize
if(iNextReadFilePosHits < KMaxReadFilePosHits)
{
++iNextReadFilePosHits;
@@ -608,6 +615,10 @@
__FILEBUF64_INVARIANT();
return err;
}
+ if((err = DoSetCapacity(aData.Length())) != KErrNone)
+ {
+ return err;
+ }
DoDiscardBufferedReadData();
const TUint8* data = aData.Ptr();
for(TInt len = aData.Length(); len > 0 && err == KErrNone;)
@@ -1078,6 +1089,64 @@
__FILEBUF64_INVARIANT();
}
+/**
+Sets the most appropriate buffer capacity based on the database page size.
+The function does a lazy evaluation. The first time the function is called and
+aRwDataLength parameter is recognized to be a database or journal page size, the new (optimal)
+buffer capacity is calculated and set. All next DoSetCapacity() calls will detect that the new
+capacity is already set and will return KErrNone.
+
+@param aRwDataLength The length of the data being read or written.
+@return KErrNone The new capacity was set successfully,
+ KErrNoMemory Out of memory.
+*/
+TInt RFileBuf64::DoSetCapacity(TInt aRwDataLength)
+ {
+ const TInt KMinPageCount = 4;//the buffer capacity should be at least (KMinPageCount * page size)
+ //but not less than the original capacity.
+ const TInt KDefaultPageSize = 1024;//The journal header size is equal to 512 bytes, so it is not easy
+ //to detect the 512 bytes page size.
+
+ __FBUF64_ASSERT(aRwDataLength >= 0, EFBufPanicRwDataLength);
+ __FILEBUF64_INVARIANT();
+ if(iOptimized || aRwDataLength == 0)
+ {
+ __FILEBUF64_INVARIANT();
+ return KErrNone;
+ }
+ if((aRwDataLength & (aRwDataLength - 1)) != 0 || aRwDataLength < KDefaultPageSize)
+ {
+ __FILEBUF64_INVARIANT();
+ return KErrNone;
+ }
+ //Here: aRwDataLength is power of 2 and is bigger than the default db page size.
+ //aRwDataLength is the size of the db page.
+ const TInt pageSize = aRwDataLength;
+ TInt cnt = iCapacity / pageSize;//how many pages can fit in the buffer now
+ TInt pageCount = Max(cnt, KMinPageCount);//the number of pages that should fit in the new buffer
+ TInt newBufCapacity = pageCount * pageSize;
+ if(newBufCapacity != iCapacity)
+ {
+ TUint8* newBase = static_cast <TUint8*> (User::ReAlloc(iBase, newBufCapacity));
+ if(!newBase)
+ {
+ __FILEBUF64_INVARIANT();
+ return KErrNoMemory;
+ }
+ iBase = newBase;
+ iCapacity = newBufCapacity;
+ //Adjust the initial read-ahead size to be multiple of the page size.
+ if((iReadAheadSize % pageSize) != 0)
+ {
+ TInt q = iReadAheadSize / pageSize;
+ iReadAheadSize = q != 0 ? pageSize * q : pageSize;
+ }
+ }
+ iOptimized = ETrue;
+ __FILEBUF64_INVARIANT();
+ return KErrNone;
+ }
+
#ifdef _DEBUG
/**
@@ -1093,7 +1162,7 @@
@panic FBuf64 6 In _DEBUG mode - null file handle (the RFile64 object is not created or already destroyed).
@panic FBuf64 13 In _DEBUG mode - set but negative iNextReadFilePos value.
@panic FBuf64 14 In _DEBUG mode - negative iNextReadFilePosHits value.
-@panic FBuf64 15 In _DEBUG mode - iReadAheadSize is negative or is not power of two.
+@panic FBuf64 15 In _DEBUG mode - iReadAheadSize is negative or is bigger than iCapacity.
*/
void RFileBuf64::Invariant() const
{
@@ -1106,7 +1175,7 @@
__FBUF64_ASSERT(iFile.SubSessionHandle() != 0, EFBufPanicFileHandle);
__FBUF64_ASSERT(iNextReadFilePos == KNextReadFilePosNotSet || iNextReadFilePos >= 0, EFBufPanicNextReadFilePos);
__FBUF64_ASSERT(iNextReadFilePosHits >= 0, EFBufPanicNextReadFilePosHits);
- __FBUF64_ASSERT(iReadAheadSize > 0 && (iReadAheadSize & (iReadAheadSize - 1)) == 0, EFBufPanicFileBlockSize);
+ __FBUF64_ASSERT(iReadAheadSize > 0, EFBufPanicFileBlockSize);
}
#endif