MCL/sf/mw/web: comparison webengine/osswebengine/cache/src/HttpCacheLookupTable.cpp

equal deleted inserted replaced

-:dd21522fd290
+:7c90e6132015
 CleanupStack::Pop();
 return self;
 }
+// -----------------------------------------------------------------------------
 // Destructor
+// -----------------------------------------------------------------------------
 CHttpCacheLookupTable::~CHttpCacheLookupTable()
 {
 // do not call ResetAndDestroy on iEntries
 // as delete item are not set to NULL
 if (iEntries)
 // -----------------------------------------------------------------------------
 // CHttpCacheLookupTable::Find
 //
 // -----------------------------------------------------------------------------
 //
-CHttpCacheEntry* CHttpCacheLookupTable::Find(
+CHttpCacheEntry* CHttpCacheLookupTable::Find( const TDesC8& aUrl )
-const TDesC8& aUrl )
 {
 CHttpCacheEntry* entry = NULL;
 TInt pos( Probe( aUrl, EFalse ) );
-//
-if( Valid( pos ) )
+if ( Valid( pos ) )
 {
 entry = iEntries->At( pos );
-}
-return entry;
+if ( entry )
+{
+if ( entry->BodySize() == 0 &&
+entry->State() == CHttpCacheEntry::ECacheComplete )
+{
+#ifdef __CACHELOG__
+HttpCacheUtil::WriteLogFilenameAndUrl( 0,
+_L("CHttpCacheLookupTable::Find - Found ZERO size"),
+entry->Filename(),
+entry->Url(),
+pos,
+ELogLookupTablePos );
+#endif
+return NULL;
+}
+}
+}
+return entry;
 }
 // -----------------------------------------------------------------------------
 // CHttpCacheLookupTable::Remove
 //
 // -----------------------------------------------------------------------------
 //
-TInt CHttpCacheLookupTable::Remove(
+TInt CHttpCacheLookupTable::Remove( const TDesC8& aUrl )
-const TDesC8& aUrl )
 {
 TInt status( KErrNotFound );
 TInt pos( Probe( aUrl, EFalse ) );
-//
 if( Valid( pos ) )
 {
 // remove only nonactive entry
 CHttpCacheEntry* entry = iEntries->At( pos );
-if( entry->State() == CHttpCacheEntry::ECacheComplete )
+if ( entry->State() == CHttpCacheEntry::ECacheComplete )
 {
+#ifdef __CACHELOG__
+HttpCacheUtil::WriteLogFilenameAndUrl( 0,
+_L("CHttpCacheLookupTable::Remove - ERASING item"),
+entry->Filename(),
+entry->Url(),
+pos,
+ELogLookupTablePos );
+#endif
 Erase( pos );
 status = KErrNone;
-HttpCacheUtil::WriteLog( 0, _L( "remove item" ), pos );
 }
 #ifndef __CACHELOG__
 }
-#else // __CACHELOG__
+#else //__CACHELOG__
 else
 {
-HttpCacheUtil::WriteLog( 0, _L( "item is active. cannot be removed" ), pos );
+HttpCacheUtil::WriteLogFilenameAndUrl( 0,
+_L("CHttpCacheLookupTable::Remove - can NOT remove item, is active state"),
+entry->Filename(),
+entry->Url(),
+pos,
+ELogLookupTablePos );
 }
 }
 else
 {
-HttpCacheUtil::WriteLog( 0, _L( "item is not valid. cannot be removed" ), pos );
+HttpCacheUtil::WriteLog( 0, _L( "CHttpCacheLookupTable::Remove - item is not valid. cannot be removed" ), pos );
 }
 #endif // __CACHELOG__
 return status;
 }
 // -----------------------------------------------------------------------------
-// CHttpCacheLookupTable::EraseCorruptEntry
+// CHttpCacheLookupTable::EraseCacheEntry
 //
 // -----------------------------------------------------------------------------
 //
-void CHttpCacheLookupTable::EraseCorruptEntry(
+void CHttpCacheLookupTable::EraseCacheEntry( const TDesC8& aUrl )
-const TDesC8& aUrl )
+{
-{
+TInt pos( Probe( aUrl, EFalse ) );
-TInt pos( Probe( aUrl, EFalse ) );
-//
+if ( Valid( pos ) )
-if( Valid( pos ) )
 {
 Erase( pos );
-HttpCacheUtil::WriteLog( 0, _L( "remove corrupt item" ), pos );
 }
 #ifdef __CACHELOG__
 else
 {
 // there must be a valid position for this entry
 __ASSERT_DEBUG( EFalse, User::Panic( _L("cacheHandler Panic"), KErrCorrupt ) );
-HttpCacheUtil::WriteLog( 0, _L( "corrupt item is not valid" ), pos );
 }
 #endif // __CACHELOG__
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 TInt CHttpCacheLookupTable::RemoveAll()
 {
 TInt numberOfBytes( 0 );
-HttpCacheUtil::WriteLog( 0, _L( "remove 'em all" ) );
-//
+#ifdef __CACHELOG__
-for( TInt i = 0; i < iEntries->Count(); i++ )
+HttpCacheUtil::WriteLog( 0, _L( "CHttpCacheLookupTable::RemoveAll - remove 'em all" ) );
+#endif
+for ( TInt i = 0; i < iEntries->Count(); i++ )
 {
 CHttpCacheEntry* entry = iEntries->At( i );
-// remove all nonactive entries
+// Remove all nonactive entries
-if( Valid( i ) && entry->State() == CHttpCacheEntry::ECacheComplete )
+if ( Valid( i ) && entry->State() == CHttpCacheEntry::ECacheComplete )
 {
-numberOfBytes+= ( entry->HeaderSize() + entry->Size() );
+numberOfBytes += ( entry->HeaderSize() + entry->BodySize() );
 Erase( i );
 }
 }
 #ifdef __CACHELOG__
 HttpCacheUtil::WriteLog( 0, _L( "number of items left:" ), iCount );
 // check if there are pending items -should not be though
 __ASSERT_DEBUG( iCount == 0, User::Panic( _L("cacheHandler Panic"), KErrCorrupt ) );
 #endif // __CACHELOG__
 return numberOfBytes;
 }
 // -----------------------------------------------------------------------------
 return error;
 }
 // -----------------------------------------------------------------------------
-// CHttpCacheLookupTable::Internalize
+// CHttpCacheLookupTable::InternalizeL
 //
 // -----------------------------------------------------------------------------
 //
 void CHttpCacheLookupTable::InternalizeL(
 RFileReadStream& aReadStream,
 const TDesC& /*aDirectory*/ )
 {
 // get number of entries
 TInt version = 0;
-TRAP_IGNORE( version = aReadStream.ReadInt32L() );
+version = aReadStream.ReadInt32L();
 if( version == KCacheVersionNumber )
 {
 TInt count( aReadStream.ReadInt32L() );
 TInt contentSize( 0 );
 TInt err;
 // leave only on no memory
 if( err == KErrNone )
 {
 // insert to the table
 InsertL( entry );
-contentSize+=entry->HeaderSize();
+contentSize += entry->HeaderSize();
-contentSize+=entry->Size();
+contentSize += entry->BodySize();
 }
-else if( err == KErrNoMemory )
+else if ( err == KErrNoMemory )
 {
 User::Leave( KErrNoMemory );
 }
 else
 {
-// suggestions?
+// suggestions
 }
 // takes ownership
 CleanupStack::Pop(); // entry
 }
 // set startup cache size
+#ifdef __CACHELOG__
 HttpCacheUtil::WriteLog( 0, _L( "startup content size" ), contentSize );
-iStreamHandler->SetStartupCacheSize( contentSize );
+#endif
+iStreamHandler->SetSavedContentSize( contentSize );
 }
 else
 {
-// cleanup index.dat?
+// cleanup index.dat
 }
 }
 // -----------------------------------------------------------------------------
 // CHttpCacheLookupTable::Externalize
 TInt CHttpCacheLookupTable::InsertL(
 CHttpCacheEntry* aCacheEntry )
 {
 __ASSERT_DEBUG( aCacheEntry != NULL,
 User::Panic( _L("cacheHandler Panic"), KErrCorrupt ) );
-//
 TInt pos( -1 );
-if( aCacheEntry )
+if ( aCacheEntry )
 {
 pos = Probe( aCacheEntry->Url(), ETrue );
 // double check
 if( Valid( pos ) )
 {
 {
 // completly failed
 pos = -1;
 }
 }
 // insert
 if( pos != -1 )
 {
 iEntries->At( pos ) = aCacheEntry;
 iCount++;
+#ifdef __CACHELOG__
 HttpCacheUtil::WriteLog( 0, _L( "insert new item to the lookuptable" ), pos );
+#endif
 // check if the hashtable is full
-if( iCount > ( iEntries->Count() >> 1 ) )
+if ( iCount > ( iEntries->Count() >> 1 ) )
 {
 ReHashL();
 }
 }
 else
 //
 // -----------------------------------------------------------------------------
 //
 void CHttpCacheLookupTable::ReHashL()
 {
+#ifdef __CACHELOG__
 HttpCacheUtil::WriteLog( 1, _L( "Resize lookuptable!" ) );
 HttpCacheUtil::WriteLog( 1, _L( "count=" ), iCount );
 HttpCacheUtil::WriteLog( 1, _L( "Table size=" ), iEntries->Count() );
-//
+#endif
 TUint newSize( NextPrime( iEntries->Count() * 2 ) );
 CArrayPtrFlat<CHttpCacheEntry>* newEntries =
 new( ELeave )CArrayPtrFlat<CHttpCacheEntry>( newSize );
 // hash must operate on the new table
 CArrayPtrFlat<CHttpCacheEntry>* oldEntries = iEntries;
 iEntries = newEntries;
 CleanupStack::PushL( oldEntries );
 // -----------------------------------------------------------------------------
 // CHttpCacheLookupTable::Erase
 //
 // -----------------------------------------------------------------------------
 //
-void CHttpCacheLookupTable::Erase(
+void CHttpCacheLookupTable::Erase( TInt aPos )
-TInt aPos )
 {
 // must be a valid pos
 __ASSERT_DEBUG( Valid( aPos ),  User::Panic( _L("cacheHandler Panic"), KErrCorrupt ) );
 CHttpCacheEntry* entry = iEntries->At( aPos );
 if( entry )
 {
 // delete file associated with this entry
 TBool attached( EFalse );
+#ifdef __CACHELOG__
+HttpCacheUtil::WriteLogFilenameAndUrl( 0,
+_L("CHttpCacheLookupTable::Erase"),
+entry->Filename(),
+entry->Url(),
+aPos,
+ELogLookupTablePos );
+#endif
 TRAPD( err, attached = iStreamHandler->AttachL( *entry ) );
-if( err == KErrNone && attached )
+if ( err == KErrNone && attached )
 {
-iStreamHandler->Erase( *entry );
+iStreamHandler->EraseCacheFile( *entry );
 iStreamHandler->Detach( *entry );
 }
-//
 SetDeleted( aPos );
 delete entry;
 iCount--;
 }
 }

changeset 1	7c90e6132015
parent 0	dd21522fd290
child 5	10e98eab6f85