MCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/goommonitor/src/goomactionlist.cpp

equal deleted inserted replaced

-:cd0ae4656946
+:c9d868f1e20c
 // we can't reset action index here because plugins would miss memory good events
 iAppIndex = 0;
 aWindowGroupList.RefreshL(iTryOptional);
+/*
 for (TInt i = 0; aWindowGroupList.LowOnMemWgs(i) != KErrNotFound ; i++ )
 {
 if ( iLowOnMemWgs.Find(aWindowGroupList.LowOnMemWgs(i)) == KErrNotFound)
 {
 iLowOnMemWgs.Append(aWindowGroupList.LowOnMemWgs(i));
 }
 }
+*/
 iRunningKillAppActions = ETrue;
+TInt oldcount = iActionRefs.Count();
 if (aWindowGroupList.Count())
 {
 // Go through each item in the wglist, create an app close action for this application
 TInt wgIndex = aWindowGroupList.Count() - 1;
 // Get the app ID for the wglist item
 // This sets the window group name
 TInt32 appId = aWindowGroupList.AppId(wgIndex, ETrue);
+if(AppCloseActionAlreadyExists(aWindowGroupList, appId))
+{
+wgIndex--;
+continue;
+}
 CApaWindowGroupName* wgName = aWindowGroupList.WgName();
 __ASSERT_DEBUG(wgName, GOomMonitorPanic(KInvalidWgName));
 TBool skipped = EFalse;
 wgIndex--;
 }
 }
-TRACES1("BuildActionListL: Action list built with %d items",iActionRefs.Count());
+TRACES1("BuildActionListL: Action list built with %d  new items",iActionRefs.Count()- oldcount);
 }
+TBool CGOomActionList::AppCloseActionAlreadyExists(CGOomWindowGroupList& aWindowGroupList, TInt32 appId)
+{
+for(TInt i = 0 ; i < iActionRefs.Count() ; i++)
+{
+TActionRef ref = iActionRefs[i];
+if(ref.Type() == TActionRef::EAppClose )
+{
+if(aWindowGroupList.AppIdfromWgId(ref.WgId(), ETrue) == appId)
+return ETrue;
+}
+}
+return EFalse;
+}
 // Execute the OOM actions according to their priority
 // Run batches of OOM actions according to their sync mode
 void CGOomActionList::FreeMemory(TInt aMaxPriority)
 {
 iAppIndex++;
 static_cast<CGOomCloseApp*>(action)->Reconfigure(ref);
 ref.iAppPlugin = action;
-//Double checking again if this app is now in foreground, if yes then we dont kill
+TInt32 appId = iMonitor.GetWindowGroupList()->AppIdfromWgId(ref.WgId(), ETrue);
-CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(iWs, iWs.GetFocusWindowGroup());
-TInt32 fgApp = wgName->AppUid().iUid;
+if(!IsOkToKillApp(appId))
-TInt32 appId = iMonitor.GetWindowGroupList()->AppIdfromWgId(ref.WgId(), ETrue);
-if(appId == fgApp)
-{
-TRACES1("Foreground App wgid %x, spared by GOOM", appId);
-iCurrentActionIndex++;
-CleanupStack::PopAndDestroy();
-continue;
-}
-//check if this is not parent of foreground app
-TBool spared = EFalse;
-TRACES1("CGOomActionList::FreeMemory - Going to kill Appid %x ",appId);
-TInt prevWgId = 0;
-while(prevWgId != KErrNotFound)
-{
-wgName->FindByAppUid(wgName->AppUid(), iWs, prevWgId);
-if(prevWgId == KErrNotFound)
-break;
-TInt parentId = 0;
-TRAPD(err, parentId = iMonitor.GetWindowGroupList()->FindParentIdL(prevWgId));
-TRACES2("CGOomActionList::FreeMemory - Foreground App wgid %d, parent wgid %d",prevWgId, parentId);
-if( err == KErrNone && parentId != 0)
-{
-TInt32 parentAppId = iMonitor.GetWindowGroupList()->AppIdfromWgId(parentId, ETrue);
-if(parentAppId == appId)
-{
-TRACES3("Parent App %x (wgId %d), of Foreground App %x, spared by GOOM", parentAppId, parentId, fgApp);
-spared = ETrue;
-break;
-}
-}
-}
-CleanupStack::PopAndDestroy();
-if(spared)
 {
 iCurrentActionIndex++;
 if (iCurrentActionIndex >= iActionRefs.Count())
 {
 StateChanged();
 iCurrentPluginRun = ref.RunPlugin().Id();
 }
 iFreeingMemory = ETrue;
 TRACES2("CGOomActionList::FreeMemory: Running action %d which has priority %d", iCurrentActionIndex,ref.Priority());
+iCurrentActionIndex++;
 action->FreeMemory(iCurrentTarget - memoryEstimate, iUseSwRendering);
 iCurrentPluginRun = 0;
 memoryFreeingActionRun = ETrue;
 // Actions with EContinueIgnoreMaxBatchSize don't add to the tally of running actions
 }
 if ((ref.SyncMode() == ECheckRam)
 || (numberOfRunningActions >= maxBatchSize)
 || estimatedEnoughMemoryFreed
-|| globalConfig.ForceCheckAtPriority(iActionRefs[iCurrentActionIndex].Priority()))
+|| globalConfig.ForceCheckAtPriority(iActionRefs[iCurrentActionIndex-1].Priority()))
 // If this actions requires a RAM check then wait for it to complete
 // Also force a check if we've reached the maximum number of concurrent operations
 // Also check if we estimate that we have already freed enough memory (assuming that the sync mode is "estimate"
 {
 // Return from the loop - we will be called back (in CGOomActionList::StateChanged()) when the running actions complete
-iCurrentActionIndex++;
 TRACES("CGOomActionList::FreeMemory: Exiting run action loop");
 return;
 }
 // ... otherwise continue running actions, don't wait for any existing ones to complete
-iCurrentActionIndex++;
 if (iCurrentActionIndex >= iActionRefs.Count())
 {
 StateChanged();
 return;
 else
 {
 iTryOptional = EFalse;
 iOptionalTried = EFalse;
 TRACES("CGOomActionList::FreeMemory: No usable memory freeing action has been found");
+iFreeingMemory = EFalse;
 iServer.CloseAppsFinished(freeMemory, EFalse);
 iMonitor.WaitAndSynchroniseMemoryState();
 }
 }
+}
+TBool CGOomActionList::IsOkToKillApp(TInt aAppId)
+{
+//Double checking again if this app is now in foreground, if yes then we dont kill
+TUid fgAppuid = TUid::Uid(iMonitor.ForegroundAppUid());
+TInt32 fgApp = fgAppuid.iUid;
+TRACES1("Foreground Appuid %x", fgApp);
+if (aAppId == fgApp)
+{
+TRACES1("Foreground App wgid %x, spared by GOOM", aAppId);
+return EFalse;
+}
+//check if this is not parent of foreground app
+TBool spared = EFalse;
+TRACES2("CGOomActionList::FreeMemory - Going to kill Appid %x, Foreground app %x ", aAppId, fgApp);
+TInt prevWgId = 0;
+CApaWindowGroupName::FindByAppUid(fgAppuid, iWs, prevWgId);
+TInt i = 0;
+while ((prevWgId == KErrNotFound) && (i++ < 3))   //try 3 times before quiting. It takes time to get the wgid info when app is starting
+{
+TRACES1("Cannot find any more parent, trying again %d",i);
+User::After(200000);
+prevWgId = 0;
+CApaWindowGroupName::FindByAppUid(fgAppuid, iWs, prevWgId);
+}
+while (prevWgId != KErrNotFound)
+{
+TInt parentId = 0;
+TRAPD(err, parentId = iMonitor.GetWindowGroupList()->FindParentIdL(prevWgId));
+TRACES3("CGOomActionList::FreeMemory - Foreground App AppId %x, wgid %d, parent wgid %d", fgApp, prevWgId, parentId);
+if (err == KErrNone && parentId > 0)
+{
+TInt32 parentAppId = iMonitor.GetWindowGroupList()->AppIdfromWgId(parentId, ETrue);
+if (parentAppId == aAppId)
+{
+TRACES3("Parent App %x (wgId %d), of Foreground App %x, spared by GOOM", parentAppId, parentId, fgApp);
+spared = ETrue;
+break;
+}
+}
+CApaWindowGroupName::FindByAppUid(fgAppuid, iWs, prevWgId);
+}
+return !spared;
 }
 // Should be called when the memory situation is good
 // It results in notifications of the good memory state to all plugins with an outstanding FreeMemory request
 void CGOomActionList::MemoryGood()
 {
 FUNC_LOG;
+if(!ALWAYS_SW_REND)
+{
 TInt actionRefIndex = iActionRefs.Count();
 // Go through each of the action references, if it's a plugin action then call MemoryGood on it
 // Note that this only results in a call to the plugin if FreeMemory has been called on this plugin since that last call to MemoryGood
 while (actionRefIndex--)
 || (iActionRefs[actionRefIndex].Type() == TActionRef::ESystemPlugin))
 {
 iActionRefs[actionRefIndex].RunPlugin().MemoryGood();
 }
 }
 // notify window groups which were triggered to low mem that
+iMonitor.SwitchMemMode(CMemoryMonitor::EGOomGoodMemMode);
+}
+/*
 TWsEvent event;
 event.SetType(KGoomMemoryGoodEvent); // naive
 for (TInt i = iLowOnMemWgs.Count()-1; i>=0; i--)
 {
 #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
 iWs.SendEventToWindowGroup(iLowOnMemWgs[i], event);
 #endif // #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
 iLowOnMemWgs.Remove(i);
 		}
+*/
 }
 TBool CGOomActionList::FreeMemoryAboveTarget(TInt& aFreeMemory)
 {
 FUNC_LOG;
 if (!freeMemoryAboveTarget)
 // If we are still below the good-memory-threshold then continue running actions
 {
 TRACES2("CGOomActionList::StateChanged: Finished Action %d out of %d",iCurrentActionIndex, iActionRefs.Count());
-if (iCurrentActionIndex < iActionRefs.Count()-1)
+if (iCurrentActionIndex < iActionRefs.Count())
 {
-// launch more actions, potential recursion !!
+// There are still more actions to try, so we continue
-iCurrentActionIndex++;
+TRACES1("CGOomActionList::StateChanged: All current actions complete, running more actions. freeMemory=%d", freeMemory);
 return FreeMemory(iMaxPriority);
 }
 if(iRunningKillAppActions)
 	            {
 iRunningKillAppActions = EFalse;
-// There are no more actions to try, so we give up
-TRACES1("CGOomActionList::StateChanged: All current actions complete, below good threshold with no more actions available. freeMemory=%d", freeMemory);
 if (!iTryOptional && !iOptionalTried && freeMemory < 25*1024*1024 ) // magic, should read this from config
 {
 iTryOptional = ETrue;
 iOptionalTried = ETrue;
 iMonitor.RunCloseAppActions(iMaxPriority);
 }
 else
 {
+// There are no more actions to try, so we give up
+TRACES1("CGOomActionList::StateChanged: All current actions complete, below good threshold with no more actions available. freeMemory=%d", freeMemory);
 iTryOptional = EFalse;
 iServer.CloseAppsFinished(freeMemory, EFalse);
 iMonitor.WaitAndSynchroniseMemoryState();
 }
 }

branch	RCL_3
changeset 17	c9d868f1e20c
parent 15	cd0ae4656946
child 18	1801340c26a2