MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp

equal deleted inserted replaced

-:ee674526fac5
+:85a88bc05e45
 #include "thumbnailpanic.h"
 #include "thumbnailmanagerconstants.h"
 #include "thumbnailserver.h"
-_LIT8( KThumbnailSqlConfig, "page_size=1024; cache_size=32;" );
+_LIT8( KThumbnailSqlConfig, "page_size=16384; cache_size=32;" );
 const TInt KStreamBufferSize = 1024 * 8;
 const TInt KMajor = 3;
 const TInt KMinor = 2;
 // ---------------------------------------------------------------------------
 // RThumbnailTransaction::BeginL()
 // ---------------------------------------------------------------------------
 //
 void RThumbnailTransaction::BeginL()
 {
+if (iDatabase.InTransaction())
+{
+TN_DEBUG1( "RThumbnailTransaction::BeginL() - error: old transaction open!" );
+__ASSERT_DEBUG(( !iDatabase.InTransaction() ), ThumbnailPanic( EThumbnailSQLTransaction ));
+// old transaction already open, don't open another
+iState = EOldOpen;
+return;
+}
 const TInt err = iDatabase.Exec( KThumbnailBeginTransaction );
 if ( err >= 0 )
 {
 iState = EOpen;
 }
 // RThumbnailTransaction::Close()
 // ---------------------------------------------------------------------------
 //
 void RThumbnailTransaction::Close()
 {
-if ( iState != EClosed )
+if ( iState != EClosed && iState != EOldOpen )
 {
 Rollback();
 }
 }
 // RThumbnailTransaction::CommitL()
 // ---------------------------------------------------------------------------
 //
 void RThumbnailTransaction::CommitL()
 {
-TInt ret = iDatabase.Exec( KThumbnailCommitTransaction );
+if ( iState != EOldOpen )
+{
+TInt ret = iDatabase.Exec( KThumbnailCommitTransaction );
 #ifdef _DEBUG
 TPtrC errorMsg = iDatabase.LastErrorMessage();
 TN_DEBUG3( "RThumbnailTransaction::CommitL() lastError %S, ret = %d" , &errorMsg, ret);
 #endif
 User::LeaveIfError( ret );
+}
 iState = EClosed;
 }
 // ---------------------------------------------------------------------------
 // RThumbnailTransaction::Rollback()
 // ---------------------------------------------------------------------------
 //
 TInt RThumbnailTransaction::Rollback()
 {
-const TInt err = iDatabase.Exec( KThumbnailRollbackTransaction );
+if ( iState != EOldOpen )
-if ( err >= 0 )
+{
-{
+const TInt err = iDatabase.Exec( KThumbnailRollbackTransaction );
-iState = EClosed;
+if ( err >= 0 )
-}
+{
-return err;
+iState = EClosed;
+}
+return err;
+}
+iState = EClosed;
+return KErrNone;
 }
 // ======== MEMBER FUNCTIONS ========
 rowStatus = stmt->Next();
 }
 CleanupStack::PopAndDestroy( stmt_infodata );
 CleanupStack::PopAndDestroy( stmt_info );
+CleanupStack::PopAndDestroy( stmt );
 		//remove delete mark
 User::LeaveIfError( iDatabase.Exec( KThumbnailSqlDeleteFromDeleted ) );
 }
 else
 {
+TN_DEBUG1( "CThumbnailStore::DeleteThumbnailByPathL() -- add to Deleted" );
 // only add path to deleted table
 stmt = &iStmt_KThumbnailSqlInsertDeleted;
 CleanupStack::PushL(TCleanupItem(ResetStatement, stmt));
 paramIndex = stmt->ParameterIndex( KThumbnailSqlParamPath );
 User::LeaveIfError( paramIndex );
 User::LeaveIfError( stmt->BindText( paramIndex, *path ));
 count = stmt->Exec();
-}
+CleanupStack::PopAndDestroy( stmt );
-CleanupStack::PopAndDestroy( stmt );
+}
 if (aTransaction)
 {
 transaction.CommitL();
 CleanupStack::PopAndDestroy( &transaction );
 {
 // cache empty or db unusable
 return;
 }
-if(iBatchItemCount < iBatchFlushItemCount && !aForce)
+// fixed batch size if MTP sync on
+TInt MPXHarvesting(0);
+TInt ret = RProperty::Get(KTAGDPSNotification, KMPXHarvesting, MPXHarvesting);
+if(ret != KErrNone)
+{
+TN_DEBUG2( "CThumbnailStore::FlushCacheTable() error checking MTP sync: %d", ret);
+}
+if(MPXHarvesting && iBatchItemCount < KMaxBatchItemsMTP && !aForce)
+{
+TN_DEBUG1("CThumbnailStore::FlushCacheTable() MTP sync, fixed batch...");
+//some items in cache
+StartAutoFlush();
+return;
+}
+else if(!MPXHarvesting && iBatchItemCount < iBatchFlushItemCount && !aForce)
 {
 //some items in cache
 StartAutoFlush();
 return;
 }
 iStartFlush.UniversalTime();
 // Move data from temp table to main....
 TInt err_begin = iDatabase.Exec( KThumbnailBeginTransaction );
 TN_DEBUG1("CThumbnailStore::FlushCacheTable() db corrupted");
 // open new
 TRAP_IGNORE(OpenDatabaseL(ETrue));
 }
-	//adjust batch size dynamically between min and max based on read flush speed.
 iStopFlush.UniversalTime();
 TInt aFlushDelay = (TInt)iStopFlush.MicroSecondsFrom(iStartFlush).Int64()/1000;
 TN_DEBUG2( "CThumbnailStore::FlushCacheTable() took %d ms", aFlushDelay);
+//adjust batch size dynamically between min and max based on read flush speed
+if (!MPXHarvesting)
+{
+//increase batch count if there room for one more item (based on average time per item)
+if( aFlushDelay < KMaxFlushDelay && iBatchFlushItemCount < KMaxBatchItems )
+{
+iBatchFlushItemCount++;
+}
+//decrease batch count if we exeeced max time allowed in flushing the TEMP table
+else if(aFlushDelay > KMaxFlushDelay && iBatchFlushItemCount > KMInBatchItems )
+{
+iBatchFlushItemCount--;
+}
+}
 //cache flushed
 iBatchItemCount = 0;
-//increase batch count if there room for one more item (based on average time per item)
-if( aFlushDelay < KMaxFlushDelay && iBatchFlushItemCount < KMaxBatchItems )
-{
-iBatchFlushItemCount++;
-}
-//decrease batch count if we exeeced max time allowed in flushing the TEMP table
-else if(aFlushDelay > KMaxFlushDelay && iBatchFlushItemCount > KMInBatchItems )
-{
-iBatchFlushItemCount--;
-}
 TN_DEBUG2("CThumbnailStore::FlushCacheTable() out iBatchFlushItemCount = %d", iBatchFlushItemCount);
 }
 // -----------------------------------------------------------------------------
 // next round
 if (self->iIdle && ( self->iDeleteThumbs || self->iCheckFilesExist) )
 {
 self->StartMaintenance();
 }
-else
+else if (!self->iDeleteThumbs && !self->iCheckFilesExist)
 {
 // no need to monitor activity anymore
 self->iActivityManager->Cancel();
 }
 }

branch	RCL_3
changeset 11	85a88bc05e45
parent 10	ee674526fac5
child 13	ffb2d5dd62e9