diff -r 739cef680932 -r 4610cd70c542 sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp --- a/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Wed Sep 15 12:23:15 2010 +0300 +++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Wed Oct 13 14:43:04 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -185,36 +185,17 @@ iClientRequestActive = ETrue; TClientRequest* request = iQueue.First(); - - RThread clientThread; - TInt err = (request->iRequestFreeRamMessage).Client(clientThread); - TBool dataPaged = EFalse; - if(err == KErrNone) - { - RProcess processName; - err = clientThread.Process(processName); - if(err == KErrNone) - { - dataPaged = processName.DefaultDataPaged(); - processName.Close(); - } - clientThread.Close(); - } - else - { - OomMonitorPanic(KInvalidClientRequestType); - } - + switch (request->iClientRequestType) { case EClientServerRequestOptionalRam: { TInt pluginId = request->iRequestFreeRamMessage.Int2(); - iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId, dataPaged); + iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId); break; } case EClientServerRequestFreeMemory: - iMonitor.RequestFreeMemoryL(request->iBytesRequested, dataPaged); + iMonitor.RequestFreeMemoryL(request->iBytesRequested); break; case EPublishAndSubscribe: iMonitor.RequestFreeMemoryPandSL(request->iBytesRequested); @@ -277,7 +258,7 @@ message = request->iRequestFreeRamMessage; if (!message.IsNull()) { - TInt memoryAvailable = aBytesFree - iMonitor.GoodRamThreshold(); + TInt memoryAvailable = aBytesFree - iMonitor.GoodThreshold(); TInt minimumNeeded = message.Int1(); if (memoryAvailable >= minimumNeeded) {