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

equal deleted inserted replaced

-:27a3ad0677c1
+:69409653e863
 void CGOomActionList::BuildKillAppActionListL(CGOomWindowGroupList& aWindowGroupList, CGOomConfig& aConfig)
 {
 FUNC_LOG;
-//    iActionRefs.Reset();
+// we can't reset action index here because plugins would miss memory good events
-//    iCurrentActionIndex = 0;
+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;
 if (aWindowGroupList.Count())
 {
 // Go through each item in the wglist, create an app close action for this application
 //AppClose Actions should always have a unique prioirity determined by the application's z order.
 TInt err = iActionRefs.InsertInOrder(ref, ComparePriorities);
 if ((err != KErrNone) && (err != KErrAlreadyExists))
 {
+TRACES3("BuildActionListL: Adding app to action list, Uid = %x, wgId = %d, err = %d", appId, wgId, err);
 User::Leave(err);
 }
 TRACES3("BuildActionListL: Adding app to action list, Uid = %x, wgId = %d, wgIndex = %d", appId, wgId, wgIndex);
 }
 continue;
 }
 TActionRef ref = iActionRefs[iCurrentActionIndex];
 CGOomAction* action = NULL;
-if (ref.Type() == TActionRef::EAppClose)
+if (ref.Type() == TActionRef::EAppClose )
 {
-action = iCloseAppActions[numberOfRunningActions];
+iAppIndex%=iCloseAppActions.Count();
+TRACES2("Proceeding with app action from index %d, out of %d", iAppIndex, iCloseAppActions.Count() );
+action = iCloseAppActions[iAppIndex];
+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
 CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(iWs, iWs.GetFocusWindowGroup());
 TInt32 fgApp = wgName->AppUid().iUid;
 TInt32 appId = iMonitor.GetWindowGroupList()->AppIdfromWgId(ref.WgId(), ETrue);
 if(appId == fgApp)
 {
 TRACES1("Foreground App wgid %x, spared by GOOM", appId);
 iCurrentActionIndex++;
 }
 CleanupStack::PopAndDestroy();
 if(spared)
 {
 iCurrentActionIndex++;
-continue;
+if (iCurrentActionIndex >= iActionRefs.Count())
+{
+StateChanged();
+return;
+}
+else
+{
+continue;
+}
 }
 }
 else
 {
 action = &(ref.RunPlugin());
 }
 else
 {
 iTryOptional = EFalse;
 iOptionalTried = EFalse;
 TRACES("CGOomActionList::FreeMemory: No usable memory freeing action has been found");
+iFreeingMemory = EFalse;
 iServer.CloseAppsFinished(freeMemory, EFalse);
 iMonitor.WaitAndSynchroniseMemoryState();
 }
 }
 }
 // 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;
 void CGOomActionList::AppNotExiting(TInt aWgId)
 {
 FUNC_LOG;
 TInt index = iCloseAppActions.Count();
+TRACES1("CGOomCloseApp::AppNotExiting: count of actions %d",index);
 while (index--)
 {
 CGOomCloseApp* action = iCloseAppActions[index];
+TRACES3("CGOomCloseApp::AppNotExiting: %d %d %d", aWgId, action->WgId(), action->IsRunning());
 if ( (action->WgId() == aWgId) && (action->IsRunning()) )
 {
 TRACES1("CGOomCloseApp::AppNotExiting: App with window group id %d has not responded to the close event", aWgId);
 action->CloseAppEvent();
 }
 {
 FUNC_LOG;
 TBool allActionsComplete = ETrue;
-// Note that the actions themselves are responsible for timing out if necessary.
+TInt index = iActionRefs.Count();
-TInt index = iCloseAppActions.Count();
+	while ((index--) && (allActionsComplete))
-while ((index--) && (allActionsComplete))
+{
-{
+if (iActionRefs[index].IsRunning())
-if (iCloseAppActions[index]->IsRunning())
+{
-{
+TRACES1("CGOomActionList::StateChanged. Action %d STILL RUNNING.", index);
-TRACES1("CGOomActionList::StateChanged. CloseAppAction %d STILL RUNNING. PROBLEM !!! YOU SHOULD NEVER SEE THIS", index);
-allActionsComplete = EFalse;
-}
-}
-index = iRunPluginActions.Count();
-while ((index--) && (allActionsComplete))
-{
-if (iRunPluginActions[index]->IsRunning())
-{
-TRACES1("CGOomActionList::StateChanged. PluginAction %d STILL RUNNING. PROBLEM !!! YOU SHOULD NEVER SEE THIS", index);
 allActionsComplete = EFalse;
 }
 }
 TRACES1("CGOomActionList::StateChanged. Current Target = %d", iCurrentTarget);
 TRACES1("CGOomActionList::StateChanged. Free Memory = %d", freeMemory);
 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())
-if (iCurrentActionIndex >= iActionRefs.Count())
 {
-if(iRunningKillAppActions)
+// There are still more actions to try, so we continue
+TRACES1("CGOomActionList::StateChanged: All current actions complete, running more actions. freeMemory=%d", freeMemory);
+return FreeMemory(iMaxPriority);
+}
+if(iRunningKillAppActions)
+	            {
+iRunningKillAppActions = EFalse;
+if (!iTryOptional && !iOptionalTried && freeMemory < 25*1024*1024 ) // magic, should read this from config
+{
+iTryOptional = ETrue;
+iOptionalTried = ETrue;
+iMonitor.RunCloseAppActions(iMaxPriority);
+}
+else
 {
-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);
+iTryOptional = EFalse;
-/* Do not call memory good immidiately after freeing memory for some app
+iServer.CloseAppsFinished(freeMemory, EFalse);
-if (freeMemory >= iCurrentTarget && !iMonitor.NeedToPostponeMemGood())
+iMonitor.WaitAndSynchroniseMemoryState();
-{
+}
-MemoryGood();
-}
-*/
-if (!iTryOptional && !iOptionalTried && freeMemory < 25*1024*1024 ) // magic, should read this from config
-{
-iTryOptional = ETrue;
-iOptionalTried = EFalse;
-iMonitor.RunCloseAppActions(iMaxPriority);
-}
-else
-{
-iTryOptional = EFalse;
-iServer.CloseAppsFinished(freeMemory, EFalse);
-iMonitor.WaitAndSynchroniseMemoryState();
-}
-}
-else
-{
-TRACES1("CGOomActionList::StateChanged: All current Plugin actions complete, below good threshold, Time to kill bad guys. freeMemory=%d", freeMemory);
-iRunningKillAppActions = ETrue;
-iMonitor.RunCloseAppActions(iMaxPriority);
-}
 }
 else
 {
-// There are still more actions to try, so we continue
+TRACES1("CGOomActionList::StateChanged: All current Plugin actions complete, below good threshold, Time to kill bad guys. freeMemory=%d", freeMemory);
-TRACES1("CGOomActionList::StateChanged: All current actions complete, running more actions. freeMemory=%d", freeMemory);
+iRunningKillAppActions = ETrue;
-FreeMemory(iMaxPriority);
+iMonitor.RunCloseAppActions(iMaxPriority);
 }
 }
 else
 {
 TRACES1("CGOomActionList::StateChanged: All current actions complete, memory good. freeMemory=%d", freeMemory);
-/* Do not call memory good immidiately after freeing memory for some app
-			if(freeMemory > iMonitor.GetGoodThreshold() && !iMonitor.NeedToPostponeMemGood())
-{
-MemoryGood();
-}
-*/
 iRunningKillAppActions = EFalse;
 iServer.CloseAppsFinished(freeMemory, ETrue);
 iMonitor.WaitAndSynchroniseMemoryState();
 }
 }

changeset 38	69409653e863
parent 32	27a3ad0677c1
child 40	dd05fdd05078
child 48	7ced047fb7ae