--- a/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/ServiceRegistry/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apfile/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apgrfx/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/aplist/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apparc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apserv/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apsexe/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/apstart/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/appfw/apparchitecture/group/backup_registration.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" standalone="yes"?>
<!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
--- a/appfw/apparchitecture/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tdata/Corrupted_reg.RSC Mon Feb 08 13:38:38 2010 +0000
+++ b/appfw/apparchitecture/tdata/Corrupted_reg.RSC Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
// which accompanies this distribution, and is available
// at the URL "http://www.eclipse.org/legal/epl-v10.html".
//
@@ -21,4 +21,4 @@
@internalComponent - Internal Symbian test code
*/
-kJ !€ º< ©ÁÚ$ Õ beytfyugjcert
\ No newline at end of file
+kJ !€ º< ©ÁÚ$ Õ beytfyugjcert
Binary file appfw/apparchitecture/tdata/TSTAPPU.DOC has changed
--- a/appfw/apparchitecture/tdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tdata/mimecontentpolicy/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tdatasrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TAppInstall/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TBufferOnlyRec/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TESTREC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TEndTaskTestApp/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TMimeRec/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TMimeRec1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TNonNative/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TRecUpgrade/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TRecUpgrade_1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TRecUpgrade_2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/TSidChecker/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/T_DataPrioritySystem2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/T_EnvSlots/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/scripts/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tRuleBasedApps/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testapp/testforceregistrationapp1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testapp/testupdregappuninstallation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/testapp/testupgradeupdregappuninstallation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tlargestack/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tnotifydrivesapp/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tssaac/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tssaac/scripts/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tssaac/scripts/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/apparchitecture/tef/tupgradeiconapp/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/automation/SubsystemList.py Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# SubsystemList.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# SubsystemList_95.txt
-# This file lists the subsystem components that are to be built.
-# Each line points to a bld.inf
-
-\app-framework\TestFramework\group
-\app-framework\animation\group
-\app-framework\bmpanim\group
-\app-framework\clock\group
-\app-framework\cone\group
-\app-framework\egul\group
-\app-framework\errorresgt\group
-\app-framework\fepbase\group
-\app-framework\gfxtranseffect\group
-\app-framework\grid\group
-\app-framework\print\group
-\app-framework\uiklafGT\group
-\app-framework\uikon\group
-
-\thindump\group
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/SubsystemList.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,33 @@
+# SubsystemList.txt
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# SubsystemList_95.txt
+# This file lists the subsystem components that are to be built.
+# Each line points to a bld.inf
+
+\app-framework\TestFramework\group
+\app-framework\animation\group
+\app-framework\bmpanim\group
+\app-framework\clock\group
+\app-framework\cone\group
+\app-framework\egul\group
+\app-framework\errorresgt\group
+\app-framework\fepbase\group
+\app-framework\gfxtranseffect\group
+\app-framework\grid\group
+\app-framework\print\group
+\app-framework\uiklafGT\group
+\app-framework\uikon\group
+
+\thindump\group
--- a/appfw/uiftestfw/automation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/automation/testlists/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.py Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-# tests_sw_core.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-# DUMMY TEST
-# workaround for DEF059510 to prevent first test case randomly failing
-appfwk_test_dummytest, epocwind.out, , , 180
-
-# ANIMATION TESTS
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_basic.htm, , z:\animationtest\animationtest_t_basic.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_custom.htm, , z:\animationtest\animationtest_t_custom.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_frames.htm, , z:\animationtest\animationtest_t_frames.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_mng.htm, , z:\animationtest\animationtest_t_mng.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_oom.htm, , z:\animationtest\animationtest_t_oom.script, 600
-TESTEXECUTE, C:\logs\testexecute\animationtest_t_synch.htm, , z:\animationtest\animationtest_t_synch.script, 600
-
-# BMPANIM TESTS
-TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_autoan.htm, , z:\bmpanimtest\bmpanimtest_t_autoan.script, 600
-TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 600
-
-# CLOCK TESTS
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck0.htm, , z:\clocktest\clocktest_t_clck0.script, 600
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck1.htm, , z:\clocktest\clocktest_t_clck1.script, 600
-TESTEXECUTE, C:\logs\testexecute\clocktest_t_msgwin0.htm, , z:\clocktest\clocktest_t_msgwin0.script, 600
-
-# CONE TESTS
-TESTEXECUTE, C:\logs\testexecute\conetest_t_background.htm, , z:\conetest\conetest_t_background.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coedatastorage.htm, , z:\conetest\conetest_t_coedatastorage.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone0.htm, , z:\conetest\conetest_t_cone0.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone1.htm, , z:\conetest\conetest_t_cone1.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone2.htm, , z:\conetest\conetest_t_cone2.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone3.htm, , z:\conetest\conetest_t_cone3.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone4exe.htm, , z:\conetest\conetest_t_cone4exe.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone5.htm, , z:\conetest\conetest_t_cone5.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone6.htm, , z:\conetest\conetest_t_cone6.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_cone7.htm, , z:\conetest\conetest_t_cone7.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conecoecntss.htm, , z:\conetest\conetest_t_conecoecntss.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneerrormsg.htm, , z:\conetest\conetest_t_coneerrormsg.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conehelptext.htm, , z:\conetest\conetest_t_conehelptext.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneinvalidate.htm, , z:\conetest\conetest_t_coneinvalidate.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransition.htm, , z:\conetest\conetest_t_conetransition.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conevisibility.htm, , z:\conetest\conetest_t_conevisibility.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conezoomfont.htm, , z:\conetest\conetest_t_conezoomfont.script, 600
-TESTEXECUTE, C:\logs\testexecute\conetest_t_multiplescreens.htm, , z:\conetest\conetest_t_multiplescreens.script, 600, , z\appfwk\test\mulscreens_sw_test.cmd install, z\appfwk\test\mulscreens_sw_test.cmd uninstall
-TESTEXECUTE, C:\logs\testexecute\conetest_t_coneresourceloader.htm, , z:\conetest\conetest_t_coneresourceloader.script, 800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conestateobs.htm, , z:\conetest\conetest_t_conestateobs.script, 800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransparency.htm, , z:\conetest\conetest_t_conetransparency.script, 600
-
-# CONE MENU TESTS
-TESTEXECUTE, C:\logs\testexecute\menutest_t_menu0.htm, , z:\conetest\menutest_t_menu0.script, 600
-TESTEXECUTE, C:\logs\testexecute\menutest_t_menu1.htm, , z:\conetest\menutest_t_menu1.script, 600
-TESTEXECUTE, C:\logs\testexecute\menutest_t_vwa.htm, , z:\conetest\menutest_t_vwa.script, 600
-
-# EGUL TESTS
-TESTEXECUTE, C:\logs\testexecute\egultest_t_alignment.htm, , z:\egultest\egultest_t_alignment.script, 600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_border.htm, , z:\egultest\egultest_t_border.script, 600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_color.htm, , z:\egultest\egultest_t_color.script, 600
-TESTEXECUTE, C:\logs\testexecute\egultest_t_digitwidth.htm, , z:\egultest\egultest_t_digitwidth.script, 600
-
-# ETUL TESTS
-TESTEXECUTE, C:\logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800
-TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800
-TESTEXECUTE, C:\logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800
-
-# FEPBASE TESTS
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_appmorse.htm, , z:\fepbasetest\fepbasetest_t_appmorse.script, 600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fepgen.htm, , z:\fepbasetest\fepbasetest_t_fepgen.script, 600
-
-# FEP TESTS
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script, 600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fep1testtarget.htm, , z:\fepbasetest\fepbasetest_t_fep1testtarget.script, 600
-TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_keyboardlogger.htm, , z:\fepbasetest\fepbasetest_t_keyboardlogger.script, 600
-
-# GFXTRANSEFFECT TESTS
-TESTEXECUTE, C:\logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script, 800
-
-# GRID TESTS
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_cogrid.htm, , z:\gridtest\gridtest_t_cogrid.script, 600
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_glay.htm, , z:\gridtest\gridtest_t_glay.script, 600
-TESTEXECUTE, C:\logs\testexecute\gridtest_t_grid0.htm, , z:\gridtest\gridtest_t_grid0.script, 600
-
-# PRINT TESTS
-TESTEXECUTE, C:\logs\testexecute\printtest_t_fpr.htm, , z:\printtest\printtest_t_fpr.script, 600
-TESTEXECUTE, C:\logs\testexecute\printtest_t_stream.htm, , z:\printtest\printtest_t_stream.script, 600
-
-# UIK TESTS
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_addlibrary.htm, , z:\uiktest\uiktest_t_addlibrary.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguage.htm, , z:\uiktest\uiktest_t_applicationlanguage.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagesc.htm, , z:\uiktest\uiktest_t_applicationlanguagesc.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagezulu.htm, , z:\uiktest\uiktest_t_applicationlanguagezulu.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_autoLib.htm, , z:\uiktest\uiktest_t_autoLib.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_backup.htm, , z:\uiktest\uiktest_t_backup.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_brdrcol.htm, , z:\uiktest\uiktest_t_brdrcol.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability1.htm, , z:\uiktest\uiktest_t_capability1.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability2.htm, , z:\uiktest\uiktest_t_capability2.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_colovr.htm, , z:\uiktest\uiktest_t_colovr.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_colscm.htm, , z:\uiktest\uiktest_t_colscm.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_disableexitchecks.htm, , z:\uiktest\uiktest_t_disableexitchecks.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_eikenv.htm, , z:\uiktest\uiktest_t_eikenv.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_error.htm, , z:\uiktest\uiktest_t_error.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_fileutils.htm, , z:\uiktest\uiktest_t_fileutils.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_focus.htm, , z:\uiktest\uiktest_t_focus.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_hlsprite.htm, , z:\uiktest\uiktest_t_hlsprite.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_msg.htm, , z:\uiktest\uiktest_t_msg.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_multiplealarm.htm, , z:\uiktest\uiktest_t_multiplealarm.script, 600, ,z\uiktest\multiplealarm_setup.bat install, z\uiktest\multiplealarm_setup.bat uninstall
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_nonfocus.htm, , z:\uiktest\uiktest_t_nonfocus.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_notdial.htm, , z:\uiktest\uiktest_t_notdial.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_package.htm, , z:\uiktest\uiktest_t_package.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_parent.htm, , z:\uiktest\uiktest_t_parent.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_shutter.htm, , z:\uiktest\uiktest_t_shutter.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_spane.htm, , z:\uiktest\uiktest_t_spane.script, 600
-TESTEXECUTE, C:\logs\testexecute\uiktest_t_syscolor.htm, , z:\uiktest\uiktest_t_syscolor.script, 600
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/emulator/tests_sw_core.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,129 @@
+# tests_sw_core.txt
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+# DUMMY TEST
+# workaround for DEF059510 to prevent first test case randomly failing
+appfwk_test_dummytest, epocwind.out, , , 180
+
+# ANIMATION TESTS
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_basic.htm, , z:\animationtest\animationtest_t_basic.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_custom.htm, , z:\animationtest\animationtest_t_custom.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_frames.htm, , z:\animationtest\animationtest_t_frames.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_mng.htm, , z:\animationtest\animationtest_t_mng.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_oom.htm, , z:\animationtest\animationtest_t_oom.script, 600
+TESTEXECUTE, C:\logs\testexecute\animationtest_t_synch.htm, , z:\animationtest\animationtest_t_synch.script, 600
+
+# BMPANIM TESTS
+TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_autoan.htm, , z:\bmpanimtest\bmpanimtest_t_autoan.script, 600
+TESTEXECUTE, C:\logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 600
+
+# CLOCK TESTS
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck0.htm, , z:\clocktest\clocktest_t_clck0.script, 600
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_clck1.htm, , z:\clocktest\clocktest_t_clck1.script, 600
+TESTEXECUTE, C:\logs\testexecute\clocktest_t_msgwin0.htm, , z:\clocktest\clocktest_t_msgwin0.script, 600
+
+# CONE TESTS
+TESTEXECUTE, C:\logs\testexecute\conetest_t_background.htm, , z:\conetest\conetest_t_background.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coedatastorage.htm, , z:\conetest\conetest_t_coedatastorage.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone0.htm, , z:\conetest\conetest_t_cone0.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone1.htm, , z:\conetest\conetest_t_cone1.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone2.htm, , z:\conetest\conetest_t_cone2.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone3.htm, , z:\conetest\conetest_t_cone3.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone4exe.htm, , z:\conetest\conetest_t_cone4exe.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone5.htm, , z:\conetest\conetest_t_cone5.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone6.htm, , z:\conetest\conetest_t_cone6.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_cone7.htm, , z:\conetest\conetest_t_cone7.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conecoecntss.htm, , z:\conetest\conetest_t_conecoecntss.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneerrormsg.htm, , z:\conetest\conetest_t_coneerrormsg.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conehelptext.htm, , z:\conetest\conetest_t_conehelptext.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneinvalidate.htm, , z:\conetest\conetest_t_coneinvalidate.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransition.htm, , z:\conetest\conetest_t_conetransition.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conevisibility.htm, , z:\conetest\conetest_t_conevisibility.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conezoomfont.htm, , z:\conetest\conetest_t_conezoomfont.script, 600
+TESTEXECUTE, C:\logs\testexecute\conetest_t_multiplescreens.htm, , z:\conetest\conetest_t_multiplescreens.script, 600, , z\appfwk\test\mulscreens_sw_test.cmd install, z\appfwk\test\mulscreens_sw_test.cmd uninstall
+TESTEXECUTE, C:\logs\testexecute\conetest_t_coneresourceloader.htm, , z:\conetest\conetest_t_coneresourceloader.script, 800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conestateobs.htm, , z:\conetest\conetest_t_conestateobs.script, 800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conetransparency.htm, , z:\conetest\conetest_t_conetransparency.script, 600
+
+# CONE MENU TESTS
+TESTEXECUTE, C:\logs\testexecute\menutest_t_menu0.htm, , z:\conetest\menutest_t_menu0.script, 600
+TESTEXECUTE, C:\logs\testexecute\menutest_t_menu1.htm, , z:\conetest\menutest_t_menu1.script, 600
+TESTEXECUTE, C:\logs\testexecute\menutest_t_vwa.htm, , z:\conetest\menutest_t_vwa.script, 600
+
+# EGUL TESTS
+TESTEXECUTE, C:\logs\testexecute\egultest_t_alignment.htm, , z:\egultest\egultest_t_alignment.script, 600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_border.htm, , z:\egultest\egultest_t_border.script, 600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_color.htm, , z:\egultest\egultest_t_color.script, 600
+TESTEXECUTE, C:\logs\testexecute\egultest_t_digitwidth.htm, , z:\egultest\egultest_t_digitwidth.script, 600
+
+# ETUL TESTS
+TESTEXECUTE, C:\logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800
+TESTEXECUTE, C:\logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800
+TESTEXECUTE, C:\logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800
+
+# FEPBASE TESTS
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_appmorse.htm, , z:\fepbasetest\fepbasetest_t_appmorse.script, 600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fepgen.htm, , z:\fepbasetest\fepbasetest_t_fepgen.script, 600
+
+# FEP TESTS
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script, 600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_fep1testtarget.htm, , z:\fepbasetest\fepbasetest_t_fep1testtarget.script, 600
+TESTEXECUTE, C:\logs\testexecute\fepbasetest_t_keyboardlogger.htm, , z:\fepbasetest\fepbasetest_t_keyboardlogger.script, 600
+
+# GFXTRANSEFFECT TESTS
+TESTEXECUTE, C:\logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script, 800
+
+# GRID TESTS
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_cogrid.htm, , z:\gridtest\gridtest_t_cogrid.script, 600
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_glay.htm, , z:\gridtest\gridtest_t_glay.script, 600
+TESTEXECUTE, C:\logs\testexecute\gridtest_t_grid0.htm, , z:\gridtest\gridtest_t_grid0.script, 600
+
+# PRINT TESTS
+TESTEXECUTE, C:\logs\testexecute\printtest_t_fpr.htm, , z:\printtest\printtest_t_fpr.script, 600
+TESTEXECUTE, C:\logs\testexecute\printtest_t_stream.htm, , z:\printtest\printtest_t_stream.script, 600
+
+# UIK TESTS
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_addlibrary.htm, , z:\uiktest\uiktest_t_addlibrary.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguage.htm, , z:\uiktest\uiktest_t_applicationlanguage.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagesc.htm, , z:\uiktest\uiktest_t_applicationlanguagesc.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_applicationlanguagezulu.htm, , z:\uiktest\uiktest_t_applicationlanguagezulu.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_autoLib.htm, , z:\uiktest\uiktest_t_autoLib.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_backup.htm, , z:\uiktest\uiktest_t_backup.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_brdrcol.htm, , z:\uiktest\uiktest_t_brdrcol.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability1.htm, , z:\uiktest\uiktest_t_capability1.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_capability2.htm, , z:\uiktest\uiktest_t_capability2.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_colovr.htm, , z:\uiktest\uiktest_t_colovr.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_colscm.htm, , z:\uiktest\uiktest_t_colscm.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_disableexitchecks.htm, , z:\uiktest\uiktest_t_disableexitchecks.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_eikenv.htm, , z:\uiktest\uiktest_t_eikenv.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_error.htm, , z:\uiktest\uiktest_t_error.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_fileutils.htm, , z:\uiktest\uiktest_t_fileutils.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_focus.htm, , z:\uiktest\uiktest_t_focus.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_hlsprite.htm, , z:\uiktest\uiktest_t_hlsprite.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_msg.htm, , z:\uiktest\uiktest_t_msg.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_multiplealarm.htm, , z:\uiktest\uiktest_t_multiplealarm.script, 600, ,z\uiktest\multiplealarm_setup.bat install, z\uiktest\multiplealarm_setup.bat uninstall
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_nonfocus.htm, , z:\uiktest\uiktest_t_nonfocus.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_notdial.htm, , z:\uiktest\uiktest_t_notdial.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_package.htm, , z:\uiktest\uiktest_t_package.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_parent.htm, , z:\uiktest\uiktest_t_parent.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_shutter.htm, , z:\uiktest\uiktest_t_shutter.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_spane.htm, , z:\uiktest\uiktest_t_spane.script, 600
+TESTEXECUTE, C:\logs\testexecute\uiktest_t_syscolor.htm, , z:\uiktest\uiktest_t_syscolor.script, 600
+
--- a/appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.py Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# tests_sw_nga_enabled.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptr.htm, , z:\conetest\conetest_t_conemultiptr.script, 800
-TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptrcompound.htm,,z:\conetest\conetest_t_conemultiptrcompound.script, 800
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/emulator/tests_sw_nga_enabled.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,21 @@
+# tests_sw_core.txt
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptr.htm, , z:\conetest\conetest_t_conemultiptr.script, 800
+TESTEXECUTE, C:\logs\testexecute\conetest_t_conemultiptrcompound.htm,,z:\conetest\conetest_t_conemultiptrcompound.script, 800
+
--- a/appfw/uiftestfw/automation/testlists/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.py Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-# tests_hw_core.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-# ANIMATION TESTS
-TESTEXECUTE, logs\testexecute\animationtest_t_basic.htm, , z:\animationtest\animationtest_t_basic.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_custom.htm, , z:\animationtest\animationtest_t_custom.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_frames.htm, , z:\animationtest\animationtest_t_frames.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_mng.htm, , z:\animationtest\animationtest_t_mng.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_oom.htm, , z:\animationtest\animationtest_t_oom.script, 800
-TESTEXECUTE, logs\testexecute\animationtest_t_synch.htm, , z:\animationtest\animationtest_t_synch.script, 800
-
-# BMPANIM TESTS
-TESTEXECUTE, logs\testexecute\bmpanimtest_t_autoan.htm, , z:\bmpanimtest\bmpanimtest_t_autoan.script, 800
-TESTEXECUTE, logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 800
-
-# CLOCK TESTS
-TESTEXECUTE, logs\testexecute\clocktest_t_clck0.htm, , z:\clocktest\clocktest_t_clck0.script, 800
-TESTEXECUTE, logs\testexecute\clocktest_t_clck1.htm, , z:\clocktest\clocktest_t_clck1.script, 800
-TESTEXECUTE, logs\testexecute\clocktest_t_msgwin0.htm, , z:\clocktest\clocktest_t_msgwin0.script, 800
-
-# CONE TESTS
-# Multiplescreens test is commented since hardware support wasn't available (yet) when PREQ1227 was submitted
-TESTEXECUTE, logs\testexecute\conetest_t_background.htm, , z:\conetest\conetest_t_background.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_coedatastorage.htm, , z:\conetest\conetest_t_coedatastorage.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone0.htm, , z:\conetest\conetest_t_cone0.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone1.htm, , z:\conetest\conetest_t_cone1.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone2.htm, , z:\conetest\conetest_t_cone2.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone3.htm, , z:\conetest\conetest_t_cone3.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone4exe.htm, , z:\conetest\conetest_t_cone4exe.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone5.htm, , z:\conetest\conetest_t_cone5.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone6.htm, , z:\conetest\conetest_t_cone6.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_cone7.htm, , z:\conetest\conetest_t_cone7.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conecoecntss.htm, , z:\conetest\conetest_t_conecoecntss.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_coneerrormsg.htm, , z:\conetest\conetest_t_coneerrormsg.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conehelptext.htm, , z:\conetest\conetest_t_conehelptext.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_coneinvalidate.htm, , z:\conetest\conetest_t_coneinvalidate.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conetransition.htm, , z:\conetest\conetest_t_conetransition.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conevisibility.htm, , z:\conetest\conetest_t_conevisibility.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conezoomfont.htm, , z:\conetest\conetest_t_conezoomfont.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_multiplescreens.htm, , z:\conetest\conetest_t_multiplescreens.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_coneresourceloader.htm, , z:\conetest\conetest_t_coneresourceloader.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conestateobs.htm, , z:\conetest\conetest_t_conestateobs.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conetransparency.htm, , z:\conetest\conetest_t_conetransparency.script, 600
-
-# CONE MENU TESTS
-TESTEXECUTE, logs\testexecute\menutest_t_menu0.htm, , z:\conetest\menutest_t_menu0.script, 800
-TESTEXECUTE, logs\testexecute\menutest_t_menu1.htm, , z:\conetest\menutest_t_menu1.script, 800
-TESTEXECUTE, logs\testexecute\menutest_t_vwa.htm, , z:\conetest\menutest_t_vwa.script, 800
-
-# EGUL TESTS
-TESTEXECUTE, logs\testexecute\egultest_t_alignment.htm, , z:\egultest\egultest_t_alignment.script, 800
-TESTEXECUTE, logs\testexecute\egultest_t_border.htm, , z:\egultest\egultest_t_border.script, 800
-TESTEXECUTE, logs\testexecute\egultest_t_color.htm, , z:\egultest\egultest_t_color.script, 800
-TESTEXECUTE, logs\testexecute\egultest_t_digitwidth.htm, , z:\egultest\egultest_t_digitwidth.script, 800
-# ETUL TESTS
-TESTEXECUTE, logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800
-TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800
-TESTEXECUTE, logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800
-
-# FEPBASE TESTS
-TESTEXECUTE, logs\testexecute\fepbasetest_t_appmorse.htm, , z:\fepbasetest\fepbasetest_t_appmorse.script, 800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_fepgen.htm, , z:\fepbasetest\fepbasetest_t_fepgen.script, 800
-
-# FEP TESTS
-TESTEXECUTE, logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script, 800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_fep1testtarget.htm, , z:\fepbasetest\fepbasetest_t_fep1testtarget.script, 800
-TESTEXECUTE, logs\testexecute\fepbasetest_t_keyboardlogger.htm, , z:\fepbasetest\fepbasetest_t_keyboardlogger.script, 800
-
-# GFXTRANSEFFECT TESTS
-TESTEXECUTE, logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script, 800
-
-# GRID TESTS
-TESTEXECUTE, logs\testexecute\gridtest_t_cogrid.htm, , z:\gridtest\gridtest_t_cogrid.script, 800
-TESTEXECUTE, logs\testexecute\gridtest_t_glay.htm, , z:\gridtest\gridtest_t_glay.script, 800
-TESTEXECUTE, logs\testexecute\gridtest_t_grid0.htm, , z:\gridtest\gridtest_t_grid0.script, 800
-
-# PRINT TESTS
-TESTEXECUTE, logs\testexecute\printtest_t_fpr.htm, , z:\printtest\printtest_t_fpr.script, 800
-TESTEXECUTE, logs\testexecute\printtest_t_stream.htm, , z:\printtest\printtest_t_stream.script, 800
-
-# UIK TESTS
-TESTEXECUTE, logs\testexecute\uiktest_t_addlibrary.htm, , z:\uiktest\uiktest_t_addlibrary.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguage.htm, , z:\uiktest\uiktest_t_applicationlanguage.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagesc.htm, , z:\uiktest\uiktest_t_applicationlanguagesc.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagezulu.htm, , z:\uiktest\uiktest_t_applicationlanguagezulu.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_autoLib.htm, , z:\uiktest\uiktest_t_autoLib.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_backup.htm, , z:\uiktest\uiktest_t_backup.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_brdrcol.htm, , z:\uiktest\uiktest_t_brdrcol.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_capability1.htm, , z:\uiktest\uiktest_t_capability1.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_capability2.htm, , z:\uiktest\uiktest_t_capability2.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_colovr.htm, , z:\uiktest\uiktest_t_colovr.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_colscm.htm, , z:\uiktest\uiktest_t_colscm.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_disableexitchecks.htm, , z:\uiktest\uiktest_t_disableexitchecks.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_eikenv.htm, , z:\uiktest\uiktest_t_eikenv.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_error.htm, , z:\uiktest\uiktest_t_error.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_fileutils.htm, , z:\uiktest\uiktest_t_fileutils.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_focus.htm, , z:\uiktest\uiktest_t_focus.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_hlsprite.htm, , z:\uiktest\uiktest_t_hlsprite.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_msg.htm, , z:\uiktest\uiktest_t_msg.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_nonfocus.htm, , z:\uiktest\uiktest_t_nonfocus.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_notdial.htm, , z:\uiktest\uiktest_t_notdial.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_package.htm, , z:\uiktest\uiktest_t_package.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_parent.htm, , z:\uiktest\uiktest_t_parent.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_shutter.htm, , z:\uiktest\uiktest_t_shutter.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_spane.htm, , z:\uiktest\uiktest_t_spane.script, 800
-TESTEXECUTE, logs\testexecute\uiktest_t_syscolor.htm, , z:\uiktest\uiktest_t_syscolor.script, 800
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/hardware/tests_hw_core.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,124 @@
+# tests_hw_core.txt
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+# ANIMATION TESTS
+TESTEXECUTE, logs\testexecute\animationtest_t_basic.htm, , z:\animationtest\animationtest_t_basic.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_custom.htm, , z:\animationtest\animationtest_t_custom.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_frames.htm, , z:\animationtest\animationtest_t_frames.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_mng.htm, , z:\animationtest\animationtest_t_mng.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_oom.htm, , z:\animationtest\animationtest_t_oom.script, 800
+TESTEXECUTE, logs\testexecute\animationtest_t_synch.htm, , z:\animationtest\animationtest_t_synch.script, 800
+
+# BMPANIM TESTS
+TESTEXECUTE, logs\testexecute\bmpanimtest_t_autoan.htm, , z:\bmpanimtest\bmpanimtest_t_autoan.script, 800
+TESTEXECUTE, logs\testexecute\bmpanimtest_t_bmpanim.htm, , z:\bmpanimtest\bmpanimtest_t_bmpanim.script, 800
+
+# CLOCK TESTS
+TESTEXECUTE, logs\testexecute\clocktest_t_clck0.htm, , z:\clocktest\clocktest_t_clck0.script, 800
+TESTEXECUTE, logs\testexecute\clocktest_t_clck1.htm, , z:\clocktest\clocktest_t_clck1.script, 800
+TESTEXECUTE, logs\testexecute\clocktest_t_msgwin0.htm, , z:\clocktest\clocktest_t_msgwin0.script, 800
+
+# CONE TESTS
+# Multiplescreens test is commented since hardware support wasn't available (yet) when PREQ1227 was submitted
+TESTEXECUTE, logs\testexecute\conetest_t_background.htm, , z:\conetest\conetest_t_background.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_coedatastorage.htm, , z:\conetest\conetest_t_coedatastorage.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone0.htm, , z:\conetest\conetest_t_cone0.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone1.htm, , z:\conetest\conetest_t_cone1.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone2.htm, , z:\conetest\conetest_t_cone2.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone3.htm, , z:\conetest\conetest_t_cone3.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone4exe.htm, , z:\conetest\conetest_t_cone4exe.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone5.htm, , z:\conetest\conetest_t_cone5.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone6.htm, , z:\conetest\conetest_t_cone6.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_cone7.htm, , z:\conetest\conetest_t_cone7.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conecoecntss.htm, , z:\conetest\conetest_t_conecoecntss.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_coneerrormsg.htm, , z:\conetest\conetest_t_coneerrormsg.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conehelptext.htm, , z:\conetest\conetest_t_conehelptext.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_coneinvalidate.htm, , z:\conetest\conetest_t_coneinvalidate.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conetransition.htm, , z:\conetest\conetest_t_conetransition.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conevisibility.htm, , z:\conetest\conetest_t_conevisibility.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conezoomfont.htm, , z:\conetest\conetest_t_conezoomfont.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_multiplescreens.htm, , z:\conetest\conetest_t_multiplescreens.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_coneresourceloader.htm, , z:\conetest\conetest_t_coneresourceloader.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conestateobs.htm, , z:\conetest\conetest_t_conestateobs.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conetransparency.htm, , z:\conetest\conetest_t_conetransparency.script, 600
+
+# CONE MENU TESTS
+TESTEXECUTE, logs\testexecute\menutest_t_menu0.htm, , z:\conetest\menutest_t_menu0.script, 800
+TESTEXECUTE, logs\testexecute\menutest_t_menu1.htm, , z:\conetest\menutest_t_menu1.script, 800
+TESTEXECUTE, logs\testexecute\menutest_t_vwa.htm, , z:\conetest\menutest_t_vwa.script, 800
+
+# EGUL TESTS
+TESTEXECUTE, logs\testexecute\egultest_t_alignment.htm, , z:\egultest\egultest_t_alignment.script, 800
+TESTEXECUTE, logs\testexecute\egultest_t_border.htm, , z:\egultest\egultest_t_border.script, 800
+TESTEXECUTE, logs\testexecute\egultest_t_color.htm, , z:\egultest\egultest_t_color.script, 800
+TESTEXECUTE, logs\testexecute\egultest_t_digitwidth.htm, , z:\egultest\egultest_t_digitwidth.script, 800
+# ETUL TESTS
+TESTEXECUTE, logs\testexecute\etultest_t_addressstringtokenizer.htm, ,z:\etultest\etultest_t_addressstringtokenizer.script, 800
+TESTEXECUTE, logs\testexecute\etultest_t_phonenumberutils.htm, , z:\etultest\etultest_t_phonenumberutils.script, 800
+TESTEXECUTE, logs\testexecute\etultest_t_textresourceutils.htm, , z:\etultest\etultest_t_textresourceutils.script, 800
+
+# FEPBASE TESTS
+TESTEXECUTE, logs\testexecute\fepbasetest_t_appmorse.htm, , z:\fepbasetest\fepbasetest_t_appmorse.script, 800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_fepgen.htm, , z:\fepbasetest\fepbasetest_t_fepgen.script, 800
+
+# FEP TESTS
+TESTEXECUTE, logs\testexecute\fepbasetest_t_defocusingedwin.htm, , z:\fepbasetest\fepbasetest_t_defocusingedwin.script, 800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_fep1testtarget.htm, , z:\fepbasetest\fepbasetest_t_fep1testtarget.script, 800
+TESTEXECUTE, logs\testexecute\fepbasetest_t_keyboardlogger.htm, , z:\fepbasetest\fepbasetest_t_keyboardlogger.script, 800
+
+# GFXTRANSEFFECT TESTS
+TESTEXECUTE, logs\testexecute\gfxtranstest_t_gfxtranseffect.htm, , z:\gfxtranstest\gfxtranstest_t_gfxtranseffect.script, 800
+
+# GRID TESTS
+TESTEXECUTE, logs\testexecute\gridtest_t_cogrid.htm, , z:\gridtest\gridtest_t_cogrid.script, 800
+TESTEXECUTE, logs\testexecute\gridtest_t_glay.htm, , z:\gridtest\gridtest_t_glay.script, 800
+TESTEXECUTE, logs\testexecute\gridtest_t_grid0.htm, , z:\gridtest\gridtest_t_grid0.script, 800
+
+# PRINT TESTS
+TESTEXECUTE, logs\testexecute\printtest_t_fpr.htm, , z:\printtest\printtest_t_fpr.script, 800
+TESTEXECUTE, logs\testexecute\printtest_t_stream.htm, , z:\printtest\printtest_t_stream.script, 800
+
+# UIK TESTS
+TESTEXECUTE, logs\testexecute\uiktest_t_addlibrary.htm, , z:\uiktest\uiktest_t_addlibrary.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguage.htm, , z:\uiktest\uiktest_t_applicationlanguage.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagefrench.htm, , z:\uiktest\uiktest_t_applicationlanguagefrench.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagenotset.htm, , z:\uiktest\uiktest_t_applicationlanguagenotset.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagesc.htm, , z:\uiktest\uiktest_t_applicationlanguagesc.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_applicationlanguagezulu.htm, , z:\uiktest\uiktest_t_applicationlanguagezulu.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_autoLib.htm, , z:\uiktest\uiktest_t_autoLib.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_backup.htm, , z:\uiktest\uiktest_t_backup.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_brdrcol.htm, , z:\uiktest\uiktest_t_brdrcol.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_capability1.htm, , z:\uiktest\uiktest_t_capability1.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_capability2.htm, , z:\uiktest\uiktest_t_capability2.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_colovr.htm, , z:\uiktest\uiktest_t_colovr.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_colscm.htm, , z:\uiktest\uiktest_t_colscm.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_disableexitchecks.htm, , z:\uiktest\uiktest_t_disableexitchecks.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_eikenv.htm, , z:\uiktest\uiktest_t_eikenv.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_error.htm, , z:\uiktest\uiktest_t_error.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_fileutils.htm, , z:\uiktest\uiktest_t_fileutils.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_focus.htm, , z:\uiktest\uiktest_t_focus.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_hlsprite.htm, , z:\uiktest\uiktest_t_hlsprite.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_msg.htm, , z:\uiktest\uiktest_t_msg.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_nonfocus.htm, , z:\uiktest\uiktest_t_nonfocus.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_notdial.htm, , z:\uiktest\uiktest_t_notdial.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_package.htm, , z:\uiktest\uiktest_t_package.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_parent.htm, , z:\uiktest\uiktest_t_parent.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_shutter.htm, , z:\uiktest\uiktest_t_shutter.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_spane.htm, , z:\uiktest\uiktest_t_spane.script, 800
+TESTEXECUTE, logs\testexecute\uiktest_t_syscolor.htm, , z:\uiktest\uiktest_t_syscolor.script, 800
+
--- a/appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.py Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# tests_hw_nga_enabled.txt
-# Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# program,log,commdb,script,timeout,release,pre cmd,post cmd
-
-# NOTE: Execution order is essentially alphabetical, except where noted.
-
-TESTEXECUTE, logs\testexecute\conetest_t_conemultiptr.htm, , z:\conetest\conetest_t_conemultiptr.script, 800
-TESTEXECUTE, logs\testexecute\conetest_t_conemultiptrcompound.htm, , z:\conetest\conetest_t_conemultiptrcompound.script, 800
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/appfw/uiftestfw/automation/testlists/hardware/tests_hw_nga_enabled.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,21 @@
+# tests_hw_nga_enabled.txt
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# program,log,commdb,script,timeout,release,pre cmd,post cmd
+
+# NOTE: Execution order is essentially alphabetical, except where noted.
+
+TESTEXECUTE, logs\testexecute\conetest_t_conemultiptr.htm, , z:\conetest\conetest_t_conemultiptr.script, 800
+TESTEXECUTE, logs\testexecute\conetest_t_conemultiptrcompound.htm, , z:\conetest\conetest_t_conemultiptrcompound.script, 800
+
--- a/appfw/uiftestfw/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/resource/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/scripts/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/scripts/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/uiftestfw/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/client/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/server/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/scripts/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/scripts/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/applaunchtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/applaunchtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/applaunchtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/tview1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/tview2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/tview3/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/tview4/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appfw/viewserver/test/tviews/tvw/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/amastartsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/dscstoresrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/localinc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/localsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/resource/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/emulator/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/scripts/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tamastarter/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/tdscstore/testdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/aftermarketappstarter/test/testapps/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/apstartsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/test/tapstart/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/test/tapstart/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/test/tapstart/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/applaunchservices/applaunchplugins/test/testapps/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_info/appsupport_metadata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/action_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/action_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/action_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/application_orientation_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/application_orientation_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/application_orientation_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_access_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_access_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_access_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_client_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_client_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_client_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_listener_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_listener_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_listener_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_services_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_services_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_services_api/inc/cfwcontextdef.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/context_framework_services_api/inc/cfwcontextdef.h Fri Feb 26 17:43:11 2010 +0000
@@ -20,7 +20,7 @@
#ifndef CFWCONTEXTDEF_H
#define CFWCONTEXTDEF_H
-#include <CFDefinitions.h>
+#include <cfdefinitions.h>
//-----------------------------------------------------------------------------
// Source: 'ContextFramework'
--- a/appsupport_plat/context_framework_services_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_version_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_version_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_framework_version_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_settings_manager_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_settings_manager_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_source_settings_manager_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_subscription_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_subscription_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/context_subscription_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_mmi_service_interface_custom_api/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_netscape_plugin_command_api/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_netscape_plugin_command_api/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/flash_netscape_plugin_command_api/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_mapper_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_mapper_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/key_event_framework_mapper_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/media_keys_definition_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/media_keys_definition_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/media_keys_definition_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/ood_threshold_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/ood_threshold_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/ood_threshold_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_api/inc/oommonitor.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/oom_monitor_api/inc/oommonitor.h Fri Feb 26 17:43:11 2010 +0000
@@ -16,11 +16,10 @@
*/
-#include <e32hashtab.h>
-#include <f32file.h>
+#ifndef OOMMONITOR_H
+#define OOMMONITOR_H
+
#include <w32std.h>
-#include <apgtask.h>
-#include <e32property.h>
/**
* Creates thread for OOM watchers.
@@ -28,248 +27,4 @@
*/
IMPORT_C void CreateOOMWatcherThreadL();
-// ---------------------------------------------------------
-// CMemoryMonitor
-// ---------------------------------------------------------
-//
-class COutOfMemoryWatcher;
-class CSubscribeHelper;
-class COomMonitorPlugin;
-class COomPlugins;
-class CAppCloseTimer;
-class CAppCloseWatcher;
-class CMemoryMonitorServer;
-class CWservEventReceiver;
-class RResourceFile;
-class CApaWindowGroupName;
-
-NONSHARABLE_CLASS(CMemoryMonitor) : public CBase
- {
-public:
- static CMemoryMonitor* NewL();
- ~CMemoryMonitor();
-
-public: // event handlers
- void FreeMemThresholdCrossedL();
- void CloseAppEvent();
- void AppNotExiting(TInt aWgId);
- void StartFreeSomeRamL(TInt aTargetFree);
- void HandleFocusedWgChangeL();
-
-private:
- CMemoryMonitor();
- void ConstructL();
- void CloseAppsFinished(TBool aMemoryGood);
- static TInt WatchdogStatusStatusChanged(TAny* aPtr);
- void HandleWatchdogStatusCallBackL();
- void ColapseWindowGroupTree();
- void SetPluginMemoryGood(TBool aSetToGood);
- void GetWgsToCloseL();
- TBool FreeMemoryAboveThreshold();
- void CancelAppCloseWatchers();
- TInt AppCloseOrder(TInt aWgIndex, TInt aWgId);
- void CloseNextApp();
- void ReadAppResourceArrayL(RResourceFile& aResFile, TInt aResId, TInt aOrderBase, TInt aOrderInc);
- void RestartAppCloser();
-
-public:
- // All members are owned
- // generally useful sessions
- RFs iFs;
- RWsSession iWs;
-
-private:
- // All members are owned, except where stated
- // parameters for OOM watcher.
- TInt iLowThreshold;
- TInt iGoodThreshold;
- TInt iMaxExitTime; // Time we wait for application exit gracefully, after this we'll try to shut next application down.
- TInt iRamPluginRunTime; // Time we wait for plugins to free RAM before we start to shut apps.
-
- // parameters for app close order
- enum TAppCloseOrderConstants
- {
- ECloseFirst = -1000000, // apps to close first are given an order around negative one million
- ECloseNormal = 0, // apps to close normally are given an order around zero
- ECloseLast = 1000000, // apps to close last are given an order around one million
- ENeverClose = 1000000000 // one billion signals apps that should never be closed
- };
- typedef RHashMap<TInt, TInt> RAppCloseOrderMap; // maps app UID to close order
- RAppCloseOrderMap iAppCloseOrderMap;
-
- // internal
- CApaWindowGroupName* iWgName;
- HBufC* iWgNameBuf; // owned by iWgName
-
- // app closer state
- TBool iAppCloserRunning;
- TInt iCurrentTarget;
- TApaTask iCurrentTask;
- RArray<RWsSession::TWindowGroupChainInfo> iWgIds;
- TInt iNextAppToClose;
- TBool iMemoryAboveThreshold;
-
- // event receivers
- CAppCloseTimer* iAppCloseTimer;
- CAppCloseWatcher* iAppCloseWatcher;
- COutOfMemoryWatcher* iOOMWatcher;
- CWservEventReceiver* iWservEventReceiver;
-
- // parameters for P&S watcher.
- RProperty iWatchdogStatusProperty;
- CSubscribeHelper* iWatchdogStatusSubscriber;
-
- // Plugin support
- COomPlugins* iPlugins;
- TBool iPluginMemoryGood;
-
- // Server
- CMemoryMonitorServer* iServer;
- };
-
-
-
-NONSHARABLE_CLASS(COutOfMemoryWatcher) : public CActive
- {
-public:
- static COutOfMemoryWatcher* NewL(CMemoryMonitor& aLafShutdown, TInt aLowThreshold, TInt aGoodThreshold);
- ~COutOfMemoryWatcher();
- void Start();
-private:
- COutOfMemoryWatcher(CMemoryMonitor& aLafShutdown);
- void ConstructL(TInt aLowThreshold, TInt aGoodThreshold);
-private: // from CActive
- void DoCancel();
- void RunL();
-private: // data
- RChangeNotifier iChangeNotifier;
- CMemoryMonitor& iLafShutdown;
- };
-
-NONSHARABLE_CLASS(CSubscribeHelper) : public CActive
- {
-public:
- CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty);
- ~CSubscribeHelper();
-
-public: // New functions
- void SubscribeL();
- void StopSubscribe();
-
-private: // from CActive
- void RunL();
- void DoCancel();
-
-private:
- TCallBack iCallBack;
- RProperty& iProperty;
- };
-
-
-NONSHARABLE_CLASS(COomPlugins) : public CBase
- {
-public:
- COomPlugins();
- ~COomPlugins();
- void ConstructL();
-
-public:
- void FreeRam();
- void MemoryGood();
-
-private:
- struct TPlugin
- {
- TPlugin();
- COomMonitorPlugin* iImpl;
- TUid iDtorUid;
- };
-
-private:
- RArray<TPlugin> iPlugins;
- };
-
-
-NONSHARABLE_CLASS(CAppCloseTimer) : public CTimer
- {
-public:
- static CAppCloseTimer* NewL(CMemoryMonitor& aMonitor);
-private:
- CAppCloseTimer(CMemoryMonitor& aMonitor);
- void RunL();
-private:
- CMemoryMonitor& iMonitor;
- };
-
-
-NONSHARABLE_CLASS(CAppCloseWatcher) : public CActive
- {
-public:
- CAppCloseWatcher(CMemoryMonitor& aMonitor);
- ~CAppCloseWatcher();
- void Start(const TApaTask& aTask);
-private:
- void DoCancel();
- void RunL();
-private:
- CMemoryMonitor& iMonitor;
- RThread iThread;
- TProcessPriority iOriginalProcessPriority;
- };
-
-
-NONSHARABLE_CLASS(CWservEventReceiver) : public CActive
- {
-public:
- CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs);
- ~CWservEventReceiver();
- void ConstructL();
-private:
- void Queue();
- void DoCancel();
- void RunL();
-private:
- CMemoryMonitor& iMonitor;
- RWsSession& iWs;
- RWindowGroup iWg;
- };
-
-
-NONSHARABLE_CLASS(CMemoryMonitorServer) : public CServer2
- {
-public:
- static CMemoryMonitorServer* NewL(CMemoryMonitor& aMonitor);
- ~CMemoryMonitorServer();
-
- CMemoryMonitor& Monitor();
- void CloseAppsFinished(TBool aMemoryGood);
-
-private:
- CMemoryMonitorServer(CMemoryMonitor& aMonitor);
- void ConstructL();
- CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const;
- TInt RunError(TInt aError);
-
-private:
- CMemoryMonitor& iMonitor;
- };
-
-
-NONSHARABLE_CLASS(CMemoryMonitorSession) : public CSession2
- {
-public:
- CMemoryMonitorSession();
- void CreateL();
- void CloseAppsFinished(TBool aMemoryGood);
-
-private:
- ~CMemoryMonitorSession();
- CMemoryMonitorServer& Server();
- CMemoryMonitor& Monitor();
- void ServiceL(const RMessage2& aMessage);
-
-private:
- RMessagePtr2 iRequestFreeRam;
- };
-
-
+#endif // OOMMONITOR_H
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_api/inc/oommonitorsession.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/oom_monitor_api/inc/oommonitorsession.h Fri Feb 26 17:43:11 2010 +0000
@@ -21,50 +21,125 @@
#include <e32std.h>
+const TInt KOomMaxAllocationWithoutPermission = 1048576;
+const TUid KOomMemoryMonitorStatusPropertyCategory = {0x10207218};
+const TUint32 KOomMemoryMonitorStatusPropertyKey = 0;
+enum TMemoryMonitorStatusPropertyValues
+ {
+ // Above Treshhold: Free Ram is above good treshhold point and memory monitor isn't freeing any memory
+ EAboveTreshHold,
+
+ // Freeing Memory: Memory monitor is in the middle of freeing memory
+ EFreeingMemory,
+
+ // Below Treshhold: Memory monitor has tried to free some RAM but total memory is still below treshhold and memory monitor has given up freeing more memory.
+ EBelowTreshHold
+ };
class ROomMonitorSession : public RSessionBase
- {
+ {
+public:
+
+ /** Defines the application priorities of OOM monitor. */
+ enum TOomPriority
+ {
+ /**
+ * Application can be closed if needed.
+ */
+ EOomPriorityNormal = 0,
+
+ /**
+ * Application should not be closed if possible.
+ */
+ EOomPriorityHigh,
+
+ /**
+ * Application is busy and should not be closed.
+ */
+ EOomPriorityBusy
+ };
+
public:
- /**
- * Connects a new session.
- * Sessions must be connected before any other APIs can be used.
- * When the client has finished using a session, Close() must be called.
- * @return KErrNone if successful, error code otherwise.
- */
- IMPORT_C TInt Connect();
- /**
- * Request that the OOM monitor attempts to free some memory.
- * This function may take several seconds to execute, depending on
- * the memory state. It will not return until the attempt to recover
- * memory has completed.
- * @param aBytesRequested The number of bytes of free memory that the client requests.
- * @return KErrNone if the request memory is free. KErrNoMemory if that
- * amount of memory could not be recovered. Other error codes may
- * also be returned.
- */
- IMPORT_C TInt RequestFreeMemory(TInt aBytesRequested);
- /**
- * Request that the OOM monitor attempts to free some memory.
- * This is an asynchronous version of the request for free memory.
- * @param aBytesRequested The number of bytes of free memory that the client requests.
- * @param aStatus will be completed when the attempt to recover memory
- * has finished. This may take several seconds, depending on
- * the memory state. On completion, aStatus will be set to
- * KErrNone if the request memory is free. KErrNoMemory if that
- * amount of memory could not be recovered. Other error codes may
- * also be set.
- */
- IMPORT_C void RequestFreeMemory(TInt aBytesRequested, TRequestStatus& aStatus);
- /**
- * Cancels the asynchronous request for free memory.
- */
- IMPORT_C void CancelRequestFreeMemory();
- /**
- * Notifiy the OOM monitor that this application is not responding
- * to the EEikCmdExit request to exit the application.
- * This function is used by the Avkon framework's app shutter.
- * @param aWgId the window group identifier of the app that is not exiting.
- */
- IMPORT_C void ThisAppIsNotExiting(TInt aWgId);
- };
+ /**
+ * Connects a new session.
+ * Sessions must be connected before any other APIs can be used.
+ * When the client has finished using a session, Close() must be called.
+ * @return KErrNone if successful, error code otherwise.
+ */
+ IMPORT_C TInt Connect();
+
+ /**
+ * Request that the OOM monitor attempts to free some memory.
+ * This function may take several seconds to execute, depending on
+ * the memory state. It will not return until the attempt to recover
+ * memory has completed.
+ * @param aBytesRequested The number of bytes of free memory that the client requests.
+ * @return KErrNone if the request memory is free. KErrNoMemory if that
+ * amount of memory could not be recovered. Other error codes may
+ * also be returned.
+ */
+ IMPORT_C TInt RequestFreeMemory(TInt aBytesRequested);
+
+ /**
+ * Request that the OOM monitor attempts to free some memory.
+ * This is an asynchronous version of the request for free memory.
+ * @param aBytesRequested The number of bytes of free memory that the client requests.
+ * @param aStatus will be completed when the attempt to recover memory
+ * has finished. This may take several seconds, depending on
+ * the memory state. On completion, aStatus will be set to
+ * KErrNone if the request memory is free. KErrNoMemory if that
+ * amount of memory could not be recovered. Other error codes may
+ * also be set.
+ */
+ IMPORT_C void RequestFreeMemory(TInt aBytesRequested, TRequestStatus& aStatus);
+
+ /**
+ * Request that the OOM monitor attempts to free some memory for an optional allocation.
+ * The passed in plugin ID is used to determine the priority for this allocation.
+ * Lower priority OOM actions may be executed to free enough RAM for this allocation.
+ * This function may take several seconds to execute, depending on
+ * the memory state. It will not return until the attempt to recover
+ * memory has completed.
+ * @param aBytesRequested The number of bytes of free memory that the client requests.
+ * @param aPluginId The ID of the plugin that may delete the allocation in event of low memory.
+ * @return KErrNone if the request memory is free. KErrNoMemory if that
+ * amount of memory could not be recovered. Other error codes may
+ * also be returned.
+ */
+ IMPORT_C TInt RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable);
+
+ /**
+ * Request that the OOM monitor attempts to free some memory for an optional allocation.
+ * The passed in plugin ID is used to determine the priority for this allocation.
+ * Lower priority OOM actions may be executed to free enough RAM for this allocation.
+ * This function may take several seconds to execute, depending on
+ * the memory state. It will not return until the attempt to recover
+ * memory has completed.
+ * @param aBytesRequested The number of bytes of free memory that the client requests.
+ * @param aPluginId The ID of the plugin that may delete the allocation in event of low memory.
+ * @param aStatus The TRequestStatus (completes with the number of bytes freed (aStatus >= 0) or an error (aStatus <= 0))
+ * @return None
+ */
+ IMPORT_C void RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TRequestStatus& aStatus);
+
+ /**
+ * Cancels the asynchronous request for free memory.
+ */
+ IMPORT_C void CancelRequestFreeMemory();
+
+ /**
+ * Notify the OOM monitor that this application is not responding
+ * to the EEikCmdExit request to exit the application.
+ * This function is used by the Avkon framework's app shutter.
+ * @param aWgId the window group identifier of the app that is not exiting.
+ */
+ IMPORT_C void ThisAppIsNotExiting(TInt aWgId);
+
+ /**
+ * Notify the OOM monitor that this application has the specified priority
+ * @param aPriority the priority of the application
+ */
+ IMPORT_C void SetOomPriority(TOomPriority aPriority);
+
+ };
#endif // R_OOMMONITORSESSION_H
--- a/appsupport_plat/oom_monitor_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -99,6 +99,44 @@
};
+class COomMonitorPluginV2 : public COomMonitorPlugin
+ {
+public: // From COomMonitorPlugin
+ /**
+ * FreeRam is called when the system RAM level becomes
+ * low. This plugin is requested to help free some RAM.
+ *
+ * Note that OomMonitorV2 will not call this version of the function so it does not need to be implemented.
+ */
+ IMPORT_C virtual void FreeRam();
+
+ /**
+ * MemoryGood is called when the system RAM level becomes
+ * good after being low.The plugin may take this opportunity
+ * to start using RAM again.
+ * Nb It is assumed that the plugin will not immediately
+ * cause a large increase in memory use, but that memory may be
+ * used over time, otherwise the plugin may cause oscillation
+ * between low and good memory states.
+ */
+ virtual void MemoryGood() = 0;
+
+public:
+ /**
+ * FreeRam is called when the system RAM level becomes
+ * low. This plugin is requested to help free some RAM.
+ * Note that it is desirable to delete all memory associated with this plugin if
+ * not using a disconnected chunk. The reason for this is that by only releasing a small amount
+ * of the memory you reduce the chances of that memory being at the end of the chunk and therefore
+ * reduce the likelihood of it being released to the system.
+ * @param aBytesToFree The minimum number of bytes of free memory that the plugin should try to free.
+ */
+ virtual void FreeRam(TInt aBytesToFree) = 0;
+
+ };
+
+
+
/**
* CAppOomMonitorPlugin is a specialised OOM monitor plugin
* that sends messages to applications when the memory state
--- a/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.hrh Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/oom_monitor_plugin_api/inc/oommonitorplugin.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -22,4 +22,6 @@
#define KOomPluginInterfaceUidValue 0x10281eea
#define KOomPluginInterfaceUid (TUid::Uid(KOomPluginInterfaceUidValue))
+#define KOomPluginInterfaceV2UidValue 0x10286A80
+#define KOomPluginInterfaceV2Uid (TUid::Uid(KOomPluginInterfaceV2UidValue))
#endif // OOMMONITORPLUGIN_HRH
--- a/appsupport_plat/operation_provider_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/operation_provider_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/operation_provider_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/phonecmdhandler_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/phonecmdhandler_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/phonecmdhandler_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/restore_factory_settings_api/inc/rfsClient.h Fri Feb 26 17:43:11 2010 +0000
@@ -24,7 +24,7 @@
// INCLUDES
#include <e32base.h>
-#include "RfsHandler.h"
+#include "rfsHandler.h"
// CONSTANTS
--- a/appsupport_plat/restore_factory_settings_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/restore_factory_settings_plugin_api/inc/rfsPlugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
-#include <ecom/ECom.h>
+#include <ecom/ecom.h>
#include <rfsPluginDef.h>
// CONSTANTS
--- a/appsupport_plat/secondary_display_accfw_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_accfw_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_accfw_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_accfw_api/inc/secondarydisplay/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_startup_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_startup_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_startup_api/inc/SecondaryDisplay/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_startup_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_sysap_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_sysap_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_sysap_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_sysap_api/inc/secondarydisplay/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_system_state_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_system_state_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_system_state_api/inc/SecondaryDisplay/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/secondary_display_system_state_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/sensor_user_setting_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/sensor_user_setting_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/sensor_user_setting_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/startup_configuration_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/startup_configuration_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/startup_configuration_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_key_handler_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_key_handler_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_key_handler_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_key_handler_plugin_api/inc/sysapkeyhandlerplugininterface.h Mon Feb 08 13:38:38 2010 +0000
+++ b/appsupport_plat/system_application_key_handler_plugin_api/inc/sysapkeyhandlerplugininterface.h Fri Feb 26 17:43:11 2010 +0000
@@ -23,8 +23,8 @@
// INCLUDES
#include <ecom/ecom.h>
#include <e32base.h>
-#include <COEDEF.H>
-#include <W32STD.H>
+#include <coedef.h>
+#include <w32std.h>
#include <sysapcallback.h>
//CONSTANTS
--- a/appsupport_plat/system_application_light_control_plugin_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_light_control_plugin_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_light_control_plugin_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_notification_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_notification_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_notification_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_plugin_callback_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_plugin_callback_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_plat/system_application_plugin_callback_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/rom_files/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/sis/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bmarm/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/Bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/bc/networkstatus/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/appsupport_pub/network_status_api/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/AlarmAlert/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/AlarmAlert/Shared/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/AlarmAlert/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Client/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Client/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/ConsoleAlarmAlertServer/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file commonappservices/alarmserver/Design/EALWL to Alarm Server Porting Guide.doc has changed
--- a/commonappservices/alarmserver/Design/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file commonappservices/alarmserver/Documentation/SGL.GT0257.207_Rev1.1_Alarm_Server_Configuration_how_to.doc has changed
Binary file commonappservices/alarmserver/Documentation/alarm server test code.doc has changed
--- a/commonappservices/alarmserver/Documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/commonappservices/alarmserver/Group/backup_registration.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" standalone="yes"?>
<!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
--- a/commonappservices/alarmserver/Group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Server/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Server/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Shared/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Shared/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/SGL.GT0257.603_AlarmServer updatesTest Specification.doc has changed
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/AlarmTestServer/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/SGL.GT0257.612.Bravo_SystemSupportForUTC_Test_Case_PREQ234 Rev1.0.doc has changed
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/Documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/Integration/TestCITAlarmServer/testdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/ssm/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/unit/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/unit/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/unit/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/Test/unit/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmserver/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestAlarmSrv/AlarmCreateDelete/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestAlarmSrv/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestAlarmSrv/startconsolealarmalertserver/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/alarmservertest/TestMultipleAlarmsSuite/testdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file commonappservices/appservicesdocs/App-Services_Architectural_Description.doc has changed
Binary file commonappservices/appservicesdocs/App-Services_Functional_Specification.doc has changed
Binary file commonappservices/appservicesdocs/PIMTestCodeOrganisationHowTo.doc has changed
Binary file commonappservices/appservicesdocs/SGL.GT0109.110_Rev1.2_AppServices_Subsystem_Release_Note.doc has changed
Binary file commonappservices/appservicesdocs/SGL.GT228.017_Migration Guide for v9.1 Time Handling APIs.doc has changed
--- a/commonappservices/appservicesdocs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/backuprestorenotification/tsrc/Integration/TestBackupRestoreNotification/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/Group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/Inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/TestServer/Client/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/TestServer/Inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/TestServer/Server/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/TestServer/Test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/commonappservices/coreappstest/preparedrivec/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file contenthandling/webrecognisers/Documentation/Recogniser Test Specifications.doc has changed
--- a/contenthandling/webrecognisers/Documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/Group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_ebookmark/TestData/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_ebookmark/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_recogtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_recwap/TestData/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_recwap/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_recweb/TestData/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_recweb/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/Test/t_weburlrec/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/eBookmark/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file contenthandling/webrecognisers/eBookmark/ebookmark.doc has changed
--- a/contenthandling/webrecognisers/eBookmark/examples/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/recweb/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/waprecogniser/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contenthandling/webrecognisers/weburlrec/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/CenRep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/basicoperationsplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfactivatorengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfclient/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfcontextsourcemanager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfcontextsourcesettingsmanager/cfcontextsourcesettingsmanagerimpl.h Mon Feb 08 13:38:38 2010 +0000
+++ b/contextframework/cfw/inc/cfcontextsourcesettingsmanager/cfcontextsourcesettingsmanagerimpl.h Fri Feb 26 17:43:11 2010 +0000
@@ -23,7 +23,7 @@
#include "cfcontextsourcesettingsmanager.h"
-#include <GMXMLParser.h>
+#include <gmxmlparser.h>
class RFs;
class CMDXMLNode;
--- a/contextframework/cfw/inc/cfcontextsourcesettingsmanager/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfoperationpluginservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfscriptengine/CFScriptHandler.h Mon Feb 08 13:38:38 2010 +0000
+++ b/contextframework/cfw/inc/cfscriptengine/CFScriptHandler.h Fri Feb 26 17:43:11 2010 +0000
@@ -21,7 +21,7 @@
#include <f32file.h>
#include <badesca.h>
-#include <GMXMLParser.h>
+#include <gmxmlparser.h>
#include "CFScriptEngineInterface.h"
#include "cfstarterobserver.h"
--- a/contextframework/cfw/inc/cfscriptengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfserver/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/cfservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/inc/common/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/basicoperationsplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfactivatorengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfclient/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfcontextsourcemanager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfcontextsourcesettingsmanager/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfoperationpluginservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfscriptengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfserver/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/src/cfservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/cfwtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/cfwtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_BasicOperationsPlugIn/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_CFClient/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceManager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_CFContextSourceSettingsManager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_CFOperationPluginManager/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/MT_CFScriptEngine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestActionPlugIn/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/TestContextSourcePlugIn/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFContextManager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CCFEngine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CFActivatorEngine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceManager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CFContextSourceSettingsManager/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/UT_CFOperationPluginManager/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/common/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/data/testscripts/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/data/testsettings/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/data/testsettings/settingupgrade/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfactionplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfservices/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/action_v2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/contextsource_v2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/mt_cfsisupgrade/operation_v3/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/basic/sis/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfw/tsrc/public/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h Mon Feb 08 13:38:38 2010 +0000
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/ApplicationStateSourcePlugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -29,14 +29,30 @@
#include <cfcontextsourceplugin.h>
#include <cfcontextobject.h>
#include <cenrepnotifyhandler.h>
-
+#include <w32std.h>
+#include <apgwgnam.h>
#include "cfapplicationstatesettings.h"
#include "uidorientationpair.h"
// FORWARD DECLARATIONS
class CRepository;
class CCenRepNotifyHandler;
+// FORWARD DECLARATIONS
+class CWsEventHandler;
+NONSHARABLE_CLASS( MWsEventObserver )
+ {
+public:
+
+ /**
+ * Handles window server event.
+ *
+ * @since S60 5.0
+ * @param aEvent New window server event.
+ * @return None.
+ */
+ virtual void HandleWsEventL( RWsSession& aWsSession ) = 0;
+ };
// CLASS DECLARATION
/**
@@ -50,7 +66,7 @@
*/
NONSHARABLE_CLASS( CApplicationStateSourcePlugIn ):
public CCFContextSourcePlugIn,
- public MVwsSessionWrapperObserver,
+ public MWsEventObserver,
public MCenRepNotifyHandlerCallback
{
public: // Constructors and destructor
@@ -75,10 +91,7 @@
// @see CCFContextSourcePlugIn
void InitializeL();
-public: // From MVwsSessionWrapperObserver
- // @see MVwsSessionWrapperObserver
- void HandleViewEventL( const TVwsViewEvent& aEvent );
public: // From MCenRepNotifyHandlerCallback
@@ -110,7 +123,7 @@
// Initialize the fg application context
void InitializeFgApplicationL();
-
+ void HandleWsEventL( RWsSession& aWsSession );
// Handles the view server event
void DoHandleViewEventL( const TVwsViewEvent& aEvent );
@@ -148,6 +161,7 @@
// Foreground application setting list
RApplicationStateSettingsPointerArray iApplicationSettings;
+ CWsEventHandler* iWsEventHandler;
// Previous foreground application orientation
TPtrC iPreviousOrientation;
@@ -164,5 +178,67 @@
// KCRUidDefaultAppOrientation listener
CCenRepNotifyHandler* iCRAppOrientationListener;
};
+/**
+ * Listens events from window server and forwards them to observer.
+ */
+NONSHARABLE_CLASS( CWsEventHandler ): public CActive
+ {
+public:
+ /**
+ * Symbian two phased constructors.
+ *
+ * @since S60 5.0
+ * @param None.
+ * @return CDisplayServiceUILayout
+ */
+ static CWsEventHandler* NewL( MWsEventObserver& aObserver );
+ static CWsEventHandler* NewLC( MWsEventObserver& aObserver );
+
+ /**
+ * C++ destructor.
+ */
+ virtual ~CWsEventHandler();
+
+public:
+
+ /**
+ * Start event listening.
+ *
+ * @since S60 5.0
+ * @param None.
+ * @return None.
+ */
+ void IssueRequest();
+
+protected:
+
+ // @see CActive
+ virtual void RunL();
+
+ // @see CActive
+ virtual void DoCancel();
+
+ // @see CActive
+ virtual TInt RunError( TInt aError );
+
+private:
+
+ CWsEventHandler( MWsEventObserver& aObserver );
+ void ConstructL();
+
+private: // Data
+
+ /** Observer */
+ MWsEventObserver& iObserver;
+
+ /** Window server session */
+ RWsSession iWsSession;
+
+ /** Window group for receiving window server events */
+ RWindowGroup* iWindowGroup;
+
+ /** Window group name to hide it from the task manager */
+ CApaWindowGroupName* iWindowGroupName;
+ };
#endif // C_APPLICATIONSTATESOURCEPLUGIN_H
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/ApplicationStateSourcePlugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -26,10 +26,10 @@
#include <apgwgnam.h>
#include <applicationorientation.h>
#include <aknappui.h>
+#include <coedef.h>
#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <vwsdefpartner.h>
#endif
-
#include "ApplicationStateSourcePlugin.h"
#include "ApplicationStateSourceContextDef.h"
#include "ContextFrameworkPrivateCRKeys.h"
@@ -82,6 +82,8 @@
iDefaultAppName = KApplicationStateDefaultValue().AllocL();
iDefaultViewName = KApplicationStateDefaultValue().AllocL();
iContext = CCFContextObject::NewL();
+ iWsEventHandler = CWsEventHandler::NewL( *this );
+ iWsEventHandler->IssueRequest();
}
// -----------------------------------------------------------------------------
@@ -131,7 +133,7 @@
delete iCRAppOrientation;
iApplicationSettings.ResetAndDestroy();
delete iSettings;
- delete iVws;
+
delete iDefaultViewName;
delete iDefaultAppName;
delete iApplDefaultState;
@@ -223,8 +225,7 @@
iSettings = NULL;
}
- iVws = CVwsSessionWrapper::NewL( *this );
- iVws->NotifyNextActivation();
+
}
// -----------------------------------------------------------------------------
@@ -351,33 +352,7 @@
}
}
-// -----------------------------------------------------------------------------
-// CApplicationStateSourcePlugIn::HandleViewEventL
-// Maps view activations to contexts.
-// -----------------------------------------------------------------------------
-//
-void CApplicationStateSourcePlugIn::HandleViewEventL(
- const TVwsViewEvent& aEvent )
- {
- FUNC_LOG;
- // Renew listening
- iVws->NotifyNextActivation();
-
- // Handle the view server event
- DoHandleViewEventL( aEvent );
-
- // Log event members!
- INFO_1( "HandleViewEventL: eventType: [%d]", aEvent.iEventType );
-
- INFO_2( "HandleViewEventL: viewOne [appUid:%S] [viewUid%S]",
- &(const TDesC&)aEvent.iViewOneId.iAppUid.Name(),
- &(const TDesC&)aEvent.iViewOneId.iViewUid.Name() );
-
- INFO_2( "HandleViewEventL: viewTwo [appUid:%S] [viewUid%S]",
- &(const TDesC&)aEvent.iViewTwoId.iAppUid.Name(),
- &(const TDesC&)aEvent.iViewTwoId.iViewUid.Name() );
- }
//------------------------------------------------------------------------------
// CApplicationStateSourcePlugIn::HandleNotifyGeneric
@@ -745,3 +720,223 @@
}
return index;
}
+void CApplicationStateSourcePlugIn::HandleWsEventL( RWsSession& aWsSession )
+ {
+ TUid appUid( TUid::Null() );
+ TPtrC bgApp( *iDefaultAppName );
+ TPtrC fgApp( *iDefaultAppName );
+ TPtrC fgView( *iDefaultViewName );
+
+ TInt focWndGrp( aWsSession.GetFocusWindowGroup() );
+ CApaWindowGroupName* wndGrpName = CApaWindowGroupName::NewL( aWsSession );
+ CleanupStack::PushL( wndGrpName );
+ wndGrpName->ConstructFromWgIdL( focWndGrp );
+ appUid = wndGrpName->AppUid();
+
+ for ( TInt i = 0; i < iApplicationSettings.Count(); ++i )
+ {
+ CCFApplicationStateSettings* appSettings = iApplicationSettings[ i ];
+ if ( appUid == appSettings->Uid() )
+ {
+ fgApp.Set( appSettings->Name() );
+ appSettings->GetViewName( appUid, fgView );
+ bgApp.Set( iPreviousForegroundApplication );
+ break;
+ }
+ }
+ TBool publishFgApp( EFalse );
+ TBool publishFgView( EFalse );
+ TBool publishBgApp( EFalse );
+
+ if ( iPreviousForegroundApplication.Compare( fgApp ) != 0 )
+ {
+ publishFgApp = ETrue;
+ }
+ else if ( iPreviousForegroundView.Compare( fgView ) != 0 )
+ {
+ publishFgView = ETrue;
+ }
+
+ if ( bgApp != fgApp )
+ {
+ publishBgApp = ETrue;
+ }
+
+ iPreviousForegroundApplication.Set( fgApp ); // Store for next round
+ iPreviousForegroundView.Set( fgView );
+
+ RThread thread;
+
+ if ( publishFgApp )
+ {
+ iContext->SetTypeL( KApplicationStateForegroundApplicationType );
+ iContext->SetValueL( fgApp );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ if ( publishFgApp || publishFgView )
+ {
+ iContext->SetTypeL( KApplicationStateForegroundApplicationViewType );
+ iContext->SetValueL( fgView );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ if ( publishBgApp )
+ {
+ iContext->SetTypeL( KApplicationStateBackgroundApplicationType );
+ iContext->SetValueL( bgApp );
+ iCF.PublishContext( *iContext, thread );
+ }
+
+ thread.Close();
+ CleanupStack::PopAndDestroy( wndGrpName );
+
+ }
+
+// ======================== CWsEventHandler ========================
+
+// ---------------------------------------------------------------------------
+// C++ constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::CWsEventHandler( MWsEventObserver& aObserver ):
+ CActive( CActive::EPriorityStandard ),
+ iObserver( aObserver )
+ {
+ CActiveScheduler::Add( this );
+ }
+
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor.
+// ---------------------------------------------------------------------------
+//
+void CWsEventHandler::ConstructL()
+ {
+ // Connect to window server server
+ User::LeaveIfError( iWsSession.Connect() );
+
+ // Construct window group
+ iWindowGroup = new( ELeave ) RWindowGroup( iWsSession );
+ User::LeaveIfError( iWindowGroup->Construct( (TUint32)this, EFalse ) );
+ User::LeaveIfError( iWindowGroup->EnableGroupChangeEvents() );
+ iWindowGroup->SetOrdinalPosition( 0, ECoeWinPriorityNeverAtFront );
+ iWindowGroup->EnableReceiptOfFocus( EFalse );
+
+ // Hide the invisible window from the task manager
+ iWindowGroupName = CApaWindowGroupName::NewL( iWsSession );
+ iWindowGroupName->SetHidden( ETrue );
+ iWindowGroupName->SetWindowGroupName( *iWindowGroup );
+
+ }
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewL( MWsEventObserver& aObserver )
+ {
+ CWsEventHandler* self = CWsEventHandler::NewLC( aObserver );
+ CleanupStack::Pop( self );
+
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// Symbian two phased constructor.
+// Leaves pointer in the cleanup stack.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler* CWsEventHandler::NewLC( MWsEventObserver& aObserver )
+ {
+ CWsEventHandler* self = new ( ELeave ) CWsEventHandler( aObserver );
+ CleanupStack::PushL( self );
+ self->ConstructL();
+
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// C++ destructor.
+// ---------------------------------------------------------------------------
+//
+CWsEventHandler::~CWsEventHandler()
+ {
+ Cancel();
+
+ // Cleanup window group name
+ delete iWindowGroupName;
+
+ // Cleanup window group
+ if( iWindowGroup )
+ {
+ iWindowGroup->DisableGroupChangeEvents();
+ iWindowGroup->Close();
+ delete iWindowGroup;
+ }
+
+ // Cleanup window server session
+ iWsSession.Close();
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::IssueRequest
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::IssueRequest()
+ {
+ // Request events from window server
+ iWsSession.EventReady( &iStatus );
+ SetActive();
+ }
+
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunL
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::RunL()
+ {
+ TInt err = iStatus.Int();
+ if( err == KErrNone )
+ {
+ // No errors occured, fetch event
+ TWsEvent wsEvent;
+ iWsSession.GetEvent( wsEvent );
+
+ // Continue listening
+ IssueRequest();
+ switch (wsEvent.Type())
+ {
+ case EEventWindowGroupsChanged :
+ // Forward event to observer
+ iObserver.HandleWsEventL( iWsSession );
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::DoCancel
+//------------------------------------------------------------------------------
+//
+void CWsEventHandler::DoCancel()
+ {
+ // Cancel event ready from window server
+ iWsSession.EventReadyCancel();
+ }
+
+//------------------------------------------------------------------------------
+// CWsEventHandler::RunError
+//------------------------------------------------------------------------------
+//
+TInt CWsEventHandler::RunError( TInt /*aError*/ )
+ {
+ // Issue a new request, other error handling is not performed since the
+ // problem has occured in the observer code
+ IssueRequest();
+
+ return KErrNone;
+ }
+
+
--- a/contextframework/cfwplugins/ApplicationStateSourcePlugIn/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/context/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/CallStateSourcePlugIn/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/context/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/PSStateSourcePlugIn/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/cenrepsourceplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/displaysourceplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/orientationactionplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/context/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/sensorsourceplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/cfwplugins/vibraactionplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/contextframework/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/data/2001A273.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,48 @@
+
+
+ // Copyright (c) 2008-2009 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"
+ // which accompanies this distribution, and is available
+ // at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ // Initial Contributors:
+ // Nokia Corporation - initial contribution.
+ // Contributors:
+ // Description:
+ // ECOM DLL UID: 0x2001A273
+ // Interface UID : 0x2001CBEE
+ // Implementation UID : 0x2001A274
+
+
+#include "../inc/atcmdpluginuids.hrh"
+#include <ecom/registryinfo.rh>
+
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ // UID for the DLL
+ dll_uid = KUidATCmdEcomDll;
+ // Declare array of interface info
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ // UID of interface that is implemented
+ interface_uid = 0x2001CBEE; //ATEXT_INTERFACE_DUN_UID
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KUidATCmdEcomImpl1;
+ version_no = 1;
+ display_name = " CKPD command Imp";
+ default_data = "PAT+CKPD|PAT+CTSA|PAT+CBKLT?|PAT+CBKLT";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/data/atcmdpluginresource.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,252 @@
+
+ // Copyright (c) 2008-2009 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"
+ // which accompanies this distribution, and is available
+ // at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ // Initial Contributors:
+ // Nokia Corporation - initial contribution.
+ // Contributors:
+ // Description: ATCmdplugin resource definitions.
+
+// RESOURCE IDENTIFIER
+NAME ATCD
+
+#include <eikon.rh>
+#include <e32keys.h>
+#include <ncp_consts.hrh>
+#include "atcmdplugin.rh"
+
+
+// CONSTANTS
+
+// MACROS
+
+// RESOURCE DEFINITIONS
+
+//-----------------------------------------------------------------------------
+//
+// -
+// Resource signature
+//
+//-----------------------------------------------------------------------------
+//
+RESOURCE RSS_SIGNATURE {}
+
+//-----------------------------------------------------------------------------
+//
+// -
+// Resource filename
+//
+//-----------------------------------------------------------------------------
+//
+RESOURCE TBUF
+ {
+ buf = "atcmdpluginresource";
+ }
+
+
+
+// -----------------------------------------------------------------------------
+//
+// r_atcmdplugin_translationtable
+// Translation table
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE ARRAY r_atcmdplugin_translationtable
+ {
+ items =
+ {
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyHash;
+ text = "#";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '%';
+ text = "%";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyNkpAsterisk;
+ text = "*";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '0';
+ text = "0";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '1';
+ text = "1";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '2';
+ text = "2";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '3';
+ text = "3";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '4';
+ text = "4";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '5';
+ text = "5";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '6';
+ text = "6";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '7';
+ text = "7";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '8';
+ text = "8";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = '9';
+ text = "9";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyLeftArrow;
+ text = "<";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyRightArrow;
+ text = ">";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EKeyNull;
+ text = "\"";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EKeyNull;
+ text = ";";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ // Escape character for manufacturer specific keys
+ code = -1;
+ text = ":";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = 'P';
+ text = "w";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDevice0; // left SK
+ text = "[";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDevice1; // right SK
+ text = "]";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyIncVolume;
+ text = "u";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDecVolume;
+ text = "d";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyNo;
+ text = "c";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyYes;
+ text = "s";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyNo;
+ text = "e";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDownArrow;
+ text = "v";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyUpArrow;
+ text = "^";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyApplication0; // menu
+ text = "m";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDevice2; // power
+ text = "p";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = BSW_EStdProductKey09; // mute
+ text = "q";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyNkpPlus;
+ text = ":+";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyBackspace;
+ text = "y";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDevice1;
+ text = "y]";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EStdKeyDevice3;
+ text = ":J";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EKeyNull;
+ text = "\n";
+ },
+ ATCMDPLUGIN_TRANSLATION
+ {
+ code = EKeyNull;
+ text = "\r";
+ }
+ };
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/group/atcmdplugin.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,66 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :
+ *
+ */
+
+
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+#include "../inc/atcmdpluginuids.hrh"
+
+CAPABILITY CAP_ECOM_PLUGIN
+VENDORID VID_DEFAULT
+TARGET atcmdplugin.dll
+TARGETTYPE PLUGIN
+UID 0x10009D8D KUidATCmdEcomDll
+
+SOURCEPATH ../src
+SOURCE main.cpp
+SOURCE atcmdplugin.cpp
+SOURCE atcmd.cpp
+
+USERINCLUDE ../inc
+
+MW_LAYER_SYSTEMINCLUDE
+
+START RESOURCE ../data/2001A273.rss
+TARGET atcmdplugin.rsc
+END
+
+//not actually localized
+//LANG SC
+
+START RESOURCE ../data/atcmdpluginresource.rss
+HEADER
+TARGETPATH APP_RESOURCE_DIR
+END // RESOURCE
+
+LIBRARY apgrfx.lib
+LIBRARY cone.lib
+LIBRARY ecom.lib
+LIBRARY eikcore.lib
+LIBRARY euser.lib
+LIBRARY atextpluginbase.lib
+LIBRARY bafl.lib
+LIBRARY efsrv.lib
+LIBRARY ws32.lib
+LIBRARY hwrmlightclient.lib
+LIBRARY HAL.lib
+
+DEBUGLIBRARY flogger.lib
+
+
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,34 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :This file provides the information required for building the
+ * atcmdpluginecom.dll
+ *
+ */
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+../rom/atcmdplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(atcmdplugin.iby)
+
+PRJ_TESTEXPORTS
+
+PRJ_MMPFILES
+atcmdplugin.mmp
+
+PRJ_TESTMMPFILES
+
+// End of File
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmd.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :
+ *
+ */
+
+
+#ifndef __ATCMD_H
+#define __ATCMD_H
+
+// INCLUDES
+#include <e32base.h>
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+class TATCkpdCmd
+ {
+ public:
+ inline TATCkpdCmd() {}
+ public:
+ TInt iCode;
+ TTimeIntervalMicroSeconds32 iStrokeDelay;
+ TTimeIntervalMicroSeconds32 iStrokeTime;
+ };
+
+class CATCmdTranslation
+ : public CBase
+ {
+ public:
+ CATCmdTranslation( HBufC8& aParam, const TInt aCode );
+ ~CATCmdTranslation();
+ public:
+ TInt Code() const;
+ TPtrC8 Param() const;
+ private:
+ HBufC8* iParam;
+ const TInt iCode;
+
+ };
+
+
+
+#endif // __ATCMD_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,260 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description : ATCmdplugin class declaration.
+ *
+ */
+
+
+
+#ifndef __ATCMDPLUGINECOM_H
+#define __ATCMDPLUGINECOM_H
+
+// INCLUDES
+#include <atextpluginbase.h>
+#include <w32std.h>
+#include <hwrmlight.h>
+#include "matcmdtimer.h"
+#include "atcmd.h"
+
+// FORWARD DECLARATIONS
+class CCoeEnv;
+
+// CLASS DECLARATION
+
+/**
+* CATCmdPluginEcom
+* -
+*/
+class CATCmdPluginEcom : public CATExtPluginBase, public MATCmdTimer, public MHWRMLightObserver
+ {
+ public: // Constructors, destructor
+ /**
+ * Two-phased constructor.
+ */
+ static CATCmdPluginEcom* NewL();
+
+ /**
+ * C++ Destructor.
+ */
+ ~CATCmdPluginEcom();
+
+ /**
+ * From MHWRMLightObserver
+ */
+ void LightStatusChanged (TInt aTarget, CHWRMLight::TLightStatus aStatus);
+
+ void HandleCommandCancel();
+
+ void ReportConnectionName( const TDesC8& aName );
+
+
+ TInt NextReplyPartLength();
+
+ /**
+ * Gets the next part of reply initially set by HandleCommandComplete().
+ * Length of aNextReply must be equal or less than KDefaultCmdBufLength.
+ *
+ * @since S60 5.0
+ * @param aNextReply Next reply
+ * @return Symbian error code on error, KErrNone otherwise
+ */
+ TInt GetNextPartOfReply( RBuf8& aNextReply ) ;
+
+ /**
+ * Receives unsolicited results. Cancelling of the pending request is done
+ * by ReceiveUnsolicitedResultCancel(). The implementation in the extension
+ * plugin should be asynchronous.
+ *
+ * @since S60 5.0
+ * @return None
+ */
+ void ReceiveUnsolicitedResult();
+
+ /**
+ * Cancels a pending ReceiveUnsolicitedResult request.
+ *
+ * @since S60 5.0
+ * @return None
+ */
+ void ReceiveUnsolicitedResultCancel();
+
+ /**
+ * Reports NVRAM status change to the plugins.
+ *
+ * @since S60 5.0
+ * @param aNvram New NVRAM status. Each call of this function is a result
+ * of DUN extracting the form notified by
+ * CATExtCommonBase::SendNvramStatusChange(). Each of the
+ * settings from SendNvramStatusChange() is separated to
+ * one call of ReportNvramStatusChange().
+ * @return None
+ */
+ void ReportNvramStatusChange( const TDesC8& aNvram );
+
+ /**
+ * Reports about external handle command error condition.
+ * This is for cases when for example DUN decided the reply contained an
+ * error condition but the plugin is still handling the command internally.
+ * Example: in command line "AT+TEST;ATDT1234" was given. "AT+TEST" returns
+ * "OK" and "ATDT" returns "CONNECT". Because "OK" and "CONNECT" are
+ * different reply types the condition is "ERROR" and DUN ends processing.
+ * This solution keeps the pointer to the last AT command handling plugin
+ * inside ATEXT and calls this function there to report the error.
+ * It is to be noted that HandleCommandCancel() is not sufficient to stop
+ * the processing as the command handling has already finished.
+ *
+ * @since S60 5.0
+ * @return None
+ */
+ void ReportExternalHandleCommandError();
+
+
+
+ enum TPluginStatus
+ {
+ ECmdCkpd,
+ ECmdCbklt,
+ EKeepAlive
+ };
+
+ enum TLightStatus
+ {
+ ELightUninitialized = -1,
+ ELightOff = 0,
+ ELightOnWithDuration,
+ ELightOn
+ };
+
+ private: // From base classes
+
+ // @see CCFActionPlugIn
+ void HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool aReplyNeeded );
+
+ // @see CCFActionPlugIn
+ TBool IsCommandSupported( const TDesC8& aCmd );
+
+ private: // New implementation
+
+ /**
+ * AT commands handling
+ * @param aCmd
+ * @param aReply
+ */
+ void HandleCommandL( const TDesC8& aCmd );
+
+
+ private: // CATCmdTimer
+ /**
+ * CATCmdTimer
+ */
+ class CATCmdTimer
+ : public CTimer
+ {
+ public: // Constructor, destructor
+ /**
+ * Constructor
+ */
+ CATCmdTimer( MATCmdTimer& aObserver, TInt aRelatedCommand );
+
+ /**
+ * 2nd phase constructor
+ */
+ void ConstructL();
+
+ public: // from CActive
+ /**
+ * Timer callback
+ */
+ virtual void RunL();
+
+ private: // data
+ /** */
+ MATCmdTimer& iObserver;
+ TInt iRelatedCommand;
+ };
+
+ private: // from MATCmdTimer
+ void TimerExpiredL( TInt aRelatedCommand );
+
+ private:
+ void LoadResourcesL();
+
+ void HandleCkpdCommandL( const TDesC8& aCmd );
+
+ void HandleCbkltCommandL( const TDesC8& aCmd );
+ void HandleCtsaCommandL( const TDesC8& aCmd );
+
+ void ParseParametersL( const TDesC8& aCmd,
+ TInt& aStrokeTime,
+ TInt& aStrokeDelay );
+
+ void SendKeyL();
+
+ void SendNextKeyL();
+
+ void SimulateRawEventL( TKeyEvent& aKey, TEventCode aEvent );
+
+ void EnableBackLight();
+
+ void DisableBackLight();
+
+ private:
+ /**
+ * @param aCmd
+ */
+ //void ATCmdPNDRecv( CATCommand& aCmd );
+
+ private: // Constructors
+ /**
+ * C++ Constructor
+ */
+ CATCmdPluginEcom();
+
+ /**
+ * Symbian 2nd phase constructor
+ */
+ void ConstructL();
+
+ private: // Data
+ /** Owns: */
+ CArrayFix<TATCkpdCmd>* iCkpdCmdArray;
+
+ /** Owns: */
+ CATCmdTimer* iKpdTimer;
+
+ CATCmdTimer* iBkltTimer;
+
+ CATCmdTimer* iKeepAliveTimer;
+
+ /** Owns: */
+ CArrayPtr<CATCmdTranslation>* iTranslations;
+
+ TEventCode iLastEvent;
+
+ /** Owns: */
+ CHWRMLight* iLight;
+
+ RWsSession iWsSession;
+
+ TPluginStatus iCmdReceived;
+
+ TLightStatus iLightStatus;
+
+ TInt iDuration;
+
+ RBuf8* iReplyBuf;
+ };
+
+#endif // __ATCMDPLUGINECOM_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdplugin.rh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,36 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :Resource structure definitions for ATCmdplugin
+ *
+ */
+
+#ifndef __AVKON_HRH__
+#include <avkon.hrh>
+#endif
+
+#if !defined(__BADEF_RH__)
+#include <BADEF.RH>
+#endif
+
+#if !defined(__UIKON_HRH__)
+#include <uikon.hrh>
+#endif
+
+
+STRUCT ATCMDPLUGIN_TRANSLATION
+ {
+ LONG code = 0;
+ LTEXT8 text;
+ }
+
+// End Of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/atcmdpluginuids.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description: Collection of uid's
+ *
+ */
+
+#ifndef __ATCMDPLUGINUIDS_HRH
+#define __ATCMDPLUGINUIDS_HRH
+
+
+// INCLUDES
+#define KUidATCmdEcomDll 0x2001A273
+#define KUidATCmdEcomImpl1 0x2001A274
+#define KUidT_ATCmdExe 0x2001A275
+// Reserved 0x2001A276
+
+
+#endif // __ATCMDPLUGINUIDS_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/debug.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,227 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :tracing and debuging definitions.
+ *
+ */
+
+
+#ifndef DEBUGTRACE_H
+#define DEBUGTRACE_H
+
+#include <e32base.h>
+#include <e32svr.h>
+
+#ifdef _DEBUG
+
+#include <flogger.h>
+
+_LIT(KLogFile,"atcmdplugin.txt");
+_LIT(KLogDir,"atcmdplugin");
+_LIT(KATDebugFile, "log.txt" );
+_LIT(KATDebugDir, "atcmdplugin" );
+
+_LIT(KTracePrefix16, "[ATCmdPlugin] ");
+_LIT8(KTracePrefix8, "[ATCmdPlugin] ");
+_LIT8(KFuncFormat8, ">< %S");
+_LIT8(KFuncThisFormat8, ">< %S, [0x%08X]");
+_LIT8(KFuncEntryFormat8, "-> %S");
+_LIT8(KFuncEntryThisFormat8, "-> %S, [0x%08X]");
+_LIT8(KFuncEntryArgFormat8, "-> %S, (%S)");
+_LIT8(KFuncExitFormat8, "<- %S");
+_LIT(KPanicCategory, "ATCmdPlugin");
+_LIT8(KPanicPrefix8, "PANIC code ");
+_LIT8(KLeavePrefix8, "LEAVE code ");
+
+const TInt KMaxLogLineLength = 256;
+
+// Trace options
+#define KPRINTERROR 0x00000001 // Print error
+#define KPRINTINFO 0x00000002 // Print function trace
+#define KPRINTSTATE 0x00000004 // Print state machine infos
+#define KPRINTWARNING 0x00000008 // Print warnings
+
+//#define USE_FILE_LOGGING
+
+const TInt KTraceMask = KPRINTERROR | KPRINTINFO | KPRINTSTATE | KPRINTWARNING;
+
+NONSHARABLE_CLASS(TOverflowTruncate16) : public TDes16Overflow
+ {
+public:
+ void Overflow(TDes16& /*aDes*/) {}
+ };
+
+NONSHARABLE_CLASS(TOverflowTruncate8) : public TDes8Overflow
+ {
+public:
+ void Overflow(TDes8& /*aDes*/) {}
+ };
+
+inline void Trace(TRefByValue<const TDesC16> aFmt, ...)
+ {
+ VA_LIST list;
+ VA_START(list,aFmt);
+ RBuf16 buf;
+ buf.Create(KMaxLogLineLength);
+ buf.Zero();
+ buf.Append(KTracePrefix16);
+ TOverflowTruncate16 overflow;
+ buf.AppendFormatList(aFmt,list,&overflow);
+ RDebug::Print(buf);
+#ifdef USE_FILE_LOGGING
+ RFileLogger::Write(KLogDir, KLogFile, EFileLoggingModeAppend, buf);
+#endif
+ buf.Close();
+ }
+
+inline void Trace(TRefByValue<const TDesC8> aFmt, ...)
+ {
+ VA_LIST list;
+ VA_START(list, aFmt);
+ TOverflowTruncate8 overflow;
+ RBuf8 buf8;
+ buf8.Create(KMaxLogLineLength);
+ buf8.Zero();
+ buf8.Append(KTracePrefix8);
+ buf8.AppendFormatList(aFmt, list, &overflow);
+ RDebug::RawPrint(buf8);
+#ifdef USE_FILE_LOGGING
+ RFileLogger::Write(KLogDir, KLogFile, EFileLoggingModeAppend, buf8);
+#endif
+ buf8.Close();
+ }
+
+inline void TracePanic(
+ char* aFile,
+ TInt aLine,
+ TInt aPanicCode,
+ const TDesC& aPanicCategory)
+ {
+ TPtrC8 fullFileName((const TUint8*)aFile);
+ TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+ RBuf8 buf;
+ buf.Create(KMaxLogLineLength);
+ buf.Zero();
+ buf.Append(KPanicPrefix8);
+ buf.AppendFormat(_L8("%d at line %d in file %S"), aPanicCode, aLine, &fileName);
+ Trace(buf);
+ buf.Close();
+ User::Panic(aPanicCategory, aPanicCode);
+ }
+
+inline void TraceLeave(char* aFile, TInt aLine, TInt aReason)
+ {
+ TPtrC8 fullFileName((const TUint8*)aFile);
+ TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1);
+ RBuf8 buf;
+ buf.Create(KMaxLogLineLength);
+ buf.Zero();
+ buf.Append(KLeavePrefix8);
+ buf.AppendFormat(_L8("%d at line %d in file %S"), aReason, aLine, &fileName);
+ Trace(buf);
+ buf.Close();
+ User::LeaveIfError(aReason);
+ }
+
+inline TBuf8<64> ArgFormat(TRefByValue<const TDesC8> aFmt, ...)
+ {
+ TOverflowTruncate8 overflow;
+ TBuf8<64> buf8;
+ buf8.Format(aFmt, &overflow);
+ return buf8;
+ }
+
+#define TRACE_INFO(p) {if(KTraceMask & KPRINTINFO) Trace p;}
+
+#define TRACE_ERROR(p) {if(KTraceMask & KPRINTERROR) Trace p;}
+
+#define TRACE_STATE(p) {if(KTraceMask & KPRINTSTATE) Trace p;}
+
+#define TRACE_WARNING(p) {if(KTraceMask & KPRINTWARNING) Trace p;}
+
+#define TRACE_INFO_SEG(p) {if(KTraceMask & KPRINTINFO) p;}
+
+#define TRACE_ASSERT(GUARD, CODE) {if (!(GUARD)) \
+ TracePanic(__FILE__, __LINE__, CODE, KPanicCategory);}
+
+#define PANIC(CODE) TracePanic(__FILE__, __LINE__, CODE, KPanicCategory)
+
+#define LEAVE_IF_ERROR(REASON) {if (REASON) \
+ TraceLeave(__FILE__, __LINE__, REASON);}
+
+#define LEAVE(REASON) TraceLeave(__FILE__, __LINE__, REASON)
+
+#define TRACE_FUNC_ENTRY {if(KTraceMask & KPRINTINFO) { \
+ TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+ Trace(KFuncEntryFormat8, &ptr8);}}
+
+#define TRACE_FUNC_ENTRY_THIS {if(KTraceMask & KPRINTINFO) {\
+ TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+ Trace(KFuncEntryThisFormat8, &ptr8, this);}}
+
+#define TRACE_FUNC_EXIT {if(KTraceMask & KPRINTINFO) {\
+ TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+ Trace(KFuncExitFormat8, &ptr8);}}
+
+#define TRACE_FUNC {if(KTraceMask & KPRINTINFO) { \
+ TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+ Trace(KFuncFormat8, &ptr8);}}
+
+#define TRACE_FUNC_THIS {if(KTraceMask & KPRINTINFO) {\
+ TPtrC8 ptr8((TUint8*)__PRETTY_FUNCTION__); \
+ Trace(KFuncThisFormat8, &ptr8, this);}}
+
+#define TRACE_FUNC_ARG(a) { if(KTraceMask & KPRINTINFO) { \
+ TPtrC8 func( (TUint8*) __PRETTY_FUNCTION__ ); \
+ TPtrC8 arg( ArgFormat a ); \
+ Trace( KFuncEntryArgFormat8, &func, &arg ); } }
+
+#define RETURN_IF_ERR(ERR) {if(ERR) {Trace(_L8(" RETURN %d at file %S line %d"), ERR, &(TPtrC8((const TUint8*)__FILE__)), __LINE__); return ERR;}}
+
+#else // ! _DEBUG
+
+#define TRACE_INFO(p)
+
+#define TRACE_ERROR(p)
+
+#define TRACE_STATE(p)
+
+#define TRACE_WARNING(p)
+
+#define TRACE_INFO_SEG(p)
+
+#define TRACE_ASSERT(GUARD, CODE)
+
+#define PANIC(CODE) {User::Panic(KPanicCategory, CODE);}
+
+#define LEAVE_IF_ERROR(REASON) {static_cast<void>(User::LeaveIfError(REASON));}
+
+#define LEAVE(REASON) {static_cast<void>(User::Leave(REASON));}
+
+#define TRACE_FUNC_ENTRY
+
+#define TRACE_FUNC_ENTRY_THIS
+
+#define TRACE_FUNC_EXIT
+
+#define TRACE_FUNC
+
+#define TRACE_FUNC_THIS
+
+#define TRACE_FUNC_ARG(a)
+
+#define RETURN_IF_ERR(ERR) {if(ERR) return ERR;}
+#endif // _DEBUG
+
+#endif // DEBUGTRACE_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/inc/matcmdtimer.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,38 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :Abstract interface for MATCmdTimer callback functionality
+ *
+ */
+
+
+
+#ifndef __MATCMDTIMER_H
+#define __MATCMDTIMER_H
+
+// INCLUDES
+#include <e32std.h>
+
+// FORWARD DECLARATIONS
+
+// CLASS DECLARATION
+
+class MATCmdTimer
+ {
+ public:
+ virtual void TimerExpiredL( TInt aRelatedCommand ) = 0;
+ };
+
+#endif // __MATCMDTIMER_H
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/readme.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,4 @@
+- AT Command plugin implements AT commands for AT+CKPD, AT+CBKLT, AT+CTSA
+- This plugin will not be part of SF and will be moved to ext folder later
+- To test this plugin we need to manually build
+- Optionally, after building we can generate a sisx file and use it for testing. Look at ATCmdPlugin\sis folder for information
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/rom/atcmdplugin.iby Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,30 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :Contains information about binary files and binary file locations
+ *
+ */
+
+#ifndef __ATCMDPLUGIN_IBY
+#define __ATCMDPLUGIN_IBY
+
+//#ifdef FF_ATNT_AT_COMMANDS
+
+// The above line ifdef is commented,Because FF_ATNT_AT_COMMANDSis going to be replaced with new macro.
+ECOM_PLUGIN(atcmdplugin.dll, atcmdplugin.rsc)
+S60_APP_RESOURCE(atcmdpluginresource)
+
+//#endif
+
+#endif // __ATCMDPLUGIN_IBY
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,22 @@
+; ExtAtCmdHandler.pkg
+;
+;Language - standard language definitions
+&EN
+
+;Standard SIS file header (use UI application UID)
+#{"ATCmdPlugin"},(0x2001A273),1,0,0
+
+;Supports Series 60 v 3.0
+[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+
+;Localised Vendor name
+%{"Nokia"}
+
+;Unique Vendor name
+:"Nokia"
+
+;Files to install
+"\epoc32\release\armv5\urel\atcmdplugin.dll" -"!:\sys\bin\atcmdplugin.dll"
+"\epoc32\data\z\resource\plugins\atcmdplugin.rsc" -"!:\resource\plugins\atcmdplugin.rsc"
+"\epoc32\data\z\resource\apps\atcmdpluginresource.rsc" -"!:\resource\apps\atcmdpluginresource.rsc"
+
Binary file coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sis has changed
Binary file coreapplicationuis/ATCmdPlugin/sis/atcmdplugin.sisx has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/atcmd.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,50 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :
+ *
+ */
+
+
+
+// INCLUDES
+#include "debug.h"
+#include "atcmd.h"
+
+// CONSTANTS
+
+// ============================= LOCAL FUNCTIONS =============================
+
+// ============================= MEMBER FUNCTIONS =============================
+
+CATCmdTranslation::CATCmdTranslation( HBufC8& aParam, const TInt aCode )
+ : iParam( &aParam ),
+ iCode( aCode )
+ {
+ }
+
+CATCmdTranslation::~CATCmdTranslation()
+ {
+ delete iParam;
+ }
+
+TInt CATCmdTranslation::Code() const
+ {
+ return iCode;
+ }
+
+TPtrC8 CATCmdTranslation::Param() const
+ {
+ return iParam->Des();
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/atcmdplugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,1067 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :
+ *
+ */
+
+
+
+// INCLUDES
+#include <HWRMLightDomainCRKeys.h>
+#include <coreapplicationuisdomainpskeys.h>
+#include <hal.h>
+#include <atcmdpluginresource.rsg>
+#include <barsread.h>
+#include <barsc.h>
+#include <bautils.h>
+#include <e32math.h>
+#include <e32base.h>
+#include <eikenv.h>
+#include <apgtask.h>
+#include "debug.h"
+#include "atcmdplugin.h"
+
+// CONSTANTS
+_LIT8( KAtCkpd, "+CKPD" );
+_LIT8( KAtCbklt, "+CBKLT" );
+_LIT8( KCRLF, "\r\n" );
+_LIT8( KAtCtsa, "+CTSA");
+
+const TInt KCustomKeyCodeIdentifier = -1;
+const TInt KGranularity = 10;
+const TInt KTimeMultiplier = 100000;
+const TInt KMicroSeconds = 1000000;
+
+#define REPLY_BUFFER_SIZE 200
+
+// These values are based on testing results.
+// Values less than 2000 causes some times missing key events
+// even all keys are simulated with long commands.
+const TInt KDefaultStrokeDelay = 50000;
+const TInt KDefaultStrokeTime = 10000;
+
+const TInt KLightTarget = CHWRMLight::EPrimaryDisplayAndKeyboard;
+
+_LIT8( KParameterSeparator, "," );
+_LIT8( Kok, "\r\nOK\r\n");
+_LIT8( KCmeErrorNotSupported, "\r\n+CME ERROR: 4\r\n");
+_LIT8( KTestCommand, "=?" );
+_LIT8( KReadCommand, "?" );
+_LIT8( KCbkltTestCommandResp, ":(0,1,2)" );
+_LIT8( KCkpdTestCommandResp, ":(GSM)" );
+_LIT8( KCtsaTestCommandResp, ":(0,1,2),(width),(height)" );
+_LIT( KFileName, "\\resource\\apps\\atcmdpluginresource.rsc" );
+
+
+// ============================= MEMBER FUNCTIONS =============================
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::NewL
+// 2-phased constructor
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom* CATCmdPluginEcom::NewL()
+ {
+ CATCmdPluginEcom* self = new (ELeave) CATCmdPluginEcom();
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop( self );
+
+ return self;
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdPluginEcom
+// Constructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::CATCmdPluginEcom()
+ : CATExtPluginBase()
+ {
+ TRACE_FUNC
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::ConstructL
+// Constructor
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::ConstructL()
+ {
+ TRACE_FUNC
+
+ LEAVE_IF_ERROR( iWsSession.Connect() );
+ iCkpdCmdArray = new (ELeave) CArrayFixFlat<TATCkpdCmd>( KGranularity );
+
+ iKpdTimer = new ( ELeave ) CATCmdTimer( *this, ECmdCkpd );
+ iKpdTimer->ConstructL();
+
+ iBkltTimer = new ( ELeave ) CATCmdTimer( *this, ECmdCbklt );
+ iBkltTimer->ConstructL();
+
+ iKeepAliveTimer = new ( ELeave ) CATCmdTimer( *this, EKeepAlive );
+ iKeepAliveTimer->ConstructL();
+
+
+ LoadResourcesL();
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::::LoadResourcesL
+// Load resources
+// (may leave)
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::LoadResourcesL()
+ {
+ TRACE_FUNC_ENTRY
+
+ RFs fs;
+ CleanupClosePushL( fs );
+
+ TFileName fileName;
+ fileName.Copy( KFileName );
+ User::LeaveIfError( fs.Connect() );
+ BaflUtils::NearestLanguageFile( fs, fileName );
+
+ RResourceFile resourceFile;
+ CleanupClosePushL( resourceFile );
+ resourceFile.OpenL( fs, fileName );
+ resourceFile.ConfirmSignatureL();
+
+ HBufC8* buf8 = resourceFile.AllocReadLC( R_ATCMDPLUGIN_TRANSLATIONTABLE );
+
+ TResourceReader reader;
+ reader.SetBuffer( buf8 );
+
+ TInt count = reader.ReadInt16(); // array count
+ iTranslations = new ( ELeave ) CArrayPtrFlat<CATCmdTranslation>( count );
+
+ while ( count-- )
+ {
+ const TInt code = reader.ReadInt32();
+
+ HBufC8* param = reader.ReadHBufC8L();
+ CleanupStack::PushL( param );
+ CATCmdTranslation* t = new (ELeave) CATCmdTranslation( *param, code );
+ CleanupStack::Pop( param ); // transfer ownership
+
+ CleanupStack::PushL( t );
+ iTranslations->AppendL( t );
+ CleanupStack::Pop( t ); // transfer ownership
+ }
+
+ CleanupStack::PopAndDestroy( 3 ); // resourceFile, fs, buf8
+
+ TRACE_FUNC_EXIT
+ }
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::~CATCmdPluginEcom
+// C++ Destructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::~CATCmdPluginEcom()
+ {
+ TRACE_FUNC
+
+ if(iKpdTimer)
+ {
+ iKpdTimer->Cancel();
+ delete iKpdTimer;
+ }
+ if(iBkltTimer)
+ {
+ iBkltTimer->Cancel();
+ delete iBkltTimer;
+ }
+ if(iKeepAliveTimer)
+ {
+ iKeepAliveTimer->Cancel();
+ delete iKeepAliveTimer;
+ }
+ if ( iTranslations)
+ {
+ iTranslations->ResetAndDestroy();
+ delete iTranslations;
+ }
+ if ( iCkpdCmdArray)
+ {
+ iCkpdCmdArray->Reset();
+ delete iCkpdCmdArray;
+ }
+ iWsSession.Close();
+ }
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCommand
+// Handle given command
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool /* aReplyNeeded */)
+ {
+ TRACE_FUNC_ENTRY
+ aReply.Create(REPLY_BUFFER_SIZE);
+ aReply.Zero();
+ iReplyBuf = &aReply;
+
+ if ( IsCommandSupported( aCmd ) )
+ {
+
+ TRAPD( err, HandleCommandL( aCmd ) );
+
+ if ( err )
+ {
+ iReplyBuf->Append( KCmeErrorNotSupported );
+ }
+ else
+ {
+ if(iReplyBuf->Length() == 0)
+ {
+ iReplyBuf->Append( Kok );
+ }
+ }
+ HandleCommandCompleted( KErrNone,EReplyTypeOk );
+ }
+ TRACE_FUNC_EXIT
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCommandL
+// Handle given command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCommandL( const TDesC8& aCmd )
+ {
+ // Verify command
+ TInt offset;
+ HBufC8* cmd = aCmd.AllocLC();
+// CleanupStack:: PushL(cmd);
+ TPtr8 ptr = cmd->Des();
+
+ ptr.Trim();
+ TPtrC8 cptr;
+
+ if ( ( offset = ptr.FindF(KAtCkpd) ) >= 0 )
+ {
+ cptr.Set( ptr.Mid( offset + KAtCkpd().Length() ) );
+ HandleCkpdCommandL( cptr );
+ }
+ else if ( ( offset = ptr.FindF(KAtCbklt) ) >= 0 )
+ {
+ cptr.Set( ptr.Mid( offset + KAtCbklt().Length() ) );
+ HandleCbkltCommandL( cptr );
+ }
+ else if ( ( offset = ptr.FindF(KAtCtsa) ) >= 0 )
+ {
+ cptr.Set( ptr.Mid( offset + KAtCtsa().Length() ) );
+ HandleCtsaCommandL( cptr );
+ }
+ CleanupStack::PopAndDestroy( cmd );
+ }
+
+// -------------------------
+// HandleCtsaCommandL
+//
+// -------------------------
+
+void CATCmdPluginEcom::HandleCtsaCommandL( const TDesC8& aCmd )
+ {
+
+ if ( aCmd.Compare( KTestCommand ) == 0 )
+ {
+ // Test command just returns "OK"
+ iReplyBuf->Append( KCRLF );
+ iReplyBuf->Append( KAtCtsa );
+ iReplyBuf->Append( KCtsaTestCommandResp );
+ iReplyBuf->Append( KCRLF );
+ TRACE_FUNC_EXIT
+ return;
+ }
+
+ // Check boundary condition
+ if ( ( aCmd.Length() < 6 ) || ( aCmd[2] != ',' ))
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+ TInt pos=0;
+ TInt8 actionValue = aCmd[1] - '0';
+ TInt16 xCoordinateValue = 0;
+ TInt16 yCoordinateValue = 0;
+ TInt16 commandLen = aCmd.Length();
+
+
+ if( actionValue < 0 || actionValue > 4 )
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+
+ pos=3; // X Cordinate starts from 3d character
+
+ CWsScreenDevice *scrnDevPointer = new(ELeave) CWsScreenDevice(iWsSession);
+ TSize coordinateSize;
+
+ scrnDevPointer->Construct();
+ coordinateSize = scrnDevPointer->SizeInPixels();
+ delete scrnDevPointer;
+
+ while(pos < commandLen)
+ {
+ if((aCmd[pos] >= '0') && (aCmd[pos] <= '9'))
+ {
+ xCoordinateValue *= 10;
+ xCoordinateValue += aCmd[pos] - '0';
+ pos++;
+ if(xCoordinateValue > coordinateSize.iWidth )
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+ }
+ else if((aCmd[pos] == ',') && pos > 3 )
+ {
+ pos++;
+ break;
+ }
+ else
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+ }
+ if(pos == commandLen)
+ {
+ // Command of type =0,100 /* Command Syntax Error */
+ User::Leave( KErrNotSupported );
+ }
+ while(pos < commandLen)
+ {
+ if((aCmd[pos] >= '0') && (aCmd[pos] <= '9'))
+ {
+ yCoordinateValue *= 10;
+ yCoordinateValue += aCmd[pos] - '0';
+ pos++;
+ if(yCoordinateValue > coordinateSize.iHeight)
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+ }
+ else
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+ }
+
+ TRawEvent rawEvent;
+ switch(actionValue)
+ {
+ case 0: // Release pointer event
+ {
+ rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue, yCoordinateValue);
+ iWsSession.SimulateRawEvent(rawEvent);
+ iWsSession.Flush();
+ break;
+ }
+ case 1: // Depress pointer event
+ {
+ rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+ iWsSession.SimulateRawEvent(rawEvent);
+ iWsSession.Flush();
+ break;
+ }
+ case 2: // Single tap pointer event
+ {
+ rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+ iWsSession.SimulateRawEvent(rawEvent);
+ rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+ iWsSession.SimulateRawEvent(rawEvent);
+ iWsSession.Flush();
+ break;
+ }
+ case 3: // Double tap pointer event
+ {
+ rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+ iWsSession.SimulateRawEvent(rawEvent);
+ rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+ iWsSession.SimulateRawEvent(rawEvent);
+ rawEvent.Set( TRawEvent::EButton1Down, xCoordinateValue, yCoordinateValue);
+ iWsSession.SimulateRawEvent(rawEvent);
+ rawEvent.Set( TRawEvent::EButton1Up, xCoordinateValue+1, yCoordinateValue+1);
+ iWsSession.SimulateRawEvent(rawEvent);
+ iWsSession.Flush();
+ break;
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCkpdCommandL
+// Handle CKPD command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCkpdCommandL( const TDesC8& aCmd )
+ {
+ TRACE_FUNC_ENTRY
+ TBool commandVerified(EFalse);
+ TInt strokeTime = 0;
+ TInt strokeDelay = 0;
+
+ if ( aCmd.Compare( KTestCommand ) == 0 )
+ {
+ iReplyBuf->Append( KCRLF );
+ iReplyBuf->Append( KAtCkpd );
+ iReplyBuf->Append( KCkpdTestCommandResp );
+ iReplyBuf->Append( KCRLF );
+ TRACE_FUNC_EXIT
+ return;
+ }
+
+ CArrayFix<TATCkpdCmd>* ckpdCmds =
+ new (ELeave) CArrayFixFlat<TATCkpdCmd>( KGranularity );
+ CleanupStack::PushL( ckpdCmds );
+
+ // Check that keys are defined
+ if ( aCmd.Length() <= 1 )
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+
+ // Go through keys
+ TBuf8<2> key;
+ for (TInt i = 1 ; i < aCmd.Length(); i++ )
+ {
+ key.Copy(&aCmd[i],1);
+
+ // Go through translation table for every character
+ for ( TInt j = 0; j < iTranslations->Count(); j++ )
+ {
+ CATCmdTranslation& translation = *iTranslations->At( j );
+ if ( key.CompareF( translation.Param() ) == 0 )
+ {
+ // Check if key is escape character for manufacturer specific keys
+ if ( translation.Code() == KCustomKeyCodeIdentifier )
+ {
+ // Read next key to form key combination
+ i++;
+
+ // Check that there are key after escape character
+ if ( i >= aCmd.Length() )
+ {
+ TRACE_INFO(( _L( "INFO: invalid manufacturer specific key" ) ))
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+
+ if ( key.Length() < key.MaxLength() )
+ {
+ key.Append(aCmd[i]);
+ }
+
+ // Start looping again for looking keycombination
+ // from translation table
+ j = 0;
+ }
+ else
+ {
+ // Command verified
+ commandVerified = ETrue;
+
+ if ( translation.Code() != EKeyNull )
+ {
+ TATCkpdCmd cmd;
+ cmd.iCode = translation.Code();
+ ckpdCmds->AppendL( cmd );
+ }
+
+ break;
+ }
+ }
+ }
+
+ if (!commandVerified)
+ {
+ // Check if character is parameter separator
+ if ( key.Compare( KParameterSeparator ) == 0 )
+ {
+ i++;
+
+ if ( i > aCmd.Length() )
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+
+ ParseParametersL(
+ aCmd.Right(aCmd.Length()-i),
+ strokeTime,
+ strokeDelay);
+
+ strokeTime *= KTimeMultiplier;
+ strokeDelay *= KTimeMultiplier;
+
+ break;
+ }
+ else
+ {
+ TRACE_ERROR(( _L8( "ERROR: Command %S not supported" ), &key ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+ }
+
+ commandVerified = EFalse;
+ }
+
+ // Set default stroke time and delay if those are not set with parameters or
+ // parameter value have been zero. If values are not greater than ~2ms there
+ // is possibility to loose key events with long commands even all keys are
+ // simulated by atcmdplugin
+ if ( !strokeTime )
+ {
+ strokeTime = KDefaultStrokeTime;
+ }
+
+ if ( !strokeDelay )
+ {
+ strokeDelay = KDefaultStrokeDelay;
+ }
+
+ // Append commands to command array
+ for ( TInt count = 0; count < ckpdCmds->Count(); count++ )
+ {
+ TATCkpdCmd cmd = ckpdCmds->At(count);
+ cmd.iStrokeTime = strokeTime;
+ cmd.iStrokeDelay = strokeDelay;
+
+ iCkpdCmdArray->AppendL( cmd );
+ }
+
+ CleanupStack::PopAndDestroy(ckpdCmds);
+
+ SendKeyL();
+
+ TRACE_FUNC_EXIT
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::HandleCbkltCommandL
+// Handle CKPD command
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::HandleCbkltCommandL( const TDesC8& aCmd )
+ {
+ TRACE_FUNC_ENTRY
+
+
+ if ( aCmd.Compare( KTestCommand ) == 0 )
+ {
+ iReplyBuf->Append( KCRLF );
+ iReplyBuf->Append( KAtCbklt );
+ iReplyBuf->Append( KCbkltTestCommandResp );
+ iReplyBuf->Append( KCRLF );
+ TRACE_FUNC_EXIT
+ return;
+ }
+
+ if(iLightStatus != ELightOnWithDuration)
+ {
+ iLight = CHWRMLight::NewL( this );
+
+ iLightStatus =
+ ( iLight->LightStatus( KLightTarget ) == CHWRMLight::ELightOff )?
+ ELightOff : ELightOn;
+ delete iLight;
+ }
+
+ if ( aCmd.Compare( KReadCommand ) == 0 )
+ {
+ iReplyBuf->Append( KCRLF );
+ iReplyBuf->Append( KAtCbklt );
+ iReplyBuf->Append( ':' );
+ iReplyBuf->Append( ' ' );
+ iReplyBuf->AppendNum( iLightStatus );
+ if ( iLightStatus == ELightOnWithDuration )
+ {
+ iReplyBuf->Append( ',' );
+ iReplyBuf->AppendNum( iDuration );
+ }
+ iReplyBuf->Append( KCRLF );
+ TRACE_FUNC_EXIT
+ return;
+ }
+
+ if ( aCmd.Length() <= 1 )
+ {
+ // Command Syntax Error
+ User::Leave( KErrNotSupported );
+ }
+
+ switch ( aCmd[ 1 ] )
+ {
+ case '0':
+ {
+ if ( aCmd.Length() == 2 )
+ {
+ iKeepAliveTimer->Cancel();
+ DisableBackLight();
+ iLightStatus = ELightOff;
+ }
+ else
+ {
+ //if the command is too long it means that is incorrect
+ User::Leave( KErrNotSupported );
+ }
+ break;
+ }
+ case '1':
+ {
+ if ( ( aCmd.Length() > 3 ) && ( aCmd[ 2 ] == ',' ) )
+ {
+ TInt pos = 3;
+ TInt commandLen = aCmd.Length();
+ iDuration = 0;
+ while(pos < commandLen)
+ {
+ if((aCmd[pos] >= '0') && (aCmd[pos] <= '9'))
+ {
+ iDuration *= 10;
+ iDuration += aCmd[pos] - '0';
+ pos++;
+ }
+ else
+ {
+ User::Leave( KErrNotSupported );
+ }
+ }
+ iBkltTimer->Cancel();
+ iBkltTimer->After( iDuration * KMicroSeconds );
+ EnableBackLight();
+ if ( !iKeepAliveTimer->IsActive() )
+ {
+ iKeepAliveTimer->After( 2000000 );
+ }
+ iLightStatus = ELightOnWithDuration;
+ }
+ else
+ {
+ //the command is wrong
+ User::Leave( KErrNotSupported );
+ }
+ break;
+ }
+ case '2':
+ {
+ if ( aCmd.Length() == 2 )
+ {
+ iBkltTimer->Cancel();
+ EnableBackLight();
+ if ( !iKeepAliveTimer->IsActive() )
+ {
+ iKeepAliveTimer->After( 2000000 );
+ }
+ iLightStatus = ELightOn;
+ }
+ else
+ {
+ //if the command is too long it means that is incorrect
+ User::Leave( KErrNotSupported );
+ }
+ break;
+ }
+ default:
+ {
+ User::Leave( KErrNotSupported );
+ }
+ }
+ TRACE_FUNC_EXIT
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::EnableBackLight()
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::EnableBackLight()
+ {
+ TRACE_FUNC
+ RProperty::Set( KPSUidCoreApplicationUIs, KLightsATCForcedLightsOn, EForcedLightsOn );
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::DisableBackLight()
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::DisableBackLight()
+ {
+ TRACE_FUNC
+ RProperty::Set( KPSUidCoreApplicationUIs, KLightsATCForcedLightsOn, EForcedLightsOff );
+ }
+
+// -----------------------------------------------------------------------------
+// CATCmdPluginEcom::LightStatusChanged()
+// -----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::LightStatusChanged( TInt /*aTarget*/, CHWRMLight::TLightStatus /*aStatus*/ )
+ {
+ //TRACE_STATE(( _L( "** LightStatusChanged %d, %d" ), aTarget, aStatus ))
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::IsCommandSupported
+// -
+// ----------------------------------------------------------------------------
+//
+TBool CATCmdPluginEcom::IsCommandSupported( const TDesC8& aCmd )
+ {
+ TRACE_FUNC
+ TBool ret(EFalse);
+
+ if ( aCmd != KNullDesC8 && ( aCmd.FindF(KAtCkpd) >= 0 ||
+ aCmd.FindF(KAtCbklt) >= 0 || aCmd.FindF(KAtCtsa) >= 0 ))
+ {
+ ret = ETrue;
+ }
+ return ret;
+ }
+
+// CATCmdPluginEcom::ParseParameterL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::ParseParametersL(
+ const TDesC8& aCmd,
+ TInt& aStrokeTime,
+ TInt& aStrokeDelay )
+ {
+ TRACE_FUNC_ENTRY
+
+ TInt i(0);
+
+ if ( !aCmd.Length() )
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+
+
+ // Parse stroke time parameter
+ TBuf8<3> strokeTimeBuf;
+
+ // Go through command until end or parameter separator is reached
+ for ( ; i < aCmd.Length(); i++ )
+ {
+ if ( aCmd[i] >= '0' && aCmd[i] <= '9' )
+ {
+ strokeTimeBuf.Append(aCmd[i]);
+ continue;
+ }
+ else if ( aCmd[i] == ',' || aCmd[i] == '\r' || aCmd[i] == '\n' )
+ {
+ i++;
+ break;
+ }
+ else
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+ }
+
+ TLex8 strokeTimeLex( strokeTimeBuf );
+ strokeTimeLex.Val( aStrokeTime );
+
+ // Verify parsed parameter
+ if ( aStrokeTime < 0 || aStrokeTime > 255 )
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke time parameter" ) ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+
+
+ // Parse stroke delay parameter
+ TBuf8<3> strokeDelayBuf;
+
+ for ( ; i < aCmd.Length(); i++ )
+ {
+ if ( aCmd[i] >= '0' && aCmd[i] <= '9' )
+ {
+ strokeDelayBuf.Append(aCmd[i]);
+ continue;
+ }
+ else if ( aCmd[i] == ',' || aCmd[i] == '\r' || aCmd[i] == '\n' )
+ {
+ break;
+ }
+ else
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke delay parameter" ) ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+ }
+
+ TLex8 strokeDelayLex( strokeDelayBuf );
+ strokeDelayLex.Val( aStrokeDelay );
+
+ if ( aStrokeDelay < 0 || aStrokeDelay > 255 )
+ {
+ TRACE_ERROR(( _L( "ERROR: invalid stroke delay parameter" ) ))
+
+ // Not handled
+ User::Leave( KErrNotSupported );
+ }
+
+ TRACE_FUNC_EXIT
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SendKeyL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SendKeyL()
+ {
+ TRACE_FUNC
+
+ if ( !iKpdTimer->IsActive() )
+ {
+ const TInt count = iCkpdCmdArray->Count();
+ if ( count )
+ {
+ TATCkpdCmd cmd = iCkpdCmdArray->At(0);
+ TKeyEvent key;
+ key.iScanCode = cmd.iCode;
+ key.iCode = 0;
+ key.iRepeats = 0;
+
+ TTimeIntervalMicroSeconds32 strokeTime = cmd.iStrokeTime;
+ TTimeIntervalMicroSeconds32 strokeDelay = cmd.iStrokeDelay;
+
+ TRACE_INFO(( _L( " Scancode:%d, stroke time:%d, stroke delay: %d" ),
+ key.iScanCode, strokeTime.Int(), strokeDelay.Int() ))
+
+ if ( iLastEvent == EEventNull || iLastEvent == EEventKeyUp)
+ {
+ SimulateRawEventL( key, EEventKeyDown );
+
+ if ( strokeTime.Int() > 0)
+ {
+ iKpdTimer->After( strokeTime );
+ return;
+ }
+ }
+
+ if ( iLastEvent == EEventKeyDown || iLastEvent == EEventKey )
+ {
+ SimulateRawEventL( key, EEventKeyUp );
+
+ iCkpdCmdArray->Delete( 0 );
+
+ if ( strokeDelay.Int() > 0 && iCkpdCmdArray->Count() > 0 )
+ {
+ iKpdTimer->After( strokeDelay );
+ return;
+ }
+ else
+ {
+ SendNextKeyL();
+ }
+ }
+ }
+ }
+ }
+
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SendNextKeyL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SendNextKeyL()
+ {
+ TRACE_FUNC
+
+ const TInt count = iCkpdCmdArray->Count();
+ if ( count )
+ {
+ SendKeyL();
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::TimerExpiredL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::TimerExpiredL( TInt aRelatedCommand )
+ {
+ TRACE_FUNC
+
+ if( aRelatedCommand == ECmdCkpd )
+ {
+ SendNextKeyL();
+ }
+ else if ( aRelatedCommand == ECmdCbklt )
+ {
+ DisableBackLight();
+ iLightStatus = ELightOff;
+ iKeepAliveTimer->Cancel();
+ }
+ else
+ {
+ User::ResetInactivityTime();
+ iKeepAliveTimer->After( 2000000 );
+ }
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::SimulateRawEventL
+// -
+// (may leave)
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::SimulateRawEventL( TKeyEvent& aKey, TEventCode aEvent )
+ {
+ TRACE_FUNC
+
+ TRawEvent rawEvent;
+ TRawEvent::TType rawType( TRawEvent::ENone );
+ switch ( aEvent )
+ {
+ case EEventKeyUp:
+ rawType = TRawEvent::EKeyUp;
+ break;
+ case EEventKeyDown:
+ rawType = TRawEvent::EKeyDown;
+ break;
+ default:
+ break;
+ }
+
+ if ( rawType != TRawEvent::ENone )
+ {
+ rawEvent.Set( rawType, aKey.iScanCode );
+ iWsSession.SimulateRawEvent( rawEvent );
+ iWsSession.Flush();
+ }
+
+ iLastEvent = aEvent;
+ }
+
+// ========================= OTHER EXPORTED FUNCTIONS =========================
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::CATCmdTimer
+// C++Constructor
+// ----------------------------------------------------------------------------
+//
+CATCmdPluginEcom::CATCmdTimer::CATCmdTimer( MATCmdTimer& aObserver,
+ TInt aRelatedCommand )
+ : CTimer( EPriorityStandard ),
+ iObserver( aObserver ),
+ iRelatedCommand( aRelatedCommand )
+ {
+ TRACE_FUNC
+
+ CActiveScheduler::Add( this );
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::ConstructL
+// 2nd phase constructor
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::CATCmdTimer::ConstructL()
+ {
+ TRACE_FUNC
+ CTimer::ConstructL();
+ }
+
+// ----------------------------------------------------------------------------
+// CATCmdPluginEcom::CATCmdTimer::RunL
+// Timer callback
+// ----------------------------------------------------------------------------
+//
+void CATCmdPluginEcom::CATCmdTimer::RunL()
+ {
+ TRACE_FUNC
+
+ const TInt err = iStatus.Int();
+ if ( err != KErrCancel )
+ {
+ iObserver.TimerExpiredL( iRelatedCommand );
+ }
+ }
+
+
+void CATCmdPluginEcom::ReportConnectionName( const TDesC8& /* aName */)
+ {
+
+ }
+void CATCmdPluginEcom::HandleCommandCancel()
+ {
+
+ }
+void CATCmdPluginEcom::ReportExternalHandleCommandError()
+ {
+
+ }
+void CATCmdPluginEcom::ReportNvramStatusChange( const TDesC8& /* aNvram */)
+ {
+
+ }
+void CATCmdPluginEcom::ReceiveUnsolicitedResultCancel()
+ {
+
+ }
+void CATCmdPluginEcom::ReceiveUnsolicitedResult()
+ {
+
+ }
+TInt CATCmdPluginEcom::GetNextPartOfReply( RBuf8& /* aNextReply */)
+ {
+ return KErrNone;
+ }
+TInt CATCmdPluginEcom::NextReplyPartLength()
+ {
+ return KErrNone;
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/coreapplicationuis/ATCmdPlugin/src/main.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,56 @@
+
+/*
+ * Copyright (c) 2008-2009 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"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ * Description :
+ *
+ */
+
+
+
+// INCLUDES
+#include <e32base.h>
+#include <ecom/implementationproxy.h>
+#include "atcmdpluginuids.hrh"
+#include "atcmdplugin.h"
+
+// ============================= LOCAL FUNCTIONS =============================
+
+// ============================= MEMBER FUNCTIONS =============================
+
+// ========================= OTHER EXPORTED FUNCTIONS =========================
+
+// ----------------------------------------------------------------------------
+// ImplementationTable
+// Ecom plug-in implementation table
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY( KUidATCmdEcomImpl1, CATCmdPluginEcom::NewL ),
+ };
+
+// ----------------------------------------------------------------------------
+// ImplementationGroupProxy
+// Instance of implementation proxy
+// (exported)
+// Status : Approved
+// ----------------------------------------------------------------------------
+//
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
+ {
+ aTableCount = sizeof( ImplementationTable ) / sizeof( TImplementationProxy );
+
+ return ImplementationTable;
+ }
+
+// End of File
--- a/coreapplicationuis/DbRecovery/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/Group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/Inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/DbRecovery/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/Inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/Logger/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/GSServerEngine/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/NspsWsPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/NspsWsPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/NspsWsPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/NspsWsPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/GSRFSPluginContainer.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/Rfs/Plugins/GSRFSPlugin/src/GSRFSPluginContainer.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -99,9 +99,7 @@
void CGSRFSPluginContainer::GetHelpContext( TCoeHelpContext& aContext ) const
{
aContext.iMajor = KUidGS;
- // TODO: The following statement should be un-commented and assigned with
- // the RFS helper text UID once available from concerned team
- // aContext.iContext = KSET_HLP_WLAN_SETTINGS;
+ aContext.iContext = KSET_HLP_GENERAL_ORIG_SET;
}
// End of File
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/Plugins/rfscustcmd/tsrc/rfscustcmdtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/Rfs/bmarm/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/Rfs/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Aif/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/CenRep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/SysAp/Inc/SysApFeatureManager.h Fri Feb 26 17:43:11 2010 +0000
@@ -180,6 +180,14 @@
TBool GripNotSupported() const;
/**
+ * Returns whether SlideSupported is set.
+ *
+ * @since S60 9.2
+ * @return ETrue if feature is set
+ */
+ TBool CSysApFeatureManager::SlideSupported() const;
+
+ /**
* Returns whether Cover Display is supported.
*
* @since S60 3.2
@@ -322,6 +330,11 @@
TBool iGripNotSupported;
/**
+ * Slide supported status.
+ */
+ TBool iSlideSupported;
+
+ /**
* Cover display support status.
*/
TBool iCoverDisplaySupported;
--- a/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/SysAp/Inc/sysapdefaultkeyhandler.h Fri Feb 26 17:43:11 2010 +0000
@@ -25,6 +25,8 @@
class MSysapCallback;
class RAknKeylock2;
+class CRepository;
+class CKeyLockPolicyApi;
/**
@@ -185,6 +187,11 @@
RAknKeylock2* iKeylock;
/**
+ * Owned. Used to enable/disable keylock activation when slide is close/open
+ */
+ CKeyLockPolicyApi* iKeylockPolicy;
+
+ /**
* Handle of the captured camera key event.
*/
TInt iCapturedEKeyCamera;
@@ -224,6 +231,11 @@
*/
RAknUiServer iAknUiServer;
+ /**
+ * Keypad slide handling CR
+ */
+ CRepository* iSlideRepository;
+ TBool iKeypadWasLocked;
};
#endif // SYSAPDEFAULTKEYHANDLER_H
--- a/coreapplicationuis/SysAp/PubSub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/Bt/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/BtSap/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/CenRepObservers/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/OfflineModeController/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/PrivacyFramework/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/SysAp/Src/SysApAppUi.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -184,6 +184,9 @@
const TInt KCoefficientKhzToMhz = 1000;
const TInt KDecimalsInMhzFrequency = 2;
+const TInt KHWSwitchGroup( 29 );
+const TInt KHWSwitchGrip( 2 );
+
_LIT_SECURITY_POLICY_PASS(KAlwaysPassPolicy);
_LIT_SECURITY_POLICY_C1(KWriteDeviceDataPolicy, ECapabilityWriteDeviceData);
@@ -401,11 +404,23 @@
TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: trying CSysApDefaultKeyHandler::NewL()") ) );
iSysApDefaultKeyHandler = CSysApDefaultKeyHandler::NewL( *this );
-
- if ( iSysApFeatureManager->GripNotSupported() )
- {
- RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
- }
+ TInt status(0);
+ err = UserSvr::HalFunction( KHWSwitchGroup, KHWSwitchGrip, &status, 0 );
+ if( err == KErrNone )
+ {
+ if( status == 0 )
+ {
+ RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
+ }
+ else
+ {
+ RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripClosed );
+ }
+ }
+ else
+ {
+ TRACES ( RDebug::Print( _L("CSysApAppUi::ConstructL: error in getting slide status: err = %d"), err ) );
+ }
#ifndef RD_MULTIPLE_DRIVE
if ( iSysApFeatureManager->MmcSupported() )
@@ -733,6 +748,7 @@
switch ( aCommand )
{
case EEikCmdExit: // EAknCmdExit
+ // Quick fix for Defect: UTUL-7ZQLJU
Exit();
break;
default:
@@ -3593,10 +3609,11 @@
TInt callType ( StateOfProperty( KPSUidCtsyCallInformation, KCTsyCallType ) );
if ( !( callState == EPSCTsyCallStateConnected && callType == EPSCTsyCallTypeH324Multimedia ) )
{
- if ( iSysApFeatureManager->GripNotSupported() ||
- ( (!iSysApFeatureManager->GripNotSupported() ) && ( StateOfProperty( KPSUidHWRM, KHWRMGripStatus ) == EPSHWRMGripClosed ) ) )
- // "Lock keypad" command is shown always when there is no grip, and if there
- // there is no grip, only when the grip is closed.
+ if ( ( iSysApFeatureManager->GripNotSupported() && !iSysApFeatureManager->SlideSupported() ) ||
+ ( (!iSysApFeatureManager->GripNotSupported() || iSysApFeatureManager->SlideSupported() ) &&
+ ( StateOfProperty( KPSUidHWRM, KHWRMGripStatus ) == EPSHWRMGripClosed ) ) )
+ // "Lock keypad" command is shown always when there is no grip, and if there
+ // there is no grip, only when the grip is closed.
{
if ( CKeyLockPolicyApi::KeyguardAllowed() )
{
@@ -4671,6 +4688,25 @@
}
}
+/**
+ * To check the for an emergency call.
+ *
+ * @return ETrue if there is an emergency call active otherwise, EFalse.
+ */
+TBool IsEmergencyCall()
+ {
+ TBool retVal( EFalse );
+ TInt err( KErrNone );
+ TInt state( 0 );
+
+ err = RProperty::Get(KPSUidCtsyEmergencyCallInfo, KCTSYEmergencyCallInfo, state );
+ if ( err == KErrNone && state )
+ {
+ retVal = ETrue;
+ }
+ return retVal;
+ }
+
// ----------------------------------------------------------------------------
// CSysApAppUi::HandleCurrentCallStateChangeL()
// ----------------------------------------------------------------------------
@@ -4686,9 +4722,10 @@
switch ( aCurrentCallState )
{
- case EPSCTsyCallStateRinging:
+ case EPSCTsyCallStateRinging:
+ {
iSysApLightsController->CallComingInL( ETrue );
- // disable keylock when a call is coming in
+ // Disable keylock when a call is coming in
if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle || iKeyLockOnBeforeAlarm )
{
TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateRinging: disable keylock") ) );
@@ -4703,24 +4740,29 @@
}
}
break;
+ }
case EPSCTsyCallStateDialling:
- // disable keylock during an emergency call
+ {
+ // Disable keypad lock during an emergency call
+ // no need to disable the key lock when a call is made using the wireless car-kit
+ // but if the call is an emergency one then we will disable the keypad lock
if ( iKeyLockEnabled || iDeviceLockEnabled || iKeyLockOnBeforeCradle )
{
TRACES( RDebug::Print( _L("CSysApAppUi::HandleCurrentCallStateChangeL: EPSCTsyCallStateDialling: disable keylock") ) );
iKeyLockOnBeforeCall = ETrue;
- if ( iKeyLockEnabled || iDeviceLockEnabled )
+ if ( IsEmergencyCall() && (iKeyLockEnabled || iDeviceLockEnabled ))
{
KeyLock().DisableWithoutNote();
}
}
- // enable signal & network indicators when an emergency call is made in Offline Mode
+ // Enable signal & network indicators when an emergency call is made in Offline Mode
if( iSysApOfflineModeController->OfflineModeActive() )
{
- if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP) // signal indicators not updated with VoIP call
+ // Signal indicators not updated with VoIP call
+ if ( StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) != EPSCTsyCallTypeVoIP)
{
iEmergencyCallActive = ETrue;
UpdateSignalBarsL();
@@ -4728,11 +4770,13 @@
}
}
break;
-
+ }
+
case EPSCTsyCallStateConnected:
+ {
if (StateOfProperty(KPSUidCtsyCallInformation, KCTsyCallType) == EPSCTsyCallTypeCSVoice)
{
- // check if GPRS suspended note is required
+ // Check if GPRS suspended note is required
iCallActivated = ETrue;
HandleGprsNotesL();
}
@@ -4743,8 +4787,10 @@
KeyLock().EnableAutoLockEmulation();
}
break;
+ }
case EPSCTsyCallStateNone:
+ {
// reset timers in ScreenSaver and Autolock
User::ResetInactivityTime();
@@ -4785,6 +4831,8 @@
}
iCallActivated = EFalse;
break;
+ }
+
default:
break;
}
--- a/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/SysAp/Src/SysApFeatureManager.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -63,6 +63,10 @@
iGripNotSupported = FeatureManager::FeatureSupported( KFeatureIdKeypadNoSlider );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iGripNotSupported=%d"), iGripNotSupported ) );
+// iSlideSupported = FeatureManager::FeatureSupported( KFeatureIdFfCommonSlide );
+ iSlideSupported = EFalse;
+ TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: iSlideSupported=%d"), iSlideSupported ) );
+
iLocationPrivacySupported = FeatureManager::FeatureSupported( KFeatureIdPrivacyFramework );
TRACES( RDebug::Print( _L("CSysApFeatureManager::ConstructL: Location Privacy supported=%d"), iLocationPrivacySupported ) );
@@ -342,6 +346,15 @@
{
return iGripNotSupported;
}
+
+// ----------------------------------------------------------------------------
+// CSysApFeatureManager::SlideSupported()
+// ----------------------------------------------------------------------------
+//
+TBool CSysApFeatureManager::SlideSupported() const
+ {
+ return iSlideSupported;
+ }
// ----------------------------------------------------------------------------
// CSysApFeatureManager::CoverDisplaySupported()
--- a/coreapplicationuis/SysAp/Src/Usb/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/memorycard/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/powersavemode/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -20,24 +20,27 @@
#include <eikon.hrh>
#include <coemain.h>
#include <aknkeylock.h>
-#include <AknTaskList.h>
+#include <akntasklist.h>
#include <apgtask.h>
#include <apgcli.h>
#include <apgwgnam.h>
#include <apacmdln.h>
-#include <AiwPoCParameters.h>
-#include <AiwServiceHandler.h>
+#include <aiwpocparameters.h>
+#include <aiwservicehandler.h>
#include <featmgr.h>
#include <coreapplicationuisdomainpskeys.h>
-#include <PSVariables.h>
+#include <psvariables.h>
#include <startupdomainpskeys.h>
#include <hwrmdomainpskeys.h>
#include <u32hal.h>
-#include <SysAp.rsg>
+#include <sysap.rsg>
+#include <centralrepository.h> //for CRepository
+#include <settingsinternalcrkeys.h>
+#include <keylockpolicyapi.h>
#include "sysapdefaultkeyhandler.h"
#include "sysapcallback.h"
#include "SysAp.hrh"
-#include "AknSgcc.h"
+#include "aknsgcc.h"
const TInt KModifierMask( 0 );
@@ -91,6 +94,8 @@
iCallback.ExecQueryL( MSysapCallback::EGetKeylock, lockBuf );
iKeylock = lockBuf();
+ iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
+
__ASSERT_DEBUG( iKeylock, User::Panic( _L("CSysApDefaultKeyHandler::ConstructL: iKeylock not initialized"), KErrBadHandle ) );
if ( iCoverDisplaySupported ) // if flip status is monitored, set the initial flip status now
@@ -119,6 +124,10 @@
}
}
}
+
+ //Load keylock slide handling CR
+ TRAP_IGNORE( iSlideRepository = CRepository::NewL( KCRUidSlideSettings ) );
+ iKeylockPolicy = CKeyLockPolicyApi::NewL( EPolicyActivateKeyguard );
}
// ---------------------------------------------------------------------------
@@ -154,7 +163,8 @@
groupWin.CancelCaptureKey( iCapturedEKeyGripOpen );
groupWin.CancelCaptureKey( iCapturedEKeyGripClose );
groupWin.CancelCaptureKey( iCapturedEKeyPoC );
-
+ delete iSlideRepository;
+ delete iKeylockPolicy;
}
@@ -180,6 +190,8 @@
case EKeyGripOpen:
TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripOpen") ) );
RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
+ iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
+ iKeylockPolicy->DisableKeyguardFeature();
if (!IsDeviceLocked())
{
iCallback.ExecCommandL( MSysapCallback::EResetKeyguardState );
@@ -193,11 +205,38 @@
case EKeyGripClose:
TRACES( RDebug::Print(_L("CSysApDefaultKeyHandler::HandleKeyEventL: EKeyGripClosed") ) );
RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripClosed );
+ iKeylockPolicy->EnableKeyguardFeature();
iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
- if ( !IsDeviceLocked() && UiReady() )
- {
- iKeylock->OfferKeyLock();
- }
+ if( !iSlideRepository )
+ { // default behavior is to always ask for keylock
+ if ( !IsDeviceLocked() && UiReady() )
+ {
+ iKeylock->OfferKeyLock();
+ }
+ }
+ else
+ { // keylock action is defined by user setting
+ TInt keyGuardSetting;
+ iSlideRepository->Get( KSlideKeyguard, keyGuardSetting );
+ switch( ( TSlideSettingKeyguard ) keyGuardSetting )
+ {
+ case ESlideSettingsKeyguardActivatingOn:
+ iKeylock->EnableKeyLock();
+ break;
+ case ESlideSettingsKeyguardActivatingAskMe:
+ iKeylock->OfferKeyLock();
+ break;
+ case ESlideSettingsKeyguardActivatingOff:
+ //do nothing
+ break;
+ case ESlideSettingsKeyguardActivatingAutomatic:
+ if( iKeypadWasLocked )
+ {
+ iKeylock->EnableKeyLock();
+ }
+ break;
+ }
+ }
// apply default light control
iCallback.ExecCommandL( MSysapCallback::EUpdateLights, TUpdateLightsBuf(EKeyGripClose) );
break;
--- a/coreapplicationuis/SysAp/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/SysAp/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/VariatedSettings/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/VariatedSettings/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/VariatedSettings/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/VariatedSettings/scripts/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/accfwuinotifier/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/mt_atspc/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/advancedtspcontroller/tsrc/stub/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/Inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/gsserverenginestub/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/kefmapper/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/CenRep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batindicatorpaneplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/batterypopupcontrol/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/bsutil/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/bsutil/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/bsutil/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/adv/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BSUtil/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/MT_BatteryPopupControl/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/basic/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/powersaveutilities/tsrc/public/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/AIRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/CertRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/ClockRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DatastoreRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DefaultFolderRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/DisplayContrastPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FavouritesRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/coreapplicationuis/rfsplugins/FormatterRFSPlugin/src/formatterrfsplugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -19,10 +19,10 @@
// SYSTEM INCLUDE
#include <centralrepository.h>
#include <driveinfo.h>
-#include <swi\sisregistrysession.h>
-#include <swi\sisregistryentry.h>
-#include <swi\sisregistrypackage.h>
-#include <mmf\common\mmfcontrollerpluginresolver.h>
+#include <swi/sisregistrysession.h>
+#include <swi/sisregistryentry.h>
+#include <swi/sisregistrypackage.h>
+#include <mmf/common/mmfcontrollerpluginresolver.h>
// USER INCLUDE
#include "formatterrfsplugin.h"
#include "formatterrfspluginprivatecrkeys.h"
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/NitzRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SIPRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/StarterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/SyncMLRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/TelephonyRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/UnitconverterRFSPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/msgcentrerfsplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/formatterrfsplugintest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/msgcentrerfsplugintest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/rfstestapp/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/secureformattertest/testdatacreator/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/rfsplugins/tsrc/rfspluginstest/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/data/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/sensordatacompensatorplugin/tsrc/sensordatacompensatorplgtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/adv/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/adv/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/adv/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/adv/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/adv/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_PhoneCmdhandler/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_Rfs/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/MT_kefmapper/Src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/data/rfs/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/coreapplicationuis/tsrc/public/basic/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/CNFTOOL/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/Design/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/INC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/SRC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file filehandling/fileconverterfw/TSRC/W7ALLCHR.DOC has changed
--- a/filehandling/fileconverterfw/TSRC/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/Tef/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/Tef/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file filehandling/fileconverterfw/documentation/SGL.GT0093.110_How_To_Implement_and_use_a_file converter_objectv1.4.doc has changed
--- a/filehandling/fileconverterfw/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/fileconverterfw/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tdata/profiling/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tdata/testHtml/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/Integration/TestHtmlToCrtCoverter/testdata/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/htmltorichtextconverter/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/richtexttohtmlconverter/Group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/richtexttohtmlconverter/Src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/richtexttohtmlconverter/TSrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/richtexttohtmlconverter/Test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/filehandling/richtexttohtmlconverter/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/flashliteapi_3_1/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/flashliteapi_3_1/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/flashliteapi_3_1/mmi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/flashliteapi_3_1/mmi/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/flashliteapi_3_1/ns/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/flashliteapi_3_1/ns/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/flashliteapi_3_1/viewerfw/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/flashliteapi_3_1/viewerfw/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/hwresourceadaptation/hwresourcemgruiplugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/hwresourceadaptation/hwresourcemgruiplugin/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/hwresourceadaptation/hwresourcemgruiplugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/hwresourceadaptation/hwresourcemgruiplugin/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/layers.sysdef.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/layers.sysdef.xml Fri Feb 26 17:43:11 2010 +0000
@@ -12,6 +12,7 @@
<module name="">
<unit unitID="sydo.appsupport.appsupport_plat.flash_mmi_service_interface_custom_api" name="sydo_appsupport_appsupport_plat_flash_mmi_service_interface_custom_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_mmi_service_interface_custom_api/group" mrp="" filter="!sf_build" />
<unit unitID="sydo.appsupport.appsupport_plat.flash_netscape_plugin_command_api" name="sydo_appsupport_appsupport_plat_flash_netscape_plugin_command_api" bldFile="&layer_real_source_path;/appsupport_plat/flash_netscape_plugin_command_api/group" mrp="" filter="!sf_build" />
+ <unit unitID="sydo.appsupport.coreapplicationuis.atcmdplugin" name="sydo_appsupport_appsupport_coreapplicationuis_atcmdplugin" bldFile="&layer_real_source_path;/coreapplicationuis/atcmdplugin/group" mrp="" filter="sf_build" />
</module>
</layer>
</systemModel>
--- a/mediakeys/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/KeyPublisherPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/KeyPublisherPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/KeyPublisherPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/KeyPublisherPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/MMKeyBearer/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/MMKeyBearer/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/MMKeyBearer/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/MMKeyBearer/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/mediakeys/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/openenvutils/commandshell/copydatafile/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/copydatafile/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/copydatafile/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
Binary file openenvutils/commandshell/docs/test/SGL.GT0355.203 v1.0 PREQ1459_Test Specification.doc has changed
--- a/openenvutils/commandshell/docs/test/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/cat/src/cat.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/cat/src/cat.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// cat.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/commandshell/shell/commands/cat/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/cp/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/cp/src/cp.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/cp/src/cp.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,23 @@
/* $Id: cp.c,v 1.2 2000/08/14 16:26:08 amai Exp $ */
/* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1988, 1993, 1994
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/commandshell/shell/commands/cp/src/cputils.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/cp/src/cputils.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,24 @@
/* $Id: utils.c,v 1.2 2000/08/14 16:26:08 amai Exp $ */
/* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*-
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/commandshell/shell/commands/cp/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/find/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
Binary file openenvutils/commandshell/shell/commands/find/docs/findmanual.doc has changed
--- a/openenvutils/commandshell/shell/commands/find/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/find/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/find/inc/namespace.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/inc/namespace.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef __NAMESPACE_H__
#define __NAMESPACE_H__
/* ______________________________________________________________________
--- a/openenvutils/commandshell/shell/commands/find/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/find/src/find.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/find.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
/* $NetBSD: find.c,v 1.23 2006/10/11 19:51:10 apb Exp $ */
-/*-© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*-
* Copyright (c) 1991, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/fnmatch.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/fnmatch.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
/* $NetBSD: fnmatch.c,v 1.21 2005/12/24 21:11:16 perry Exp $ */
-/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/function.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/function.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
/* $NetBSD: function.c,v 1.62 2007/02/06 13:25:01 elad Exp $ */
-/*-© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*-©
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/ls.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/ls.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
/* $NetBSD: ls.c,v 1.19 2006/10/11 19:51:10 apb Exp $ */
-/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*- ©
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/main.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/main.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,26 @@
/* $NetBSD: main.c,v 1.26 2006/11/09 20:50:53 christos Exp $ */
-/*- © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*- ©
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/misc.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/misc.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
/* $NetBSD: misc.c,v 1.14 2006/10/11 19:51:10 apb Exp $ */
-/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+/*- ©
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/find/src/namespace.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/namespace.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/* ______________________________________________________________________
namespace.c
$Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $
--- a/openenvutils/commandshell/shell/commands/find/src/options.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/find/src/options.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,24 @@
/* $NetBSD: options.c,v 1.26 2007/02/06 15:33:22 perry Exp $ */
-/*- © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+/*- ©
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/grep/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
Binary file openenvutils/commandshell/shell/commands/grep/docs/manualforgrep.doc has changed
--- a/openenvutils/commandshell/shell/commands/grep/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/grep/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/grep/inc/grep.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/inc/grep.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $NetBSD: grep.h,v 1.3 2006/05/15 21:12:21 rillig Exp $ */
/*-
--- a/openenvutils/commandshell/shell/commands/grep/inc/namespace.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/inc/namespace.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
#ifndef __NAMESPACE_H__
#define __NAMESPACE_H__
/* ______________________________________________________________________
--- a/openenvutils/commandshell/shell/commands/grep/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/grep/src/file.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/src/file.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $NetBSD: file.c,v 1.2 2006/05/15 21:12:21 rillig Exp $ */
/*-
--- a/openenvutils/commandshell/shell/commands/grep/src/grep.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/src/grep.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.*/
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $NetBSD: grep.c,v 1.3 2006/05/15 21:12:21 rillig Exp $ */
/*-
--- a/openenvutils/commandshell/shell/commands/grep/src/mmfile.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/src/mmfile.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-/*© Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.*/
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $NetBSD: mmfile.c,v 1.3 2006/05/15 21:12:21 rillig Exp $ */
/*-
--- a/openenvutils/commandshell/shell/commands/grep/src/namespace.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/src/namespace.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/* ______________________________________________________________________
namespace.c
$Id: namespace.c,v 1.1 2003/06/29 00:22:47 jriehl Exp $
--- a/openenvutils/commandshell/shell/commands/grep/src/util.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/grep/src/util.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-/* © Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.*/
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $NetBSD: util.c,v 1.4 2006/05/15 21:12:21 rillig Exp $ */
/*-
--- a/openenvutils/commandshell/shell/commands/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/inc/err.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/inc/err.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,5 +1,22 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
/*-
- * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+ * ©
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/ls/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/ls/src/cmp.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/cmp.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,25 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $Id: cmp.c,v 1.2 2000/08/22 22:20:23 amai Exp $ */
/* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*
* Copyright (c) 1989, 1993
--- a/openenvutils/commandshell/shell/commands/ls/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/ls/src/getbsize.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/getbsize.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,25 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
//getbsize.c
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*-
* Copyright (c) 1991, 1993
--- a/openenvutils/commandshell/shell/commands/ls/src/ls.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/ls.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
/* $Id: ls.c,v 1.2 2000/08/22 22:20:23 amai Exp $ */
/* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
+// ©
//
/*
* Copyright (c) 1989, 1993, 1994
--- a/openenvutils/commandshell/shell/commands/ls/src/print.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/print.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
/* $Id: print.c,v 1.2 2000/08/22 22:20:24 amai Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*
* Copyright (c) 1989, 1993, 1994
--- a/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/stat_flags.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,26 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
/* $Id: stat_flags.c,v 1.3 2000/08/26 09:22:51 amai Exp $ */
/* $NetBSD: stat_flags.c,v 1.5 1995/09/07 06:43:01 jtc Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*-
* Copyright (c) 1993
--- a/openenvutils/commandshell/shell/commands/ls/src/util.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/ls/src/util.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,25 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $Id: util.c,v 1.2 2000/08/22 22:20:24 amai Exp $ */
/* $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*
* Copyright (c) 1989, 1993, 1994
--- a/openenvutils/commandshell/shell/commands/ps/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
Binary file openenvutils/commandshell/shell/commands/ps/docs/pscommand.doc has changed
--- a/openenvutils/commandshell/shell/commands/ps/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/ps/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/ps/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/src/err.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/src/err.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,5 +1,23 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*-
- * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
+ * ©
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
*
--- a/openenvutils/commandshell/shell/commands/src/fts.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/src/fts.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,24 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* $Id: fts.c,v 1.5 2000/11/25 16:33:36 arnd Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*-
* Copyright (c) 1990, 1993, 1994
--- a/openenvutils/commandshell/shell/commands/touch/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/touch/src/touch.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/touch/src/touch.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,24 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
/* $OpenBSD: touch.c,v 1.3 1997/01/15 23:43:22 millert Exp $ */
/* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
+// ©
//
/*
* Copyright (c) 1993
--- a/openenvutils/commandshell/shell/commands/unzip/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/unzip/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/unzip/inc/unzip.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,24 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* unzip.h -- IO for uncompress .zip files using zlib
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-
Copyright (C) 1998-2005 Gilles Vollant
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
--- a/openenvutils/commandshell/shell/commands/unzip/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/unzip/src/ioapi.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,27 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-
+
Copyright (C) 1998-2005 Gilles Vollant
*/
--- a/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/unzip/src/miniunz.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,25 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
miniunz.c
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.
Copyright (C) 1998-2005 Gilles Vollant
*/
--- a/openenvutils/commandshell/shell/commands/unzip/src/unzip.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/unzip/src/unzip.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,25 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* unzip.c -- IO for uncompress .zip files using zlib
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-
+
Copyright (C) 1998-2005 Gilles Vollant
Read unzip.h for more info
--- a/openenvutils/commandshell/shell/commands/zip/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/zip/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/zip/inc/zip.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/zip/inc/zip.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,24 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* zip.h -- IO for compress .zip files using zlib
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
Copyright (C) 1998-2005 Gilles Vollant
--- a/openenvutils/commandshell/shell/commands/zip/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/commands/zip/src/ioapi.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/zip/src/ioapi.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,27 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-
+
Copyright (C) 1998-2005 Gilles Vollant
*/
--- a/openenvutils/commandshell/shell/commands/zip/src/minizip.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/zip/src/minizip.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,9 +1,24 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
/*
minizip.c
Version 1.01e, February 12th, 2005
- Portions copyright (c) 2007-2008 Symbian Software Ltd. All rights reserved.
-
Copyright (C) 1998-2005 Gilles Vollant
*/
--- a/openenvutils/commandshell/shell/commands/zip/src/zip.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/commands/zip/src/zip.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,26 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
/* zip.c -- IO on .zip files using zlib
Version 1.01e, February 12th, 2005
27 Dec 2004 Rolf Kalbermatter
Modification to zipOpen2 to support globalComment retrieval.
- Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
Copyright (C) 1998-2005 Gilles Vollant
--- a/openenvutils/commandshell/shell/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/inc/.indent.pro Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/.indent.pro Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+#
+# Copyright (c) 2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
--dont-format-comments
--procnames-start-lines
--no-parameter-indentation
--- a/openenvutils/commandshell/shell/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/inc/errcount.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/errcount.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#define ERRCOUNT 124
--- a/openenvutils/commandshell/shell/inc/poll.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/poll.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,22 @@
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
/*-
* Copyright (c) 1997 Peter Wemm <peter@freebsd.org>
* All rights reserved.
@@ -24,7 +43,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- * © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
* $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $
*/
--- a/openenvutils/commandshell/shell/inc/rlimits.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/rlimits.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/** rlimits.h **/
/** architecture-customized limits for zsh **/
--- a/openenvutils/commandshell/shell/inc/sigcount.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/sigcount.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,2 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#define SIGCOUNT 31
#define sigmsg(sig) ((sig) <= SIGCOUNT ? sig_msg[sig] : "unknown signal")
--- a/openenvutils/commandshell/shell/inc/tcp.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/tcp.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* tcp.h - builtin FTP client
*
--- a/openenvutils/commandshell/shell/inc/termios.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/termios.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//termios.h
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*-
* Copyright (c) 1988, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/commandshell/shell/inc/version.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/version.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#define ZSH_VERSION "4.2.6"
--- a/openenvutils/commandshell/shell/inc/zle_widget.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/zle_widget.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/** zle_widget.h **/
/** indices of and pointers to internal widgets **/
--- a/openenvutils/commandshell/shell/inc/zshpaths.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/zshpaths.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#define MODULE_DIR "/usr/local/lib/zsh/4.2.6"
#define SITEFPATH_DIR "/usr/local/share/zsh/site-functions"
#define FPATH_DIR "/usr/local/share/zsh/4.2.6/functions"
--- a/openenvutils/commandshell/shell/inc/zshxmods.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/inc/zshxmods.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#define LINKED_XMOD_zshQsmain 1
#ifdef DYNAMIC
# define UNLINKED_XMOD_zshQsrlimits 1
--- a/openenvutils/commandshell/shell/src/builtin.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/builtin.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,20 @@
-//builtin.c - builtin commands
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/builtins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/src/builtins/rlimits.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/builtins/rlimits.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//rlimits.c - resource limit builtins
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/builtins/sched.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/builtins/sched.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// sched.c - execute commands at scheduled times
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/compat.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/compat.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* compat.c - compatibility routines for the deprived
*
--- a/openenvutils/commandshell/shell/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/src/exec.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/exec.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// exec.c - command execution
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007 - 2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/glob.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/glob.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//glob.c - filename generation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/hashtable.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/hashtable.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//hashtable.c - hash tables
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/hist.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/hist.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//hist.c - history expansion
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/init.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/init.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//init.c - main loop and initialization routines
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/input.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/input.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//input.c - read and store lines of input
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/jobs.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/jobs.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// jobs.c - job control
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/lex.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/lex.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// lex.c - lexical analysis
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/linklist.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/linklist.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// linklist.c - linked lists
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/loop.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/loop.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// loop.c - loop execution
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/math.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/math.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// math.c - mathematical expression evaluation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/mem.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/mem.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// mem.c - memory management
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modentry.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modentry.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
#include "zsh.mdh"
int setup_ _((Module));
--- a/openenvutils/commandshell/shell/src/module.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/module.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// module.c - deal with dynamic modules
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/cap.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/cap.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// cap.c - POSIX.1e (POSIX.6) capability set manipulation
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/clone.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/clone.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,22 @@
#ifndef __SYMBIAN32__
-// clone.c - start a forked instance of the current shell on a new terminal
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/datetime.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/datetime.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// datetime.c - parameter interface to langinfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/src/modules/errnames.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/errnames.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/** errnames.c **/
/** architecture-customized errnames.c for zsh **/
--- a/openenvutils/commandshell/shell/src/modules/example.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/example.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// example.c - an example module for zsh
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/files.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/files.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// files.c - file operation builtins
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/langinfo.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/langinfo.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// langinfo.c - parameter interface to langinfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/mapfile.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/mapfile.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// mapfile.c - associative array interface to external files
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/mathfunc.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/mathfunc.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// mathfunc.c - basic mathematical functions for use in math evaluations
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/parameter.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/parameter.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// parameter.c - parameter interface to zsh internals
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/socket.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/socket.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// socket.c - Unix domain socket module
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/stat.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/stat.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// stat.c - stat builtin interface to system call
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/system.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/system.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// sysread.c - interface to system read/write
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/tcp.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/tcp.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// tcp.c - TCP module
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/termcap.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/termcap.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// termcap.c - termcap manipulation through curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/terminfo.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/terminfo.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// terminfo.c - parameter interface to terminfo via curses
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/zftp.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/zftp.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* zftp.c - builtin FTP client
*
--- a/openenvutils/commandshell/shell/src/modules/zprof.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/zprof.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* zprof.c - a shell function profiling module for zsh
*
--- a/openenvutils/commandshell/shell/src/modules/zpty.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/zpty.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,22 @@
#ifndef __SYMBIAN32__
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* zpty.c - sub-processes with pseudo terminals
*
--- a/openenvutils/commandshell/shell/src/modules/zselect.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/zselect.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,22 @@
// zselect.c - builtin support for select system call
-//
-// © Portions copyright (c) 2007 Symbian Software Ltd. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/modules/zutil.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/modules/zutil.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,22 @@
#ifndef __SYMBIAN32__
-// zutil.c - misc utilities
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/options.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/options.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// options.c - shell options
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/params.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/params.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// params.c - parameters
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/parse.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/parse.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// parse.c - parser
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/pattern.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/pattern.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,6 +1,21 @@
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* pattern.c - pattern matching
*
--- a/openenvutils/commandshell/shell/src/prompt.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/prompt.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,5 @@
-// prompt.c - construct zsh prompts
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/signals.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/signals.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,5 @@
-// signals.c - signals handling code
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/signames.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/signames.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
/** signames.c **/
/** architecture-customized signames.c for zsh **/
--- a/openenvutils/commandshell/shell/src/subst.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/subst.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,23 @@
-// subst.c - various substitutions
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/utils.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/utils.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// utils.c - miscellaneous utilities
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/src/watch.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/src/watch.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,8 +1,22 @@
#ifndef __SYMBIAN32__
-// watch.c - login/logout watching
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* This file is part of zsh, the Z shell.
*
--- a/openenvutils/commandshell/shell/test/docs/Readme.txt Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Tests to be run (order does not matter)
-
-1) . ./zshtests_auto1.sh
-2) . ./zshtests_auto2.sh
-3) . ./greptest2.sh > greptest2.txt
-4) . ./findtest1.sh > findtest1.txt
-
-5) . ./findtest2.sh > findtest2.txt
-6) . ./findtest3.sh > findtest3.txt
-
-7) . ./greptest1.sh > greptest1.txt
-
-
-Run Manually the following tests ( Do not redirect the output )
-
-1. readtest_manual.sh
-2. ls.sh
-3) . ./externalcmd_test.sh - This test will not have any output, but should not hang the shell
-4) zshtests_manual.sh
-5) Enter atleast 10 commands at the zsh prompt and then execute . ./fctest_manual.sh
--- a/openenvutils/commandshell/shell/test/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/test/scripts/aliastest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/aliastest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,17 +1,17 @@
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
+// Copyright (c) 2007-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
init()
{
--- a/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/autoloadtest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/breaktest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/breaktest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/cdtest1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/cdtest1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/cdtest2.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/cdtest2.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/continuetest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/continuetest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/dirstest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/dirstest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/commandshell/shell/test/scripts/dottest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/dottest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/evaltest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/evaltest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/exittest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/exittest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/fctest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/fctest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/fctest_manual.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/findtest1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/findtest1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/findtest2.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/findtest2.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/findtest3.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/findtest3.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/functionstest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/functionstest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/greptest1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/greptest1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/greptest2.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/greptest2.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/ls.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/ls.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,4 +1,21 @@
-#opyright (c) Symbian Software Ltd 2007. All rights reserved.
+#
+# Copyright (c) 2007-2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+#
+
+
#!/home/guest/vinodp/local/bin/zsh
###################################
# Test cases for internal commands#
--- a/openenvutils/commandshell/shell/test/scripts/miniziptest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/miniziptest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/printtest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/printtest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/pstest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/pstest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/pwdtest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/pwdtest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/readtest_manual.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/redirecttest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/redirecttest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/sanity_auto.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/setopttest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/setopttest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/settest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/settest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/shifttest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/shifttest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/typesettest1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/typesettest1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/typesettest2.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/typesettest2.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/unhashtest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/unhashtest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/unsetopttest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/unsettest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/unsettest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/unziptest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/unziptest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/util_dot1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/util_dot1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/util_set17.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/util_set17.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/util_source.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/util_source.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/whencetest.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/whencetest.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto1.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_auto2.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/commandshell/shell/test/scripts/zshtests_manual.sh Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,7 @@
# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
#
--- a/openenvutils/commandshell/shell/test/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/telnetserver/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/telnetserver/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/telnetserver/inc/telnetd.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/inc/telnetd.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,23 @@
//telnetd.h
//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/inc/termios.h Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/inc/termios.h Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-//termios.h
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*-
* Copyright (c) 1988, 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/authenc.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/authenc.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// authenc.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/telnetserver/src/global.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/global.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// global.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/mini_inetd.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/mini_inetd.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// mini_inetd.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1995 - 2001 Kungliga Tekniska Hgskolan
* (Royal Institute of Technology, Stockholm, Sweden).
--- a/openenvutils/telnetserver/src/slc.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/slc.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// slc.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/state.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/state.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// state.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/sys_term.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/sys_term.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// sys_term.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/telnetd.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/telnetd.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// telnetd.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007-2008. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/termstat.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/termstat.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// termstat.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/src/utility.c Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/src/utility.c Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// utility.c
-//
-// © Portions Copyright (c) Symbian Software Ltd 2007. All rights reserved.
-//
+/*
+* Copyright (c) 2007-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
--- a/openenvutils/telnetserver/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/test/group/ethernetced_dynamicIP.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
--- a/openenvutils/telnetserver/test/group/ethernetced_staticIP.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/openenvutils/telnetserver/test/group/ethernetced_staticIP.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
--- a/openenvutils/telnetserver/test/utils/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/printingsupport/printinguisupport/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file printingsupport/printinguisupport/group/PRINTSDK.DOC has changed
--- a/printingsupport/printinguisupport/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/src_prev/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/src_prn/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/tef/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/printingsupport/printinguisupport/tef/scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/Bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/Data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/SplashScreen/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/MediatorPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/MediatorPlugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/MediatorPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/MediatorPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/aif/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/bmarm/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/pubsub/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h Mon Feb 08 13:38:38 2010 +0000
+++ b/startupservices/Startup/pubsub/StartupAppInternalPSKeys.h Fri Feb 26 17:43:11 2010 +0000
@@ -20,7 +20,7 @@
#define STARTUPAPPINTERNALPSKEYS_H
// INCLUDES
-#include <StartupDomainPSKeys.h>
+#include <startupdomainpskeys.h>
// =============================================================================
// Touch Screen Calibration API
--- a/startupservices/Startup/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/Startup/syserrcmd/tsrc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/init/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/Startup/syserrcmd/tsrc/syserrcmdtestsstub/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
--- a/startupservices/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimctrl/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/bwins/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/eabi/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimengine/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimihlplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimihlplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimihlplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimihlplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimihlplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimmmfplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimmmfplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimmmfplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimmmfplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimmmfplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimsvgplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimsvgplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimsvgplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimsvgplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/startupservices/startupanimation/sanimsvgplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/CenRep/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/BWINS/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/EABI/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/resource/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/oodmonitor2/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/resource/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oodmonitor/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/bwins/oommonitorU.DEF Fri Feb 26 17:43:11 2010 +0000
@@ -13,4 +13,8 @@
?SetMemoryMonitorTls@@YAXPAVCMemoryMonitor@@@Z @ 12 NONAME ; void SetMemoryMonitorTls(class CMemoryMonitor *)
?ThisAppIsNotExiting@ROomMonitorSession@@QAEXH@Z @ 13 NONAME ; void ROomMonitorSession::ThisAppIsNotExiting(int)
?WsSession@COomMonitorPlugin@@QAEAAVRWsSession@@XZ @ 14 NONAME ; class RWsSession & COomMonitorPlugin::WsSession(void)
+ ?FreeRam@COomMonitorPluginV2@@UAEXXZ @ 15 NONAME ; void COomMonitorPluginV2::FreeRam(void)
+ ?RequestOptionalRam@ROomMonitorSession@@QAEHHHHAAH@Z @ 16 NONAME ; int ROomMonitorSession::RequestOptionalRam(int, int, int, int &)
+ ?RequestOptionalRam@ROomMonitorSession@@QAEXHHHAAVTRequestStatus@@@Z @ 17 NONAME ; void ROomMonitorSession::RequestOptionalRam(int, int, int, class TRequestStatus &)
+ ?SetOomPriority@ROomMonitorSession@@QAEXW4TOomPriority@1@@Z @ 18 NONAME ; void ROomMonitorSession::SetOomPriority(enum ROomMonitorSession::TOomPriority)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/data/oomconfig.xml Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,154 @@
+<!--
+ Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of the License "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+
+-->
+
+
+<!-- This is the configuration file for the new OOM Monitor. This configuration file
+defines an OOM policy where RAM is released in the following order.
+
+1. Empty server caches (skin server cache, icon server cache, MDS cache, TFX server cache)
+2. Close applications that have not been used for more than 12 hours (including Browser and high priority applications)
+3. If Browser is in the background, empty Browser cache and close unused windows
+4. Close always-on applications in the following order: Clock, Calendar, Messaging, Contacts, Logs, Camera
+5. Close applications that have not been used for more than 15 minutes (including Browser but excluding high priority applications)
+6. Close Matrix UI if it has not been used for more than 15 seconds and continue closing WRT widgets immediately.
+7. Close WRT widgets
+8. Close other background applications that have been used within 15 minutes except Browser and high priority applications
+9. Close high priority applications
+10. If Browser is in the foreground, empty Browser cache and close unused windows
+11. Close Browser in the background when it has been used within 15 minutes
+-->
+<oom_config>
+
+<!-- Low RAM and good RAM thresholds are defined here in kilobytes.
+ The max_app_close_batch indicates how many applications can be closed in parallel.
+ The value 1 means that applications are not closed in parallel.
+ default_wait_after_plugin defines how long is waited (in milliseconds) after
+ an OOM plugin is called and before the free RAM is checked to determine if more
+ actions are needed. This value is meaningful only when "check" or "estimate" sync mode is
+ used with plugins.
+-->
+ <global_settings low_ram_threshold="3637" good_ram_threshold="4900" max_app_close_batch="3" default_wait_after_plugin="10" max_app_exit_time="2000">
+ </global_settings>
+
+<!-- Application specific low RAM and good RAM thresholds are defined here. The higher values of
+the low and good thresholds are defined to avoid OOM errors with these applications when the default
+threshold values are used.
+-->
+ <app_specific_thresholds>
+ <app uid="10008d39" low_ram_threshold="8637" good_ram_threshold="9900"></app> <!-- Browser -->
+ <app uid="20001f63" low_ram_threshold="4637" good_ram_threshold="5900"></app> <!-- Maps -->
+ <app uid="101f857a" low_ram_threshold="5637" good_ram_threshold="6900"></app> <!-- camera -->
+ <app uid="10282822" low_ram_threshold="5637" good_ram_threshold="6900"></app> <!-- Widget UI -->
+ <app uid="200009ee" low_ram_threshold="8637" good_ram_threshold="9900"></app> <!-- Photos -->
+ <app uid="20007b39" low_ram_threshold="10637" good_ram_threshold="11900"></app> <!-- NGage -->
+ </app_specific_thresholds>
+
+<!-- The priority of closing each application is defined here.
+-->
+ <app_close_settings>
+
+<!-- The uid DEFAULT_APP refers to all applications, which priority is not specifically
+ defined in the conf file.
+-->
+ <close_app uid="DEFAULT_APP" priority="80" sync_mode="check">
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="20"></app_close_idle_priority>
+ </close_app>
+<!-- The uid BUSY_APP refers to applications, which have set the OOM priority BUSY
+ by using the OOM Monitor API SetOomPriority(). The priority NEVER_CLOSE
+ means that the application is not closed at all.
+-->
+ <close_app uid="BUSY_APP" priority="NEVER_CLOSE" sync_mode="check"></close_app>
+
+<!-- The uid HIGH_PRIORITY_APP refers to applications, which have set the OOM priority HIGH
+ by using the OOM Monitor API SetOomPriority().
+-->
+ <close_app uid="HIGH_PRIORITY_APP" priority="90" sync_mode="check">
+ <app_close_idle_priority idle_time="43200" priority="20"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="10005903" priority="80" sync_mode="check"> <!-- Clock -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="40"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="10005901" priority="80" sync_mode="check"> <!-- Calendar -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="41"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="100058c5" priority="80" sync_mode="check"> <!-- Messaging -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="42"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="101f4cce" priority="80" sync_mode="check"> <!-- Contacts -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="43"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="101f4cd5" priority="80" sync_mode="check"> <!-- Logs -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="44"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="101f857a" priority="80" sync_mode="check"> <!-- Camcorder -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="45"></app_close_idle_priority>
+ </close_app>
+ <close_app uid="10008d39" priority="110" sync_mode="check"> <!-- Browser -->
+ <app_close_idle_priority idle_time="900" priority="50"></app_close_idle_priority>
+ <app_close_idle_priority idle_time="43200" priority="20"></app_close_idle_priority>
+ </close_app>
+<!-- Widget UI plugin handles the closing of widgets. Widget UI application is not closed.
+-->
+ <close_app uid="10282822" priority="NEVER_CLOSE" sync_mode="check"> </close_app> <!-- Widget UI -->
+ <close_app uid="101f4cd2" priority="NEVER_CLOSE" sync_mode="continue">
+ <app_close_idle_priority idle_time="15" priority="60"></app_close_idle_priority>
+ <foreground_app_priority if_foreground_app_id="10207218" priority="NEVER_CLOSE"></foreground_app_priority> <!-- Fast swap -->
+ </close_app> <!-- Matrix UI -->
+ <close_app uid="10207a89" priority="NEVER_CLOSE" sync_mode="check">
+ <app_close_idle_priority idle_time="43200" priority="20"></app_close_idle_priority>
+ </close_app> <!-- Radio -->
+ </app_close_settings>
+<!-- The priority of executing each system plugin is defined here.
+ System plugin is a plugin, which priority is not related to any application.
+-->
+ <system_plugin_settings>
+<!-- The uid DEFAULT_PLUGIN refers to all plugins, which priority is not specificly
+ defined in the conf file.
+-->
+ <system_plugin uid="DEFAULT_PLUGIN" priority="10" sync_mode="continue"></system_plugin>
+ <system_plugin uid="10207140" priority="10" sync_mode="continue"></system_plugin> <!-- AKNSKINSOOMPLUGIN -->
+ <system_plugin uid="10281fe6" priority="10" sync_mode="continue"></system_plugin> <!-- AKNICONOOMPLUGIN -->
+ <system_plugin uid="10282e4f" priority="10" sync_mode="continue"></system_plugin> <!-- TFXSRVOOMPLUGIN -->
+ <system_plugin uid="2001b2c6" priority="10" sync_mode="continue"></system_plugin> <!-- MDSOOMPLUGIN -->
+ </system_plugin_settings>
+<!-- The priority of executing each application plugin is defined here.
+ Application plugin is a plugin, which priority depends on the target application.
+ The target application must be defined for each application plugin.
+ By default all plugins are system plugins unless specifically defined as application
+ plugin in this section.
+-->
+ <app_plugin_settings>
+ <app_plugin uid="10281f93" target_app_id="10008d39" priority="30" wait="100" sync_mode="check"> <!-- WEBENGINEMEMORYPLUGIN, target app Browser -->
+ <plugin_foreground_app_priority target_app_id="10008d39" priority="100"></plugin_foreground_app_priority>
+ </app_plugin>
+
+<!-- Widget memory plugin has very long plugin wait time because we don't want to unnecessarily
+ close any other applications after closing it. We call Widget memory plugin only if
+ Widget UI application is running in the background.
+-->
+ <app_plugin uid="10282855" target_app_id="10282822" priority="70" wait="3500" sync_mode="check" call_if_target_app_not_running="false"> <!-- WIDGETMEMORYPLUGIN, target app Widget UI -->
+ <plugin_foreground_app_priority target_app_id="10282822" priority="NEVER_CLOSE"></plugin_foreground_app_priority> <!-- target app Widget UI -->
+ </app_plugin>
+ </app_plugin_settings>
+</oom_config>
--- a/sysresmonitoring/oommonitor/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/eabi/oommonitorU.DEF Fri Feb 26 17:43:11 2010 +0000
@@ -17,4 +17,10 @@
_ZN20CAppOomMonitorPlugin4NewLE4TUid @ 16 NONAME
_ZTI17COomMonitorPlugin @ 17 NONAME ; #<TI>#
_ZTV17COomMonitorPlugin @ 18 NONAME ; #<VT>#
+ _ZN18ROomMonitorSession18RequestOptionalRamEiiiRi @ 19 NONAME
+ _ZN19COomMonitorPluginV27FreeRamEv @ 20 NONAME
+ _ZTI19COomMonitorPluginV2 @ 21 NONAME ; #<TI>#
+ _ZTV19COomMonitorPluginV2 @ 22 NONAME ; #<VT>#
+ _ZN18ROomMonitorSession18RequestOptionalRamEiiiR14TRequestStatus @ 23 NONAME
+ _ZN18ROomMonitorSession14SetOomPriorityENS_12TOomPriorityE @ 24 NONAME
--- a/sysresmonitoring/oommonitor/group/bld.inf Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -18,16 +18,15 @@
#include <platform_paths.hrh>
+PRJ_PLATFORMS
+DEFAULT
+
PRJ_EXPORTS
-../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby)
+../rom/oommonitor.iby CORE_MW_LAYER_IBY_EXPORT_PATH(oommonitor.iby)
+../data/oomconfig.xml /epoc32/RELEASE/winscw/UDEB/Z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/RELEASE/winscw/UREL/Z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
PRJ_MMPFILES
-
-#ifndef TOOLS
-
oommonitor.mmp
-
-#endif
-
-PRJ_TESTMMPFILES
-// ../internal/oomtestplugin/oomtestplugin.mmp
+oommonitorlib.mmp
--- a/sysresmonitoring/oommonitor/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/group/oommonitor.mmp Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/group/oommonitor.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -18,10 +18,22 @@
#include <platform_paths.hrh>
+//uncomment both of these macros to use the CLIENT_REQUEST_QUEUE
+macro CLIENT_REQUEST_QUEUE
+#define CLIENT_REQUEST_QUEUE
+
TARGET oommonitor.dll
+
TARGETTYPE dll
UID 0x1000008D 0x10282DBF
+NOEXPORTLIBRARY
+#ifdef WINS
+DEFFILE ../bwins/oommonitor.def
+#else
+DEFFILE ../eabi/oommonitor.def
+#endif
+
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
@@ -32,9 +44,38 @@
MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../src
+SOURCE oomIdletimerule.cpp
+SOURCE oomaction.cpp
+SOURCE oomactionconfig.cpp
+SOURCE oomactionlist.cpp
+SOURCE oomactionref.cpp
+SOURCE oomappclosetimer.cpp
+SOURCE oomappclosewatcher.cpp
+SOURCE oomapplicationconfig.cpp
+SOURCE oomcloseapp.cpp
+SOURCE oomcloseappconfig.cpp
+SOURCE oomconfig.cpp
+SOURCE oomconfigparser.cpp
+SOURCE oomforegroundrule.cpp
+SOURCE oomglobalconfig.cpp
+SOURCE oomlog.cpp
+SOURCE oommemorymonitor.cpp
+SOURCE oommemorymonitorserver.cpp
+SOURCE oommemorymonitorsession.cpp
+SOURCE oommonitor.cpp
SOURCE oommonitorplugin.cpp
SOURCE oommonitorsession.cpp
-SOURCE oommonitor.cpp
+SOURCE oomoutofmemorywatcher.cpp
+SOURCE oompanic.cpp
+SOURCE oompluginwaiter.cpp
+SOURCE oomrunplugin.cpp
+SOURCE oomrunpluginconfig.cpp
+SOURCE oomsubscribehelper.cpp
+SOURCE oomwindowgrouplist.cpp
+SOURCE oomwserveventreceiver.cpp
+#ifdef CLIENT_REQUEST_QUEUE
+SOURCE oomclientrequestqueue.cpp
+#endif
LIBRARY euser.lib
LIBRARY apparc.lib
@@ -46,3 +87,8 @@
LIBRARY ecom.lib
LIBRARY hal.lib
LIBRARY efsrv.lib
+LIBRARY xmlframework.lib
+LIBRARY cone.lib
+#ifdef _DEBUG
+LIBRARY flogger.lib
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/group/oommonitorlib.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,26 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Project definition file
+*
+*/
+
+TARGET oommonitor.lib
+TARGETTYPE IMPLIB
+UID 0x1000008D 0x10282DBF
+
+#ifdef WINS
+ DEFFILE ../bwins/oommonitor.def
+#else
+ DEFFILE ../eabi/oommonitor.def
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/OomTraces.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,487 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Includes some common defines used in the OOM monitor app.
+*
+*/
+
+
+#ifndef OOMTRACES_H
+#define OOMTRACES_H
+
+#include "traceconfiguration.hrh"
+#include "tracedefs.h"
+
+#ifdef TRACE_INTO_FILE
+#include <flogger.h> // RFileLogger
+#else
+#include <e32debug.h> // RDebug
+#endif
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+//
+
+/**
+* Prefix error trace
+*/
+#define _PREFIX_ERROR( aMsg ) _PREFIX_TRACE( "[ERROR: %d]: " L##aMsg )
+
+/**
+* Prefix info trace.
+*/
+#define _PREFIX_INFO( aMsg ) _PREFIX_TRACE( "[INFO]: " L##aMsg )
+
+/**
+* Define needed directories if TRACE_INTO_FILE macro in use
+*/
+#ifdef TRACE_INTO_FILE
+
+ _LIT( KDir, "oommonitor2" );
+ _LIT( KFile, "oommonitor2_log.txt" );
+ _LIT( KFullPath, "c:\\logs\\oommonitor2\\" );
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Error trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef ERROR_TRACE
+
+ /**
+ * Error trace definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define ERROR( aErr, aMsg )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr );\
+ }\
+ }
+ #define ERROR_1( aErr, aMsg, aP1 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1 );\
+ }\
+ }
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2 );\
+ }\
+ }
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )\
+ {\
+ if( aErr < KErrNone )\
+ {\
+ RDebug::Print( _PREFIX_ERROR( aMsg ), aErr, aP1, aP2, aP3 );\
+ }\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+ #define ERROR_GEN( aMsg ) ERROR( KErrGeneral, aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 ) ERROR_1( KErrGeneral, aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 ) ERROR_2( KErrGeneral, aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 ) ERROR_3( KErrGeneral, aMsg, aP1, aP3 )
+
+ #define ERROR_PARAM(_p) _p
+
+ #define TRAPD_ERR( aErr, aStmt ) TRAPD( aErr, aStmt )
+ #define TRAP_ERR( aErr, aStmt ) TRAP( aErr, aStmt )
+
+ #define TRAP_AND_LEAVE(_s,_t) \
+ { TRAPD(_e,_s); ERROR(_e,_t); User::LeaveIfError(_e); }
+
+#else//ERROR_TRACE not defined
+
+ #define ERROR( aErr, aMsg )
+ #define ERROR_1( aErr, aMsg, aP1 )
+ #define ERROR_2( aErr, aMsg, aP1, aP2 )
+ #define ERROR_3( aErr, aMsg, aP1, aP2, aP3 )
+ #define ERROR_GEN( aMsg )
+ #define ERROR_GEN_1( aMsg, aP1 )
+ #define ERROR_GEN_2( aMsg, aP1, aP2 )
+ #define ERROR_GEN_3( aMsg, aP1, aP2, aP3 )
+
+ #define ERROR_PARAM(_p)
+
+ #define TRAPD_ERR( aErr, aStmt ) TRAP_IGNORE( aStmt )
+ #define TRAP_ERR( aErr, aStmt ) TRAP_IGNORE( aStmt )
+
+ #define TRAP_AND_LEAVE(_s,_t) { _s; }
+
+#endif//ERROR_TRACE
+
+//-----------------------------------------------------------------------------
+// Info trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef INFO_TRACE
+
+ /**
+ * Info log message definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define TRACES( aMsg )\
+ {\
+ RFileLogger::Write( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ) );\
+ }
+ #define TRACES1( aMsg, aP1 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define TRACES2( aMsg, aP1, aP2 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define TRACES3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define TRACES4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, \
+ _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define TRACES( aMsg )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ) );\
+ }
+ #define TRACES1( aMsg, aP1 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1 );\
+ }
+ #define TRACES2( aMsg, aP1, aP2 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2 );\
+ }
+ #define TRACES3( aMsg, aP1, aP2, aP3 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3 );\
+ }
+ #define TRACES4( aMsg, aP1, aP2, aP3, aP4 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4 );\
+ }
+ #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 )\
+ {\
+ RDebug::Print( _PREFIX_INFO( aMsg ), aP1, aP2, aP3, aP4, aP5 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+ #define TRACES_PARAM( aParam ) aParam
+
+#else//INFO_TRACE not defined
+
+ #define TRACES( aMsg )
+ #define TRACES1( aMsg, aP1 )
+ #define TRACES2( aMsg, aP1, aP2 )
+ #define TRACES3( aMsg, aP1, aP2, aP3 )
+ #define TRACES4( aMsg, aP1, aP2, aP3, aP4 )
+ #define TRACES5( aMsg, aP1, aP2, aP3, aP4, aP5 )
+ #define TRACES_PARAM( aParam )
+
+#endif//INFO_TRACE
+
+//-----------------------------------------------------------------------------
+// Trace current client thread name and process id
+//-----------------------------------------------------------------------------
+//
+#ifdef CLIENT_TRACE
+
+ #define CLIENT( aMessage )\
+ {\
+ RThread thread;\
+ TInt err = aMessage.Client( thread );\
+ if( err == KErrNone )\
+ {\
+ RProcess process;\
+ err = thread.Process( process );\
+ if( err == KErrNone )\
+ {\
+ TPtrC thredName( thread.Name() );\
+ TUid processUid( process.SecureId() );\
+ TRACES2( "Current client process UID: [%x], thread name: [%S]",\
+ processUid,\
+ &thredName );\
+ }\
+ process.Close();\
+ }\
+ thread.Close();\
+ }
+
+#else
+
+ #define CLIENT( aMessage )
+
+#endif
+
+//-----------------------------------------------------------------------------
+// Function trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef FUNC_TRACE
+
+ #include <e32base.h> // TCleanupItem
+
+ /**
+ * Function logging definitions.
+ */
+ #ifdef TRACE_INTO_FILE
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ TPtrC8 trace( _S8( aMsg ) );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend, trace, aP1 );\
+ }\
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define FUNC( aMsg, aP1 )\
+ {\
+ RDebug::Printf( aMsg, aP1 );\
+ }\
+
+ #endif//TRACE_INTO_FILE
+
+ /**
+ * Function trace helper class.
+ *
+ * NOTE:
+ * LC -methods cannot be trapped. Therefore if LC -method leaves
+ * END trace is used instead of LEAVE trace.
+ * If you have an idea how to round this problem please tell.
+ */
+ _LIT8( KFuncNameTerminator, "(" );
+ _LIT8( KFuncLeavePatternL, "L" );
+ class TFuncLog
+ {
+ public:
+ static void Cleanup( TAny* aPtr )
+ {
+ TFuncLog* self = static_cast< TFuncLog* >( aPtr );
+ self->iLeft = ETrue;
+ FUNC( _PREFIX_CHAR("%S-LEAVE"), &self->iFunc ); // Leave detected
+ }
+ inline TFuncLog( const char* aFunc ) :
+ iFunc( aFunc ? _S8( aFunc ) : _S8("") ),
+ iLeft( EFalse ),
+ iCleanupItem( Cleanup, this ),
+ iCanLeave( EFalse )
+ {
+ TInt pos( iFunc.Find( KFuncNameTerminator ) );
+ if( pos != KErrNotFound )
+ {
+ iFunc.Set( iFunc.Left( pos ) );
+ iCanLeave = !iFunc.Right(
+ KFuncLeavePatternL().Length() ).Compare( KFuncLeavePatternL );
+ if ( iCanLeave )
+ {
+ CleanupStack::PushL( iCleanupItem ); // Ignore warnings
+ }
+ }
+ FUNC( _PREFIX_CHAR("%S-START"), &iFunc );
+ }
+
+ inline ~TFuncLog()
+ {
+ if ( !iLeft )
+ {
+ if ( iCanLeave )
+ {
+ CleanupStack::Pop( this ); // Pop the cleanup item
+ }
+ FUNC( _PREFIX_CHAR("%S-END"), &iFunc ); // Normally finished
+ }
+ }
+
+ private: // Data
+ TPtrC8 iFunc;
+ TBool iLeft;
+ TCleanupItem iCleanupItem;
+ TBool iCanLeave;
+ };
+ #define FUNC_LOG TFuncLog _fl( __PRETTY_FUNCTION__ );
+
+#else//FUNC_TRACE not defined
+
+ #define FUNC_LOG
+
+#endif//FUNC_TRACE
+
+//-----------------------------------------------------------------------------
+// Timestamp trace macros
+//-----------------------------------------------------------------------------
+//
+#ifdef TIMESTAMP_TRACE
+
+ #define PREFIX_TIMESTAMP( aCaption ) _PREFIX_TRACE_2("[TIMESTAMP] (%d:%02d:%02d.%06d us) ",aCaption)
+ #define CURRENT_TIME( aDt ) TDateTime aDt; { TTime t; t.HomeTime(); aDt = t.DateTime(); }
+ #define EXTRACT_TIME( aDt ) aDt.Hour(), aDt.Minute(), aDt.Second(), aDt.MicroSecond()
+
+ #ifdef TRACE_INTO_FILE
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ CURRENT_TIME( dt );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\
+ }
+
+ #define TIMESTAMP_1( aCaption, aP1 )\
+ {\
+ CURRENT_TIME( dt );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\
+ }
+
+ #define TIMESTAMP_2( aCaption, aP1, aP2 )\
+ {\
+ CURRENT_TIME( dt );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\
+ }
+
+ #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\
+ {\
+ CURRENT_TIME( dt );\
+ RFileLogger::WriteFormat( KDir, KFile, EFileLoggingModeAppend,\
+ PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\
+ }
+
+ #else//TRACE_INTO_FILE not defined
+
+ #define TIMESTAMP( aCaption )\
+ {\
+ CURRENT_TIME( dt );\
+ RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ) );\
+ }
+
+ #define TIMESTAMP_1( aCaption, aP1 )\
+ {\
+ CURRENT_TIME( dt );\
+ RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1 );\
+ }
+
+ #define TIMESTAMP_2( aCaption, aP1, aP2 )\
+ {\
+ CURRENT_TIME( dt );\
+ RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2 );\
+ }
+
+ #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )\
+ {\
+ CURRENT_TIME( dt );\
+ RDebug::Print( PREFIX_TIMESTAMP(aCaption),EXTRACT_TIME( dt ),aP1,aP2,aP3 );\
+ }
+
+ #endif//TRACE_INTO_FILE
+
+#else//TIMESTAMP_TRACE not defined
+
+ #define TIMESTAMP( aCaption )
+ #define TIMESTAMP_1( aCaption, aP1 )
+ #define TIMESTAMP_2( aCaption, aP1, aP2 )
+ #define TIMESTAMP_3( aCaption, aP1, aP2, aP3 )
+
+#endif//TIMESTAMP_TRACE
+
+#ifdef _DEBUG
+
+ #include <e32debug.h> // RDebug
+
+ static void Panic( const TDesC8& aFileName, const TInt aLineNum )
+ {
+ TPath name;
+ name.Copy( aFileName );
+ RDebug::Print( _L( "Assertion failed in file=%S, line=%d" ), &name, aLineNum );
+ User::Invariant();
+ }
+
+ #define ASSERT_ALWAYS_TRACE Panic( _L8(__FILE__), __LINE__ );
+ #define ASSERT_TRACE( _s ) if ( !( _s ) ) { ASSERT_ALWAYS_TRACE; }
+
+#else // _DEBUG
+
+ #define ASSERT_ALWAYS_TRACE
+ #define ASSERT_TRACE( _s )
+
+#endif // _DEBUG
+
+#define TRACE_MATRIX( aMsg, aMatrix ) \
+ TRACES( aMsg ); \
+ TRACES( "------------------------------------------------" ); \
+ TRACES3( " [%f %f %f]", (TReal)(aMatrix)[0], (TReal)(aMatrix)[1], (TReal)(aMatrix)[2] ); \
+ TRACES3( "Matrix [%f %f %f]", (TReal)(aMatrix)[3], (TReal)(aMatrix)[4], (TReal)(aMatrix)[5] ); \
+ TRACES3( " [%f %f %f]", (TReal)(aMatrix)[6], (TReal)(aMatrix)[7], (TReal)(aMatrix)[8] ); \
+ TRACES( "------------------------------------------------" );
+
+#endif // OOMTRACES_H
+
+// End of File
--- a/sysresmonitoring/oommonitor/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomaction.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,81 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMACTION_H_
+#define OOMACTION_H_
+
+#include <e32base.h>
+
+class MOomActionObserver;
+
+/*
+ * The base class for all OOM actions (i.e. close application or run OOM plug-in).
+ *
+ * A base class is used because both types of action have common aspects, specifically:
+ * - They are prioritised according to application idle time
+ * - They need to be prioritised against each other
+ * - For each action it is possible to either continue immediately or to wait for completion
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomAction) : public CBase
+ {
+public:
+
+ virtual ~COomAction();
+
+ /**
+ * Activate the OOM action
+ *
+ * @since S60 5.0
+ * @param aBytesRequested ?description
+ */
+ virtual void FreeMemory(TInt aBytesRequested) = 0;
+
+ /**
+ * @since S60 5.0
+ * @return ETrue if the action is currently freeing memory, else EFalse
+ */
+ virtual TBool IsRunning() = 0;
+
+protected:
+ //
+ /**
+ * To be called by the derived class after the memory has been freed (or if it fails)
+ *
+ * @since S60 5.0
+ * @param aError KErrNone if memory has successfully been freed, otherwise any system wide error code
+ */
+ void MemoryFreed(TInt aError);
+
+ COomAction(MOomActionObserver& aStateChangeObserver);
+
+private: //data
+
+ enum TOomActionState
+ {
+ EOomIdle,
+ EOomFreeingMemory
+ };
+ TOomActionState iState;
+
+ MOomActionObserver& iStateChangeObserver;
+ };
+
+#endif /*OOMACTION_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,82 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMACTIONCONFIG_
+#define OOMACTIONCONFIG_
+
+#include <e32cmn.h>
+#include <e32std.h>
+#include <w32std.h>
+
+class MOomRuleConfig;
+class COomWindowGroupList;
+
+enum TOomSyncMode
+ {
+ EContinue, // Continue with the next action regardless of anything else (exluding max_batch_size)
+ EEstimate, // Continue with the next action if we estimate that we need to free more memory
+ ECheckRam, // Wait for this action to complete, then check the free RAM before continuing
+ EContinueIgnoreMaxBatchSize // Continue with the next action regardless of anything else (including max_batch_size)
+ };
+
+/*
+ * The base class for the configuration of all OOM actions
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomActionConfig) : public CBase
+ {
+public:
+ // Add a rule
+ // This class takes ownership of the given rule
+ void AddRuleL(MOomRuleConfig* aRule); // Add the configuration for a rule (e.g. an idle time rule)
+
+ virtual ~COomActionConfig();
+
+ // Set the priority of this action
+ // This priority will be applied if none of the attached rules can be applied
+ inline void SetDefaultPriority(TUint aPriority);
+
+protected:
+
+ // Return the priority for this action for the idle time of the target app
+ TUint Priority(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const;
+
+ void ConstructL();
+
+ COomActionConfig(TInt32 aId);
+
+public:
+
+ TOomSyncMode iSyncMode;
+
+ TInt iRamEstimate; // The estimated RAM saving after performing this action
+
+ TInt32 iId; // The ID of the affected component (e.g. an application ID for app closure, or a plugin ID for a plugin event)
+
+ TUint iDefaultPriority;
+
+protected:
+
+ RPointerArray<MOomRuleConfig> iRules;
+ };
+
+#include "oomactionconfig.inl"
+
+#endif /*OOMACTIONCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomactionconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMACTIONCONFIGINL_H_
+#define OOMACTIONCONFIGINL_H_
+
+// Set the priority of this action
+// This priority will be applied if none of the attached rules can be applied
+inline void COomActionConfig::SetDefaultPriority(TUint aPriority)
+ {
+ iDefaultPriority = aPriority;
+ }
+
+
+#endif /*OOMACTIONCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomactionlist.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,237 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMACTIONLIST_H_
+#define OOMACTIONLIST_H_
+
+#include <e32def.h>
+#include <e32base.h>
+
+#include "oommonitorplugin.h"
+
+class COomWindowGroupList;
+class CMemoryMonitorServer;
+class COomCloseApp;
+class TActionRef;
+class COomRunPlugin;
+class COomConfig;
+
+/*
+ * Interface for reporting a change of state in an OOM action
+ * e.g. that the action has changed from a freeing-memory state to an idle state
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+class MOomActionObserver
+ {
+public:
+ virtual void StateChanged() = 0;
+ };
+
+
+template <class T>
+/**
+ * A class for getting instances of all of the OOM ECom plugins
+ * This class is templated because we actually need two types of list
+ * One list for V1 plugins
+ * One list for V2 plugins
+ * The functionality of each list is nearly identical, hence the templated class
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomPluginList) : public CBase
+ {
+public:
+
+ /**
+ * Two-phased constructor.
+ * @param aInterfaceUid The interface of the plugin (either V1 or V2) depending on the templated type
+ */
+ static COomPluginList* NewL(TInt aInterfaceUid);
+ inline TInt Count();
+ inline T& Implementation(TInt aIndex);
+ inline TInt32 Uid(TInt aIndex);
+
+ ~COomPluginList();
+
+private:
+ COomPluginList();
+ void ConstructL(TInt aInterfaceUid);
+
+private: // data
+
+ struct TPlugin
+ {
+ TPlugin();
+ T* iImpl;
+ TUid iDtorUid;
+ TInt32 iUid;
+ };
+
+ RArray<TPlugin> iPlugins;
+ };
+
+/*
+ * The list of possible OOM actions to be run.
+ *
+ * This class is responsible for identifying the best action(s) to execute at a given time.
+ * This decision is based on the properties of each action and idle time of the target apps.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomActionList) : public CBase, public MOomActionObserver
+ {
+public:
+
+ /**
+ * Two-phased constructor.
+ * @param aMonitor the owning Memory Monitor
+ * @param aServer
+ * @param aWs a handle to a window server session, opened by the Memory Monitor
+ * @param aConfig
+ */
+ static COomActionList* NewL(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs, COomConfig& aConfig);
+
+ ~COomActionList();
+
+ /**
+ * Creates a list of actions based on the contents of the config and the current window group list
+ * Any old actions will be replaced.
+ *
+ * @since S60 5.0
+ * @param aWindowGroupList
+ * @param aConfig
+ */
+ void BuildActionListL(COomWindowGroupList& aWindowGroupList, COomConfig& aConfig);
+
+ template <class T>
+ void BuildPluginActionsL(COomPluginList<T>& aPluginList, COomWindowGroupList& aWindowGroupList, COomConfig& aConfig, TInt& aActionsIndex);
+
+ /**
+ * Execute the OOM actions according to their priority
+ * Actions are run in batches according to their sync mode
+ *
+ * @since S60 5.0
+ * @param aMaxPriority The maximum priority of actions to run
+ */
+ void FreeMemory(TInt aMaxPriority);
+
+ /**
+ * Sets the target; the maximum prioirity up to which actions are run when an OomMonitor event
+ * occurs
+ *
+ * @since S60 5.0
+ * @param aCurrentTarget the prio
+ */
+ inline void SetCurrentTarget(TUint aCurrentTarget);
+
+ /**
+ * Switch all plugins to Off (Memory Good) state
+ * Should be called when the memory situation is good, i.e. the actions run have released enough memory
+ * so that the device is above the current target.
+ * It is also always called after an optional RAM request has been processed, even if insufficient
+ * memory could be freed to successfully complete the request.
+ *
+ * @since S60 5.0
+ */
+ void SwitchOffPlugins();
+
+ /**
+ * Compares priorites of two actions, hard-coded rules are used to determine the order
+ * of actions with equal priority:
+ * - application plugins are run in preference to system plugins
+ * - appliction plugins where the target app is not running are run first
+ * - Z order of the target app determines order of the rest of the application plugins (furthest back first)
+ * - system plugins are run before app close actions
+ * - Z order determines the prioirty of app close actions (furthest back first)
+ *
+ * @since S60 5.0
+ */
+ static TInt ComparePriorities(const TActionRef& aPos1, const TActionRef& aPos2 );
+
+ /**
+ * A callback from the UI framework that an applications has failed to respond to the close event.
+ * Allows us to cleanup the related app close action object and move on the next available action.
+ *
+ * @since S60 5.0
+ * @param aWgId the window group ID of the application that has not closed.
+ */
+ void AppNotExiting(TInt aWgId);
+
+// from MOomActionObserver
+
+ /**
+ *
+ * from MOomActionObserver
+ *
+ * An action has changed state (possibly it has completed freeing memory)
+ */
+ void StateChanged();
+
+private:
+
+ COomActionList(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs);
+
+ void ConstructL(COomConfig& aConfig);
+
+private: //data
+
+ RWsSession& iWs;
+
+ RPointerArray<COomCloseApp> iCloseAppActions;
+ RPointerArray<COomRunPlugin> iRunPluginActions;
+ RArray<TActionRef> iActionRefs;
+
+ TInt iCurrentActionIndex;
+
+ TUint iCurrentTarget;
+
+ /*
+ * Flag specifying that a OomMonitor event is in progress.
+ */
+ TBool iFreeingMemory;
+
+ CMemoryMonitor& iMonitor;
+
+ /**
+ * The list of V1 plugins
+ * Own
+ */
+ COomPluginList<COomMonitorPlugin>* iPluginList;
+
+ /**
+ * The list of V2 plugins
+ * Own
+ */
+ COomPluginList<COomMonitorPluginV2>* iPluginListV2;
+
+ /**
+ * The maximum priority of actions that should be run by an OomMonitor Event
+ */
+ TInt iMaxPriority;
+
+ CMemoryMonitorServer& iServer;
+
+ };
+
+#include "oomactionlist.inl"
+
+#endif /*OOMACTIONLIST_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomactionlist.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,46 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMACTIONLISTINL_H_
+#define OOMACTIONLISTINL_H_
+
+template <class T>
+inline TInt COomPluginList<T>::Count()
+ {
+ return iPlugins.Count();
+ }
+
+template <class T>
+inline T& COomPluginList<T>::Implementation(TInt aIndex)
+ {
+ return *(iPlugins[aIndex].iImpl);
+ }
+
+template <class T>
+inline TInt32 COomPluginList<T>::Uid(TInt aIndex)
+ {
+ return iPlugins[aIndex].iUid;
+ }
+
+inline void COomActionList::SetCurrentTarget(TUint aCurrentTarget)
+ {
+ iCurrentTarget = aCurrentTarget;
+ }
+
+
+#endif /*OOMACTIONLISTINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomactionref.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,73 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMACTIONREF_H_
+#define OOMACTIONREF_H_
+
+#include <e32base.h>
+#include "oomactionconfig.h"
+
+class COomRunPlugin;
+
+/**
+ * Encapsulates a reference to an action.
+ *
+ * Objects of this T-class are instantiated at memory freeing time in preference to the
+ * COomAction derived objects, so that we do not instantiate anything on the heap at a time
+ * when the device is, by-definition, low on memory.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+class TActionRef
+ {
+public:
+
+ enum TActionType
+ {
+ EAppPlugin,
+ ESystemPlugin,
+ EAppClose
+ };
+
+ //constructor for Plugin actions
+ TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, COomRunPlugin& aRunPlugin, TUint aWgIndexOfTargetApp);
+
+ //constructor for AppClose actions
+ TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, TInt aWgId, TUint aWgIndex);
+
+ TActionType Type() const;
+ TUint Priority() const;
+ TOomSyncMode SyncMode() const;
+ TInt RamEstimate() const;
+ TInt WgId() const;
+ TInt WgIndex() const;
+ COomRunPlugin& RunPlugin();
+
+private: //data
+
+ TActionType iType;
+ TUint iPriority;
+ TOomSyncMode iSyncMode; //needed as we don't have reference to the config
+ TInt iRamEstimate; //needed as we don't have reference to the config
+ TInt iWgId; //For AppClose
+ TInt iWgIndex;
+ COomRunPlugin* iRunPlugin; //For Plugins. Not owned
+ };
+
+#endif /*OOMACTIONREF_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomappclosetimer.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,53 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Timer class which implements a timeout for an application close action.
+*
+*/
+
+
+#ifndef OOMAPPCLOSETIMER_H_
+#define OOMAPPCLOSETIMER_H_
+
+#include <e32base.h>
+
+class COomCloseApp;
+
+/**
+ * A simple timer class which implements a timeout for an application close action.
+ *
+ * If the application has not been closed within the period this timer is started with,
+ * then we complete the action as if he had been successful, allowing us to move on to the
+ * action or set of actions.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomAppCloseTimer) : public CTimer
+ {
+public:
+ static COomAppCloseTimer* NewL(COomCloseApp& aMonitor);
+private:
+ COomAppCloseTimer(COomCloseApp& aMonitor);
+ void RunL();
+
+private: //data
+
+ /**
+ * A reference to the owning close app action
+ */
+ COomCloseApp& iMonitor;
+
+ };
+
+#endif /*OOMAPPCLOSETIMER_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomappclosewatcher.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,64 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: An active object which watches for app close actions successfully completing.
+*
+*/
+
+
+#ifndef OOMAPPCLOSEWATCHER_H_
+#define OOMAPPCLOSEWATCHER_H_
+
+#include <e32base.h>
+
+class COomCloseApp;
+class TApaTask;
+
+/**
+ * This class implements an active object which watches for app close actions successfully completing.
+ *
+ * This watcher object logs-on to the thread of the application being closed and completes
+ * the app close action when the thread dies.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomAppCloseWatcher) : public CActive
+ {
+public:
+ COomAppCloseWatcher(COomCloseApp& aMonitor);
+ ~COomAppCloseWatcher();
+ void Start(const TApaTask& aTask);
+private:
+ void DoCancel();
+ void RunL();
+
+private: //data
+
+ /**
+ * A reference to the owning close app action
+ */
+ COomCloseApp& iMonitor;
+
+ /**
+ * A handle to the main thread of the application to be closed.
+ */
+ RThread iThread;
+
+ /**
+ * A backup of the orginal priority of the application's process
+ */
+ TProcessPriority iOriginalProcessPriority;
+ };
+
+#endif /*OOMAPPCLOSEWATCHER_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,90 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMAPPLICATIONCONFIG_
+#define OOMAPPLICATIONCONFIG_
+
+#include <e32base.h>
+
+class COomCloseAppConfig;
+class MOomRuleConfig;
+
+/*
+ * A list of action configurations for a particular target application.
+ *
+ * All configured actions in this list must be for the same target application.
+ * Actions may be configured to close the application or to run an OOM plugin.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomApplicationConfig) : public CBase
+ {
+public:
+
+ /**
+ * Two-phased constructor
+ * @param aApplicationId the UID of the application
+ */
+ static COomApplicationConfig* NewL(TUint aApplicationId);
+
+// Functions for getting configuration
+
+ /**
+ * Return a pointer to the close app config, this may be NULL if no app close config has been configured
+ * Ownership is NOT passed to the caller
+ */
+ inline COomCloseAppConfig* GetAppCloseConfig();
+
+ inline TUint Id();
+
+// Functions for setting configuration
+
+ inline void SetAppCloseConfig(COomCloseAppConfig* aActionConfig);
+
+ /**
+ * Add a rule
+ *
+ * This class takes ownership of the given rule
+ * The rule would will apply to the "application close" event
+ */
+ void AddRuleL(MOomRuleConfig* aRule);
+
+ ~COomApplicationConfig();
+
+public:
+
+ TUint iGoodRamThreshold;
+ TUint iLowRamThreshold;
+
+private:
+
+ void ConstructL();
+
+ COomApplicationConfig(TUint aApplicationId);
+
+ COomCloseAppConfig* iCloseAppConfig;
+
+ TInt iIndex;
+
+ TUint iApplicationId;
+ };
+
+#include "oomapplicationconfig.inl"
+
+#endif /*OOMAPPLICATIONCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomapplicationconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,42 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMAPPLICATIONCONFIGINL_H_
+#define OOMAPPLICATIONCONFIGINL_H_
+
+#include "oompanic.h"
+
+inline COomCloseAppConfig* COomApplicationConfig::GetAppCloseConfig()
+ {
+ return iCloseAppConfig;
+ }
+
+inline void COomApplicationConfig::SetAppCloseConfig(COomCloseAppConfig* aActionConfig)
+ {
+ __ASSERT_ALWAYS(iCloseAppConfig == NULL, OomMonitorPanic(KSameAppClosureConfiguredTwice));
+
+ iCloseAppConfig = aActionConfig;
+ }
+
+
+inline TUint COomApplicationConfig::Id()
+ {
+ return iApplicationId;
+ }
+
+#endif /*OOMAPPLICATIONCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomclientrequestqueue.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,134 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: COomClientRequestQueue.cpp.
+*
+*/
+
+
+#ifndef COOMCLIENTREQUESTQUEUE_H
+#define COOMCLIENTREQUESTQUEUE_H
+
+#include <e32std.h>
+#include <e32base.h>
+#include <e32property.h>
+
+#include "oommemorymonitor.h"
+
+class COomClientRequestQueue;
+class CMemoryMonitor;
+class CSubscribeHelper;
+
+class TClientRequest
+ {
+public:
+ TClientRequest(TActionTriggerType aClientRequestType, TInt aBytesRequested);
+ TClientRequest(TActionTriggerType aClientRequestType, const RMessage2& aRequestFreeRam);
+public:
+ TActionTriggerType iClientRequestType;
+ TInt iBytesRequested;
+ RMessage2 iRequestFreeRamMessage;
+ TSglQueLink iLink;
+ };
+
+/*
+ * If two client requests are queued, the COomClientRequestTimer is used to wait after the first request
+ * has been completed, to allow the first client time to allocate the memory it requested.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomClientRequestTimer) : public CTimer
+ {
+public:
+ static COomClientRequestTimer* NewL(COomClientRequestQueue& aQueue);
+private:
+ COomClientRequestTimer(COomClientRequestQueue& aQueue);
+ void RunL();
+
+private: //data
+ COomClientRequestQueue& iClientRequestQueue;
+ };
+
+/**
+ * Queues client requests so that the actual RAM level of the device is in a state where it can be more
+ * accurately determined whether more actions need to be run
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomClientRequestQueue) : public CBase
+ {
+public:
+
+ // Constructors and destructor
+
+ /**
+ * Destructor.
+ */
+ ~COomClientRequestQueue();
+
+ /**
+ * Two-phased constructor.
+ */
+ static COomClientRequestQueue* NewL(CMemoryMonitor& aMonitor);
+
+ CMemoryMonitor& Monitor();
+
+ void RequestFreeMemoryL(const RMessage2& aMessage);
+ void RequestOptionalRamL(const RMessage2& aMessage);
+ void ActionsCompleted(TInt aBytesFree, TBool aMemoryGood);
+ void RequestTimerCallbackL();
+
+private:
+
+ /**
+ * Constructor for performing 1st stage construction
+ */
+ COomClientRequestQueue(CMemoryMonitor& aMonitor);
+
+ /**
+ * EPOC default constructor for performing 2nd stage construction
+ */
+ void ConstructL();
+
+ static TInt WatchdogStatusStatusChanged(TAny* aPtr);
+ void HandleWatchdogStatusCallBack();
+ void AddClientRequestL(TClientRequest& request);
+ void StartClientRequestL();
+
+ // parameters for P&S watcher.
+
+ /**
+ * The handle to the P&S property that can be used to initiate OOM Monitor actions
+ */
+ RProperty iWatchdogStatusProperty;
+
+ /**
+ * The active object which monitors the P&S property that can be used to initiate OOM Monitor actions
+ * Own.
+ */
+ CSubscribeHelper* iWatchdogStatusSubscriber;
+
+ TSglQue<TClientRequest> iQueue;
+
+ TBool iClientRequestActive;
+
+ CMemoryMonitor& iMonitor;
+
+ COomClientRequestTimer* iClientRequestTimer;
+
+ TTime iLastClientCompletedTime;
+ };
+
+#endif // COOMCLIENTREQUESTQUEUE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,100 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMCLOSEAPP_H_
+#define OOMCLOSEAPP_H_
+
+
+#include <apgtask.h>
+
+#include "oomaction.h"
+
+class COomAppCloseTimer;
+class COomAppCloseWatcher;
+class TApaTask;
+class TActionRef;
+
+/*
+ * The OOM action of closing an application in order to free up memory.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomCloseApp) : public COomAction
+ {
+public:
+ /**
+ * Two-phased constructor.
+ * @param aStateChangeObserver an observer to the state of the application
+ * @param aWs a connected handle to a window server session
+ */
+ static COomCloseApp* NewL(MOomActionObserver& aStateChangeObserver, RWsSession& aWs);
+
+ //from COomAction
+
+ /**
+ * Close the application in order to free memory
+ * Call the COomAction::MemoryFreed when it is done
+ * @param aBytesRequested not used for clsoe app actions
+ */
+ virtual void FreeMemory(TInt aBytesRequested);
+
+ ~COomCloseApp();
+
+ /**
+ * Callback from COomAppCloseWatcher and COomAppCloseTimer
+ */
+ void CloseAppEvent();
+
+ inline TBool IsRunning();
+
+ /**
+ * Configure, or reconfigure the COomCloseApp object
+ * Action objects are reused to minimize any memory allocation when memory is low
+ */
+ void Reconfigure(const TActionRef& aRef);
+
+ inline TUint WgId() const;
+
+private:
+
+ COomCloseApp(MOomActionObserver& aStateChangeObserver, RWsSession& aWs);
+
+ void ConstructL();
+
+ TUint iWgId;
+
+ TBool iAppCloserRunning;
+ TApaTask iCurrentTask;
+
+ /**
+ * A timeout for an app close action
+ * Own
+ */
+ COomAppCloseTimer* iAppCloseTimer;
+
+ /**
+ * A watcher for the application closing
+ * Own
+ */
+ COomAppCloseWatcher* iAppCloseWatcher;
+ };
+
+#include "oomcloseapp.inl"
+
+#endif /*OOMCLOSEAPP_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomcloseapp.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMCLOSEAPPINL_H_
+#define OOMCLOSEAPPINL_H_
+
+inline TBool COomCloseApp::IsRunning()
+ {
+ return iAppCloserRunning;
+ }
+
+inline TUint COomCloseApp::WgId() const
+ {
+ return iWgId;
+ }
+
+#endif /*OOMCLOSEAPPINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,59 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMCLOSEAPPCONFIG_
+#define OOMCLOSEAPPCONFIG_
+
+#include "oomactionconfig.h"
+
+/*
+ *
+ */
+/**
+ * The OOM action of closing an application in order to free up memory.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomCloseAppConfig) : public COomActionConfig
+ {
+public:
+ /**
+ * Two-phased constructor.
+ * @param aId The Uid of the applicaton
+ */
+ static COomCloseAppConfig* NewL(TInt32 aId);
+
+ ~COomCloseAppConfig();
+
+ /**
+ * Calculates the priority of a close app action, based on its position on the window group list
+ *
+ * @param aWindowGroupList a fully constructed, collapsed window group list
+ * @param aAppIndexInWindowGroup the position in the window group list
+ */
+ inline TUint CalculateCloseAppPriority(const COomWindowGroupList& aWindowGroupList, TUint aAppIndexInWindowGroup);
+
+private:
+
+ COomCloseAppConfig(TInt32 aId);
+ };
+
+#include "oomcloseappconfig.inl"
+
+#endif /*OOMCLOSEAPPCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomcloseappconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMCLOSEAPPCONFIGINL_H_
+#define OOMCLOSEAPPCONFIGINL_H_
+
+inline TUint COomCloseAppConfig::CalculateCloseAppPriority(const COomWindowGroupList& aWindowGroupList, TUint aAppIndexInWindowGroup)
+ {
+ // Calculating the priority for application closures is simple, we just get the base class to apply the rules
+ return Priority(aWindowGroupList, aAppIndexInWindowGroup);
+ }
+
+#endif /*OOMCLOSEAPPCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,102 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMCONFIG_
+#define OOMCONFIG_
+
+#include <e32base.h>
+
+#include "oomglobalconfig.h"
+
+class COomCloseAppConfig;
+class COomRunPluginConfig;
+class MOomRuleConfig;
+class COomApplicationConfig;
+
+/*
+ * A class representing the entire configuration.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomConfig) : public CBase
+ {
+public:
+
+ static COomConfig* NewL();
+
+// Functions for setting configuration
+
+ // Add the configuration for an application closure.
+ // This class takes ownership of this configuration object.
+ void SetAppCloseConfigL(COomCloseAppConfig* aActionConfig);
+
+ // Add the configuration for a plugin action.
+ // This class takes ownership of the configuration object.
+ void AddPluginConfigL(COomRunPluginConfig* aPluginConfig);
+
+ // Add a rule for an application
+ // This class takes ownership of the given rule
+ // This rule applies to the specified application (and not a plugin associated with this application)
+ // The rule would usually apply to an "application close" event
+ void AddApplicationRuleL(TUint aTargetAppId, MOomRuleConfig* aRule);
+
+ // Add a rule for a plugin
+ // This class takes ownership of the given rule
+ // This rule is applied to the plugin with the specified ID
+ void AddPluginRuleL(TUint aPluginId, MOomRuleConfig* aRule);
+
+ // Add this application config - this class takes ownership of it
+ // Application config includes settings for a particular application, e.g. whether or not it can be closed
+ void AddApplicationConfigL(COomApplicationConfig* aApplicationConfig);
+
+// Functions for getting configuration
+
+ // Get the application configuration for the given app id
+ // If no specific actions have been configured for this application then the default application configuration is returned
+ COomApplicationConfig& GetApplicationConfig(TInt32 aAppId);
+
+ // Get the plugin configuration for the given plugin id
+ // If no specific actions have been configured for this plugin then the default plugin configuration is returned
+ COomRunPluginConfig& GetPluginConfig(TInt32 aPluginId);
+
+// Functions for setting global configuration
+
+ ~COomConfig();
+
+ inline COomGlobalConfig& GlobalConfig();
+
+ inline void SetDefaultLowRamThreshold(TInt aLowRamThreshold);
+ inline void SetDefaultGoodRamThreshold(TInt aGoodRamThreshold);
+ inline void SetMaxCloseAppBatch(TUint MaxCloseAppBatch);
+ inline void SetDefaultWaitAfterPlugin(TInt aMilliseconds);
+ inline void SetMaxAppExitTime(TInt aMilliseconds);
+
+private:
+ void ConstructL();
+
+ RHashMap<TInt32, COomApplicationConfig*> iApplicationToConfigMapping; // A hash-map of application configs, keyed on the application ID
+
+ RHashMap<TInt32, COomRunPluginConfig*> iPluginToConfigMapping; // A hash-map of plug-in configs, keyed on the plugin ID
+
+ COomGlobalConfig iGlobalConfig;
+ };
+
+#include "oomconfig.inl"
+
+#endif /*OOMCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,51 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMCONFIGINL_H_
+#define OOMCONFIGINL_H_
+
+inline COomGlobalConfig& COomConfig::GlobalConfig()
+ {
+ return iGlobalConfig;
+ }
+
+void COomConfig::SetDefaultLowRamThreshold(TInt aLowRamThreshold)
+ {
+ iGlobalConfig.iLowRamThreshold = aLowRamThreshold;
+ }
+
+void COomConfig::SetDefaultGoodRamThreshold(TInt aGoodRamThreshold)
+ {
+ iGlobalConfig.iGoodRamThreshold = aGoodRamThreshold;
+ }
+
+void COomConfig::SetMaxCloseAppBatch(TUint aMaxCloseAppBatch)
+ {
+ iGlobalConfig.iMaxCloseAppBatch = aMaxCloseAppBatch;
+ }
+void COomConfig::SetDefaultWaitAfterPlugin(TInt aMilliseconds)
+ {
+ iGlobalConfig.iDefaultWaitAfterPlugin = aMilliseconds;
+ }
+
+void COomConfig::SetMaxAppExitTime(TInt aMilliseconds)
+ {
+ iGlobalConfig.iMaxAppExitTime = aMilliseconds;
+ }
+
+#endif /*OOMCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomconfigparser.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,123 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: The parser for the OOM configuration file.
+*
+*/
+
+
+#ifndef OOMCONFIGPARSER_H_
+#define OOMCONFIGPARSER_H_
+
+#include <xml/contenthandler.h>
+
+using namespace Xml;
+
+class COomConfig;
+class COomRunPluginConfig;
+
+/**
+ * Parser for the Oom Monitor configuration file
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomConfigParser) : public CBase, public MContentHandler
+ {
+public:
+ COomConfigParser(COomConfig& aConfig, RFs& aFs);
+
+ void ParseL();
+
+
+ // From MContent handler
+ virtual void OnStartDocumentL(const RDocumentParameters& aDocParam, TInt aErrorCode);
+ virtual void OnEndDocumentL(TInt aErrorCode);
+ virtual void OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes,
+ TInt aErrorCode);
+ virtual void OnEndElementL(const RTagInfo& aElement, TInt aErrorCode);
+ virtual void OnContentL(const TDesC8& aBytes, TInt aErrorCode);
+ virtual void OnStartPrefixMappingL(const RString& aPrefix, const RString& aUri,
+ TInt aErrorCode);
+ virtual void OnEndPrefixMappingL(const RString& aPrefix, TInt aErrorCode);
+ virtual void OnIgnorableWhiteSpaceL(const TDesC8& aBytes, TInt aErrorCode);
+ virtual void OnSkippedEntityL(const RString& aName, TInt aErrorCode);
+ virtual void OnProcessingInstructionL(const TDesC8& aTarget, const TDesC8& aData,
+ TInt aErrorCode);
+ virtual void OnError(TInt aErrorCode);
+ virtual TAny* GetExtendedInterface(const TInt32 aUid);
+
+
+
+private:
+
+ void ConfigError(TInt aError);
+
+
+
+ void StartElementL(const TDesC8& aLocalName,
+ const RAttributeArray& aAttributes);
+
+ void SetGlobalSettings(const RAttributeArray& aAttributes);
+ void SetForceCheckConfigL(const RAttributeArray& aAttributes);
+ void SetAppConfigL(const RAttributeArray& aAttributes);
+ void SetCloseAppConfigL(const RAttributeArray& aAttributes);
+ void SetAppCloseIdlePriorityConfigL(const RAttributeArray& aAttributes);
+ void SetForegroundAppPriorityL(const RAttributeArray& aAttributes);
+
+ void SetSystemPluginConfigL(const RAttributeArray& aAttributes);
+ void SetAppPluginConfigL(const RAttributeArray& aAttributes);
+ void SetPluginIdlePriorityL(const RAttributeArray& aAttributes);
+ void SetPluginForegroundAppPriorityL(const RAttributeArray& aAttributes);
+
+ TInt GetValueFromAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TPtrC8& aValue);
+ TInt GetValueFromHexAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue);
+ TInt GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue);
+ TInt GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TInt& aValue);
+ TInt GetValueFromBooleanAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TBool& aValue);
+
+ void SetPluginSyncMode(const RAttributeArray& aAttributes, COomRunPluginConfig& aRunPluginConfig);
+
+ enum TOomParsingState
+ {
+ EOomParsingStateNone,
+ EOomParsingStateRoot,
+ EOomParsingStateGlobalSettings,
+ EOomParsingStateAppSettings,
+ EOomParsingStateAppCloseSettings,
+ EOomParsingStateSystemPluginSettings,
+ EOomParsingStateAppPluginSettings
+ };
+
+ // Check that the current state is as expected
+ // If not then the specified config error is generated
+ void CheckState(TOomParsingState aExpectedState, TInt aError);
+
+ // Check that the current state is as expected
+ // If not then the specified config error is generated
+ // This version checks to ensure that the current state matches either of the passed in states
+ void CheckState(TOomParsingState aExpectedState1, TOomParsingState aExpectedState2, TInt aError);
+
+ COomConfig& iConfig;
+
+ RFs& iFs;
+
+ void ChangeState(TOomParsingState aState);
+
+ TOomParsingState iState;
+
+ TUint iParentUid;
+ TUint iParentTargetApp;
+ };
+
+#endif /*OOMCONFIGPARSER_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomconstants.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,39 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Out of Memory Monitor Constants.
+*
+*/
+
+
+#ifndef OOMCONSTANTS_HRH_
+#define OOMCONSTANTS_HRH_
+
+const TInt KAppNotInWindowGroupList = -1;
+
+const TInt KOomDefaultAppId = 0;
+const TInt KOomDefaultPluginId = 0;
+const TInt KOomThresholdUnset = 0;
+
+const TInt KOomBusyAppId = 0x10286A84;
+const TInt KOomHighPriorityAppId = 0x10286A85;
+
+const TInt KOomPriorityInfinate = 1024;
+
+// same as Akncapserver since fast swap is contained in it
+const TUid KUidFastSwap = { 0x10207218 };
+const TUid KUidPenInputServer = { 0x10281855 };
+
+const TInt KMicrosecondsInMillisecond = 1000;
+
+#endif /*OOMCONSTANTS_HRH_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,48 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMFOREGROUNDRULE_
+#define OOMFOREGROUNDRULE_
+
+#include <e32base.h>
+#include "oomruleconfig.h"
+
+/**
+ * A rule to modify the priority if a particular application is in the foreground
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomForegroundRule) : public CBase, public MOomRuleConfig
+ {
+public:
+ // If the specified target app is in the foreground then apply the specified priority
+ COomForegroundRule(TInt aTargetAppId, TInt aPriority);
+
+ TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const;
+
+ inline TUint Priority() const;
+
+private:
+ TInt iTargetAppId;
+ TInt iPriority; // The priority to apply if the specified app is in the foreground
+ };
+
+#include "oomforegroundrule.inl"
+
+#endif /*OOMFOREGROUNDRULE_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomforegroundrule.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMFOREGROUNDRULEINL_H_
+#define OOMFOREGROUNDRULEINL_H_
+
+
+inline TUint COomForegroundRule::Priority() const
+ {
+ return iPriority;
+ }
+
+#endif /*OOMFOREGROUNDRULEINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,54 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMGLOBALCONFIG_
+#define OOMGLOBALCONFIG_
+
+#include <e32base.h>
+#include <e32hashtab.h>
+
+/**
+ * Class presenting the parts of the configuration that are global defaults rather than specific
+ * to the current state of the device
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomGlobalConfig) : public CBase
+ {
+public:
+ ~COomGlobalConfig();
+
+ inline void AddForceCheckPriorityL(TUint aPriority);
+
+ // Return ETrue if a force check has been added for this priority, return EFalse otherwise
+ inline TBool ForceCheckAtPriority(TUint aPriority) const;
+
+public:
+ TInt iLowRamThreshold;
+ TInt iGoodRamThreshold;
+ TUint iMaxCloseAppBatch;
+ TInt iDefaultWaitAfterPlugin;
+ TInt iMaxAppExitTime;
+
+ RHashSet<TUint> iForceCheckPriorities;
+ };
+
+#include "oomglobalconfig.inl"
+
+#endif /*OOMGLOBALCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomglobalconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,33 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMGLOBALCONFIGINL_H_
+#define OOMGLOBALCONFIGINL_H_
+
+void COomGlobalConfig::AddForceCheckPriorityL(TUint aPriority)
+ {
+ iForceCheckPriorities.InsertL(aPriority);
+ }
+
+// Return ETrue if a force check has been added for this priority, return EFalse otherwise
+TBool COomGlobalConfig::ForceCheckAtPriority(TUint aPriority) const
+ {
+ return (iForceCheckPriorities.Find(aPriority) != NULL);
+ }
+
+#endif /*OOMGLOBALCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,53 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMIDLETIMERULE_
+#define OOMIDLETIMERULE_
+
+#include <e32base.h>
+
+#include "oomruleconfig.h"
+
+/**
+ * A rule to modify the priority of an app close action if it has been idle for a period of time
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomIdleTimeRule) : public CBase, public MOomRuleConfig
+ {
+public:
+ static COomIdleTimeRule* NewL(TTimeIntervalSeconds aIdleTime, TInt aPriority);
+
+ TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const;
+
+ inline TUint Priority() const;
+
+ ~COomIdleTimeRule();
+
+private:
+ COomIdleTimeRule(TTimeIntervalSeconds aIdleTime, TInt aPriority);
+
+private:
+ TTimeIntervalSeconds iIdleTime; // The idle time after which to apply the given priority
+ TInt iPriority; // The priority to apply after the given idle time
+ };
+
+#include "oomidletimerule.inl"
+
+#endif /*OOMIDLETIMERULE_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomidletimerule.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,27 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMIDLETIMERULEINL_H_
+#define OOMIDLETIMERULEINL_H_
+
+inline TUint COomIdleTimeRule::Priority() const
+ {
+ return iPriority;
+ }
+
+#endif /*OOMIDLETIMERULEINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomlog.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,85 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Logging functionality for OOM monitor profiling.
+*
+*/
+
+
+#ifndef OOMLOG_H_
+#define OOMLOG_H_
+
+#ifdef _DEBUG
+
+#include <apgwgnam.h>
+
+#include "oomwindowgrouplist.h"
+
+const TUint KTimeBetweenMemorySamples = 100000; // In microseconds
+const TUint KSamplingDurationUint = 3000000;
+
+const TUint KMaxBytesOfLoggingPerSample = 20;
+
+NONSHARABLE_CLASS(COomLogger) : public CTimer
+ {
+public:
+ static COomLogger* NewL(RWsSession& aWs, RFs& aFs);
+
+ // Start logging the available memory every n micro seconds
+ // Firstly a list of the app IDs is written to the log (foreground app first)
+ // Note that the log is created in memory (to a pre-allocated buffer) and flushed out after it is complete
+ // the samples are saved in CSV format so that they can easily be cut and pasted to plot graphs etc.
+ void StartL();
+
+// From CTimer / CActice
+ void RunL();
+ void DoCancel();
+
+ ~COomLogger();
+
+ void Write(const TDesC8& aBuffer);
+
+protected:
+ void LogApplicationIds();
+ void LogFreeMemory();
+
+ COomLogger(RWsSession& aWs, RFs& aFs);
+ void ConstructL();
+
+ // Duplicated functionality from OomMonitor
+ // Duplicated because it was messy to reuse it and to minimise changes to OOM monitor during development of new features
+ void ColapseWindowGroupTree();
+
+ TUid GetUidFromWindowGroupId(TInt aWgId);
+
+ RWsSession& iWs;
+
+ // Used to get a list of open applications
+ RArray<RWsSession::TWindowGroupChainInfo> iWgIds;
+ CApaWindowGroupName* iWgName;
+ HBufC* iWgNameBuf; // owned by iWgName
+
+ RFs& iFs;
+
+ RFile iFile;
+ TBool iIsOpen;
+
+ // The time when the logging was started
+ TTime iStartTime;
+
+ TBuf8<(KSamplingDurationUint / KTimeBetweenMemorySamples) * KMaxBytesOfLoggingPerSample> iWriteBuffer;
+ };
+
+#endif //_DEBUG
+
+#endif /*OOMLOG_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitor.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,196 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMMEMORYMONITOR_H
+#define OOMMEMORYMONITOR_H
+
+#include <e32property.h>
+#include <f32file.h>
+#include <w32std.h>
+#include "oomglobalconfig.h"
+#include "oomwindowgrouplist.h"
+#include "oommonitorsession.h"
+
+enum TActionTriggerType
+ {
+ ERamRotation,
+ EClientServerRequestOptionalRam,
+ EClientServerRequestFreeMemory,
+ EPublishAndSubscribe
+ };
+
+// ---------------------------------------------------------
+// CMemoryMonitor
+// ---------------------------------------------------------
+//
+class COutOfMemoryWatcher;
+class CSubscribeHelper;
+class COomMonitorPlugin;
+class CMemoryMonitorServer;
+class CWservEventReceiver;
+class COomActionList;
+class COomLogger;
+class COomConfig;
+class COomClientRequestQueue;
+
+/**
+ * The main manager class for Oom Monitor. It has the following responsibility:
+ *
+ * - initiates building the static configuration at boot time and owns the object which holds this.
+ * - owns and drives the action list which runs actions
+ * - owns the internal representation of the window group list and an active object to monitor window group changes
+ * - owns the public API via the server and client request queue.
+ * - has an active object which monitors low RAM events
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(CMemoryMonitor) : public CBase
+ {
+public:
+ static CMemoryMonitor* NewL();
+ ~CMemoryMonitor();
+
+public: // event handlers
+ void FreeMemThresholdCrossedL();
+ void AppNotExiting(TInt aWgId);
+ void StartFreeSomeRamL(TInt aTargetFree);
+ void StartFreeSomeRamL(TInt aTargetFree, TInt aMaxPriority);
+ void FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId); // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
+ void HandleFocusedWgChangeL();
+ static const COomGlobalConfig& GlobalConfig();
+ void SetPriorityBusy(TInt aWgId);
+ void SetPriorityNormal(TInt aWgId);
+ void SetPriorityHigh(TInt aWgId);
+ void ResetTargets();
+ void RequestTimerCallbackL();
+ void GetFreeMemory(TInt& aCurrentFreeMemory);
+ TActionTriggerType ActionTrigger() const;
+#ifdef CLIENT_REQUEST_QUEUE
+ void ActionsCompleted(TInt aBytesFree, TBool aMemoryGood);
+ TInt GoodThreshold() const;
+ TInt LowThreshold() const;
+#endif
+ void RequestFreeMemoryL(TInt aBytesRequested);
+ void RequestFreeMemoryPandSL(TInt aBytesRequested);
+
+ /*
+ * Sets the RProperty associated with KOomMemoryMonitorStatusPropertyKey
+ * It checks if the value is going to be changed.
+ * If the new value is the same as the old one then the property is not updated
+ * If the new value is different from the previously set one then the property is update
+ *
+ * @param aNewValue one of TMemoryMonitorStatusPropertyValues
+ */
+ void SetMemoryMonitorStatusProperty(const TMemoryMonitorStatusPropertyValues aValue);
+
+private:
+ CMemoryMonitor();
+ void ConstructL();
+#ifndef CLIENT_REQUEST_QUEUE
+ static TInt WatchdogStatusStatusChanged(TAny* aPtr);
+ void HandleWatchdogStatusCallBack();
+ TBool FreeMemoryAboveThreshold(TInt& aCurrentFreeMemory); void CloseNextApp();
+#endif
+ void RefreshThresholds();
+
+public:
+ // All members are owned
+ // generally useful sessions
+ RFs iFs;
+ RWsSession iWs;
+
+private: //data
+
+ // parameters for OOM watcher.
+ TInt iLowThreshold;
+ TInt iGoodThreshold;
+ TInt iCurrentTarget;
+#ifdef CLIENT_REQUEST_QUEUE
+ TInt iClientBytesRequested;
+#endif
+ // event receivers
+
+ /**
+ * The active object which monitors the kernel change notifier for changes in the low and good thresholds
+ * Own
+ */
+ COutOfMemoryWatcher* iOOMWatcher;
+
+
+ CWservEventReceiver* iWservEventReceiver;
+
+#ifndef CLIENT_REQUEST_QUEUE
+ // parameters for P&S watcher.
+ /**
+ * The handle to the P&S property that can be used to initiate OOM Monitor actions
+ */
+ RProperty iWatchdogStatusProperty;
+
+ /**
+ * The active object which monitors the P&S property that can be used to initiate OOM Monitor actions
+ * Own.
+ */
+ CSubscribeHelper* iWatchdogStatusSubscriber;
+#endif
+
+ /**
+ * The Memory Monitor Server
+ * Own.
+ */
+ CMemoryMonitorServer* iServer;
+
+#ifdef CLIENT_REQUEST_QUEUE
+ COomClientRequestQueue* iQueue;
+#endif
+
+#ifdef _DEBUG
+ /**
+ * Oom logging tool - samples free memory for profiling
+ * Own.
+ */
+ COomLogger* iLogger;
+#endif
+
+ /**
+ * A list of window group Ids, with child window groups removed such that there is one Id per application
+ * Own.
+ */
+ COomWindowGroupList* iOomWindowGroupList;
+
+ /**
+ * The object responsible for identifying the best actions to run, and running them
+ * Own.
+ */
+ COomActionList* iOomActionList;
+
+ /**
+ * The entire Oom Monitor configuration
+ * Own.
+ */
+ COomConfig* iConfig;
+
+ /**
+ * The most recent value the memory monitor status property was set to
+ */
+ TInt iLastMemoryMonitorStatusProperty;
+
+ TActionTriggerType iActionTrigger;
+ };
+
+#endif /*OOMMEMORYMONITOR_H*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorserver.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,63 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMMEMORYMONITORSERVER_H
+#define OOMMEMORYMONITORSERVER_H
+
+#include <e32base.h>
+
+class CMemoryMonitor;
+class COomClientRequestQueue;
+
+NONSHARABLE_CLASS(CMemoryMonitorServer) : public CServer2
+ {
+public:
+#ifdef CLIENT_REQUEST_QUEUE
+ static CMemoryMonitorServer* NewL(COomClientRequestQueue& aQueue);
+#else
+ static CMemoryMonitorServer* NewL(CMemoryMonitor& aMonitor);
+#endif
+ ~CMemoryMonitorServer();
+
+ CMemoryMonitor& Monitor();
+#ifndef CLIENT_REQUEST_QUEUE
+ void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood);
+#endif
+#ifdef CLIENT_REQUEST_QUEUE
+ COomClientRequestQueue& ClientRequestQueue();
+#endif
+
+private:
+#ifdef CLIENT_REQUEST_QUEUE
+ CMemoryMonitorServer(COomClientRequestQueue& aQueue);
+#else
+ CMemoryMonitorServer(CMemoryMonitor& aMonitor);
+#endif
+ void ConstructL();
+ CSession2* NewSessionL(const TVersion& aVersion,const RMessage2& aMessage) const;
+ TInt RunError(TInt aError);
+
+private:
+#ifdef CLIENT_REQUEST_QUEUE
+ COomClientRequestQueue& iQueue;
+#else
+ CMemoryMonitor& iMonitor;
+#endif
+ };
+
+#endif /*OOMMEMORYMONITORSERVER_H*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oommemorymonitorsession.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,53 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMMEMORYMONITORSESSION_H
+#define OOMMEMORYMONITORSESSION_H
+
+#include <e32base.h>
+
+class CMemoryMonitorServer;
+class CMemoryMonitor;
+class COomClientRequestQueue;
+
+NONSHARABLE_CLASS(CMemoryMonitorSession) : public CSession2
+ {
+public:
+ CMemoryMonitorSession();
+#ifndef CLIENT_REQUEST_QUEUE
+ void CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood);
+#endif
+
+private:
+ ~CMemoryMonitorSession();
+ CMemoryMonitorServer& Server();
+#ifdef CLIENT_REQUEST_QUEUE
+ COomClientRequestQueue& ClientRequestQueue();
+#endif
+ CMemoryMonitor& Monitor();
+ void ServiceL(const RMessage2& aMessage);
+
+private:
+ RMessagePtr2 iRequestFreeRam;
+#ifndef CLIENT_REQUEST_QUEUE
+ TInt iFunction;
+#endif
+ TInt iMinimumMemoryRequested;
+ };
+
+#endif /*OOMMEMORYMONITORSESSION_H*/
--- a/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/inc/oommonitorclientserver.h Fri Feb 26 17:43:11 2010 +0000
@@ -11,7 +11,7 @@
*
* Contributors:
*
-* Description: Command definitions for OOM Monitor client/server interface.
+* Description: The client / server classes allowing clients to make requests to OOM monitor.
*
*/
@@ -22,20 +22,24 @@
#include <e32std.h>
enum TOomMonitorClientPanic
- {
- EPanicIllegalFunction,
- EPanicRequestActive
- };
+ {
+ EPanicIllegalFunction,
+ EPanicRequestActive
+ };
void PanicClient(const RMessagePtr2& aMessage,TOomMonitorClientPanic aPanic);
_LIT(KMemoryMonitorServerName, "OomMonitorServer");
enum TOomMonitorCmd
- {
- EOomMonitorRequestFreeMemory,
- EOomMonitorCancelRequestFreeMemory,
- EOomMonitorThisAppIsNotExiting
- };
+ {
+ EOomMonitorRequestFreeMemory,
+ EOomMonitorCancelRequestFreeMemory,
+ EOomMonitorThisAppIsNotExiting,
+ EOomMonitorRequestOptionalRam,
+ EOomMonitorSetPriorityBusy,
+ EOomMonitorSetPriorityNormal,
+ EOomMonitorSetPriorityHigh
+ };
#endif // OOMMONITORCLIENTSERVER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomoutofmemorywatcher.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,58 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMOUTOFMEMORYWATCHER_H
+#define OOMOUTOFMEMORYWATCHER_H
+
+#include <e32base.h>
+
+class CMemoryMonitor;
+
+/**
+ * This class is an active object which monitors a kernel change notifer for changes in the
+ * low and good memory thresholds.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COutOfMemoryWatcher) : public CActive
+ {
+public:
+ static COutOfMemoryWatcher* NewL(CMemoryMonitor& aLafShutdown, TInt aLowThreshold, TInt aGoodThreshold);
+ ~COutOfMemoryWatcher();
+ void Start();
+
+ /**
+ * Set the Low and Good thresholds that we are listening for.
+ * These values can change from the global default values when certain applications are in the foreground.
+ * @param aLowThreshold If Ram Level drops below the low threshold Oom Monitor actions are started.
+ * @param aGoodThreshold When memory returns above the Good threshold then Oom Monitor stops freeing memory.
+ */
+ void UpdateThresholds(TInt aLowThreshold, TInt aGoodThreshold);
+private:
+ COutOfMemoryWatcher(CMemoryMonitor& aLafShutdown);
+ void ConstructL(TInt aLowThreshold, TInt aGoodThreshold);
+private: // from CActive
+ void DoCancel();
+ void RunL();
+private: // data
+ RChangeNotifier iChangeNotifier;
+ CMemoryMonitor& iLafShutdown;
+ };
+
+#endif /*OOMOUTOFMEMORYWATCHER_H*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oompanic.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,52 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Panic codes for OOM monitor.
+*
+*/
+
+
+#ifndef OOMPANIC_
+#define OOMPANIC_
+
+#include <e32def.h>
+
+enum TOomMonitorPanic
+ {
+ KRuleConfiguredBeforeApplication,
+ KCloseAppActionIsResued,
+ KAppConfigAddedTwice,
+ KSameAppClosureConfiguredTwice,
+ KOomDefaultAppCloseNotConfigured,
+ KPluginConfigAddedTwice,
+ KRuleConfiguredBeforePlugin,
+ KOomDefaultAppNotConfigured,
+ KOomDefaultPluginNotConfigured,
+ KNoCoeEnvFound,
+ KInvalidWgName,
+ KOomInvalidPriority,
+ KAppCloseActionEqualPriorities,
+ KClientQueueNotEmpty,
+ KClientRequestTimerActive,
+ KInvalidClientRequestType,
+ KPluginArrayIndexOutOfBounds,
+ KWindowGroupArrayIndexOutOfBounds,
+ KStartingActiveCloseAppTimer,
+ KStartingActiveAppCloseWatcher,
+ KStartingActivePluginWaiter
+ };
+
+void OomMonitorPanic(TOomMonitorPanic aReason);
+void OomConfigParserPanic(TInt aReason);
+
+#endif /*OOMPANIC_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oompluginwaiter.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,53 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMPLUGINWAITER_H_
+#define OOMPLUGINWAITER_H_
+
+#include <e32base.h>
+
+class COomRunPlugin;
+
+
+/*
+ * A class used for waiting for a pre-determined period before completing the plugin operation
+ * It is intended to be used to force a delay between the call to the plugin and the memory check,
+ * thus allowing the plugin to free some memory first.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomPluginWaiter) : public CTimer
+ {
+public:
+ static COomPluginWaiter* NewL(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass);
+
+ // Start the timer, it will call the plugin back when it expires
+ void Start();
+
+protected:
+ void RunL();
+
+ COomPluginWaiter(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass);
+
+private:
+ TInt iMillisecondsToWait;
+ COomRunPlugin& iCallbackClass;
+ };
+
+#endif /*OOMPLUGINWAITER_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomruleconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,33 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMRULECONFIG_
+#define OOMRULECONFIG_
+
+#include <e32std.h>
+
+class COomWindowGroupList;
+
+NONSHARABLE_CLASS(MOomRuleConfig)
+ {
+public:
+ virtual TBool RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const = 0;
+ virtual TUint Priority() const = 0;
+ };
+
+#endif /*OOMRULECONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,85 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMRUNPLUGIN_H_
+#define OOMRUNPLUGIN_H_
+
+#include "oomaction.h"
+
+class COomRunPlugin;
+class COomRunPluginConfig;
+class MOomActionObserver;
+class COomPluginWaiter;
+class COomMonitorPlugin;
+class COomMonitorPluginV2;
+class COomActionConfig;
+
+/*
+ * The OOM action of running an OOM plug-in to free up memory.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomRunPlugin) : public COomAction
+ {
+public:
+ static COomRunPlugin* NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin = NULL);
+
+ ~COomRunPlugin();
+
+ // Run the OOM plugin in order to free memory
+ // Call the COomAction::MemoryFreed when it is done
+ virtual void FreeMemory(TInt aBytesRequested);
+
+ // Call the memory good function on the plugin but...
+ // only if there is an outstanding FreeMemory request
+ void MemoryGood();
+
+ inline TBool IsRunning();
+
+ // To be called by the COomPluginWaiter
+ inline void WaitCompleted();
+
+protected:
+
+ void ConstructL(COomRunPluginConfig& aPluginConfig);
+
+ inline COomActionConfig& GetConfig();
+
+private:
+
+ COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin);
+
+ TUint iPluginId;
+
+ COomMonitorPlugin& iPlugin;
+
+ COomRunPluginConfig& iConfig;
+
+ COomPluginWaiter* iPluginWaiter;
+
+ // Note that this shouldn't be deleted
+ // If it is pointing to a V2 plugin then it is a cast to the same instance as iPlugin
+ COomMonitorPluginV2* iV2Plugin;
+
+ TBool iFreeMemoryCalled; // True if FreeMemory has been called since the last call to MemoryGood
+ };
+
+#include "oomrunplugin.inl"
+
+#endif /*OOMRUNPLUGIN_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomrunplugin.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,43 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMRUNPLUGININL_H_
+#define OOMRUNPLUGININL_H_
+
+#include "oomactionconfig.h"
+#include "oompluginwaiter.h"
+#include "oomrunpluginconfig.h"
+
+inline COomActionConfig& COomRunPlugin::GetConfig()
+ {
+ return iConfig;
+ }
+
+
+inline TBool COomRunPlugin::IsRunning()
+ {
+ return iPluginWaiter->IsActive();
+ }
+
+inline void COomRunPlugin::WaitCompleted()
+ {
+ MemoryFreed(KErrNone);
+ }
+
+
+#endif /*OOMRUNPLUGININL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,81 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMRUNPLUGINCONFIG_
+#define OOMRUNPLUGINCONFIG_
+
+#include "oomactionconfig.h"
+
+enum TOomPluginType
+ {
+ EOomAppPlugin,
+ EOomSystemPlugin
+ };
+
+/*
+ * The OOM action of running an OOM plug-in to free up memory.
+ */
+NONSHARABLE_CLASS(COomRunPluginConfig) : public COomActionConfig
+ {
+public:
+ static COomRunPluginConfig* NewL(TUint aPluginId, TOomPluginType aPluginType);
+
+ TUint CalculatePluginPriority(const COomWindowGroupList& aWindowGroupList);
+
+ inline TUint Id();
+
+ inline void SetTargetApp(TUint aTargetAppId);
+
+ inline TUint TargetApp() const;
+
+ ~COomRunPluginConfig();
+
+ // Returns ETrue if a wait period has been explicitly configured for this plugin
+ inline TBool WaitAfterPluginDefined() const;
+
+ // Returns the configured wait after the plugin has been called
+ inline TInt WaitAfterPlugin() const;
+
+ inline TBool CallIfTargetAppNotRunning() const;
+
+ // Set the time to wait
+ inline void SetWaitAfterPlugin(TInt aMillisecondsToWait);
+
+ inline void SetCallIfTargetAppNotRunning(TBool aCallIfTargetAppNotRunning);
+
+ inline TOomPluginType PluginType();
+
+private:
+ COomRunPluginConfig(TUint aPluginId, TOomPluginType aPluginType);
+
+ TUint iPluginId;
+
+ TUint iTargetAppId;
+
+ TBool iWaitAfterPluginDefined;
+
+ TInt iWaitAfterPlugin; // The period to wait after a plugin has been called
+
+ TBool iCallIfTargetAppNotRunning;
+
+ TOomPluginType iPluginType;
+ };
+
+#include "oomrunpluginconfig.inl"
+
+#endif /*OOMRUNPLUGINCONFIG_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomrunpluginconfig.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,72 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMRUNPLUGINCONFIGINL_H_
+#define OOMRUNPLUGINCONFIGINL_H_
+
+
+// Returns ETrue if a wait period has been explicitly configured for this plugin
+inline TBool COomRunPluginConfig::WaitAfterPluginDefined() const
+ {
+ return iWaitAfterPluginDefined;
+ }
+
+// Returns the configured wait after the plugin has been called
+inline TInt COomRunPluginConfig::WaitAfterPlugin() const
+ {
+ return iWaitAfterPlugin;
+ }
+
+inline TBool COomRunPluginConfig::CallIfTargetAppNotRunning() const
+ {
+ return iCallIfTargetAppNotRunning;
+ }
+
+// Set the time to wait
+inline void COomRunPluginConfig::SetWaitAfterPlugin(TInt aMillisecondsToWait)
+ {
+ iWaitAfterPluginDefined = ETrue;
+ iWaitAfterPlugin = aMillisecondsToWait;
+ }
+
+inline void COomRunPluginConfig::SetCallIfTargetAppNotRunning(TBool aCallIfTargetAppNotRunning)
+ {
+ iCallIfTargetAppNotRunning = aCallIfTargetAppNotRunning;
+ }
+
+inline void COomRunPluginConfig::SetTargetApp(TUint aTargetAppId)
+ {
+ iTargetAppId = aTargetAppId;
+ }
+
+inline TUint COomRunPluginConfig::Id()
+ {
+ return iPluginId;
+ }
+
+inline TOomPluginType COomRunPluginConfig::PluginType()
+ {
+ return iPluginType;
+ }
+
+inline TUint COomRunPluginConfig::TargetApp() const
+ {
+ return iTargetAppId;
+ }
+
+#endif /*OOMRUNPLUGINCONFIGINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomsubscribehelper.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,52 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMSUBSCRIBEHELPER_H
+#define OOMSUBSCRIBEHELPER_H
+
+#include <e32base.h>
+
+class RProperty;
+
+/**
+ * This class is a simple active object which monitors the publish subscribe key method of calling the
+ * requesting that the OOM Monitor starts to free memory
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(CSubscribeHelper) : public CActive
+ {
+public:
+ CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty);
+ ~CSubscribeHelper();
+
+public: // New functions
+ void Subscribe();
+ void StopSubscribe();
+
+private: // from CActive
+ void RunL();
+ void DoCancel();
+
+private:
+ TCallBack iCallBack;
+ RProperty& iProperty;
+ };
+
+#endif /*OOMSUBSCRIBEHELPER_H*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,119 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: A wrapper for the window group list, adding additional functionality required by OOM Monitor v2.
+*
+*/
+
+
+#ifndef OOMWINDOWGROUPLIST_H_
+#define OOMWINDOWGROUPLIST_H_
+
+#include <e32base.h>
+#include <e32hashtab.h>
+#include <w32std.h>
+
+class CApaWindowGroupName;
+
+/**
+ * This class holds a snapshot of the window group tree.
+ *
+ * The window group tree is collapsed (see CollapseWindowGroupTree) to remove child windows as we are only
+ * interested in a single window group Id per application.
+ *
+ * @lib oommonitor.lib
+ * @since S60 v5.0
+ */
+NONSHARABLE_CLASS(COomWindowGroupList) : public CBase
+ {
+public:
+
+ static COomWindowGroupList* NewL(RWsSession& aWs);
+
+ // Update the list of window groups
+ void RefreshL();
+
+ // Update the list of window groups, non-leaving version
+ void Refresh();
+
+ // Return the number of application instances in this list
+ inline TUint Count() const;
+
+ TUint AppId(TInt aIndex, TBool aResolveFromThread = EFalse) const;
+
+ inline const RWsSession::TWindowGroupChainInfo& WgId(TInt aIndex) const;
+
+ TTimeIntervalSeconds IdleTime(TInt aIndex) const;
+
+ ~COomWindowGroupList();
+
+ void SetPriorityBusy(TInt aWgId);
+
+ void SetPriorityNormal(TInt aWgId);
+
+ void SetPriorityHigh(TInt aWgId);
+
+ TBool IsBusy(TInt wgIndex);
+
+ // Returns ETrue if an application has registered itself as high priority at runtime
+ TBool IsDynamicHighPriority(TInt wgIndex);
+
+ CApaWindowGroupName* WgName() const;
+
+ // Find the specificed application in the window group list and return the index
+ TInt GetIndexFromAppId(TUint aAppId) const;
+
+private:
+
+ void CollapseWindowGroupTree();
+
+ void RemovePropertiesForClosedWindowsL();
+
+ TInt FindParentIdL(TInt aWgId);
+
+private:
+
+ COomWindowGroupList(RWsSession& aWs);
+
+ void ConstructL();
+
+ RArray<RWsSession::TWindowGroupChainInfo> iWgIds;
+ RArray<RWsSession::TWindowGroupChainInfo> iUncollapsedWgIds;
+
+ enum TOomPriority
+ {
+ EOomPriorityNormal,
+ EOomPriorityHigh,
+ EOomPriorityBusy
+ };
+
+ class TOomWindowGroupProperties
+ {
+ public:
+ TOomWindowGroupProperties();
+ TUint32 iIdleTickTime;
+ TOomPriority iDynamicPriority;
+ };
+
+ RHashMap<TInt, TOomWindowGroupProperties> iWgToPropertiesMapping; // A mapping between window group IDs and the properties such as idle time and the high-priority flag
+ RHashSet<TInt> iExistingWindowIds; // Used locally in RemoveIdleTimesForClosedWindows(), declared globally because we need to reserve space
+
+ RWsSession& iWs;
+
+ CApaWindowGroupName* iWgName;
+ HBufC* iWgNameBuf; // owned by iWgName
+ };
+
+#include "oomwindowgrouplist.inl"
+
+#endif /*OOMWINDOWGROUPLIST_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomwindowgrouplist.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,33 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#ifndef OOMWINDOWGROUPLISTINL_H_
+#define OOMWINDOWGROUPLISTINL_H_
+
+// Return the number of application instances in this list
+inline TUint COomWindowGroupList::Count() const
+ {
+ return iWgIds.Count();
+ }
+
+inline const RWsSession::TWindowGroupChainInfo& COomWindowGroupList::WgId(TInt aIndex) const
+ {
+ return iWgIds[aIndex];
+ }
+
+#endif /*OOMWINDOWGROUPLISTINL_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/oomwserveventreceiver.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,41 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#ifndef OOMWSERVEVENTRECEIVER_H
+#define OOMWSERVEVENTRECEIVER_H
+
+#include <w32std.h>
+class CMemoryMonitor;
+
+NONSHARABLE_CLASS(CWservEventReceiver) : public CActive
+ {
+public:
+ CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs);
+ ~CWservEventReceiver();
+ void ConstructL();
+private:
+ void Queue();
+ void DoCancel();
+ void RunL();
+private:
+ CMemoryMonitor& iMonitor;
+ RWsSession& iWs;
+ RWindowGroup iWg;
+ };
+
+#endif /*OOMWSERVEVENTRECEIVER_H*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/traceconfiguration.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,84 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Tracing flags configuration.
+*
+*/
+
+
+#ifndef TRACECONFIGURATION_HRH
+#define TRACECONFIGURATION_HRH
+
+//-----------------------------------------------------------------------------
+// Trace definitions
+//-----------------------------------------------------------------------------
+//
+
+/**
+* Error trace enabled
+*/
+#ifdef _DEBUG
+ #define ERROR_TRACE
+#else
+ #undef ERROR_TRACE
+#endif
+
+/**
+* Info trace enabled
+*/
+#define __OOM_INFO_TRACE__
+#if defined _DEBUG && defined __OOM_INFO_TRACE__
+ #define INFO_TRACE
+ #define TIMESTAMP_TRACE
+#else
+ #undef INFO_TRACE
+ #undef TIMESTAMP_TRACE
+#endif
+
+/**
+* Function trace enabled
+*/
+#if defined _DEBUG && defined __OOM_FUNC_TRACE__
+ #define FUNC_TRACE
+#else
+ #undef FUNC_TRACE
+#endif
+
+/**
+* Timestamp tracing on
+*/
+#if defined _DEBUG && defined __OOM_TIMESTAMP_TRACE__
+ #define TIMESTAMP_TRACE
+#else
+ #undef TIMESTAMP_TRACE
+#endif
+
+/**
+* Tracing current client process and thread
+*/
+#ifdef _DEBUG
+ #define CLIENT_TRACE
+#else
+ #undef CLIENT_TRACE
+#endif
+
+/**
+* Tracing into file enabled, default RDebug
+*/
+#ifdef __OOM_TRACE_INTO_FILE__
+ #define TRACE_INTO_FILE
+#else
+ #undef TRACE_INTO_FILE
+#endif
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/inc/tracedefs.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,39 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Definitions for tracing.
+*
+*/
+
+
+#ifndef TRACEDEFS_H
+#define TRACEDEFS_H
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+//
+
+/**
+* Prefix trace macro to complete tracing with component name.
+* Returns TDesC which can be used directly with RDebug or RFileLogger.
+*/
+#define _PREFIX_TRACE( aMsg ) TPtrC( (const TText*)L"[OOM]: " L##aMsg )
+#define _PREFIX_TRACE_2( aMsg1, aMsg2 ) TPtrC( (const TText*)L"[OOM]: " L##aMsg1 L##aMsg2 )
+
+/**
+* Prefix macro for strings
+*/
+#define _PREFIX_CHAR( aMsg ) (const char*)"[OOM]: " ##aMsg
+
+#endif // TRACEDEFS_H
--- a/sysresmonitoring/oommonitor/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/rom/oommonitor.iby Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/rom/oommonitor.iby Fri Feb 26 17:43:11 2010 +0000
@@ -22,6 +22,7 @@
#include <data_caging_paths_for_iby.hrh>
file=ABI_DIR\BUILD_DIR\oommonitor.dll SHARED_LIB_DIR\oommonitor.dll
+data=ZSYSTEM\..\private\10207218\oomconfig.xml private\10207218\oomconfig.xml
#endif // OOMMONITOR_IBY
--- a/sysresmonitoring/oommonitor/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomIdletimerule.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,51 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+#include "oomidletimerule.h"
+#include "oomwindowgrouplist.h"
+#include "oomtraces.h"
+
+COomIdleTimeRule* COomIdleTimeRule::NewL(TTimeIntervalSeconds aIdleTime, TInt aPriority)
+ {
+ FUNC_LOG;
+
+ COomIdleTimeRule* self = new (ELeave) COomIdleTimeRule(aIdleTime, aPriority);
+ return self;
+ }
+
+TBool COomIdleTimeRule::RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const
+ {
+ FUNC_LOG;
+
+ TBool applicable = EFalse;
+ if (aAppIndexInWindowGroup >= 0)
+ {
+ applicable = (aWindowGroupList.IdleTime(aAppIndexInWindowGroup) >= iIdleTime);
+ }
+ return applicable;
+ }
+
+COomIdleTimeRule::~COomIdleTimeRule()
+ {
+ FUNC_LOG;
+ }
+
+COomIdleTimeRule::COomIdleTimeRule(TTimeIntervalSeconds aIdleTime, TInt aPriority) : iIdleTime(aIdleTime), iPriority(aPriority)
+ {
+ FUNC_LOG;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomaction.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,40 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#include "oomaction.h"
+#include "oomactionlist.h"
+#include "oomtraces.h"
+
+COomAction::~COomAction()
+ {
+ FUNC_LOG;
+ }
+
+// To be called by the derived class after the memory has been freed (or if it fails)
+void COomAction::MemoryFreed(TInt)
+ {
+ FUNC_LOG;
+
+ iState = EOomIdle;
+ iStateChangeObserver.StateChanged();
+ }
+
+COomAction::COomAction(MOomActionObserver& aStateChangeObserver) : iStateChangeObserver(aStateChangeObserver)
+ {
+ FUNC_LOG;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomactionconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,77 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oomactionconfig.h"
+#include "oomruleconfig.h"
+#include "oomtraces.h"
+
+// Add a rule
+// This class takes ownership of the given rule
+void COomActionConfig::AddRuleL(MOomRuleConfig* aRule) // Add the configuration for a rule (e.g. an idle time rule)
+ {
+ FUNC_LOG;
+
+ iRules.AppendL(aRule);
+ }
+
+COomActionConfig::~COomActionConfig()
+ {
+ FUNC_LOG;
+
+ iRules.ResetAndDestroy();
+ iRules.Close();
+ }
+
+// Utility function to return the priority for this action for the given rule
+TUint COomActionConfig::Priority(const COomWindowGroupList& aWindowGroupList, TInt aAppIndexInWindowGroup) const
+ {
+ FUNC_LOG;
+
+ TUint priority = iDefaultPriority;
+
+ // See if any rules apply
+ TInt index = 0;
+ while (index < iRules.Count())
+ {
+ if (iRules[index]->RuleIsApplicable(aWindowGroupList, aAppIndexInWindowGroup))
+ {
+ // If an applicable rule has been found, then apply the new priority
+ // The last applicable rule in the config file should be used
+ // This is ensured because the last rule in the list will be the last rule from the file
+ if (iRules[index]->Priority())
+ priority = iRules[index]->Priority();
+ }
+
+ index++;
+ }
+
+ return priority;
+ }
+
+void COomActionConfig::ConstructL()
+ {
+ FUNC_LOG;
+ }
+
+COomActionConfig::COomActionConfig(TInt32 aId) : iId(aId)
+ {
+ FUNC_LOG;
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomactionlist.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,678 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+
+#include <hal.h>
+#include <apgwgnam.h>
+
+#include "oommonitorplugin.h"
+#include "oommonitorplugin.hrh"
+#include "oomactionlist.h"
+#include "oomwindowgrouplist.h"
+#include "oompanic.h"
+#include "OomTraces.h"
+#include "oomconstants.hrh"
+#include "oommemorymonitor.h"
+#include "oommemorymonitorserver.h"
+#include "oomrunplugin.h"
+#include "oomcloseapp.h"
+#include "oomconfig.h"
+#include "oomactionref.h"
+#include "oomapplicationconfig.h"
+#include "oomcloseappconfig.h"
+#include "oomrunpluginconfig.h"
+
+const TUid KUidMatrixMenuApp = { 0x101F4CD2 };
+
+template <class T>
+COomPluginList<T>::COomPluginList()
+ {
+ FUNC_LOG;
+ }
+
+template <class T>
+COomPluginList<T>::~COomPluginList()
+ {
+ FUNC_LOG;
+
+ TInt count = iPlugins.Count();
+ for (TInt ii=0; ii<count; ii++)
+ {
+ TPlugin& plugin = iPlugins[ii];
+ if (plugin.iImpl) // only if successfully added
+ REComSession::DestroyedImplementation(plugin.iDtorUid);
+ }
+ iPlugins.Close();
+ }
+
+template <class T>
+void COomPluginList<T>::ConstructL(TInt aInterfaceUid)
+ {
+ FUNC_LOG;
+
+ RImplInfoPtrArray implArray;
+ CleanupClosePushL(implArray);
+ REComSession::ListImplementationsL(TUid::Uid(aInterfaceUid), implArray);
+
+ TInt count = implArray.Count();
+ iPlugins.ReserveL(count);
+
+ for (TInt ii=0; ii<count; ii++)
+ {
+ iPlugins.AppendL(TPlugin());
+ TPlugin& plugin = iPlugins[ii];
+ TUid uid(implArray[ii]->ImplementationUid());
+ plugin.iImpl = static_cast<T*>(REComSession::CreateImplementationL(uid, plugin.iDtorUid, NULL));
+ plugin.iUid = uid.iUid;
+ }
+
+ CleanupStack::PopAndDestroy(&implArray);
+ }
+
+template <class T>
+COomPluginList<T>::TPlugin::TPlugin()
+: iImpl(0)
+ {
+ FUNC_LOG;
+ }
+
+template <class T>
+COomPluginList<T>* COomPluginList<T>::NewL(TInt aInterfaceUid)
+ {
+ FUNC_LOG;
+
+ COomPluginList* self = new (ELeave) COomPluginList();
+ CleanupStack::PushL(self);
+ self->ConstructL(aInterfaceUid);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomActionList* COomActionList::NewL(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs, COomConfig& aConfig)
+ {
+ FUNC_LOG;
+
+ COomActionList* self = new (ELeave) COomActionList(aMonitor, aServer, aWs);
+ CleanupStack::PushL(self);
+ self->ConstructL(aConfig);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomActionList::~COomActionList()
+ {
+ FUNC_LOG;
+
+ iCloseAppActions.ResetAndDestroy();
+ iCloseAppActions.Close();
+ iRunPluginActions.ResetAndDestroy();
+ iRunPluginActions.Close();
+
+ iActionRefs.Close();
+
+ delete iPluginList;
+ delete iPluginListV2;
+ }
+
+
+
+// Creates a list of actions based on the contents of the config and the current window group list
+// Any old actions will be replaced.
+// This function may leave, however enough memory should be reserved for this process so that at least
+// some actions have been created for freeing memory, these can then be run by calling FreeMemory.
+// Note that this function will only leave in extreme circumstances, in normal usage we should have
+// enough reserved memory to build the complete action list.
+void COomActionList::BuildActionListL(COomWindowGroupList& aWindowGroupList, COomConfig& aConfig)
+ {
+ FUNC_LOG;
+
+ if (iFreeingMemory)
+ {
+ TRACES("COomActionList::BuildActionListL Memory is currently being freed, do not build action list");
+ return;
+ }
+
+ iActionRefs.Reset();
+ iCurrentActionIndex = 0;
+
+ aWindowGroupList.RefreshL();
+
+ TInt actionsIndex = 0;
+
+ // we rely on the two pluginlists not having changed since construction
+ BuildPluginActionsL(*iPluginList, aWindowGroupList, aConfig, actionsIndex);
+ BuildPluginActionsL(*iPluginListV2, aWindowGroupList, aConfig, actionsIndex);
+
+ // Go through each item in the wglist, create an app close action for this application
+ TUint wgIndex = aWindowGroupList.Count() - 1;
+
+ // Fix for when fast swap has focus, or pen input server has put itself into the foreground:
+ // the wg at index 1 should be considered as the foreground app.
+ // stopIndex is calculated to take this into account.
+ TUint stopIndex = 0;
+ TUid foregroundUid = TUid::Uid(aWindowGroupList.AppId(0));
+ if ( KUidFastSwap == foregroundUid || KUidPenInputServer == foregroundUid)
+ {
+ stopIndex = 1;
+ }
+
+ while (wgIndex > stopIndex) // Don't go down to entry stopIndex because this is the foreground window
+ {
+ COomCloseAppConfig* appCloseConfig = NULL;
+
+ CApaWindowGroupName* wgName = aWindowGroupList.WgName();
+ __ASSERT_DEBUG(wgName, OomMonitorPanic(KInvalidWgName));
+
+ // Get the app ID for the wglist item
+ // This sets the window group name
+ TInt32 appId = aWindowGroupList.AppId(wgIndex);
+
+ if ( !appId || wgName->IsSystem() || wgName->Hidden() )
+ {
+ //If the UID is NULL at this point, we assume the process is not an application
+ //and therefore is not a suitable candidate for closure.
+ //We also do not close system or hidden apps.
+
+ //Matrix Menu is temporarily hardcoded here as a system app that can be closed
+ TUid appUid = TUid::Uid(aWindowGroupList.AppId(wgIndex, ETrue));
+ if ( KUidMatrixMenuApp == appUid)
+ {
+ TRACES2("BuildActionListL: System App is Matrix Menu; UID = %x, wgIndex = %d", aWindowGroupList.AppId(wgIndex, ETrue),wgIndex);
+ // Find the app close config for Menu App
+ appCloseConfig = aConfig.GetApplicationConfig(appId).GetAppCloseConfig();
+ }
+ else
+ {
+ TRACES2("BuildActionListL: Not adding process to action list; UID = %x, wgIndex = %d", aWindowGroupList.AppId(wgIndex, ETrue),wgIndex);
+ TRACES2("BuildActionListL: IsSystem = %d, Hidden = %d", wgName->IsSystem() ? 1 : 0, wgName->Hidden() ? 1 : 0);
+ wgIndex--;
+ continue;
+ }
+ }
+ if (aWindowGroupList.IsBusy(wgIndex) || wgName->IsBusy())
+ // If the application has been flagged as busy then look up the configuration for busy apps in the config file
+ {
+ // Find the app close config for this app ID
+ appCloseConfig = aConfig.GetApplicationConfig(KOomBusyAppId).GetAppCloseConfig();
+ }
+ else if (aWindowGroupList.IsDynamicHighPriority(wgIndex))
+ // If the application has been flagged as busy then look up the configuration for busy apps in the config file
+ {
+ // Find the app close config for this app ID
+ appCloseConfig = aConfig.GetApplicationConfig(KOomHighPriorityAppId).GetAppCloseConfig();
+ }
+ else
+ // If the application hasn't been flagged as busy or high priority then look up the priority according to the config
+ {
+ // Find the app close config for this app ID
+ appCloseConfig = aConfig.GetApplicationConfig(appId).GetAppCloseConfig();
+ }
+
+ //If the app close config is NULL it is because there is an app specific threshold for this
+ //app but no specific close config. Use the default app close config
+ if (!appCloseConfig)
+ {
+ appCloseConfig = aConfig.GetApplicationConfig(KOomDefaultAppId).GetAppCloseConfig();
+ }
+
+ TUint priority = appCloseConfig->CalculateCloseAppPriority(aWindowGroupList, wgIndex);
+ TInt wgId = aWindowGroupList.WgId(wgIndex).iId;
+ TOomSyncMode syncMode = appCloseConfig->iSyncMode;
+ TInt ramEstimate = appCloseConfig->iRamEstimate;
+ TActionRef ref = TActionRef(TActionRef::EAppClose, priority, syncMode, ramEstimate, wgId, wgIndex);
+
+ //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))
+ {
+ User::Leave(err);
+ }
+ TRACES3("BuildActionListL: Adding app to action list, Uid = %x, wgId = %d, wgIndex = %d", appId, wgId, wgIndex);
+
+ wgIndex--;
+ }
+
+ TRACES1("BuildActionListL: Action list built with %d items",iActionRefs.Count());
+ }
+
+template <class T>
+void COomActionList::BuildPluginActionsL(COomPluginList<T>& aPluginList, COomWindowGroupList& aWindowGroupList, COomConfig& aConfig, TInt& aActionsIndex)
+ {
+ TInt pluginIndex = aPluginList.Count();
+
+ while (pluginIndex--)
+ {
+ // Get the config for this plugin
+ COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(aPluginList.Uid(pluginIndex));
+
+ TActionRef::TActionType actionType;
+
+ if (pluginConfig.PluginType() == EOomAppPlugin)
+ {
+ if (pluginConfig.CallIfTargetAppNotRunning() == EFalse)
+ {
+ //loop through wg group and if find can't find the target app, don't add this plugin
+ TInt index = aWindowGroupList.Count() - 1;
+ TUint targetApp = pluginConfig.TargetApp();
+ TBool targetAppFound = EFalse;
+ while (index >= 0)
+ {
+ if (aWindowGroupList.AppId(index) == targetApp)
+ {
+ targetAppFound = ETrue;
+ break;
+ }
+ index--;
+ }
+ if (targetAppFound == EFalse)
+ {
+ aActionsIndex++;
+ continue;
+ }
+ }
+ actionType = TActionRef::EAppPlugin;
+ }
+ else
+ {
+ actionType = TActionRef::ESystemPlugin;
+ }
+
+ TInt priority = pluginConfig.CalculatePluginPriority(aWindowGroupList);
+ TOomSyncMode syncMode = pluginConfig.iSyncMode;
+ TInt ramEstimate = pluginConfig.iRamEstimate;
+
+ __ASSERT_DEBUG(aActionsIndex < iRunPluginActions.Count(), OomMonitorPanic(KPluginArrayIndexOutOfBounds));
+ TActionRef ref = TActionRef(actionType, priority, syncMode, ramEstimate, *(iRunPluginActions[aActionsIndex]), aWindowGroupList.GetIndexFromAppId(pluginConfig.TargetApp()));
+
+ //It is valid to have plugins with equal priority
+ User::LeaveIfError(iActionRefs.InsertInOrderAllowRepeats(ref, ComparePriorities));
+
+ aActionsIndex++;
+ }
+ }
+
+
+// Execute the OOM actions according to their priority
+// Run batches of OOM actions according to their sync mode
+void COomActionList::FreeMemory(TInt aMaxPriority)
+ {
+ FUNC_LOG;
+ if (iFreeingMemory)
+ {
+ TRACES("COomActionList::FreeMemory Memory is currently being freed, do not start any more actions");
+ return;
+ }
+
+ iMaxPriority = aMaxPriority;
+
+ TBool memoryFreeingActionRun = EFalse;
+
+ // Get the configured maximum number of applications that can be closed at one time
+ const COomGlobalConfig& globalConfig = CMemoryMonitor::GlobalConfig();
+ TInt maxBatchSize = globalConfig.iMaxCloseAppBatch;
+ TInt numberOfRunningActions = 0;
+
+ TInt memoryEstimate; // The amount of free memory we expect to be free after the currently initiated operations
+ HAL::Get(HALData::EMemoryRAMFree, memoryEstimate);
+
+
+ while (iCurrentActionIndex < iActionRefs.Count()
+ && iActionRefs[iCurrentActionIndex].Priority() <= aMaxPriority)
+ {
+ TActionRef ref = iActionRefs[iCurrentActionIndex];
+ COomAction* action = NULL;
+ if (ref.Type() == TActionRef::EAppClose)
+ {
+ action = iCloseAppActions[numberOfRunningActions];
+ static_cast<COomCloseApp*>(action)->Reconfigure(ref);
+ }
+ else
+ {
+ action = &(ref.RunPlugin());
+ }
+
+ iFreeingMemory = ETrue;
+ TRACES2("COomActionList::FreeMemory: Running action %d which has priority %d", iCurrentActionIndex,ref.Priority());
+
+ iMonitor.SetMemoryMonitorStatusProperty(EFreeingMemory);
+
+ action->FreeMemory(iCurrentTarget - memoryEstimate);
+ memoryFreeingActionRun = ETrue;
+
+ // Actions with EContinueIgnoreMaxBatchSize don't add to the tally of running actions
+ if (ref.SyncMode() != EContinueIgnoreMaxBatchSize)
+ numberOfRunningActions++;
+
+ // Update our estimate of how much RAM we think we'll have after this operation
+ memoryEstimate += ref.RamEstimate();
+
+ // Do we estimate that we are freeing enough memory (only applies if the sync mode is "esimtate" for this action)
+ TBool estimatedEnoughMemoryFreed = EFalse;
+ if ((ref.SyncMode() == EEstimate)
+ && (memoryEstimate >= iCurrentTarget))
+ {
+ estimatedEnoughMemoryFreed = ETrue;
+ }
+
+ if ((ref.SyncMode() == ECheckRam)
+ || (numberOfRunningActions >= maxBatchSize)
+ || estimatedEnoughMemoryFreed
+ || globalConfig.ForceCheckAtPriority(iActionRefs[iCurrentActionIndex].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 COomActionList::StateChanged()) when the running actions complete
+ TRACES("COomActionList::FreeMemory: Exiting run action loop");
+ return;
+ }
+ // ... otherwise continue running actions, don't wait for any existing ones to complete
+ iCurrentActionIndex++;
+ }
+
+
+ if (!memoryFreeingActionRun)
+ {
+ // No usable memory freeing action has been found, so we give up
+ TRACES("COomActionList::FreeMemory: No usable memory freeing action has been found");
+ iMonitor.ResetTargets();
+ TInt freeMemory;
+ iMonitor.GetFreeMemory(freeMemory);
+ if (freeMemory >= iCurrentTarget)
+ {
+ SwitchOffPlugins();
+ iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold);
+ }
+ else
+ {
+ if (iMonitor.ActionTrigger() == EClientServerRequestOptionalRam)
+ {
+ //We always switch off the plugins after an optional RAM request
+ SwitchOffPlugins();
+ }
+ iMonitor.SetMemoryMonitorStatusProperty(EBelowTreshHold);
+ }
+#ifdef CLIENT_REQUEST_QUEUE
+ iMonitor.ActionsCompleted(freeMemory, EFalse);
+#else
+ iServer.CloseAppsFinished(freeMemory, EFalse);
+#endif
+ }
+ }
+
+void COomActionList::SwitchOffPlugins()
+ {
+ FUNC_LOG;
+
+ 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--)
+ {
+ if ((iActionRefs[actionRefIndex].Type() == TActionRef::EAppPlugin)
+ || (iActionRefs[actionRefIndex].Type() == TActionRef::ESystemPlugin))
+ {
+ iActionRefs[actionRefIndex].RunPlugin().MemoryGood();
+ }
+ }
+ }
+
+TInt COomActionList::ComparePriorities(const TActionRef& aPos1, const TActionRef& aPos2 )
+ {
+ FUNC_LOG;
+
+ if (aPos1.Priority()< aPos2.Priority())
+ {
+ return -1;
+ }
+ if (aPos1.Priority() > aPos2.Priority())
+ {
+ return 1;
+ }
+
+ // If priorities are equal then we use hardcoded rules to determine which one is run...
+
+ // All other actions are run in preference to application closures
+ if ((aPos1.Type() != TActionRef::EAppClose)
+ && ((aPos2.Type() == TActionRef::EAppClose)))
+ {
+ return -1;
+ }
+ if ((aPos1.Type() == TActionRef::EAppClose)
+ && ((aPos2.Type() != TActionRef::EAppClose)))
+ {
+ return 1;
+ }
+ // If both actions are application closures then the Z order is used to determine which one to run (furthest back application will be closed first)
+ if ((aPos1.Type() == TActionRef::EAppClose)
+ && ((aPos2.Type() == TActionRef::EAppClose)))
+ {
+ if (aPos1.WgIndex() < aPos2.WgIndex())
+ {
+ return 1;
+ }
+ else
+ {
+ return -1;
+ }
+ //Two Apps should not have equal window group indexes, we panic below if this is the case.
+ }
+
+ // Application plugins will be run in preference to system plugins
+ if ((aPos1.Type() == TActionRef::EAppPlugin)
+ && ((aPos2.Type() == TActionRef::ESystemPlugin)))
+ {
+ return -1;
+ }
+ if ((aPos1.Type() == TActionRef::ESystemPlugin)
+ && ((aPos2.Type() == TActionRef::EAppPlugin)))
+ {
+ return 1;
+ }
+
+ // If both actions are application plugins then the Z order of the target app is used to determine which one to run (the one with the furthest back target app will be closed first)
+ // If the target app is not running then the plugin is run in preference to target apps where the target app is running
+ if ((aPos1.Type() == TActionRef::EAppPlugin)
+ && ((aPos2.Type() == TActionRef::EAppPlugin)))
+ {
+ // When the target app is not running then the plugin will be run ahead of plugins where the target app is running
+ if ((aPos1.WgIndex() == KAppNotInWindowGroupList) && (aPos2.WgIndex() != KAppNotInWindowGroupList))
+ {
+ return -1;
+ }
+ if ((aPos1.WgIndex() != KAppNotInWindowGroupList) && (aPos2.WgIndex() == KAppNotInWindowGroupList))
+ {
+ return 1;
+ }
+ // If the target apps for both plugins are running then compare the Z order
+ if ((aPos1.WgIndex() != KAppNotInWindowGroupList) && (aPos2.WgIndex() != KAppNotInWindowGroupList))
+ {
+ if (aPos1.WgIndex() < aPos2.WgIndex())
+ {
+ return 1;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ // If the target app for neither plugin is running then they are of equal priority
+ }
+ //App Close Actions must have a unique priority.
+ __ASSERT_DEBUG((aPos1.Type() != TActionRef::EAppClose) && (aPos2.Type() != TActionRef::EAppClose), OomMonitorPanic(KAppCloseActionEqualPriorities));
+ return 0;
+ }
+
+void COomActionList::AppNotExiting(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ TInt index = iCloseAppActions.Count();
+ while (index--)
+ {
+ COomCloseApp* action = iCloseAppActions[index];
+ if ( (action->WgId() == aWgId) && (action->IsRunning()) )
+ {
+ TRACES1("COomCloseApp::AppNotExiting: App with window group id %d has not responded to the close event", aWgId);
+ action->CloseAppEvent();
+ }
+ }
+ }
+
+// From MOomActionObserver
+// An action has changed state (possibly it has completed freeing memory)
+void COomActionList::StateChanged()
+ {
+ FUNC_LOG;
+
+ TBool allActionsComplete = ETrue;
+
+ // Note that the actions themselves are responsible for timing out if necessary.
+ TInt index = iCloseAppActions.Count();
+ while ((index--) && (allActionsComplete))
+ {
+ if (iCloseAppActions[index]->IsRunning())
+ {
+ allActionsComplete = EFalse;
+ }
+ }
+
+ index = iRunPluginActions.Count();
+ while ((index--) && (allActionsComplete))
+ {
+ if (iRunPluginActions[index]->IsRunning())
+ {
+ allActionsComplete = EFalse;
+ }
+ }
+
+ if (allActionsComplete)
+ {
+ //All immediate actions are complete and iFreeingMemory is being set to false but
+ //SetMemoryMonitorStatusProperty will not change here because it is possible for the freeing actions to recommence
+ //in essence, all immediate actions have been completed but not all possible actions have been processed
+ //and therefore we are still in a memory freeing state
+ iFreeingMemory = EFalse;
+ // If all of the actions are complete then check memory and run more if necessary
+ TInt freeMemory;
+ iMonitor.GetFreeMemory(freeMemory);
+ if (freeMemory < iCurrentTarget)
+ // If we are still below the good-memory-threshold then continue running actions
+ {
+ iCurrentActionIndex++;
+
+ if (iCurrentActionIndex >= iActionRefs.Count())
+ {
+ // There are no more actions to try, so we give up
+ TRACES1("COomActionList::StateChanged: All current actions complete, below good threshold with no more actions available. freeMemory=%d", freeMemory);
+ iMonitor.ResetTargets();
+ if (freeMemory >= iCurrentTarget)
+ {
+ SwitchOffPlugins();
+ iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold);
+ }
+ else
+ {
+ if (iMonitor.ActionTrigger() == EClientServerRequestOptionalRam)
+ {
+ //We always switch off the plugins after an optional RAM request
+ SwitchOffPlugins();
+ }
+ iMonitor.SetMemoryMonitorStatusProperty(EBelowTreshHold);
+ }
+#ifdef CLIENT_REQUEST_QUEUE
+ iMonitor.ActionsCompleted(freeMemory, EFalse);
+#else
+ iServer.CloseAppsFinished(freeMemory, EFalse);
+#endif
+ }
+ else
+ {
+ // There are still more actions to try, so we continue
+ TRACES1("COomActionList::StateChanged: All current actions complete, running more actions. freeMemory=%d", freeMemory);
+ FreeMemory(iMaxPriority);
+ }
+ }
+ else
+ {
+ TRACES1("COomActionList::StateChanged: All current actions complete, memory good. freeMemory=%d", freeMemory);
+ iMonitor.ResetTargets();
+ SwitchOffPlugins();
+ iMonitor.SetMemoryMonitorStatusProperty(EAboveTreshHold);
+#ifdef CLIENT_REQUEST_QUEUE
+ iMonitor.ActionsCompleted(freeMemory, ETrue);
+#else
+ iServer.CloseAppsFinished(freeMemory, ETrue);
+#endif
+ }
+ }
+
+ // If some actions are not yet in the idle state then we must continue to wait for them (they will notify us of a state change via a callback)
+ }
+
+COomActionList::COomActionList(CMemoryMonitor& aMonitor, CMemoryMonitorServer& aServer, RWsSession& aWs)
+ : iWs(aWs), iMonitor(aMonitor), iServer(aServer)
+ {
+ FUNC_LOG;
+ }
+
+void COomActionList::ConstructL(COomConfig& aConfig)
+ {
+ FUNC_LOG;
+
+ iCurrentActionIndex = 0;
+ iFreeingMemory = EFalse;
+
+ // Get the list of V1 and V2 plugins available to the system
+ iPluginList = COomPluginList<COomMonitorPlugin>::NewL(KOomPluginInterfaceUidValue);
+ iPluginListV2 = COomPluginList<COomMonitorPluginV2>::NewL(KOomPluginInterfaceV2UidValue);
+ // Go through each plugin in the plugin list, create a run-plugin action for each one
+ TInt pluginIndex = iPluginList->Count();
+ while (pluginIndex--)
+ {
+ // Get the config for this plugin
+ COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginList->Uid(pluginIndex));
+
+ // Create an action acording to the config
+ COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginList->Implementation(pluginIndex));
+
+ iRunPluginActions.AppendL(action);
+ }
+
+ // Go through each V2 in the V2 plugin list, create a run-plugin action for each one
+ pluginIndex = iPluginListV2->Count();
+ while (pluginIndex--)
+ {
+ // Get the config for this plugin
+ COomRunPluginConfig& pluginConfig = aConfig.GetPluginConfig(iPluginListV2->Uid(pluginIndex));
+
+ // Create an action acording to the config
+ COomRunPlugin* action = COomRunPlugin::NewL(iPluginList->Uid(pluginIndex), pluginConfig, *this, iPluginListV2->Implementation(pluginIndex), &(iPluginListV2->Implementation(pluginIndex)));
+
+ iRunPluginActions.AppendL(action);
+ }
+
+ //allocate empty COomCloseApp objects
+ TInt appCloseIndex = aConfig.GlobalConfig().iMaxCloseAppBatch;
+ while (appCloseIndex--)
+ {
+ COomCloseApp* action = COomCloseApp::NewL(*this, iWs);
+ iCloseAppActions.AppendL(action);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomactionref.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,66 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+
+#include "oomactionref.h"
+
+TActionRef::TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, COomRunPlugin& aRunPlugin, TUint aWgIndexOfTargetApp)
+ : iType(aType), iPriority(aPriority), iSyncMode(aSyncMode), iRamEstimate(aRamEstimate), iWgIndex(aWgIndexOfTargetApp), iRunPlugin(&aRunPlugin)
+ {
+ }
+
+TActionRef::TActionRef(TActionType aType, TInt aPriority, TOomSyncMode aSyncMode, TInt aRamEstimate, TInt aWgId, TUint aWgIndex)
+: iType(aType), iPriority(aPriority), iSyncMode(aSyncMode), iRamEstimate(aRamEstimate), iWgId(aWgId), iWgIndex(aWgIndex), iRunPlugin(NULL)
+ {
+ }
+
+
+TActionRef::TActionType TActionRef::Type() const
+ {
+ return iType;
+ }
+
+TUint TActionRef::Priority() const
+ {
+ return iPriority;
+ }
+
+TOomSyncMode TActionRef::SyncMode() const
+ {
+ return iSyncMode;
+ }
+
+TInt TActionRef::RamEstimate() const
+ {
+ return iRamEstimate;
+ }
+
+TInt TActionRef::WgId() const
+ {
+ return iWgId;
+ }
+
+TInt TActionRef::WgIndex() const
+ {
+ return iWgIndex;
+ }
+
+COomRunPlugin& TActionRef::RunPlugin()
+ {
+ return *iRunPlugin;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomappclosetimer.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,47 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Timer class which implements a timeout for an application close action.
+*
+*/
+
+
+#include "oomappclosetimer.h"
+#include "oomcloseapp.h"
+#include "oomtraces.h"
+
+COomAppCloseTimer* COomAppCloseTimer::NewL(COomCloseApp& aMonitor)
+ {
+ FUNC_LOG;
+
+ COomAppCloseTimer* self = new (ELeave) COomAppCloseTimer(aMonitor);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomAppCloseTimer::COomAppCloseTimer(COomCloseApp& aMonitor)
+: CTimer(CActive::EPriorityStandard), iMonitor(aMonitor)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+void COomAppCloseTimer::RunL()
+ {
+ FUNC_LOG;
+
+ iMonitor.CloseAppEvent();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomappclosewatcher.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,84 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: An active object which watches for app close actions successfully completing.
+*
+*/
+
+
+
+#include "oomappclosewatcher.h"
+#include "oomcloseapp.h"
+#include "oomtraces.h"
+
+COomAppCloseWatcher::COomAppCloseWatcher(COomCloseApp& aMonitor) : CActive(CActive::EPriorityStandard), iMonitor(aMonitor)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+COomAppCloseWatcher::~COomAppCloseWatcher()
+ {
+ FUNC_LOG;
+
+ Cancel();
+ }
+
+void COomAppCloseWatcher::Start(const TApaTask& aTask)
+ {
+ FUNC_LOG;
+
+ if (!IsActive())
+ {
+ TInt err = iThread.Open(aTask.ThreadId());
+ if (err == KErrNone)
+ {
+ iOriginalProcessPriority = iThread.ProcessPriority();
+ iThread.SetProcessPriority(EPriorityForeground);
+ iThread.Logon(iStatus);
+ SetActive();
+ }
+ else
+ {
+ TRequestStatus* s = &iStatus;
+ User::RequestComplete(s, err);
+ SetActive();
+ }
+ }
+ }
+
+void COomAppCloseWatcher::DoCancel()
+ {
+ FUNC_LOG;
+
+ iThread.LogonCancel(iStatus);
+ iThread.SetProcessPriority(iOriginalProcessPriority);
+ iThread.Close();
+ }
+
+void COomAppCloseWatcher::RunL()
+ {
+ FUNC_LOG;
+
+ if (iThread.Handle())
+ iThread.SetProcessPriority(iOriginalProcessPriority);
+ iThread.Close();
+ // Experimentation shows that memory may take up to 40ms
+ // to be released back to the system after app thread close.
+ // Using this delay should minimise the number of apps that
+ // need to be closed to recover the necessary memory.
+ const TInt KAppTidyUpDelay = 40000;
+ User::After(KAppTidyUpDelay);
+ iMonitor.CloseAppEvent();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomapplicationconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,67 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oomapplicationconfig.h"
+#include "oomconstants.hrh"
+#include "oomcloseappconfig.h"
+#include "oomtraces.h"
+
+COomApplicationConfig* COomApplicationConfig::NewL(TUint aApplicationId)
+ {
+ FUNC_LOG;
+
+ COomApplicationConfig* self = new (ELeave) COomApplicationConfig(aApplicationId);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// Add a rule
+// This class takes ownership of the given rule
+// This rule applies to this application itself (and not a plugin associated with this application)
+// The rule would usually apply to an "application close" event
+void COomApplicationConfig::AddRuleL(MOomRuleConfig* aRule)
+ {
+ FUNC_LOG;
+
+ __ASSERT_ALWAYS(iCloseAppConfig, OomMonitorPanic(KRuleConfiguredBeforeApplication));
+
+ iCloseAppConfig->AddRuleL(aRule);
+ }
+
+COomApplicationConfig::~COomApplicationConfig()
+ {
+ FUNC_LOG;
+
+ delete iCloseAppConfig;
+ }
+
+void COomApplicationConfig::ConstructL()
+ {
+ FUNC_LOG;
+
+ iGoodRamThreshold = KOomThresholdUnset;
+ iLowRamThreshold = KOomThresholdUnset;
+ }
+
+COomApplicationConfig::COomApplicationConfig(TUint aApplicationId) : iApplicationId(aApplicationId)
+ {
+ FUNC_LOG;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomclientrequestqueue.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,344 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: COomClientRequestQueue.cpp.
+*
+*/
+
+
+
+#include "oomclientrequestqueue.h"
+#include "oomtraces.h"
+#include "oomsubscribehelper.h"
+#include "oompanic.h"
+#include "oommemorymonitor.h"
+#include <UikonInternalPSKeys.h>
+
+const TInt KOomWatchDogStatusIdle = -1;
+const TInt KClientTimeToFreeMemory = 500000; //microseconds
+
+COomClientRequestQueue::COomClientRequestQueue(CMemoryMonitor& aMonitor)
+ :iQueue(_FOFF(TClientRequest,iLink)),
+ iMonitor(aMonitor)
+ {
+ FUNC_LOG;
+ }
+
+COomClientRequestQueue::~COomClientRequestQueue()
+ {
+ FUNC_LOG;
+
+ if (iWatchdogStatusSubscriber)
+ {
+ iWatchdogStatusSubscriber->StopSubscribe();
+ }
+ iWatchdogStatusProperty.Close();
+ delete iWatchdogStatusSubscriber;
+
+ if (iClientRequestTimer)
+ {
+ iClientRequestTimer->Cancel();
+ }
+ delete iClientRequestTimer;
+
+ TClientRequest* request;
+ TSglQueIter<TClientRequest> iter(iQueue);
+ iter.SetToFirst();
+ while (iter)
+ {
+ request = iter++;
+ iQueue.Remove(*request);
+ delete request;
+ };
+ }
+
+COomClientRequestQueue* COomClientRequestQueue::NewL(CMemoryMonitor& aMonitor)
+ {
+ FUNC_LOG;
+
+ COomClientRequestQueue* self = new (ELeave) COomClientRequestQueue(aMonitor);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+void COomClientRequestQueue::ConstructL()
+ {
+ FUNC_LOG;
+
+ TInt err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus);
+
+ TRACES1("COomClientRequestQueue::ConstructL: KUikOOMWatchdogStatus err = %d", err);
+
+ err = iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle);
+
+ iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty);
+ iWatchdogStatusSubscriber->Subscribe();
+
+
+ iClientRequestTimer = COomClientRequestTimer::NewL(*this);
+ }
+
+void COomClientRequestQueue::RequestFreeMemoryL(const RMessage2& aMessage)
+ {
+ FUNC_LOG;
+
+ TClientRequest* request = new (ELeave) TClientRequest(EClientServerRequestFreeMemory, aMessage);
+ CleanupStack::PushL(request);
+ AddClientRequestL(*request);
+ CleanupStack::Pop(request);
+ }
+
+void COomClientRequestQueue::RequestOptionalRamL(const RMessage2& aMessage)
+ {
+ FUNC_LOG;
+
+ TClientRequest* request = new (ELeave) TClientRequest(EClientServerRequestOptionalRam, aMessage);
+ CleanupStack::PushL(request);
+ AddClientRequestL(*request);
+ CleanupStack::Pop(request);
+ }
+
+TInt COomClientRequestQueue::WatchdogStatusStatusChanged(TAny* aPtr)
+ {
+ FUNC_LOG;
+
+ COomClientRequestQueue* self = static_cast<COomClientRequestQueue*>(aPtr);
+ if (self)
+ {
+ self->HandleWatchdogStatusCallBack();
+ }
+ return KErrNone;
+ }
+
+void COomClientRequestQueue::HandleWatchdogStatusCallBack()
+ {
+ FUNC_LOG;
+
+ // Someone has set the key to request some free memory.
+ TInt memoryRequested = 0;
+ iWatchdogStatusProperty.Get(memoryRequested);
+
+ // Try to free the RAM.
+ if (memoryRequested >= 1)
+ {
+ TClientRequest request = TClientRequest(EPublishAndSubscribe, memoryRequested);
+ TRAP_IGNORE(AddClientRequestL(request));
+ }
+ // Set the key back to KOomWatchDogStatusIdle to indicate we're done.
+ iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle);
+ }
+
+// The new request is added to the queue, then we have the following conditions:
+// 1. A client request is currently being processed
+// 2. The last client request completed less than KClientTimeToFreeMemory microseconds ago -> start the timer
+// 3. The timer has already been started
+// 4. none of the above -> process this request
+void COomClientRequestQueue::AddClientRequestL(TClientRequest& request)
+ {
+ FUNC_LOG;
+
+ iQueue.AddLast(request);
+
+ if ( !iClientRequestActive && !iClientRequestTimer->IsActive() )
+ {
+ TTime now;
+ now.UniversalTime();
+ TInt64 interval64 = (now.MicroSecondsFrom(iLastClientCompletedTime)).Int64();
+ TRACES3("COomClientRequestQueue::AddClientRequestL: now = %Ld, iLastClientCompletedTime = %Ld, interval64 = %Ld",
+ now.Int64(), iLastClientCompletedTime.Int64(), interval64);
+
+ if ( interval64 < 0)
+ {
+ //If the system time is moved backwards we lose the information about when the last request was
+ //made, so we wait for KClientTimeToFreeMemory microseconds
+ iClientRequestTimer->After(TTimeIntervalMicroSeconds32(KClientTimeToFreeMemory));
+ }
+ else if ( interval64 < KClientTimeToFreeMemory)
+ {
+ //The last completed client is given KClientTimeToFreeMemory microseconds to allocate the memory
+ //it requested
+ iClientRequestTimer->After(TTimeIntervalMicroSeconds32(interval64));
+ }
+ else
+ {
+ StartClientRequestL();
+ }
+ }
+ }
+
+void COomClientRequestQueue::StartClientRequestL()
+ {
+ FUNC_LOG;
+
+ iClientRequestActive = ETrue;
+
+ TClientRequest* request = iQueue.First();
+
+ switch (request->iClientRequestType)
+ {
+ case EClientServerRequestOptionalRam:
+ {
+ TInt pluginId = request->iRequestFreeRamMessage.Int2();
+ iMonitor.FreeOptionalRamL(request->iBytesRequested, pluginId);
+ break;
+ }
+ case EClientServerRequestFreeMemory:
+ iMonitor.RequestFreeMemoryL(request->iBytesRequested);
+ break;
+ case EPublishAndSubscribe:
+ iMonitor.RequestFreeMemoryPandSL(request->iBytesRequested);
+ break;
+ default:
+ OomMonitorPanic(KInvalidClientRequestType);
+ break;
+ }
+ }
+
+CMemoryMonitor& COomClientRequestQueue::Monitor()
+ {
+ FUNC_LOG;
+
+ return iMonitor;
+ }
+
+TClientRequest::TClientRequest(TActionTriggerType aClientRequestType, TInt aBytesRequested)
+ : iClientRequestType(aClientRequestType), iBytesRequested(aBytesRequested)
+ {
+ FUNC_LOG;
+ }
+
+TClientRequest::TClientRequest(TActionTriggerType aClientRequestType, const RMessage2& aRequestFreeRam)
+ : iClientRequestType(aClientRequestType), iRequestFreeRamMessage(aRequestFreeRam)
+ {
+ FUNC_LOG;
+
+ iBytesRequested = aRequestFreeRam.Int0();
+ }
+
+void COomClientRequestQueue::ActionsCompleted(TInt aBytesFree, TBool aMemoryGood)
+ {
+ FUNC_LOG;
+
+ if (iClientRequestActive)
+ {
+#ifdef _DEBUG
+ TSglQueIter<TClientRequest> iter(iQueue);
+ iter.SetToFirst();
+ TClientRequest* req;
+ while (iter)
+ {
+ req = iter++;
+ TActionTriggerType crt = req->iClientRequestType;
+ TInt bytes = req->iBytesRequested;
+ TRACES2("COomClientRequestQueue::ActionsCompleted Printing Queue: Type = %d, Bytes Requested = %d", crt, bytes);
+ };
+#endif
+
+ __ASSERT_DEBUG(!iQueue.IsEmpty(), OomMonitorPanic(KClientQueueNotEmpty));
+ __ASSERT_DEBUG(!iClientRequestTimer->IsActive(), OomMonitorPanic(KClientRequestTimerActive));
+
+ TClientRequest* request = iQueue.First();
+ RMessage2 message;
+
+ switch (request->iClientRequestType)
+ {
+ case EClientServerRequestOptionalRam:
+ message = request->iRequestFreeRamMessage;
+ if (!message.IsNull())
+ {
+ TInt memoryAvailable = aBytesFree - iMonitor.GoodThreshold();
+ TInt minimumNeeded = message.Int1();
+ if (memoryAvailable >= minimumNeeded)
+ {
+ message.Complete(memoryAvailable);
+ }
+ else
+ {
+ message.Complete(KErrNoMemory);
+ }
+ }
+ break;
+ case EClientServerRequestFreeMemory:
+ message = request->iRequestFreeRamMessage;
+ if (!message.IsNull())
+ {
+ // If memory available is greater than the requested RAM then complete with the amount of free memory, otherwise complete with KErrNoMemory
+ message.Complete(aMemoryGood ? KErrNone : KErrNoMemory);
+ }
+ break;
+ case EPublishAndSubscribe:
+ // No action required for P&S key
+ break;
+ default:
+ OomMonitorPanic(KInvalidClientRequestType);
+ break;
+ }
+
+ iClientRequestActive = EFalse;
+ iQueue.Remove(*request);
+ delete request;
+
+ iLastClientCompletedTime.UniversalTime();
+
+ if (!iQueue.IsEmpty())
+ {
+ //We give the client KClientTimeToFreeMemory microseconds to free the memory it requested before
+ //processing the next request
+ iClientRequestTimer->After(TTimeIntervalMicroSeconds32(KClientTimeToFreeMemory));
+ }
+ }
+ }
+
+void COomClientRequestQueue::RequestTimerCallbackL()
+ {
+ FUNC_LOG;
+
+ __ASSERT_DEBUG(!iQueue.IsEmpty(), OomMonitorPanic(KClientQueueNotEmpty));
+
+ StartClientRequestL();
+ }
+
+COomClientRequestTimer* COomClientRequestTimer::NewL(COomClientRequestQueue& aQueue)
+ {
+ FUNC_LOG;
+
+ COomClientRequestTimer* self = new (ELeave) COomClientRequestTimer(aQueue);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomClientRequestTimer::COomClientRequestTimer(COomClientRequestQueue& aQueue)
+: CTimer(CActive::EPriorityStandard), iClientRequestQueue(aQueue)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+
+void COomClientRequestTimer::RunL()
+ {
+ FUNC_LOG;
+
+ iClientRequestQueue.RequestTimerCallbackL();
+ }
+
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomcloseapp.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,111 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#include <apgtask.h>
+
+#include "oomcloseapp.h"
+#include "OomTraces.h"
+#include "oomappclosetimer.h"
+#include "oomappclosewatcher.h"
+#include "oomactionref.h"
+#include "oommemorymonitor.h"
+#include "oomconstants.hrh"
+#include "oompanic.h"
+
+COomCloseApp* COomCloseApp::NewL(MOomActionObserver& aStateChangeObserver, RWsSession& aWs)
+ {
+ FUNC_LOG;
+
+ COomCloseApp* self = new (ELeave) COomCloseApp(aStateChangeObserver, aWs);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// Close the application in order to free memory
+// Call the COomAction::MemoryFreed when it is done
+void COomCloseApp::FreeMemory(TInt)
+ {
+ FUNC_LOG;
+
+ iAppCloserRunning = ETrue;
+
+ // Set the TApaTask to the app
+ iCurrentTask.SetWgId(iWgId);
+
+ __ASSERT_DEBUG(!iAppCloseTimer->IsActive(), OomMonitorPanic(KStartingActiveCloseAppTimer));
+ __ASSERT_DEBUG(!iAppCloseWatcher->IsActive(), OomMonitorPanic(KStartingActiveAppCloseWatcher));
+ // Start a timer and the thread watcher
+ iAppCloseTimer->After(CMemoryMonitor::GlobalConfig().iMaxAppExitTime * KMicrosecondsInMillisecond);
+ iAppCloseWatcher->Start(iCurrentTask);
+ // Tell the app to close
+ TRACES1("COomCloseApp::FreeMemory: Closing app with window group id %d",iWgId);
+ iCurrentTask.EndTask();
+ }
+
+COomCloseApp::~COomCloseApp()
+ {
+ FUNC_LOG;
+
+ if (iAppCloseTimer)
+ iAppCloseTimer->Cancel();
+
+ if (iAppCloseWatcher)
+ iAppCloseWatcher->Cancel();
+
+ delete iAppCloseTimer;
+ delete iAppCloseWatcher;
+ }
+
+// Callback from COomAppCloseWatcher and COomAppCloseTimer
+void COomCloseApp::CloseAppEvent()
+ {
+ FUNC_LOG;
+
+ // The application has closed (or we have a timeout)
+ iAppCloserRunning = EFalse;
+
+ if (iAppCloseTimer)
+ iAppCloseTimer->Cancel();
+ if (iAppCloseWatcher)
+ iAppCloseWatcher->Cancel();
+
+ MemoryFreed(KErrNone);
+ }
+
+void COomCloseApp::Reconfigure(const TActionRef& aRef)
+ {
+ FUNC_LOG;
+
+ iWgId = aRef.WgId();
+ }
+
+void COomCloseApp::ConstructL()
+ {
+ FUNC_LOG;
+
+ iAppCloseTimer = COomAppCloseTimer::NewL(*this);
+ iAppCloseWatcher = new(ELeave) COomAppCloseWatcher(*this);
+ }
+
+COomCloseApp::COomCloseApp(MOomActionObserver& aStateChangeObserver, RWsSession& aWs)
+ : COomAction(aStateChangeObserver), iCurrentTask(aWs)
+ {
+ FUNC_LOG;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomcloseappconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,42 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oomcloseappconfig.h"
+#include "oomtraces.h"
+
+COomCloseAppConfig* COomCloseAppConfig::NewL(TInt32 aId)
+ {
+ FUNC_LOG;
+
+ COomCloseAppConfig* self = new (ELeave) COomCloseAppConfig(aId);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomCloseAppConfig::~COomCloseAppConfig()
+ {
+ FUNC_LOG;
+ }
+
+COomCloseAppConfig::COomCloseAppConfig(TInt32 aId) : COomActionConfig(aId)
+ {
+ FUNC_LOG;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,195 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include <e32hashtab.h>
+
+#include "oomconfig.h"
+#include "oomconstants.hrh"
+#include "oomapplicationconfig.h"
+#include "oomrunpluginconfig.h"
+#include "oomcloseappconfig.h"
+#include "oomtraces.h"
+
+COomConfig* COomConfig::NewL()
+ {
+ FUNC_LOG;
+
+ COomConfig* self = new (ELeave) COomConfig;
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+
+// Add the configuration for an application closure.
+// This class takes ownership of this action.
+void COomConfig::SetAppCloseConfigL(COomCloseAppConfig* aActionConfig)
+ {
+ FUNC_LOG;
+
+ // Find the right application config (if there is one) for the app
+ // The map actually contains pointers for values, so we get pointers to pointers here...
+ COomApplicationConfig** applicationConfigPointer = iApplicationToConfigMapping.Find(aActionConfig->iId);
+
+ // Used to de-reference the pointer-to-pointer, hopefully making the code more readable
+ COomApplicationConfig* applicationConfig = NULL;
+
+ // Create a new COomApplicationConfig if there isn't one for this app
+ if (!applicationConfigPointer)
+ {
+ applicationConfig = COomApplicationConfig::NewL(aActionConfig->iId);
+ iApplicationToConfigMapping.InsertL(aActionConfig->iId, applicationConfig);
+ }
+ else
+ {
+ applicationConfig = *applicationConfigPointer;
+ }
+
+ // Append the action config to the appropriate list (the list for the relevant application)
+ applicationConfig->SetAppCloseConfig(aActionConfig);
+ }
+
+// Add the configuration for a plugin action.
+// This class takes ownership of the configuration object.
+void COomConfig::AddPluginConfigL(COomRunPluginConfig* aPluginConfig)
+ {
+ FUNC_LOG;
+
+ // Check if the plugin has already been added, if so then this is an error in configuration (something is trying to add the same plugin twice)
+ COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginConfig->Id());
+ if (runPluginConfig)
+ {
+ OomMonitorPanic(KPluginConfigAddedTwice);
+ }
+
+ iPluginToConfigMapping.InsertL(aPluginConfig->Id(), aPluginConfig);
+
+ }
+
+// Add a rule
+// This class takes ownership of the given rule
+// This rule applies to the specified application (and not a plugin associated with this application)
+// The rule would usually apply to an "application close" event
+void COomConfig::AddApplicationRuleL(TUint aTargetAppId, MOomRuleConfig* aRule)
+ {
+ FUNC_LOG;
+
+ COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aTargetAppId);
+
+ if (applicationConfig)
+ {
+ (*applicationConfig)->AddRuleL(aRule);
+ }
+ else
+ {
+ OomMonitorPanic(KRuleConfiguredBeforeApplication);
+ }
+ }
+
+// Add a rule for a plugin
+// This class takes ownership of the given rule
+// This rule is applied to the plugin with the specified ID
+void COomConfig::AddPluginRuleL(TUint aPluginId, MOomRuleConfig* aRule)
+ {
+ FUNC_LOG;
+
+ COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginId);
+
+ if (runPluginConfig)
+ {
+ (*runPluginConfig)->AddRuleL(aRule);
+ }
+ else
+ {
+ OomMonitorPanic(KRuleConfiguredBeforePlugin);
+ }
+ }
+
+// Add this application config - this class takes ownership of it
+// Application config includes settings for a particular application, e.g. whether or not it can be closed
+void COomConfig::AddApplicationConfigL(COomApplicationConfig* aApplicationConfig)
+ {
+ FUNC_LOG;
+
+ // Check if the application has already been added, if so then this is an error in configuration (something is trying to add the same app twice)
+ COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aApplicationConfig->Id());
+ if (applicationConfig)
+ {
+ OomMonitorPanic(KAppConfigAddedTwice);
+ }
+
+ iApplicationToConfigMapping.InsertL(aApplicationConfig->Id(), aApplicationConfig);
+ }
+
+// Get the list of configured actions for the given app id
+// If no specific actions have been configured for this application then the default action is returned
+COomApplicationConfig& COomConfig::GetApplicationConfig(TInt32 aAppId)
+ {
+ FUNC_LOG;
+
+ COomApplicationConfig** applicationConfig = iApplicationToConfigMapping.Find(aAppId);
+
+ if (!applicationConfig)
+ applicationConfig = iApplicationToConfigMapping.Find(KOomDefaultAppId);
+
+ // The default app configuration should always exist
+ __ASSERT_ALWAYS(applicationConfig, OomMonitorPanic(KOomDefaultAppNotConfigured));
+
+ return *(*applicationConfig);
+ }
+
+// Get the plugin configuration for the given plugin id
+// If no specific actions have been configured for this plugin then the default plugin configuration is returned
+COomRunPluginConfig& COomConfig::GetPluginConfig(TInt32 aPluginId)
+ {
+ FUNC_LOG;
+
+ COomRunPluginConfig** runPluginConfig = iPluginToConfigMapping.Find(aPluginId);
+
+ if (!runPluginConfig)
+ runPluginConfig = iPluginToConfigMapping.Find(KOomDefaultPluginId);
+
+ // The default app configuration should always exist
+ __ASSERT_ALWAYS(runPluginConfig, OomMonitorPanic(KOomDefaultPluginNotConfigured));
+
+ return *(*runPluginConfig);
+ }
+
+COomConfig::~COomConfig()
+ {
+ FUNC_LOG;
+
+ // Iterate through the hash map deleting all of the items
+ RHashMap<TInt32, COomApplicationConfig*>::TIter iterator(iApplicationToConfigMapping);
+ while (iterator.NextValue())
+ delete iterator.CurrentValue();
+
+ // Iterate through the plugiun hash map deleting all of the items
+ RHashMap<TInt32, COomRunPluginConfig*>::TIter pluginIterator(iPluginToConfigMapping);
+ while (pluginIterator.NextValue())
+ delete pluginIterator.CurrentValue();
+
+ iApplicationToConfigMapping.Close();
+ }
+
+void COomConfig::ConstructL()
+ {
+ FUNC_LOG;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomconfigparser.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,1077 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: The parser for the OOM configuration file.
+*
+*/
+#include <e32base.h>
+#include <xml/parser.h>
+
+#include "oomconfigparser.h"
+#include "oompanic.h"
+#include "oomtraces.h"
+#include "oomidletimerule.h"
+#include "oomforegroundrule.h"
+#include "oomconstants.hrh"
+#include "oomapplicationconfig.h"
+#include "oomcloseappconfig.h"
+#include "oomconfig.h"
+#include "oomrunpluginconfig.h"
+
+enum TOomConfigParserPanic
+{
+KOomErrMoreThanOneOomConfig = 0,
+KOomErrGlobalSettingsMustComeAfterRoot,
+KOomErrAppSettingsMustComeAfterGlobalSettings,
+KOomErrCloseAppSettingsMustComeAfterAppSettings,
+KOomErrAppIdleSettingsMustComeAfterAppCloseSettings,
+KOomErrLowRamErrorInGlobalSettings,
+KOomErrGoodRamErrorInGlobalSettings,
+KOomErrMaxCloseErrorInGlobalSettings,
+KOomErrDefaultPriorityErrorInGlobalSettings,
+KOomErrMissingUidFromAppCloseConfig,
+KOomErrMissingPriorityFromAppCloseConfig,
+KOomErrMissingSyncModeFromAppCloseConfig,
+KOomErrMissingEstimateFromAppCloseConfig,
+KOomErrInvalidSyncMode,
+KOomErrMissingSyncModeInAppCloseConfig,
+KOomErrBadOrMissingPriorityInAppIdleRule,
+KOomErrBadOrMissingIdleTimeInAppIdleRule,
+KOomErrBadOrMissingUidInAppIdleRule,
+KOomErrBadNeverCloseValue,
+KOomErrBadOrMissingUidInAppConfig,
+KOomErrBadOrMissingPriorityInAppCloseConfig,
+KOomErrBadLowThresholdValueForAppConfig,
+KOomErrBadGoodThresholdValueForAppConfig,
+KOomErrSystemPluginSettingsMustComeAfterAppCloseSettings,
+KOomErrAppPluginSettingsMustComeAfterSystemPluginSettings,
+KOomErrAppPluginIdleTimeRulesMustComeAfterAppPluginSettings,
+KOomErrBadOrMissingUidInAppCloseConfig,
+KOomErrBadOrMissingUidInSystemPluginConfig,
+KOomErrBadOrMissingPriorityInSystemPluginConfig,
+KOomErrBadOrMissingTargetAppIdInAppPluginConfig,
+KOomErrBadOrMissingUidInAppPluginConfig,
+KOomErrBadOrMissingPriorityInAppPluginConfig,
+KOomErrBadOrMissingPriorityInPluginIdleRule,
+KOomErrBadOrMissingIdleTimeInPluginIdleRule,
+KOomErrBadOrMissingUidInPluginIdleRule,
+KOomErrBadOrMissingUidInForegroundAppRule,
+KOomErrBadOrMissingPriorityInForegroundAppRule,
+KOomErrBadOrMissingTargetAppIdInForegroundAppRule,
+KOomErrDefaultWaitAfterPluginInGlobalSettings,
+KOomErrBadOrMissingPriorityInForceCheck,
+KOomErrOomRulesMustComeLast,
+KOomErrBadPluginWaitTime,
+KOomErrBadXml,
+KOomErrAppCloseIdleRuleOutsideAppCloseElement,
+KOomErrForegroundAppRuleOutsideAppCloseElement,
+KOomErrPluginIdleRuleOutsideAppPluginElement,
+KOomErrPluginForegroundRuleOutsidePluginElement,
+KOomErrBadCallIfTargetAppNotRunning
+};
+
+const TInt KOomXmlFileBufferSize = 1024;
+const TInt KOomMaxAppExitTime = 2000;
+const TInt KBytesInMegabyte = 1024;
+#ifdef __WINS__
+const TInt KEmulatorTickDivisor = 5; // The tick is 5 times slower on the emulator than on the phone
+#endif
+using namespace Xml;
+
+// Mime type of the parsed document
+_LIT8(KXmlMimeType, "text/xml");
+
+_LIT(KOomConfigFilePath, ":\\private\\10207218\\oomconfig.xml");
+_LIT(KRomDrive, "z");
+
+// Element strings
+// Root
+_LIT8(KOomConfigOomConfig, "oom_config");
+
+// Global settings
+_LIT8(KOomConfigGlobalSettings, "global_settings");
+_LIT8(KOomConfigForceCheckAtPriority, "force_check");
+
+// App settings
+_LIT8(KOomConfigAppSettings, "app_specific_thresholds");
+_LIT8(KOomConfigApp, "app");
+
+// App close settings
+_LIT8(KOomConfigAppCloseSettings, "app_close_settings");
+_LIT8(KOomConfigCloseApp, "close_app");
+
+// App close idle time
+_LIT8(KOomConfigAppCloseIdlePriority, "app_close_idle_priority");
+
+_LIT8(KOomConfigForegroundAppPriority, "foreground_app_priority");
+
+// Global settings attribute names
+_LIT8(KOomAttributeLowRamThreshold, "low_ram_threshold");
+_LIT8(KOomAttributeGoodRamThreshold, "good_ram_threshold");
+_LIT8(KOomAttributeMaxAppCloseBatch, "max_app_close_batch");
+_LIT8(KOomAttributeDefaultWaitAfterPlugin, "default_wait_after_plugin");
+_LIT8(KOomAttributeMaxAppExitTime , "max_app_exit_time");
+
+// System plugins
+
+_LIT8(KOomAttributeSystemPluginSettings, "system_plugin_settings");
+_LIT8(KOomAttributeSystemPlugin, "system_plugin");
+
+// Application plugins
+
+_LIT8(KOomAttributeAppPluginSettings, "app_plugin_settings");
+_LIT8(KOomAttributeAppPlugin, "app_plugin");
+
+// Plugin idle time rules
+
+_LIT8(KOomAttributePluginIdlePriority, "plugin_idle_priority");
+
+// Plugin foreground app rules
+_LIT8(KOomAttributePluginForegroundAppPriority, "plugin_foreground_app_priority");
+
+// Atribute names
+_LIT8(KOomAttibuteUid, "uid");
+_LIT8(KOomAttibuteSyncMode, "sync_mode");
+_LIT8(KOomAttibutePriority, "priority");
+_LIT8(KOomAttibuteRamEstimate, "ram_estimate");
+
+_LIT8(KOomConfigSyncModeContinue, "continue");
+_LIT8(KOomConfigSyncModeCheck, "check");
+_LIT8(KOomConfigSyncModeEstimate, "estimate");
+
+_LIT8(KOomAttibuteIdleTime, "idle_time");
+_LIT8(KOomAttibuteIdlePriority, "priority");
+
+_LIT8(KOomAttibuteNeverClose, "NEVER_CLOSE");
+
+_LIT8(KOomAttributeTargetAppId, "target_app_id");
+
+_LIT8(KOomAttributeWait, "wait");
+
+_LIT8(KOomAttributeIfForegroundAppId, "if_foreground_app_id");
+
+_LIT8(KOomAttributeCallIfTargetAppNotRunning, "call_if_target_app_not_running");
+_LIT8(KOomAttributeTrue, "true");
+_LIT8(KOomAttributeFalse, "false");
+_LIT8(KOomAttribute0, "0");
+_LIT8(KOomAttribute1, "1");
+
+
+_LIT8(KOomConfigDefaultAppUid, "DEFAULT_APP");
+_LIT8(KOomConfigDefaultPluginUid, "DEFAULT_PLUGIN");
+_LIT8(KOomConfigTargetAppValue, "TARGET_APP");
+
+_LIT8(KOomConfigBusyAppUid, "BUSY_APP");
+_LIT8(KOomConfigHighPriorityAppUid, "HIGH_PRIORITY_APP");
+
+COomConfigParser::COomConfigParser(COomConfig& aConfig, RFs& aFs) : iConfig(aConfig), iFs(aFs), iState(EOomParsingStateNone)
+ {
+ }
+
+void COomConfigParser::ParseL()
+ {
+ FUNC_LOG;
+
+ TRACES("COomConfigParser::ParseL: Parsing Config File");
+
+ CParser* parser = CParser::NewLC(KXmlMimeType, *this);
+
+ RFile configFile;
+ TFileName configFileName;
+ TChar driveChar = iFs.GetSystemDriveChar();
+ configFileName.Append(driveChar);
+ configFileName.Append(KOomConfigFilePath);
+ if (configFile.Open(iFs, configFileName, EFileShareExclusive) != KErrNone)
+ {
+ configFileName.Replace(0,1,KRomDrive); //replace 'c' with 'z'
+ User::LeaveIfError(configFile.Open(iFs, configFileName, EFileShareExclusive));
+ }
+ CleanupClosePushL(configFile);
+
+ TBuf8<KOomXmlFileBufferSize> fileBuffer;
+ TInt bytesRead;
+ do
+ {
+ User::LeaveIfError(configFile.Read(fileBuffer));
+ bytesRead = fileBuffer.Size();
+
+ parser->ParseL(fileBuffer);
+
+ } while (bytesRead != 0);
+
+ CleanupStack::PopAndDestroy(2, parser); // config file - automatically closes it
+ // parser
+
+ TRACES("COomConfigParser::ParseL: Finished Parsing Config File");
+ }
+
+void COomConfigParser::OnStartDocumentL(const RDocumentParameters&, TInt)
+ {
+ FUNC_LOG;
+ }
+
+void COomConfigParser::OnEndDocumentL(TInt)
+ {
+ FUNC_LOG;
+ }
+
+
+void COomConfigParser::OnEndElementL(const RTagInfo&, TInt)
+ {
+ }
+
+void COomConfigParser::OnContentL(const TDesC8&, TInt)
+ {
+ }
+
+void COomConfigParser::OnStartPrefixMappingL(const RString&, const RString&,
+ TInt)
+ {
+ }
+
+void COomConfigParser::OnEndPrefixMappingL(const RString&, TInt)
+ {
+ }
+
+void COomConfigParser::OnIgnorableWhiteSpaceL(const TDesC8&, TInt)
+ {
+ }
+
+void COomConfigParser::OnSkippedEntityL(const RString&, TInt)
+ {
+ }
+
+void COomConfigParser::OnProcessingInstructionL(const TDesC8&, const TDesC8&,
+ TInt)
+ {
+ }
+
+void COomConfigParser::OnError(TInt)
+ {
+ }
+
+TAny* COomConfigParser::GetExtendedInterface(const TInt32)
+ {
+ return 0;
+ }
+
+void COomConfigParser::OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes,
+ TInt aErrorCode)
+ {
+ if (aErrorCode != KErrNone)
+ ConfigError(KOomErrBadXml);
+
+ StartElementL(aElement.LocalName().DesC(), aAttributes);
+ }
+
+void COomConfigParser::StartElementL(const TDesC8& aLocalName,
+ const RAttributeArray& aAttributes)
+ {
+ // Root
+ if (aLocalName == KOomConfigOomConfig)
+ {
+ if (iState != EOomParsingStateNone)
+ ConfigError(KOomErrMoreThanOneOomConfig);
+
+ ChangeState(EOomParsingStateRoot);
+ }
+ // Parse main elements
+ else if (aLocalName == KOomConfigGlobalSettings)
+ {
+ if (iState != EOomParsingStateRoot)
+ ConfigError(KOomErrGlobalSettingsMustComeAfterRoot);
+
+ SetGlobalSettings(aAttributes);
+
+ ChangeState(EOomParsingStateGlobalSettings);
+ }
+ else if (aLocalName == KOomConfigAppSettings)
+ {
+ ChangeState(EOomParsingStateAppSettings);
+ }
+ else if (aLocalName == KOomConfigAppCloseSettings)
+ {
+ ChangeState(EOomParsingStateAppCloseSettings);
+ }
+ else if (aLocalName == KOomAttributeSystemPluginSettings)
+ {
+ ChangeState(EOomParsingStateSystemPluginSettings);
+ }
+ else if (aLocalName == KOomAttributeAppPluginSettings)
+ {
+ ChangeState(EOomParsingStateAppPluginSettings);
+ }
+ // Parse actual configuration elements
+ else if (aLocalName == KOomConfigForceCheckAtPriority)
+ {
+ SetForceCheckConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomConfigApp)
+ {
+ SetAppConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomConfigCloseApp)
+ {
+ SetCloseAppConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomConfigAppCloseIdlePriority)
+ {
+ CheckState(EOomParsingStateAppCloseSettings, KOomErrAppCloseIdleRuleOutsideAppCloseElement);
+ SetAppCloseIdlePriorityConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomConfigForegroundAppPriority)
+ {
+ CheckState(EOomParsingStateAppCloseSettings, KOomErrForegroundAppRuleOutsideAppCloseElement);
+ SetForegroundAppPriorityL(aAttributes);
+ }
+ else if (aLocalName == KOomAttributeSystemPlugin)
+ {
+ SetSystemPluginConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomAttributeAppPlugin)
+ {
+ SetAppPluginConfigL(aAttributes);
+ }
+ else if (aLocalName == KOomAttributePluginIdlePriority)
+ {
+ CheckState(EOomParsingStateAppPluginSettings, KOomErrPluginIdleRuleOutsideAppPluginElement);
+ SetPluginIdlePriorityL(aAttributes);
+ }
+ else if (aLocalName == KOomAttributePluginForegroundAppPriority)
+ {
+ CheckState(EOomParsingStateAppPluginSettings, EOomParsingStateSystemPluginSettings, KOomErrPluginForegroundRuleOutsidePluginElement);
+ SetPluginForegroundAppPriorityL(aAttributes);
+ }
+
+ }
+
+void COomConfigParser::ConfigError(TInt aError)
+ {
+ OomConfigParserPanic(aError);
+ }
+
+void COomConfigParser::SetGlobalSettings(const RAttributeArray& aAttributes)
+ {
+ TInt defaultLowMemoryThreshold;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowRamThreshold, defaultLowMemoryThreshold);
+
+ if (err == KErrNone)
+ iConfig.SetDefaultLowRamThreshold(defaultLowMemoryThreshold * KBytesInMegabyte);
+ else
+ ConfigError(KOomErrLowRamErrorInGlobalSettings);
+
+ if (err == KErrNone)
+ {
+ TInt defaultGoodMemoryThreshold;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodRamThreshold, defaultGoodMemoryThreshold);
+
+ if (err == KErrNone)
+ iConfig.SetDefaultGoodRamThreshold(defaultGoodMemoryThreshold * KBytesInMegabyte);
+ else
+ ConfigError(KOomErrGoodRamErrorInGlobalSettings);
+ }
+
+ if (err == KErrNone)
+ {
+ TInt defaultMaxCloseAppBatch;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeMaxAppCloseBatch, defaultMaxCloseAppBatch);
+
+ if (err == KErrNone)
+ iConfig.SetMaxCloseAppBatch(defaultMaxCloseAppBatch);
+ else
+ ConfigError(KOomErrMaxCloseErrorInGlobalSettings);
+ }
+
+ if (err == KErrNone)
+ {
+ TInt defaultWaitAfterPlugin;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeDefaultWaitAfterPlugin, defaultWaitAfterPlugin);
+
+ if (err == KErrNone)
+ iConfig.SetDefaultWaitAfterPlugin(defaultWaitAfterPlugin);
+ else
+ ConfigError(KOomErrDefaultWaitAfterPluginInGlobalSettings);
+ }
+
+ if (err == KErrNone)
+ {
+ TInt maxAppExitTime;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeMaxAppExitTime, maxAppExitTime);
+
+ if (err == KErrNone)
+ iConfig.SetMaxAppExitTime(maxAppExitTime);
+ else
+ iConfig.SetMaxAppExitTime(KOomMaxAppExitTime);
+ }
+ }
+
+void COomConfigParser::SetForceCheckConfigL(const RAttributeArray& aAttributes)
+ {
+ TUint priority;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority);
+ if (err == KErrNone)
+ {
+ iConfig.GlobalConfig().AddForceCheckPriorityL(priority);
+ }
+ else
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInForceCheck);
+ }
+ }
+
+void COomConfigParser::SetAppConfigL(const RAttributeArray& aAttributes)
+ {
+ TUint uid;
+ COomApplicationConfig* appConfig = NULL;
+
+ TInt err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingUidInAppConfig);
+ }
+ else
+ iParentUid = uid;
+
+ appConfig = COomApplicationConfig::NewL(uid);
+ CleanupStack::PushL(appConfig);
+
+ // Set the app specific memory thresholds (if they exist)
+ // Get the app specific low threshold
+ if (err == KErrNone)
+ {
+ TUint lowThreshold;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeLowRamThreshold, lowThreshold);
+ if (err == KErrNone)
+ {
+ appConfig->iLowRamThreshold = lowThreshold * KBytesInMegabyte;
+ }
+ else if (err == KErrNotFound)
+ err = KErrNone;
+
+ if (err != KErrNone)
+ ConfigError(KOomErrBadLowThresholdValueForAppConfig);
+ }
+
+ // Get the app specific good threshold
+ if (err == KErrNone)
+ {
+ TUint goodThreshold;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeGoodRamThreshold, goodThreshold);
+ if (err == KErrNone)
+ {
+ appConfig->iGoodRamThreshold = goodThreshold * KBytesInMegabyte;
+ }
+ else if (err == KErrNotFound)
+ err = KErrNone;
+
+ if (err != KErrNone)
+ ConfigError(KOomErrBadGoodThresholdValueForAppConfig);
+ }
+
+ // Add the applciation config to the main config
+ if ((err == KErrNone) && (appConfig))
+ {
+ iConfig.AddApplicationConfigL(appConfig);
+ }
+
+ if (appConfig)
+ CleanupStack::Pop(appConfig);
+ }
+
+void COomConfigParser::SetCloseAppConfigL(const RAttributeArray& aAttributes)
+ {
+ // Get and convert uid attribute to TInt
+ TInt err = KErrNone;
+
+ TUint uid;
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingUidInAppCloseConfig);
+ return;
+ }
+ else
+ iParentUid = uid;
+
+ COomCloseAppConfig* closeAppConfig = COomCloseAppConfig::NewL(uid); // Radio UID
+ CleanupStack::PushL(closeAppConfig);
+
+ if (err == KErrNone)
+ {
+ // Check that we have a priority for the added app_close event
+ // Specifying a priority is mandatory
+ TUint priority;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority);
+ if (err == KErrNone)
+ {
+ closeAppConfig->SetDefaultPriority(priority);
+ }
+ else
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInAppCloseConfig);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ TPtrC8 syncModeString;
+ err = GetValueFromAttributeList(aAttributes, KOomAttibuteSyncMode, syncModeString);
+
+ if (err == KErrNone)
+ {
+ TOomSyncMode syncMode = EContinue;
+
+ if (syncModeString == KOomConfigSyncModeContinue)
+ syncMode = EContinue;
+ else if (syncModeString == KOomConfigSyncModeCheck)
+ syncMode = ECheckRam;
+ else if (syncModeString == KOomConfigSyncModeEstimate)
+ syncMode = EEstimate;
+ else
+ ConfigError(KOomErrInvalidSyncMode);
+
+ if (err == KErrNone)
+ {
+ closeAppConfig->iSyncMode = syncMode;
+ }
+ }
+ else
+ {
+ ConfigError(KOomErrMissingSyncModeInAppCloseConfig);
+ }
+ }
+
+
+ if (err == KErrNone)
+ {
+ // If we have a default priority attribute then add it, otherwise use the global default priority
+ TInt ramEstimate;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteRamEstimate, ramEstimate);
+ if ((err == KErrNotFound) && (closeAppConfig->iSyncMode != EEstimate))
+ {
+ err = KErrNone;
+ }
+
+ if (err != KErrNone)
+ ConfigError(KOomErrMissingEstimateFromAppCloseConfig);
+ else
+ closeAppConfig->iRamEstimate = ramEstimate * KBytesInMegabyte;
+ }
+
+ if (err == KErrNone)
+ iConfig.SetAppCloseConfigL(closeAppConfig);
+
+ CleanupStack::Pop(closeAppConfig);
+ }
+
+void COomConfigParser::SetAppCloseIdlePriorityConfigL(const RAttributeArray& aAttributes)
+ {
+ TUint uid;
+ TInt idleTime;
+ TUint priority;
+
+ // Use the UID from the parent scope
+ uid = iParentUid;
+
+ TInt err = KErrNone;
+
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdleTime, idleTime);
+
+#ifdef __WINS__
+ // The tick is 5 times slower on the emulator than on the phone
+ idleTime = idleTime / KEmulatorTickDivisor;
+#endif
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingIdleTimeInAppIdleRule);
+ }
+
+ if (err == KErrNone)
+ {
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInAppIdleRule);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ COomIdleTimeRule* idleRule = COomIdleTimeRule::NewL(idleTime, priority);
+ CleanupStack::PushL(idleRule);
+ iConfig.AddApplicationRuleL(uid, idleRule);
+ CleanupStack::Pop(idleRule);
+ }
+ }
+
+void COomConfigParser::SetForegroundAppPriorityL(const RAttributeArray& aAttributes)
+ {
+ TUint appUid;
+ TUint targetAppId;
+ TUint priority;
+
+ TInt err = KErrNone;
+
+ // Use the UID from the parent scope
+ appUid = iParentUid;
+
+ // Check that we have a priority for the added system plugin action
+ // Specifying a priority is mandatory
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttributeIfForegroundAppId, targetAppId);
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingTargetAppIdInForegroundAppRule);
+ }
+
+ if (err == KErrNone)
+ {
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInForegroundAppRule);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ COomForegroundRule* foregroundRule = new (ELeave) COomForegroundRule(targetAppId, priority);
+ CleanupStack::PushL(foregroundRule);
+ iConfig.AddApplicationRuleL(appUid, foregroundRule);
+ CleanupStack::Pop(foregroundRule);
+ }
+
+ }
+
+void COomConfigParser::SetSystemPluginConfigL(const RAttributeArray& aAttributes)
+ {
+ // Get and convert uid attribute to TInt
+ TInt err = KErrNone;
+
+ TUint uid;
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingUidInSystemPluginConfig);
+ return;
+ }
+ else
+ iParentUid = uid;
+
+ COomRunPluginConfig* pluginConfig = COomRunPluginConfig::NewL(uid, EOomSystemPlugin);
+ CleanupStack::PushL(pluginConfig);
+
+ if (err == KErrNone)
+ {
+ // Check that we have a priority for the added system plugin action
+ // Specifying a priority is mandatory
+ TUint priority;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetDefaultPriority(priority);
+ }
+ else
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInSystemPluginConfig);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ TInt wait;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeWait, wait);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetWaitAfterPlugin(wait);
+ }
+ else if (err == KErrNotFound)
+ {
+ // If this attribute isn't present then just don't set it, and clear the error
+ err = KErrNone;
+ }
+ else
+ ConfigError(KOomErrBadPluginWaitTime);
+ }
+
+ if (err == KErrNone)
+ {
+ // Get the config for the sync mode for this plugin (if one is specified) and set it
+ SetPluginSyncMode(aAttributes, *pluginConfig);
+ }
+
+ iConfig.AddPluginConfigL(pluginConfig);
+
+ CleanupStack::Pop(pluginConfig);
+ }
+
+void COomConfigParser::SetAppPluginConfigL(const RAttributeArray& aAttributes)
+ {
+ // Get and convert uid attribute to TInt
+ TInt err = KErrNone;
+
+ TUint uid;
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttibuteUid, uid);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingUidInAppPluginConfig);
+ return;
+ }
+ else
+ iParentUid = uid;
+
+ COomRunPluginConfig* pluginConfig = COomRunPluginConfig::NewL(uid, EOomAppPlugin);
+ CleanupStack::PushL(pluginConfig);
+
+ if (err == KErrNone)
+ {
+ // Check that we have a priority for the added system plugin action
+ // Specifying a priority is mandatory
+ TUint priority;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibutePriority, priority);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetDefaultPriority(priority);
+ }
+ else
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInAppPluginConfig);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that we have a priority for the added system plugin action
+ // Specifying a priority is mandatory
+ TUint targetAppId;
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppId);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetTargetApp(targetAppId);
+ iParentTargetApp = targetAppId;
+ }
+ else
+ {
+ ConfigError(KOomErrBadOrMissingTargetAppIdInAppPluginConfig);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ TInt wait;
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttributeWait, wait);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetWaitAfterPlugin(wait);
+ }
+ else if (err == KErrNotFound)
+ {
+ // If this attribute isn't present then just don't set it, and clear the error
+ err = KErrNone;
+ }
+ else
+ ConfigError(KOomErrBadPluginWaitTime);
+ }
+
+ if (err == KErrNone)
+ {
+ // Get the config for the sync mode for this plugin (if one is specified) and set it
+ SetPluginSyncMode(aAttributes, *pluginConfig);
+
+ TBool targetAppNotRunning;
+ err = GetValueFromBooleanAttributeList(aAttributes, KOomAttributeCallIfTargetAppNotRunning, targetAppNotRunning);
+ if (err == KErrNone)
+ {
+ pluginConfig->SetCallIfTargetAppNotRunning(targetAppNotRunning);
+ }
+ else if (err == KErrNotFound)
+ {
+ // If this attribute isn't present then just don't set it, and clear the error
+ err = KErrNone;
+ }
+ else
+ {
+ ConfigError(KOomErrBadCallIfTargetAppNotRunning);
+ }
+ }
+
+ iConfig.AddPluginConfigL(pluginConfig);
+
+ CleanupStack::Pop(pluginConfig);
+
+ }
+
+void COomConfigParser::SetPluginIdlePriorityL(const RAttributeArray& aAttributes)
+ {
+ TUint uid;
+ TInt idleTime;
+ TUint priority;
+
+ TInt err = KErrNone;
+
+ // Use the UID from the parent scope
+ uid = iParentUid;
+
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdleTime, idleTime);
+
+#ifdef __WINS__
+ // The tick is 5 times slower on the emulator than on the phone
+ idleTime = idleTime / KEmulatorTickDivisor;
+#endif
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingIdleTimeInPluginIdleRule);
+ }
+
+ if (err == KErrNone)
+ {
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInPluginIdleRule);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ COomIdleTimeRule* idleRule = COomIdleTimeRule::NewL(idleTime, priority);
+ CleanupStack::PushL(idleRule);
+ iConfig.AddPluginRuleL(uid, idleRule);
+ CleanupStack::Pop(idleRule);
+ }
+ }
+
+void COomConfigParser::SetPluginForegroundAppPriorityL(const RAttributeArray& aAttributes)
+ {
+ TUint uid;
+ TUint targetAppId;
+ TUint priority;
+
+ TInt err = KErrNone;
+
+ // Use the UID from the parent scope
+ uid = iParentUid;
+
+ // Check that we have a priority for the added system plugin action
+ // Specifying a priority is mandatory
+
+ TPtrC8 targetAppString;
+ err = GetValueFromAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppString);
+ if ((err == KErrNone)
+ && (targetAppString == KOomConfigTargetAppValue)
+ && (iState == EOomParsingStateAppPluginSettings))
+ // If the target app is specified as "TARGET_APP" then we use the target app from the parent entry
+ {
+ targetAppId = iParentTargetApp;
+ }
+ else
+ {
+ err = GetValueFromHexAttributeList(aAttributes, KOomAttributeTargetAppId, targetAppId);
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingTargetAppIdInForegroundAppRule);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = GetValueFromDecimalAttributeList(aAttributes, KOomAttibuteIdlePriority, priority);
+
+ if (err != KErrNone)
+ {
+ ConfigError(KOomErrBadOrMissingPriorityInForegroundAppRule);
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ COomForegroundRule* foregroundRule = new (ELeave) COomForegroundRule(targetAppId, priority);
+ CleanupStack::PushL(foregroundRule);
+ iConfig.AddPluginRuleL(uid, foregroundRule);
+ CleanupStack::Pop(foregroundRule);
+ }
+ }
+
+// Finds an attribute of the given name and gets its value
+// A value is only valid as long as AAtrributes is valid (and unmodified)
+// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise
+TInt COomConfigParser::GetValueFromAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TPtrC8& aValue)
+ {
+ TInt index = aAttributes.Count();
+ TBool attributeFound = EFalse;
+ while ((index--) && (!attributeFound))
+ {
+ if (aAttributes[index].Attribute().LocalName().DesC() == aName)
+ {
+ attributeFound = ETrue;
+ aValue.Set(aAttributes[index].Value().DesC());
+ }
+ }
+
+ TInt err = KErrNone;
+
+ if (!attributeFound)
+ err = KErrNotFound;
+
+ return err;
+ }
+
+// Finds an attribute of the given name and gets its value (coverting the string hex value to a UInt)
+// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise
+// Returns KErrCorrupt if the string is not a valid hex number
+TInt COomConfigParser::GetValueFromHexAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue)
+ {
+ TPtrC8 hexString;
+ TInt err = GetValueFromAttributeList(aAttributes, aName, hexString);
+
+ if (hexString == KOomConfigDefaultAppUid)
+ {
+ // This is a special case
+ // When we hit this value in a hex field then we return the default app UID
+ aValue = KOomDefaultAppId;
+ }
+ else if (hexString == KOomConfigDefaultPluginUid)
+ {
+ // This is a special case
+ // When we hit this value in a hex field then we return the default app UID
+ aValue = KOomDefaultPluginId;
+ }
+ else if (hexString == KOomConfigBusyAppUid)
+ {
+ aValue = KOomBusyAppId;
+ }
+ else if (hexString == KOomConfigHighPriorityAppUid)
+ {
+ aValue = KOomHighPriorityAppId;
+ }
+ else if (err == KErrNone)
+ {
+ TLex8 hexLex(hexString);
+ err = hexLex.Val(aValue, EHex);
+ if (err != KErrNone)
+ err = KErrCorrupt;
+ }
+
+ return err;
+ }
+
+// Finds an attribute of the given name and gets its value (coverting the string decimal value to a UInt)
+// Returns KErrNone if the attribute is present in the list, KErrNotFound otherwise
+// Returns KErrCorrupt if the string is not a valid decimal number
+TInt COomConfigParser::GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TUint& aValue)
+ {
+ TPtrC8 decimalString;
+ TInt err = GetValueFromAttributeList(aAttributes, aName, decimalString);
+
+ if (err == KErrNone)
+ {
+ if (decimalString == KOomAttibuteNeverClose)
+ aValue = KOomPriorityInfinate;
+ else
+ {
+ TLex8 decimalLex(decimalString);
+ err = decimalLex.Val(aValue, EDecimal);
+ if (err != KErrNone)
+ err = KErrCorrupt;
+ }
+ }
+
+ return err;
+ }
+
+TInt COomConfigParser::GetValueFromDecimalAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TInt& aValue)
+ {
+ TUint uintValue;
+ TInt err = GetValueFromDecimalAttributeList(aAttributes, aName, uintValue);
+ aValue = uintValue;
+ return err;
+ }
+
+TInt COomConfigParser::GetValueFromBooleanAttributeList(const RAttributeArray& aAttributes, const TDesC8& aName, TBool& aValue)
+ {
+ TPtrC8 ptrValue;
+ TInt err = GetValueFromAttributeList(aAttributes, aName, ptrValue);
+ if (err == KErrNone)
+ {
+ if (ptrValue == KOomAttributeTrue || ptrValue == KOomAttribute1)
+ {
+ aValue = ETrue;
+ }
+ else if (ptrValue == KOomAttributeFalse || ptrValue == KOomAttribute0)
+ {
+ aValue = EFalse;
+ }
+ else
+ {
+ err = KErrCorrupt;
+ }
+ }
+ return err;
+ }
+
+void COomConfigParser::SetPluginSyncMode(const RAttributeArray& aAttributes, COomRunPluginConfig& aRunPluginConfig)
+ {
+ TPtrC8 syncModeString;
+ TInt err = GetValueFromAttributeList(aAttributes, KOomAttibuteSyncMode, syncModeString);
+
+ if (err == KErrNone)
+ // If there is no specified sync mode then leave it as the default
+ {
+ TOomSyncMode syncMode = EContinue;
+
+ if (syncModeString == KOomConfigSyncModeContinue)
+ syncMode = EContinueIgnoreMaxBatchSize;
+ else if (syncModeString == KOomConfigSyncModeCheck)
+ syncMode = ECheckRam;
+ else if (syncModeString == KOomConfigSyncModeEstimate)
+ syncMode = EEstimate;
+ else
+ ConfigError(KOomErrInvalidSyncMode);
+
+ if (err == KErrNone)
+ {
+ aRunPluginConfig.iSyncMode = syncMode;
+ }
+ }
+ }
+
+// Check that the current state is as expected
+// If not then the specified config error is generated
+void COomConfigParser::CheckState(TOomParsingState aExpectedState, TInt aError)
+ {
+ if (iState != aExpectedState)
+ ConfigError(aError);
+ }
+
+// Check that the current state is as expected
+// If not then the specified config error is generated
+// This version checks to ensure that the current state matches either of the passed in states
+void COomConfigParser::CheckState(TOomParsingState aExpectedState1, TOomParsingState aExpectedState2, TInt aError)
+ {
+ if ((iState != aExpectedState1)
+ && (iState != aExpectedState2))
+ ConfigError(aError);
+ }
+
+void COomConfigParser::ChangeState(TOomParsingState aState)
+ {
+ iState = aState;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomforegroundrule.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,43 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#include "oomforegroundrule.h"
+#include "oomwindowgrouplist.h"
+#include "oomtraces.h"
+
+// If the specified target app is in the foreground then apply the specified priority
+COomForegroundRule::COomForegroundRule(TInt aTargetAppId, TInt aPriority) : iTargetAppId(aTargetAppId), iPriority(aPriority)
+ {
+ FUNC_LOG;
+ }
+
+TBool COomForegroundRule::RuleIsApplicable(const COomWindowGroupList& aWindowGroupList, TInt /*aAppIndexInWindowGroup*/) const
+ {
+ FUNC_LOG;
+
+ TBool ruleIsApplicable = EFalse;
+ if (aWindowGroupList.Count() > 0)
+ {
+ // If the target app is in the foreground then this rule is applicable
+ TUint foregroundAppId = aWindowGroupList.AppId(0, ETrue);
+ if (foregroundAppId == iTargetAppId)
+ ruleIsApplicable = ETrue;
+ }
+
+ return ruleIsApplicable;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomglobalconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oomglobalconfig.h"
+#include "oomtraces.h"
+
+COomGlobalConfig::~COomGlobalConfig()
+ {
+ FUNC_LOG;
+
+ iForceCheckPriorities.Close();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomlog.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,306 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Logging functionality for OOM monitor profiling.
+*
+*/
+
+
+
+#ifdef _DEBUG
+
+#include <hal.h>
+#include <w32std.h>
+#include <e32std.h>
+#include <apgwgnam.h>
+#include <flogger.h>
+
+#include "oomlog.h"
+#include "oompanic.h"
+
+_LIT8(KMemorySampleLoggingString, "%d");
+_LIT8(KMemorySampleLoggingSeparator, ", ");
+
+_LIT8(KCrLf, "\r\n");
+
+_LIT8(KOomLogCancel, "Sampling triggered before previous sampling has completed. Results so far: ");
+
+_LIT(KOomLogFile, ":\\logs\\OOM\\liveoommonitor.txt");
+_LIT(KOomOldLogFile, ":\\logs\\OOM\\oommonitor.txt");
+
+const TInt KMaxTimeStampSize = 30;
+_LIT(KTimeStampFormat, "%F %H:%T:%S");
+
+_LIT(KDummyWgName, "20");
+
+_LIT8(KUidPreamble, "App UIDs:");
+_LIT8(KUidFormat, " 0x%x");
+
+const TInt KPreallocatedSpaceForAppList = 50;
+
+const TInt KMaxUidBufferSize = 1024;
+
+COomLogger* COomLogger::NewL(RWsSession& aWs, RFs& aFs)
+ {
+ COomLogger* self = new (ELeave) COomLogger(aWs, aFs);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// Start logging the available memory every n micro seconds
+// Firstly a list of the app IDs is written to the log (foreground app first)
+// Note that the log is created in memory (to a pre-allocated buffer) and flushed out after it is complete
+// the samples are saved in CSV format so that they can easily be cut and pasted to plot graphs etc.
+void COomLogger::StartL()
+ {
+ // If the log file doesn't exist then don't attempt to sample anything
+ if (!iIsOpen)
+ return;
+
+ // If we are already active then cancel first
+ if (IsActive())
+ Cancel();
+
+ iWriteBuffer.Zero();
+
+ iStartTime.HomeTime();
+
+ // Log the timestamp
+ TBuf16<KMaxTimeStampSize> timeStamp;
+ iStartTime.FormatL(timeStamp, KTimeStampFormat);
+ TBuf8<KMaxTimeStampSize> timeStamp8;
+ timeStamp8.Copy(timeStamp);
+ Write(timeStamp8);
+
+ // Log all of the application IDs (foreground app first, then the other apps moving towards the back)
+ LogApplicationIds();
+
+ // Then, record the free memory
+ // Note that this is done to a buffer so as not to affect the timing too much
+ LogFreeMemory();
+
+ // Finally, set a timer to record the memory every n microseconds
+ HighRes(KTimeBetweenMemorySamples);
+ }
+
+// From CTimer / CActice
+void COomLogger::RunL()
+ {
+ TTime currentTime;
+ currentTime.HomeTime();
+ TTimeIntervalMicroSeconds loggingDuration = currentTime.MicroSecondsFrom(iStartTime);
+ TTimeIntervalMicroSeconds samplingDuration = KSamplingDurationUint;
+ if (loggingDuration > samplingDuration)
+ // If we have passed the desired logging duration then write the data we have collected
+ {
+ Write(iWriteBuffer);
+ }
+ else
+ {
+ // If we haven't passed the desired logging duration then record the free memory
+ // Note that this is recorded into a buffer and then logged later
+ iWriteBuffer.Append(KMemorySampleLoggingSeparator);
+ LogFreeMemory();
+
+ // Wait before taking another memory sample
+ HighRes(KTimeBetweenMemorySamples);
+ }
+ }
+
+void COomLogger::DoCancel()
+ {
+ CTimer::DoCancel();
+
+ Write(KOomLogCancel);
+ Write(iWriteBuffer);
+ }
+
+COomLogger::~COomLogger()
+ {
+ iWgIds.Close();
+ // delete iWgName; // Not owned
+ if (iIsOpen)
+ iFile.Close();
+
+ }
+
+void COomLogger::Write(const TDesC8& aBuffer)
+ {
+ if (iIsOpen)
+ {
+ iFile.Write(aBuffer);
+
+ // Add the line break
+ iFile.Write(KCrLf);
+ }
+ }
+
+void COomLogger::LogApplicationIds()
+ {
+ // get all window groups, with info about parents
+ TInt numGroups = iWs.NumWindowGroups(0);
+ TRAPD(err, iWgIds.ReserveL(numGroups));
+
+ if (err != KErrNone)
+ return;
+
+ if (iWs.WindowGroupList(0, &iWgIds) != KErrNone)
+ return;
+
+ // Remove all child window groups, promote parents to foremost child position
+ ColapseWindowGroupTree();
+
+ // Go through each window group ID in the list, get the Uid of each app then log it
+ // Start with the foreground application
+ TInt index = 0;
+
+ TUid uid;
+
+ TBuf8<KMaxUidBufferSize> uidBuffer;
+
+ uidBuffer = KUidPreamble;
+
+ while (index < numGroups)
+ {
+ __ASSERT_DEBUG(index < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ uid = GetUidFromWindowGroupId(iWgIds[index].iId);
+
+ uidBuffer.AppendFormat(KUidFormat, uid.iUid);
+
+ index++;
+ }
+
+ Write(uidBuffer);
+ }
+
+void COomLogger::LogFreeMemory()
+ {
+ TMemoryInfoV1Buf meminfo;
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+
+ // Save the free memory to a descriptor which will be written later
+ iWriteBuffer.AppendFormat(KMemorySampleLoggingString(), freeMem);
+ }
+
+COomLogger::COomLogger(RWsSession& aWs, RFs& aFs) : CTimer(EPriorityStandard), iWs(aWs), iFs(aFs)
+ {
+ }
+
+void COomLogger::ConstructL()
+ {
+ CActiveScheduler::Add(this);
+
+ CTimer::ConstructL();
+
+ TFileName oldLogFileName;
+ TFileName newLogFileName;
+ TChar driveChar = iFs.GetSystemDriveChar();
+ oldLogFileName.Append(driveChar);
+ oldLogFileName.Append(KOomOldLogFile);
+ newLogFileName.Append(driveChar);
+ newLogFileName.Append(KOomLogFile);
+ // If there is an existing log then copy it, this will be the log that can be sent to the PC
+ // Without this feature then you can't get the logs off of the device because the "live" log will always be is use.
+ CFileMan* fileMan = CFileMan::NewL(iFs);
+ CleanupStack::PushL(fileMan);
+ fileMan->Copy(newLogFileName, oldLogFileName);
+ CleanupStack::PopAndDestroy(fileMan);
+
+ // Create the log file, or open it if is already exists (note that the directory must already be present
+ TInt err = iFile.Create(iFs, KOomLogFile, EFileShareAny | EFileWrite);
+ if (KErrNone != err)
+ {
+ err = iFile.Open(iFs, KOomLogFile, EFileShareAny | EFileWrite);
+ }
+
+ if (KErrNone == err)
+ {
+ iIsOpen = ETrue;
+
+ // Append all new data to the end of the file
+ TInt offset = 0;
+ iFile.Seek(ESeekEnd, offset);
+ }
+
+ // Reserve enough space to build an app list later.
+ iWgIds.ReserveL(KPreallocatedSpaceForAppList);
+ // Reserve enough space for CApaWindowGroupName.
+ iWgName = CApaWindowGroupName::NewL(iWs);
+ iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength);
+ (*iWgNameBuf) = KDummyWgName;
+ iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf*/
+
+ }
+
+void COomLogger::ColapseWindowGroupTree()
+ {
+ // start from the front, wg count can reduce as loop runs
+ for (TInt ii=0; ii<iWgIds.Count();)
+ {
+ RWsSession::TWindowGroupChainInfo& info = iWgIds[ii];
+ if (info.iParentId > 0) // wg has a parent
+ {
+ // Look for the parent position
+ TInt parentPos = ii; // use child pos as not-found signal
+ TInt count = iWgIds.Count();
+ for (TInt jj=0; jj<count; jj++)
+ {
+ if (iWgIds[jj].iId == info.iParentId)
+ {
+ parentPos = jj;
+ break;
+ }
+ }
+
+ if (parentPos > ii) // parent should be moved forward
+ {
+ iWgIds[ii] = iWgIds[parentPos];
+ iWgIds.Remove(parentPos);
+ }
+ else if (parentPos < ii) // parent is already ahead of child, remove child
+ iWgIds.Remove(ii);
+ else // parent not found, skip
+ ii++;
+ }
+ else // wg does not have a parent, skip
+ ii++;
+ }
+ }
+
+TUid COomLogger::GetUidFromWindowGroupId(TInt aWgId)
+ {
+ // get the app's details
+ TPtr wgPtr(iWgNameBuf->Des());
+
+ TUid uid;
+
+ TInt err = iWs.GetWindowGroupNameFromIdentifier(aWgId, wgPtr);
+
+ if (KErrNone != err)
+ // If there is an error then set the UID to 0;
+ {
+ uid.iUid = 0;
+ }
+ else
+ {
+ iWgName->SetWindowGroupName(iWgNameBuf);
+ uid = iWgName->AppUid(); // This UID comes from the app, not the mmp!
+ }
+
+ return uid;
+ }
+
+#endif //_DEBUG
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitor.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,469 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#include <hal.h>
+
+#include <UikonInternalPSKeys.h>
+
+#include "oommemorymonitor.h"
+#include "oommonitorplugin.h"
+#include "oomsubscribehelper.h"
+#include "oomconfig.h"
+#include "oommemorymonitorserver.h"
+#include "oomconfigparser.h"
+#include "oomactionlist.h"
+#include "oomlog.h"
+#include "OomTraces.h"
+#include "oomoutofmemorywatcher.h"
+#include "oomwserveventreceiver.h"
+#include "oomconstants.hrh"
+#include "oomrunpluginconfig.h"
+#include "oomapplicationconfig.h"
+#include "oomclientrequestqueue.h"
+
+#ifndef CLIENT_REQUEST_QUEUE
+const TInt KOomWatchDogStatusIdle = -1;
+#endif
+
+// ======================================================================
+// class CMemoryMonitor
+// ======================================================================
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+CMemoryMonitor* CMemoryMonitor::NewL()
+ { // static
+ FUNC_LOG;
+
+ CMemoryMonitor* self = new(ELeave) CMemoryMonitor();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CMemoryMonitor::CMemoryMonitor()
+ {
+ FUNC_LOG;
+
+ SetMemoryMonitorTls(this);
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+CMemoryMonitor::~CMemoryMonitor()
+ {
+ FUNC_LOG;
+
+#ifndef CLIENT_REQUEST_QUEUE
+ if (iWatchdogStatusSubscriber)
+ {
+ iWatchdogStatusSubscriber->StopSubscribe();
+ }
+ iWatchdogStatusProperty.Close();
+ delete iWatchdogStatusSubscriber;
+#endif
+
+ delete iServer;
+ delete iWservEventReceiver;
+ delete iOOMWatcher;
+ iFs.Close();
+ iWs.Close();
+
+ delete iOomWindowGroupList;
+ delete iOomActionList;
+ delete iConfig;
+#ifdef CLIENT_REQUEST_QUEUE
+ delete iQueue;
+#endif
+
+#ifdef _DEBUG
+ delete iLogger;
+#endif
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CMemoryMonitor::ConstructL()
+ {
+ FUNC_LOG;
+
+ User::LeaveIfError(iWs.Connect());
+
+ iOomWindowGroupList = COomWindowGroupList::NewL(iWs);
+
+ iConfig = COomConfig::NewL();
+
+#ifdef CLIENT_REQUEST_QUEUE
+ iQueue = COomClientRequestQueue::NewL(*this);
+
+ iServer = CMemoryMonitorServer::NewL(*iQueue);
+#else
+ iServer = CMemoryMonitorServer::NewL(*this);
+#endif
+
+ // Load up threshold & OOM app lists from resource.
+ User::LeaveIfError(iFs.Connect());
+
+ COomConfigParser* oomConfigParser = new (ELeave) COomConfigParser(*iConfig, iFs);
+ CleanupStack::PushL(oomConfigParser);
+ oomConfigParser->ParseL();
+ CleanupStack::PopAndDestroy(oomConfigParser);
+
+ iOomActionList = COomActionList::NewL(*this, *iServer, iWs, *iConfig);
+
+#ifdef _DEBUG
+ iLogger = COomLogger::NewL(iWs, iFs);
+#endif
+
+ // Get the thresholds based on the current foreground app and the config
+ RefreshThresholds();
+
+ _LIT_SECURITY_POLICY_S0(KOomMemoryMonitorPolicyWrite, KOomMemoryMonitorStatusPropertyCategory.iUid);
+ _LIT_SECURITY_POLICY_PASS(KOomMemoryMonitorPolicyRead);
+
+ // Define MemoryMonitorStatusProperty. set to "above treshhold".
+ TInt err = RProperty::Define(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, RProperty::EInt, KOomMemoryMonitorPolicyRead, KOomMemoryMonitorPolicyWrite);
+ TRACES1("CMemoryMonitor::ConstructL: KOomMemoryMonitorStatusProperty: Define err = %d", err);
+
+ err = RProperty::Set(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, EAboveTreshHold);
+ TRACES1("CMemoryMonitor::ConstructL: KOomMemoryMonitorStatusProperty: Set err = %d", err);
+
+#ifndef CLIENT_REQUEST_QUEUE
+ err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus);
+
+ TRACES1("CMemoryMonitor::ConstructL: KUikOOMWatchdogStatus err = %d", err);
+
+ err = iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle);
+
+ iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty);
+ iWatchdogStatusSubscriber->Subscribe();
+#endif
+
+
+ iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowThreshold, iGoodThreshold);
+ iOOMWatcher->Start();
+
+ iWservEventReceiver = new(ELeave) CWservEventReceiver(*this, iWs);
+ iWservEventReceiver->ConstructL();
+ }
+
+const COomGlobalConfig& CMemoryMonitor::GlobalConfig()
+ {
+ CMemoryMonitor* globalMemoryMonitor = static_cast<CMemoryMonitor*>(Dll::Tls());
+ return globalMemoryMonitor->iConfig->GlobalConfig();
+ }
+
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CMemoryMonitor::FreeMemThresholdCrossedL()
+ {
+ FUNC_LOG;
+
+ iActionTrigger = ERamRotation;
+ StartFreeSomeRamL(iGoodThreshold);
+ }
+
+void CMemoryMonitor::HandleFocusedWgChangeL()
+ {
+ FUNC_LOG;
+
+ TInt oldGoodThreshold = iGoodThreshold;
+ TInt oldLowThreshold = iLowThreshold;
+
+ // Refresh the low and good memory thresholds as they may have changed due to the new foreground application
+ RefreshThresholds();
+
+ if ((oldGoodThreshold != iGoodThreshold)
+ || (oldLowThreshold != iLowThreshold))
+ // If the thresholds have changed then update the memory watched
+ {
+ iOOMWatcher->UpdateThresholds(iLowThreshold, iGoodThreshold);
+ }
+
+ // If the available memory is less than the low memory threshold then free some RAM
+ User::CompressAllHeaps();
+ TInt current = 0;
+ HAL::Get( HALData::EMemoryRAMFree, current );
+
+ if (current < iLowThreshold)
+ {
+ iActionTrigger = ERamRotation;
+ StartFreeSomeRamL(iGoodThreshold);
+ }
+ }
+
+void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree)
+ {
+ StartFreeSomeRamL(aTargetFree, KOomPriorityInfinate - 1);
+ }
+
+void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree, TInt aMaxPriority) // The maximum priority of action to run
+ {
+ FUNC_LOG;
+
+ TRACES2("MemoryMonitor::StartFreeSomeRamL: aTargetFree = %d, iCurrentTarget = %d", aTargetFree, iCurrentTarget);
+
+ // Update the target if new target is higher. If the target is lower than the current target and memory
+ // is currently being freed then we do not want to reduce the amount of memory this operation frees.
+ if (aTargetFree > iCurrentTarget)
+ iCurrentTarget = aTargetFree;
+
+ // check if there is enough free memory already.
+ TInt freeMemory;
+ GetFreeMemory(freeMemory);
+
+ TRACES1("MemoryMonitor::StartFreeSomeRamL, freeMemory = %d", freeMemory);
+
+ if (freeMemory >= iCurrentTarget)
+ {
+ if (iLastMemoryMonitorStatusProperty != EFreeingMemory)
+ {
+ ResetTargets();
+ iOomActionList->SwitchOffPlugins();
+ SetMemoryMonitorStatusProperty(EAboveTreshHold);
+#ifdef CLIENT_REQUEST_QUEUE
+ iQueue->ActionsCompleted(freeMemory, ETrue);
+#else
+ iServer->CloseAppsFinished(freeMemory, ETrue);
+#endif
+ }
+ return;
+ }
+
+#ifdef _DEBUG
+ iLogger->StartL();
+#endif
+
+ // Build the list of memory freeing actions
+ iOomActionList->BuildActionListL(*iOomWindowGroupList, *iConfig);
+
+ iOomActionList->SetCurrentTarget(iCurrentTarget);
+
+ // Run the memory freeing actions
+ iOomActionList->FreeMemory(aMaxPriority);
+ }
+
+void CMemoryMonitor::RequestFreeMemoryPandSL(TInt aBytesRequested)
+ {
+ FUNC_LOG;
+
+ iActionTrigger = EPublishAndSubscribe;
+ StartFreeSomeRamL(aBytesRequested + iLowThreshold);
+ }
+
+void CMemoryMonitor::RequestFreeMemoryL(TInt aBytesRequested)
+ {
+ FUNC_LOG;
+
+ iActionTrigger = EClientServerRequestFreeMemory;
+ StartFreeSomeRamL(aBytesRequested + iLowThreshold);
+ }
+
+void CMemoryMonitor::FreeOptionalRamL(TInt aBytesRequested, TInt aPluginId) // The ID of the plugin that will clear up the allocation, used to determine the priority of the allocation
+ {
+ FUNC_LOG;
+
+ iActionTrigger = EClientServerRequestOptionalRam;
+
+ // Calculate the priority of the allocation (the priority of the plugin that will clear it up - 1)
+ TInt priorityOfAllocation = iConfig->GetPluginConfig(aPluginId).CalculatePluginPriority(*iOomWindowGroupList) - 1;
+
+ StartFreeSomeRamL(aBytesRequested + iGoodThreshold, priorityOfAllocation);
+ }
+
+void CMemoryMonitor::GetFreeMemory(TInt& aCurrentFreeMemory)
+ {
+ FUNC_LOG;
+
+ // may cause some extra load but allows more precise action
+ User::CompressAllHeaps();
+
+ HAL::Get( HALData::EMemoryRAMFree, aCurrentFreeMemory );
+
+ TRACES1("CMemoryMonitor::GetFreeMemory: Free RAM now %d", aCurrentFreeMemory);
+ }
+
+#ifndef CLIENT_REQUEST_QUEUE
+TInt CMemoryMonitor::WatchdogStatusStatusChanged(TAny* aPtr)
+ {
+ FUNC_LOG;
+
+ CMemoryMonitor* self = STATIC_CAST(CMemoryMonitor*,aPtr);
+ if (self)
+ self->HandleWatchdogStatusCallBack();
+ return KErrNone;
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CMemoryMonitor::HandleWatchdogStatusCallBack()
+ {
+ FUNC_LOG;
+
+ // Someone has set the key to request some free memory.
+ TInt memoryRequested = 0;
+ iWatchdogStatusProperty.Get(memoryRequested);
+
+ // Try to free the RAM.
+ if (memoryRequested >= 1)
+ {
+ iOOMWatcher->Cancel(); // Pause memory notifys.
+ TRAP_IGNORE(RequestFreeMemoryPandSL(memoryRequested + iLowThreshold)); // This call could take a few seconds to do its stuff.
+ iOOMWatcher->Start(); // Restarts memory monitoring.
+ }
+ // Set the key back to KOomWatchDogStatusIdle to indicate we're done.
+ iWatchdogStatusProperty.Set(KOomWatchDogStatusIdle);
+ }
+#endif //CLIENT_REQUEST_QUEUE
+
+void CMemoryMonitor::AppNotExiting(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ iOomActionList->AppNotExiting(aWgId);
+ }
+
+
+void CMemoryMonitor::RefreshThresholds()
+ {
+ FUNC_LOG;
+
+ iOomWindowGroupList->Refresh();
+
+ // Calculate the desired good threshold, this could be the globally configured value...
+ iGoodThreshold = CMemoryMonitor::GlobalConfig().iGoodRamThreshold;
+ iLowThreshold = CMemoryMonitor::GlobalConfig().iLowRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: Global Good Threshold = %d, Global Low Threshold = %d", iGoodThreshold, iLowThreshold);
+
+#ifdef _DEBUG
+ TRACES("CMemoryMonitor::RefreshThresholds: Dumping Window Group List");
+ TInt wgIndex = iOomWindowGroupList->Count() - 1;
+ while (wgIndex >= 0)
+ {
+ TInt32 appId = iOomWindowGroupList->AppId(wgIndex, ETrue);
+ TInt wgId = iOomWindowGroupList->WgId(wgIndex).iId;
+ TInt parentId = iOomWindowGroupList->WgId(wgIndex).iId;
+ TRACES4("CMemoryMonitor::RefreshThresholds: wgIndex=%d, oom uid=%x, wgId(child)=%d, parentId=%d", wgIndex, appId, wgId, parentId);
+ wgIndex--;
+ }
+#endif
+
+ // The global value can be overridden by an app specific value
+ // Find the application config entry for the foreground application
+ if (iOomWindowGroupList->Count())
+ {
+ TUint foregroundAppId = iOomWindowGroupList->AppId(0, ETrue);
+ TUid foregroundAppUid = TUid::Uid(foregroundAppId);
+
+ if ( (foregroundAppUid == KUidPenInputServer || foregroundAppUid == KUidFastSwap) &&
+ iOomWindowGroupList->Count() > 1 )
+ {
+ // pen input server puts itself to the foreground when the web browser is active
+ // fast swap should not reset the thresholds for the app behind it
+ foregroundAppId = iOomWindowGroupList->AppId(1, ETrue);
+ }
+
+ // If this application configuration overrides the good_ram_threshold then set it
+ if (iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold != KOomThresholdUnset)
+ {
+ iGoodThreshold = iConfig->GetApplicationConfig(foregroundAppId).iGoodRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Good Threshold = %d", foregroundAppId, iGoodThreshold);
+ }
+ // If this application configuration overrides the low_ram_threshold then set it
+ if (iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold != KOomThresholdUnset)
+ {
+ iLowThreshold = iConfig->GetApplicationConfig(foregroundAppId).iLowRamThreshold;
+ TRACES2("CMemoryMonitor::RefreshThresholds: For foreground app %x, Low Threshold = %d", foregroundAppId, iLowThreshold);
+ }
+
+ }
+ }
+
+// SetMemoryMonitorStatusProperty - updates the property value only if it has changed
+void CMemoryMonitor::SetMemoryMonitorStatusProperty(const TMemoryMonitorStatusPropertyValues aValue)
+ {
+ if (iLastMemoryMonitorStatusProperty != aValue)
+ {
+ TInt err = RProperty::Set(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey, aValue);
+ TRACES1("CMemoryMonitor::SetMemoryMonitorStatusProperty: err = %d", err);
+ iLastMemoryMonitorStatusProperty = aValue;
+ }
+ }
+
+void CMemoryMonitor::ResetTargets()
+ {
+ FUNC_LOG;
+
+ //we reset the target when a memory free operation completes, to deal with the case
+ //where the operation was initiated with a target larger than the current good threshold
+ iCurrentTarget = iGoodThreshold;
+ iOomActionList->SetCurrentTarget(iCurrentTarget);
+ }
+
+void CMemoryMonitor::SetPriorityBusy(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ iOomWindowGroupList->SetPriorityBusy(aWgId);
+ }
+
+void CMemoryMonitor::SetPriorityNormal(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ iOomWindowGroupList->SetPriorityNormal(aWgId);
+ }
+
+void CMemoryMonitor::SetPriorityHigh(TInt aWgId)
+ {
+ iOomWindowGroupList->SetPriorityHigh(aWgId);
+ }
+
+TActionTriggerType CMemoryMonitor::ActionTrigger() const
+ {
+ return iActionTrigger;
+ }
+
+#ifdef CLIENT_REQUEST_QUEUE
+TInt CMemoryMonitor::GoodThreshold() const
+ {
+ return iGoodThreshold;
+ }
+
+TInt CMemoryMonitor::LowThreshold() const
+ {
+ return iLowThreshold;
+ }
+
+void CMemoryMonitor::ActionsCompleted(TInt aBytesFree, TBool aMemoryGood)
+ {
+ iQueue->ActionsCompleted(aBytesFree, aMemoryGood);
+ }
+#endif //CLIENT_REQUEST_QUEUE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorserver.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,114 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oommemorymonitorserver.h"
+#include "oommonitorclientserver.h"
+#include "oommemorymonitorsession.h"
+#include "oommemorymonitor.h"
+#include "oomtraces.h"
+
+#ifdef CLIENT_REQUEST_QUEUE
+CMemoryMonitorServer* CMemoryMonitorServer::NewL(COomClientRequestQueue& aQueue)
+#else
+CMemoryMonitorServer* CMemoryMonitorServer::NewL(CMemoryMonitor& aMonitor)
+#endif
+ {
+ FUNC_LOG;
+
+#ifdef CLIENT_REQUEST_QUEUE
+ CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aQueue);
+#else
+ CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aMonitor);
+#endif
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CMemoryMonitorServer::~CMemoryMonitorServer()
+ {
+ FUNC_LOG;
+ }
+
+#ifdef CLIENT_REQUEST_QUEUE
+CMemoryMonitorServer::CMemoryMonitorServer(COomClientRequestQueue& aQueue)
+ :CServer2(CActive::EPriorityStandard), iQueue(aQueue)
+#else
+CMemoryMonitorServer::CMemoryMonitorServer(CMemoryMonitor& aMonitor)
+ :CServer2(CActive::EPriorityStandard), iMonitor(aMonitor)
+#endif
+ {
+ FUNC_LOG;
+ }
+
+void CMemoryMonitorServer::ConstructL()
+ {
+ FUNC_LOG;
+
+ StartL(KMemoryMonitorServerName);
+ }
+
+CSession2* CMemoryMonitorServer::NewSessionL(const TVersion& /*aVersion*/, const RMessage2& /*aMessage*/) const
+ {
+ FUNC_LOG;
+
+ return new(ELeave) CMemoryMonitorSession();
+ }
+
+TInt CMemoryMonitorServer::RunError(TInt aError)
+ {
+ FUNC_LOG;
+
+ Message().Complete(aError);
+ //
+ // The leave will result in an early return from CServer::RunL(), skipping
+ // the call to request another message. So do that now in order to keep the
+ // server running.
+ ReStart();
+ return KErrNone; // handled the error fully
+ }
+
+#ifdef CLIENT_REQUEST_QUEUE
+COomClientRequestQueue& CMemoryMonitorServer::ClientRequestQueue()
+ {
+ FUNC_LOG;
+
+ return iQueue;
+ }
+#else
+CMemoryMonitor& CMemoryMonitorServer::Monitor()
+ {
+ FUNC_LOG;
+
+ return iMonitor;
+ }
+#endif
+
+#ifndef CLIENT_REQUEST_QUEUE
+void CMemoryMonitorServer::CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood)
+ {
+ FUNC_LOG;
+
+ iSessionIter.SetToFirst();
+ CSession2* s;
+ while ((s = iSessionIter++) != 0)
+ static_cast<CMemoryMonitorSession*>(s)->CloseAppsFinished(aBytesFree, aMemoryGood);
+ }
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oommemorymonitorsession.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,156 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+#include "oommonitorclientserver.h"
+#include "oommemorymonitorsession.h"
+#include "oommemorymonitor.h"
+#include "oommemorymonitorserver.h"
+#include "oomtraces.h"
+#include "oomclientrequestqueue.h"
+
+CMemoryMonitorSession::CMemoryMonitorSession()
+ {
+ FUNC_LOG;
+ }
+
+
+CMemoryMonitorSession::~CMemoryMonitorSession()
+ {
+ FUNC_LOG;
+ }
+
+CMemoryMonitorServer& CMemoryMonitorSession::Server()
+ {
+ FUNC_LOG;
+
+ return *static_cast<CMemoryMonitorServer*>(const_cast<CServer2*>(CSession2::Server()));
+ }
+
+#ifdef CLIENT_REQUEST_QUEUE
+COomClientRequestQueue& CMemoryMonitorSession::ClientRequestQueue()
+ {
+ FUNC_LOG;
+
+ return Server().ClientRequestQueue();
+ }
+#endif
+
+CMemoryMonitor& CMemoryMonitorSession::Monitor()
+ {
+ FUNC_LOG;
+
+#ifdef CLIENT_REQUEST_QUEUE
+ return ClientRequestQueue().Monitor();
+#else
+ return Server().Monitor();
+#endif
+ }
+
+void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage)
+ {
+ FUNC_LOG;
+
+#ifndef CLIENT_REQUEST_QUEUE
+ iFunction = aMessage.Function();
+#endif
+
+ switch (aMessage.Function())
+ {
+ case EOomMonitorRequestFreeMemory:
+ if (!iRequestFreeRam.IsNull())
+ PanicClient(aMessage, EPanicRequestActive);
+ // message will be completed when CloseAppsFinished() is called.
+#ifdef CLIENT_REQUEST_QUEUE
+ ClientRequestQueue().RequestFreeMemoryL(aMessage);
+#else
+ iRequestFreeRam = aMessage;
+ Monitor().RequestFreeMemoryL(aMessage.Int0());
+#endif
+ break;
+
+ case EOomMonitorCancelRequestFreeMemory:
+ if (!iRequestFreeRam.IsNull())
+ iRequestFreeRam.Complete(KErrCancel);
+ aMessage.Complete(KErrNone);
+ break;
+
+ case EOomMonitorThisAppIsNotExiting:
+ Monitor().AppNotExiting(aMessage.Int0());
+ aMessage.Complete(KErrNone);
+ break;
+
+ case EOomMonitorRequestOptionalRam:
+ if (!iRequestFreeRam.IsNull())
+ PanicClient(aMessage, EPanicRequestActive);
+ // message will be completed when CloseAppsFinished() is called.
+#ifdef CLIENT_REQUEST_QUEUE
+ ClientRequestQueue().RequestOptionalRamL(aMessage);
+#else
+ iRequestFreeRam = aMessage;
+ iMinimumMemoryRequested = aMessage.Int1();
+ Monitor().FreeOptionalRamL(aMessage.Int0(), aMessage.Int2());
+#endif
+ break;
+
+ case EOomMonitorSetPriorityBusy:
+ Monitor().SetPriorityBusy(aMessage.Int0());
+ aMessage.Complete(KErrNone);
+ break;
+
+ case EOomMonitorSetPriorityNormal:
+ Monitor().SetPriorityNormal(aMessage.Int0());
+ aMessage.Complete(KErrNone);
+ break;
+
+ case EOomMonitorSetPriorityHigh:
+ Monitor().SetPriorityHigh(aMessage.Int0());
+ aMessage.Complete(KErrNone);
+ break;
+
+ default:
+ PanicClient(aMessage, EPanicIllegalFunction);
+ break;
+ }
+ }
+
+#ifndef CLIENT_REQUEST_QUEUE
+void CMemoryMonitorSession::CloseAppsFinished(TInt aBytesFree, TBool aMemoryGood)
+ {
+ FUNC_LOG;
+
+ if (!iRequestFreeRam.IsNull())
+ {
+ if (iFunction == EOomMonitorRequestOptionalRam)
+ {
+ TInt memoryAvailable = aBytesFree - CMemoryMonitor::GlobalConfig().iGoodRamThreshold;
+
+ // If memory available is greater than the requested RAM then complete with the amount of free memory, otherwise complete with KErrNoMemory
+ if (memoryAvailable >= iMinimumMemoryRequested)
+ {
+ iRequestFreeRam.Complete(memoryAvailable);
+ }
+ else
+ {
+ iRequestFreeRam.Complete(KErrNoMemory);
+ }
+ }
+ else
+ iRequestFreeRam.Complete(aMemoryGood ? KErrNone : KErrNoMemory);
+ }
+ }
+#endif
--- a/sysresmonitoring/oommonitor/src/oommonitor.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/src/oommonitor.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -16,41 +16,20 @@
*/
-#include <hal.h>
-#include <s32file.h>
-#include <w32std.h>
-#include <akneiksrvc.h>
-#include <LafMemoryWatcher.rsg>
-#include <bautils.h>
-#include <apgwgnam.h>
-#include <apgtask.h>
-#include <barsc.h>
-#include <barsread2.h>
-#include <e32property.h>
-#include <UikonInternalPSKeys.h>
-#include <UiklafInternalCRKeys.h>
-
-#include <data_caging_path_literals.hrh>
#include "oommonitor.h"
-#include "oommonitorplugin.h"
-#include "oommonitorplugin.hrh"
+#include "oommemorymonitor.h"
#include "oommonitorclientserver.h"
-
-#define OOM_WATCHDOG_STATUS_IDLE -1
+#include "oomtraces.h"
-const TInt KPreallocatedSpaceForAppList = 50;
-const TInt KPluginFreeMemoryTime = 100000; // 100 milliseconds for plugins to free memory, overridden by LafMemoryWatcher.rss
+const TInt KStackSize = 0x2000;
-_LIT(KDriveZ, "z:");
-_LIT(KOOMWatcherResourceFileName, "lafmemorywatcher.rsc");
_LIT(KOOMWatcherThreadName, "OOM FW");
-_LIT(KDummyWgName, "20");
// Implements just Error() to avoid panic
-class CSimpleScheduler : public CActiveScheduler
+NONSHARABLE_CLASS(CSimpleScheduler) : public CActiveScheduler
{
void Error( TInt ) const{} // From CActiveScheduler
};
@@ -58,6 +37,8 @@
// thread function for OOM watcher
GLDEF_C TInt WatcherThreadFunction( TAny* )
{
+ FUNC_LOG;
+
TInt err( KErrNone );
CTrapCleanup* cleanup = CTrapCleanup::New();
@@ -95,12 +76,14 @@
// Creates thread for OOM watchers
EXPORT_C void CreateOOMWatcherThreadL()
{
+ FUNC_LOG;
+
RThread thread;
TInt ret = thread.Create( KOOMWatcherThreadName,
WatcherThreadFunction,
- 0x2000, // stack size
+ KStackSize, // stack size
NULL, // uses caller thread's heap
- (TAny*)NULL );
+ NULL );
if ( ret == KErrNone )
{
@@ -111,941 +94,10 @@
User::LeaveIfError( ret );
}
-
-// ======================================================================
-// class CMemoryMonitor
-// ======================================================================
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-CMemoryMonitor* CMemoryMonitor::NewL()
- { // static
- CMemoryMonitor* self = new(ELeave) CMemoryMonitor();
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-CMemoryMonitor::CMemoryMonitor()
-: iRamPluginRunTime(KPluginFreeMemoryTime), iCurrentTask(iWs),
- iMemoryAboveThreshold(ETrue), iPluginMemoryGood(ETrue)
- {
- SetMemoryMonitorTls(this);
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-CMemoryMonitor::~CMemoryMonitor()
- {
- if (iWatchdogStatusSubscriber)
- {
- iWatchdogStatusSubscriber->StopSubscribe();
- }
- iWatchdogStatusProperty.Close();
- delete iWatchdogStatusSubscriber;
-
- delete iServer;
- delete iWservEventReceiver;
- delete iAppCloseTimer;
- delete iAppCloseWatcher;
- delete iOOMWatcher;
- delete iPlugins;
- iAppCloseOrderMap.Close();
- iWgIds.Close();
- delete iWgName;
- iFs.Close();
- iWs.Close();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CMemoryMonitor::ConstructL()
- {
- User::LeaveIfError(iWs.Connect());
-
- // Reserve enough space to build an app list later.
- iWgIds.ReserveL(KPreallocatedSpaceForAppList);
- // Reserve enough space for CApaWindowGroupName.
- iWgName = CApaWindowGroupName::NewL(iWs);
- iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength);
- (*iWgNameBuf) = KDummyWgName;
- iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf
-
- // Load up threshold & OOM app lists from resource.
- User::LeaveIfError(iFs.Connect());
-
- RResourceFile resFile;
- TFileName filename(KDriveZ);
- filename.Append(KDC_RESOURCE_FILES_DIR);
- filename.Append(KOOMWatcherResourceFileName);
- BaflUtils::NearestLanguageFile(iFs, filename);
- resFile.OpenL(iFs, filename);
- CleanupClosePushL(resFile);
-
- HBufC8* thresholds = resFile.AllocReadLC(R_APP_OOM_THRESHOLDS);
- RResourceReader theReader;
- theReader.OpenLC(*thresholds);
-
- iLowThreshold = theReader.ReadInt32L();
- iGoodThreshold = theReader.ReadInt32L();
- iMaxExitTime = theReader.ReadInt32L();
- TRAP_IGNORE(iRamPluginRunTime = theReader.ReadInt32L()); // trapped in case lafmemorywatcher.rss does not define this value
-
- CleanupStack::PopAndDestroy(&theReader);
- CleanupStack::PopAndDestroy(thresholds);
-
- // apps to close first, first app in list gets closed first
- ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_CANDIDATES, ECloseFirst, +1); // +1 means apps later in the list are closed later
- // apps to never close, all apps get order ENeverClose
- ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_NEVER, ENeverClose, 0); // 0 means that all apps get ENeverClose
- // apps to close last, first app in list gets closed last
- ReadAppResourceArrayL(resFile, R_APP_OOM_EXIT_LAST, ECloseLast, -1); // -1 means apps later in the list are closed earlier
-
- CleanupStack::PopAndDestroy(); // resFile.Close();
-
- iPlugins = new(ELeave) COomPlugins;
- iPlugins->ConstructL();
-
- TInt err = iWatchdogStatusProperty.Attach(KPSUidUikon, KUikOOMWatchdogStatus);
-#ifdef _DEBUG
- RDebug::Print(_L("xxxx KUikOOMWatchdogStatus err=%d"), err);
-#endif
- err = iWatchdogStatusProperty.Set(OOM_WATCHDOG_STATUS_IDLE);
-
- iWatchdogStatusSubscriber = new (ELeave) CSubscribeHelper(TCallBack(WatchdogStatusStatusChanged, this), iWatchdogStatusProperty);
- iWatchdogStatusSubscriber->SubscribeL();
-
- iOOMWatcher = COutOfMemoryWatcher::NewL(*this, iLowThreshold, iGoodThreshold);
- iOOMWatcher->Start();
-
- iAppCloseTimer = CAppCloseTimer::NewL(*this);
- iAppCloseWatcher = new(ELeave) CAppCloseWatcher(*this);
-
- iWservEventReceiver = new(ELeave) CWservEventReceiver(*this, iWs);
- iWservEventReceiver->ConstructL();
-
- iServer = CMemoryMonitorServer::NewL(*this);
- }
-
-void CMemoryMonitor::ReadAppResourceArrayL(RResourceFile& aResFile, TInt aResId, TInt aOrderBase, TInt aOrderInc)
- {
- // apps in this list will be ordered starting from aOrderBase
- TInt order = aOrderBase;
- // get the resource and set up the resource reader
- HBufC8* apps = aResFile.AllocReadLC(aResId);
- TResourceReader theReader;
- theReader.SetBuffer(apps);
- // go through all apps in the list
- TInt appsCount = theReader.ReadUint16();
- for (TInt ii = 0; ii < appsCount; ii++)
- {
- TInt appUid = theReader.ReadInt32();
- // insert the app UID with the appropriate order
- iAppCloseOrderMap.Insert(appUid, order);
- // change the order number as appropriate for this list
- order += aOrderInc;
- }
- CleanupStack::PopAndDestroy(apps);
- }
-
-void CMemoryMonitor::CancelAppCloseWatchers()
- {
- iAppCloserRunning = EFalse;
- iCurrentTask.SetWgId(0);
- if (iAppCloseTimer)
- iAppCloseTimer->Cancel();
- if (iAppCloseWatcher)
- iAppCloseWatcher->Cancel();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CMemoryMonitor::FreeMemThresholdCrossedL()
- {
- StartFreeSomeRamL(iGoodThreshold);
- }
-
-void CMemoryMonitor::HandleFocusedWgChangeL()
- {
- // The focused window group has changed.
- if (iAppCloserRunning)
- {
- // if the app closer is currently running, restart it
- RestartAppCloser();
- }
- else if (!iMemoryAboveThreshold)
- {
- // If memory is low, rescan for free memory
- StartFreeSomeRamL(iGoodThreshold);
- }
- }
-
-void CMemoryMonitor::RestartAppCloser()
- {
- CancelAppCloseWatchers();
- // StartFreeSomeRamL is trapped so that clients waiting
- // for completion will definitely receive it.
- TRAPD(err, StartFreeSomeRamL(iCurrentTarget))
- if (err != KErrNone)
- CloseAppsFinished(FreeMemoryAboveThreshold());
- }
-
-// ---------------------------------------------------------
-// This function attempts to free enough RAM to leave the target amount of space free.
-// This function could take a substantial time to return as it may have to close a number
-// of applications, and each will be given a timeout of KAPPEXITTIMEOUT.
-// ---------------------------------------------------------
-//
-void CMemoryMonitor::StartFreeSomeRamL(TInt aTargetFree)
- {
- // update the target if new target is higher
- if (aTargetFree > iCurrentTarget)
- iCurrentTarget = aTargetFree;
-
- // do nothing more if app closer is already running
- if (iAppCloserRunning)
- return;
-
- iCurrentTarget = aTargetFree;
-
- // check if there is enough free memory already.
- if (FreeMemoryAboveThreshold())
- {
- CloseAppsFinished(ETrue);
- return;
- }
-
- // Tell plugins to free memory
- bool pluginsToldToFreeMemory = iPluginMemoryGood;
- SetPluginMemoryGood(EFalse);
-
- // get the list of apps to free
- GetWgsToCloseL();
-
- if (pluginsToldToFreeMemory)
- {
- // Give the plugins a short time to free memory.
- // App close timer will kick off the app closer.
- iAppCloseTimer->After(iRamPluginRunTime);
- }
- else
- {
- // start closing apps
- CloseNextApp();
- }
- }
-
-void CMemoryMonitor::CloseNextApp()
- {
- if(iNextAppToClose >= 0)
- {
- // close an app, if there's an app to be closed
-#ifdef _DEBUG
- RDebug::Print(_L("OOM WATCHER: Target not achieved; continuing... Target:%d"),iCurrentTarget);
-#endif
- // CloseNextApp() may have been called by one of the event
- // watchers, cancel them all to prevent more events from the
- // last app before restarting the watchers for the new app to close
- CancelAppCloseWatchers();
- iAppCloserRunning = ETrue;
- // Set the TApaTask to the app
- iCurrentTask.SetWgId(iWgIds[iNextAppToClose].iId);
- // Start a timer and the thread watcher
- iAppCloseTimer->After(iMaxExitTime);
- iAppCloseWatcher->Start(iCurrentTask);
- // Tell the app to close
- iCurrentTask.EndTask();
- iNextAppToClose--;
- }
- else
- {
- // stop if we have no more apps
- CloseAppsFinished(EFalse);
- }
- }
-
-// handle an app closed event
-void CMemoryMonitor::CloseAppEvent()
- {
- if (FreeMemoryAboveThreshold())
- {
- // stop if we have enough memory
- CloseAppsFinished(ETrue);
- }
- else
- {
- // otherwise try to close another app
- CloseNextApp();
- }
- }
-
-// The app closer is finished
-void CMemoryMonitor::CloseAppsFinished(TBool aMemoryGood)
- {
- CancelAppCloseWatchers();
-#ifdef _DEBUG
- RDebug::Print(_L("OOM WATCHER: Final result: Target:%d Good?:%d"),iCurrentTarget,aMemoryGood);
-#endif
- iServer->CloseAppsFinished(aMemoryGood);
- // plugins can start using memory if result is good
- SetPluginMemoryGood(aMemoryGood);
- }
-
-TBool CMemoryMonitor::FreeMemoryAboveThreshold()
- {
- // may cause some extra load but allows more precise action
- User::CompressAllHeaps();
-
- TInt current = 0;
- HAL::Get( HALData::EMemoryRAMFree, current );
-
-#ifdef _DEBUG
- RDebug::Print(_L("OOM WATCHER: Free RAM now:%d "),current);
-#endif
-
- iMemoryAboveThreshold = (current >= iCurrentTarget);
- return iMemoryAboveThreshold;
- }
-
-void CMemoryMonitor::GetWgsToCloseL()
- {
- // get all window groups, with info about parents
- TInt numGroups = iWs.NumWindowGroups(0);
- iWgIds.ReserveL(numGroups);
- User::LeaveIfError(iWs.WindowGroupList(0, &iWgIds));
-
- // Remove all child window groups, promote parents to foremost child position
- ColapseWindowGroupTree();
-
- // now rearange the list so that it only contains apps to close
- // first remove the foreground window group
- iWgIds.Remove(0);
-
- // go through the list from start to end.
- // this divides the list into two sections. Apps that never
- // close move towards the end of the list, apps that will close
- // go towards the start.
- // apps to close first will be placed further back in the close list.
- TInt numAppsToClose = 0; // numAppsToClose marks the boundary between closing and non-closing apps
- TInt count = iWgIds.Count();
- for (TInt ii=0; ii<count; ii++)
- {
- ASSERT(ii >= numAppsToClose); // we are always looking at apps after the sorted section
- // get the next window group
- RWsSession::TWindowGroupChainInfo info = iWgIds[ii];
- // get the close order for the window group
- TInt closeOrder = AppCloseOrder(ii, info.iId);
- if (closeOrder == ENeverClose)
- {
- // leave apps which should not be closed in place,
- // after the last app to close.
- continue;
- }
- else
- {
- // We no longer need the parent id. Use it to store the close order, to avoid the need to allocate more array space
- info.iParentId = closeOrder;
- // remove the app from it's current position
- iWgIds.Remove(ii);
- // find the right place to insert the app (lower orders are put further back)
- TInt insertPos;
- for (insertPos = 0; insertPos < numAppsToClose; insertPos++)
- {
- // compare this close order with window groups already in the list,
- // whose close order is stored in iParentId
- if (closeOrder > iWgIds[insertPos].iParentId)
- break;
- }
- // Insert the app in the correct place
- ASSERT(insertPos <= ii && insertPos <= numAppsToClose); // apps to close are always moved to front, before the close boundary
- iWgIds.Insert(info, insertPos);
- numAppsToClose++;
- }
- }
-
- // start closing apps from the end of the list of apps to close
- iNextAppToClose = numAppsToClose - 1;
- }
-
-// Calculate the order number in which this app should be closed
-// This is based on the app's UID and its window group Z-order
-// Apps given a lower order will be closed before those with a
-// higher order.
-TInt CMemoryMonitor::AppCloseOrder(TInt aWgIndex, TInt aWgId)
- {
- // get the app's details
- TPtr wgPtr(iWgNameBuf->Des());
- if (iWs.GetWindowGroupNameFromIdentifier(aWgId, wgPtr) != KErrNone)
- return ENeverClose;
- iWgName->SetWindowGroupName(iWgNameBuf);
- TUid uid = iWgName->AppUid(); // This UID comes from the app, not the mmp!
- TInt* order = iAppCloseOrderMap.Find(uid.iUid);
-
- // The default app close order is normal with further
- // back apps getting a lower order
- TInt closeOrder = ECloseNormal - aWgIndex;
- if (order)
- {
- // Apps with a defined close order get that order.
- closeOrder = *order;
- }
- else if (uid.iUid == 0 || iWgName->IsSystem() || iWgName->Hidden() || iWgName->IsBusy())
- {
- // Apps that should never close get the ENeverClose rank
- closeOrder = ENeverClose;
- }
-
- return closeOrder;
- }
-
-void CMemoryMonitor::SetPluginMemoryGood(TBool aSetToGood)
- {
- if (aSetToGood && !iPluginMemoryGood)
- iPlugins->MemoryGood();
- else if (!aSetToGood && iPluginMemoryGood)
- iPlugins->FreeRam();
- iPluginMemoryGood = aSetToGood;
- }
-
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-TInt CMemoryMonitor::WatchdogStatusStatusChanged(TAny* aPtr)
- {
- CMemoryMonitor* self = STATIC_CAST(CMemoryMonitor*,aPtr);
- if (self)
- self->HandleWatchdogStatusCallBackL();
- return KErrNone;
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CMemoryMonitor::HandleWatchdogStatusCallBackL()
- {
- // Someone has set the key to request some free memory.
- TInt target = 0;
- iWatchdogStatusProperty.Get(target);
-
- // Try to free the RAM.
- if (target >= 1)
- {
- iOOMWatcher->Cancel(); // Pause memory notifys.
- TRAP_IGNORE(StartFreeSomeRamL(target)); // This call could take a few seconds to do its stuff.
- iOOMWatcher->Start(); // Restarts memory monitoring.
- }
- // Set the key back to OOM_WATCHDOG_STATUS_IDLE to indicate we're done.
- iWatchdogStatusProperty.Set(OOM_WATCHDOG_STATUS_IDLE);
- }
-
-// ---------------------------------------------------------
-// Remove child window groups. Promote parent window groups forward to child position
-// ---------------------------------------------------------
-//
-void CMemoryMonitor::ColapseWindowGroupTree()
- {
- // start from the front, wg count can reduce as loop runs
- for (TInt ii=0; ii<iWgIds.Count();)
- {
- RWsSession::TWindowGroupChainInfo& info = iWgIds[ii];
- if (info.iParentId > 0) // wg has a parent
- {
- // Look for the parent position
- TInt parentPos = ii; // use child pos as not-found signal
- TInt count = iWgIds.Count();
- for (TInt jj=0; jj<count; jj++)
- {
- if (iWgIds[jj].iId == info.iParentId)
- {
- parentPos = jj;
- break;
- }
- }
-
- if (parentPos > ii) // parent should be moved forward
- {
- iWgIds[ii] = iWgIds[parentPos];
- iWgIds.Remove(parentPos);
- }
- else if (parentPos < ii) // parent is already ahead of child, remove child
- iWgIds.Remove(ii);
- else // parent not found, skip
- ii++;
- }
- else // wg does not have a parent, skip
- ii++;
- }
- }
-
-void CMemoryMonitor::AppNotExiting(TInt aWgId)
- {
- if (aWgId == iCurrentTask.WgId())
- CloseAppEvent();
- }
-
-
-// ======================================================================
-// class COutOfMemoryWatcher
-// - notifies when free memory crosses preset thresholds
-// ======================================================================
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowThreshold, TInt aGoodThreshold)
- {
- COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor);
- CleanupStack::PushL(self);
- self->ConstructL(aLowThreshold, aGoodThreshold);
- CleanupStack::Pop(self);
- return self;
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-COutOfMemoryWatcher::~COutOfMemoryWatcher()
- {
- Cancel();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor)
-: CActive(CActive::EPriorityStandard),
- iLafShutdown(aMonitor)
- {
- CActiveScheduler::Add(this);
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void COutOfMemoryWatcher::ConstructL(TInt aLowThreshold, TInt aGoodThreshold)
- {
- UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold);
- User::LeaveIfError(iChangeNotifier.Create());
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void COutOfMemoryWatcher::Start()
- {
- if (!IsActive())
- {
- iChangeNotifier.Logon(iStatus);
- SetActive();
- }
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void COutOfMemoryWatcher::DoCancel()
- {
- iChangeNotifier.LogonCancel();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void COutOfMemoryWatcher::RunL()
- {
- TInt status = iStatus.Int();
-
- if (status < 0)
- {
- User::Leave(status);
- }
-
- // Check for memory status change.
- if (status & EChangesFreeMemory)
- {
- iLafShutdown.FreeMemThresholdCrossedL();
- }
-
- // We are not active until FreeMemThresholdCrossedL returns.
- Start();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-CSubscribeHelper::CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty)
- : CActive(EPriorityNormal), iCallBack(aCallBack), iProperty(aProperty)
- {
- CActiveScheduler::Add(this);
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-CSubscribeHelper::~CSubscribeHelper()
- {
- Cancel();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CSubscribeHelper::SubscribeL()
- {
- if (!IsActive())
- {
- iProperty.Subscribe(iStatus);
- SetActive();
- }
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CSubscribeHelper::StopSubscribe()
- {
- Cancel();
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CSubscribeHelper::RunL()
- {
- if (iStatus.Int() == KErrNone)
- {
- iCallBack.CallBack();
- SubscribeL();
- }
- }
-
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-//
-void CSubscribeHelper::DoCancel()
- {
- iProperty.Cancel();
- }
-
-
-COomPlugins::COomPlugins()
- {
- }
-
-COomPlugins::~COomPlugins()
- {
- TInt count = iPlugins.Count();
- for (TInt ii=0; ii<count; ii++)
- {
- TPlugin& plugin = iPlugins[ii];
- if (plugin.iImpl) // only if successfully added
- REComSession::DestroyedImplementation(plugin.iDtorUid);
- }
- iPlugins.Close();
- }
-
-void COomPlugins::ConstructL()
- {
- RImplInfoPtrArray implArray;
- CleanupClosePushL(implArray);
- REComSession::ListImplementationsL(KOomPluginInterfaceUid, implArray);
-
- TInt count = implArray.Count();
- iPlugins.ReserveL(count);
-
- for (TInt ii=0; ii<count; ii++)
- {
- iPlugins.AppendL(TPlugin());
- TPlugin& plugin = iPlugins[ii];
- TUid uid(implArray[ii]->ImplementationUid());
- plugin.iImpl = static_cast<COomMonitorPlugin*>(REComSession::CreateImplementationL(uid, plugin.iDtorUid, NULL));
- }
-
- CleanupStack::PopAndDestroy(&implArray);
- }
-
-void COomPlugins::FreeRam()
- {
- TInt count = iPlugins.Count();
- for (TInt ii=0; ii<count; ii++)
- {
- TPlugin& plugin = iPlugins[ii];
- plugin.iImpl->FreeRam();
- }
- }
-
-void COomPlugins::MemoryGood()
- {
- TInt count = iPlugins.Count();
- for (TInt ii=0; ii<count; ii++)
- {
- TPlugin& plugin = iPlugins[ii];
- plugin.iImpl->MemoryGood();
- }
- }
-
-COomPlugins::TPlugin::TPlugin()
-: iImpl(0)
- {
- }
-
-
-CAppCloseTimer* CAppCloseTimer::NewL(CMemoryMonitor& aMonitor)
- {
- CAppCloseTimer* self = new(ELeave)CAppCloseTimer(aMonitor);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-CAppCloseTimer::CAppCloseTimer(CMemoryMonitor& aMonitor)
-: CTimer(CActive::EPriorityStandard), iMonitor(aMonitor)
- {
- CActiveScheduler::Add(this);
- }
-
-void CAppCloseTimer::RunL()
- {
- iMonitor.CloseAppEvent();
- }
-
-
-
-CAppCloseWatcher::CAppCloseWatcher(CMemoryMonitor& aMonitor)
-: CActive(CActive::EPriorityStandard), iMonitor(aMonitor)
- {
- CActiveScheduler::Add(this);
- }
-
-CAppCloseWatcher::~CAppCloseWatcher()
- {
- Cancel();
- }
-
-void CAppCloseWatcher::Start(const TApaTask& aTask)
- {
- TInt err = iThread.Open(aTask.ThreadId());
- if (err == KErrNone)
- {
- iOriginalProcessPriority = iThread.ProcessPriority();
- iThread.SetProcessPriority(EPriorityForeground);
- iThread.Logon(iStatus);
- SetActive();
- }
- else
- {
- iStatus = KRequestPending;
- TRequestStatus* s = &iStatus;
- User::RequestComplete(s, err);
- SetActive();
- }
- }
-
-void CAppCloseWatcher::DoCancel()
- {
- iThread.LogonCancel(iStatus);
- iThread.SetProcessPriority(iOriginalProcessPriority);
- iThread.Close();
- }
-
-void CAppCloseWatcher::RunL()
- {
- if (iThread.Handle())
- iThread.SetProcessPriority(iOriginalProcessPriority);
- iThread.Close();
- // Experimentation shows that memory may take up to 40ms
- // to be released back to the system after app thread close.
- // Using this delay should minimise the number of apps that
- // need to be closed to recover the necessary memory.
- const TInt KAppTidyUpDelay = 40000;
- User::After(KAppTidyUpDelay);
- iMonitor.CloseAppEvent();
- }
-
-
-
-CWservEventReceiver::CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs)
-: CActive(CActive::EPriorityStandard), iMonitor(aMonitor), iWs(aWs), iWg(aWs)
- {
- CActiveScheduler::Add(this);
- }
-
-CWservEventReceiver::~CWservEventReceiver()
- {
- Cancel();
- iWg.Close();
- }
-
-void CWservEventReceiver::ConstructL()
- {
- User::LeaveIfError(iWg.Construct((TUint32)this, EFalse));
- iWg.SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront);
- iWg.EnableFocusChangeEvents();
- Queue();
- }
-
-void CWservEventReceiver::Queue()
- {
- iWs.EventReady(&iStatus);
- SetActive();
- }
-
-void CWservEventReceiver::DoCancel()
- {
- iWs.EventReadyCancel();
- }
-
-void CWservEventReceiver::RunL()
- {
- TWsEvent event;
- iWs.GetEvent(event);
- if (event.Type() == EEventFocusGroupChanged)
- iMonitor.HandleFocusedWgChangeL();
- Queue();
- }
-
-
-
-CMemoryMonitorServer* CMemoryMonitorServer::NewL(CMemoryMonitor& aMonitor)
- {
- CMemoryMonitorServer* self=new(ELeave) CMemoryMonitorServer(aMonitor);
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-CMemoryMonitorServer::~CMemoryMonitorServer()
- {
- }
-
-CMemoryMonitorServer::CMemoryMonitorServer(CMemoryMonitor& aMonitor)
-:CServer2(CActive::EPriorityStandard), iMonitor(aMonitor)
- {
- }
-
-void CMemoryMonitorServer::ConstructL()
- {
- StartL(KMemoryMonitorServerName);
- }
-
-CSession2* CMemoryMonitorServer::NewSessionL(const TVersion& /*aVersion*/, const RMessage2& /*aMessage*/) const
- {
- return new(ELeave) CMemoryMonitorSession();
- }
-
-TInt CMemoryMonitorServer::RunError(TInt aError)
- {
- Message().Complete(aError);
- //
- // The leave will result in an early return from CServer::RunL(), skipping
- // the call to request another message. So do that now in order to keep the
- // server running.
- ReStart();
- return KErrNone; // handled the error fully
- }
-
-CMemoryMonitor& CMemoryMonitorServer::Monitor()
- {
- return iMonitor;
- }
-
-void CMemoryMonitorServer::CloseAppsFinished(TBool aMemoryGood)
- {
- iSessionIter.SetToFirst();
- CSession2* s;
- while ((s = iSessionIter++) != 0)
- static_cast<CMemoryMonitorSession*>(s)->CloseAppsFinished(aMemoryGood);
- }
-
-
-CMemoryMonitorSession::CMemoryMonitorSession()
- {
- }
-
-void CMemoryMonitorSession::CreateL()
- {
- }
-
-CMemoryMonitorSession::~CMemoryMonitorSession()
- {
- }
-
-CMemoryMonitorServer& CMemoryMonitorSession::Server()
- {
- return *static_cast<CMemoryMonitorServer*>(const_cast<CServer2*>(CSession2::Server()));
- }
-
-CMemoryMonitor& CMemoryMonitorSession::Monitor()
- {
- return Server().Monitor();
- }
-
-void CMemoryMonitorSession::ServiceL(const RMessage2& aMessage)
- {
- aMessage.HasCapabilityL(ECapabilityWriteDeviceData); //Leaves if client has not correct capability
- switch (aMessage.Function())
- {
- case EOomMonitorRequestFreeMemory:
- if (!iRequestFreeRam.IsNull())
- PanicClient(aMessage, EPanicRequestActive);
- // message will be completed when CloseAppsFinished() is called.
- iRequestFreeRam = aMessage;
- Monitor().StartFreeSomeRamL(aMessage.Int0());
- break;
-
- case EOomMonitorCancelRequestFreeMemory:
- if (!iRequestFreeRam.IsNull())
- iRequestFreeRam.Complete(KErrCancel);
- aMessage.Complete(KErrNone);
- break;
-
- case EOomMonitorThisAppIsNotExiting:
- Monitor().AppNotExiting(aMessage.Int0());
- aMessage.Complete(KErrNone);
- break;
-
- default:
- PanicClient(aMessage, EPanicIllegalFunction);
- break;
- }
- }
-
-void CMemoryMonitorSession::CloseAppsFinished(TBool aMemoryGood)
- {
- if (!iRequestFreeRam.IsNull())
- iRequestFreeRam.Complete(aMemoryGood ? KErrNone : KErrNoMemory);
- }
-
-
void PanicClient(const RMessagePtr2& aMessage,TOomMonitorClientPanic aPanic)
{
+ FUNC_LOG;
+
aMessage.Panic(KMemoryMonitorServerName, aPanic);
}
--- a/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/src/oommonitorplugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -16,26 +16,33 @@
*/
+#include <apgwgnam.h>
#include "oommonitorplugin.h"
-#include "oommonitor.h"
-#include <apgwgnam.h>
+#include "oommemorymonitor.h"
+#include "oomtraces.h"
// TLS is used to store the CMemoryMonitor pointer, CMemoryMonitor
// being the main object in the OOM monitor thread. This allows
// plugins to access the CMemoryMonitor object easily.
EXPORT_C void SetMemoryMonitorTls(CMemoryMonitor* aMonitor)
{
+ FUNC_LOG;
+
Dll::SetTls(aMonitor);
}
CMemoryMonitor* MemoryMonitorTls()
{
+ FUNC_LOG;
+
return static_cast<CMemoryMonitor*>(Dll::Tls());
}
void OomMonitorPluginPanic(TOomMonitorPluginPanic aReason)
{
+ FUNC_LOG;
+
_LIT(KCat, "OomMonitorPlugin");
User::Panic(KCat, aReason);
}
@@ -43,34 +50,53 @@
EXPORT_C COomMonitorPlugin::COomMonitorPlugin()
: iMemoryMonitor(MemoryMonitorTls())
- {
- __ASSERT_ALWAYS(iMemoryMonitor, OomMonitorPluginPanic(EOomMonitorPluginPanic_PluginConstructedOutsideOomMonitorThread));
- }
+ {
+ FUNC_LOG;
+
+ __ASSERT_ALWAYS(iMemoryMonitor, OomMonitorPluginPanic(EOomMonitorPluginPanic_PluginConstructedOutsideOomMonitorThread));
+ }
EXPORT_C COomMonitorPlugin::~COomMonitorPlugin()
- {
- }
+ {
+ FUNC_LOG;
+ }
EXPORT_C void COomMonitorPlugin::ConstructL()
- {
- // CAppOomMonitorPlugin assumes ConstructL is empty
- }
+ {
+ FUNC_LOG;
+
+ // CAppOomMonitorPlugin assumes ConstructL is empty
+ }
EXPORT_C void COomMonitorPlugin::ExtensionInterface(TUid /*aInterfaceId*/, TAny*& /*aImplementaion*/)
- {
- }
+ {
+ FUNC_LOG;
+ }
EXPORT_C RFs& COomMonitorPlugin::FsSession()
{
+ FUNC_LOG;
+
return iMemoryMonitor->iFs;
}
EXPORT_C RWsSession& COomMonitorPlugin::WsSession()
{
+ FUNC_LOG;
+
return iMemoryMonitor->iWs;
}
+
+EXPORT_C void COomMonitorPluginV2::FreeRam()
+ {
+ // Note that OomMonitorV2 will not call this version of the function
+ // so it does not need to be implemented in derived classes.
+ }
+
+
+
EXPORT_C CAppOomMonitorPlugin* CAppOomMonitorPlugin::NewL(TUid aAppUid)
{
CAppOomMonitorPlugin* self = new(ELeave) CAppOomMonitorPlugin(aAppUid);
@@ -96,18 +122,18 @@
void CAppOomMonitorPlugin::SendMessageToApp(TInt aMessage)
{
RWsSession& ws = WsSession();
- TInt wgId = 0;
+ TInt wgId = 0;
do
{
- CApaWindowGroupName::FindByAppUid(iAppUid, ws, wgId);
- if (wgId>0)
- {
- TWsEvent event;
- event.SetType(aMessage);
- event.SetTimeNow();
- ws.SendEventToWindowGroup(wgId, event);
- }
+ CApaWindowGroupName::FindByAppUid(iAppUid, ws, wgId);
+ if (wgId>0)
+ {
+ TWsEvent event;
+ event.SetType(aMessage);
+ event.SetTimeNow();
+ ws.SendEventToWindowGroup(wgId, event);
+ }
}
- while (wgId>0);
+ while (wgId>0);
}
--- a/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Mon Feb 08 13:38:38 2010 +0000
+++ b/sysresmonitoring/oommonitor/src/oommonitorsession.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -16,33 +16,104 @@
*/
-#include "oommonitorsession.h"
+#include <coemain.h>
+#include <oommonitorsession.h>
#include "oommonitorclientserver.h"
+#include "oompanic.h"
+#include "oomtraces.h"
EXPORT_C TInt ROomMonitorSession::Connect()
- {
- return CreateSession(KMemoryMonitorServerName, TVersion(0,0,0));
- }
+ {
+ FUNC_LOG;
+
+ return CreateSession(KMemoryMonitorServerName, TVersion(0,0,0));
+ }
EXPORT_C TInt ROomMonitorSession::RequestFreeMemory(TInt aBytesRequested)
- {
- TIpcArgs p(aBytesRequested);
- return SendReceive(EOomMonitorRequestFreeMemory, p);
- }
+ {
+ FUNC_LOG;
+
+ TIpcArgs p(aBytesRequested);
+ return SendReceive(EOomMonitorRequestFreeMemory, p);
+ }
+
+EXPORT_C TInt ROomMonitorSession::RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable)
+ {
+ FUNC_LOG;
+
+ TIpcArgs p(aBytesRequested, aMinimumBytesNeeded, aPluginId, aBytesAvailable);
+ TInt ret = SendReceive(EOomMonitorRequestOptionalRam, p);
+ if (ret >= 0)
+ {
+ aBytesAvailable = ret;
+ ret = KErrNone;
+ }
+
+ return ret;
+ }
+
+
+
+EXPORT_C void ROomMonitorSession::RequestOptionalRam(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TRequestStatus& aStatus)
+ {
+ FUNC_LOG;
+
+ TIpcArgs p(aBytesRequested, aMinimumBytesNeeded, aPluginId);
+ SendReceive(EOomMonitorRequestOptionalRam, p, aStatus);
+ }
EXPORT_C void ROomMonitorSession::RequestFreeMemory(TInt aBytesRequested, TRequestStatus& aStatus)
- {
- TIpcArgs p(aBytesRequested);
- SendReceive(EOomMonitorRequestFreeMemory, p, aStatus);
- }
+ {
+ FUNC_LOG;
+
+ TIpcArgs p(aBytesRequested);
+ SendReceive(EOomMonitorRequestFreeMemory, p, aStatus);
+ }
EXPORT_C void ROomMonitorSession::CancelRequestFreeMemory()
- {
- SendReceive(EOomMonitorCancelRequestFreeMemory, TIpcArgs());
- }
+ {
+ FUNC_LOG;
+
+ SendReceive(EOomMonitorCancelRequestFreeMemory, TIpcArgs());
+ }
EXPORT_C void ROomMonitorSession::ThisAppIsNotExiting(TInt aWgId)
- {
- TIpcArgs p(aWgId);
- SendReceive(EOomMonitorThisAppIsNotExiting, p);
- }
+ {
+ FUNC_LOG;
+
+ TIpcArgs p(aWgId);
+ SendReceive(EOomMonitorThisAppIsNotExiting, p);
+ }
+
+
+EXPORT_C void ROomMonitorSession::SetOomPriority(TOomPriority aPriority)
+ {
+ FUNC_LOG;
+
+ CCoeEnv* coeEnv = CCoeEnv::Static();
+
+ __ASSERT_DEBUG(coeEnv, OomMonitorPanic(KNoCoeEnvFound));
+
+ if (coeEnv)
+ {
+ TInt wgId = coeEnv->RootWin().Identifier();
+ TIpcArgs p(wgId);
+ switch (aPriority)
+ {
+ case EOomPriorityNormal:
+ SendReceive(EOomMonitorSetPriorityNormal, p);
+ break;
+ case EOomPriorityHigh:
+ SendReceive(EOomMonitorSetPriorityHigh, p);
+ break;
+ case EOomPriorityBusy:
+ SendReceive(EOomMonitorSetPriorityBusy, p);
+ break;
+ default:
+ OomMonitorPanic(KOomInvalidPriority);
+ break;
+ }
+ }
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomoutofmemorywatcher.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,136 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+
+
+#include "oomoutofmemorywatcher.h"
+#include "oommemorymonitor.h"
+#include "oomtraces.h"
+
+// ======================================================================
+// class COutOfMemoryWatcher
+// - notifies when free memory crosses preset thresholds
+// ======================================================================
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+COutOfMemoryWatcher* COutOfMemoryWatcher::NewL(CMemoryMonitor& aMonitor, TInt aLowThreshold, TInt aGoodThreshold)
+ {
+ FUNC_LOG;
+
+ COutOfMemoryWatcher* self = new (ELeave) COutOfMemoryWatcher(aMonitor);
+ CleanupStack::PushL(self);
+ self->ConstructL(aLowThreshold, aGoodThreshold);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+COutOfMemoryWatcher::~COutOfMemoryWatcher()
+ {
+ FUNC_LOG;
+
+ Cancel();
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+COutOfMemoryWatcher::COutOfMemoryWatcher(CMemoryMonitor& aMonitor)
+: CActive(CActive::EPriorityStandard),
+ iLafShutdown(aMonitor)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void COutOfMemoryWatcher::ConstructL(TInt aLowThreshold, TInt aGoodThreshold)
+ {
+ FUNC_LOG;
+
+ UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold);
+ User::LeaveIfError(iChangeNotifier.Create());
+ }
+
+void COutOfMemoryWatcher::UpdateThresholds(TInt aLowThreshold, TInt aGoodThreshold)
+ {
+ FUNC_LOG;
+
+ UserSvr::SetMemoryThresholds(aLowThreshold,aGoodThreshold);
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void COutOfMemoryWatcher::Start()
+ {
+ FUNC_LOG;
+
+ if (!IsActive())
+ {
+ iChangeNotifier.Logon(iStatus);
+ SetActive();
+ }
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void COutOfMemoryWatcher::DoCancel()
+ {
+ FUNC_LOG;
+
+ iChangeNotifier.LogonCancel();
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void COutOfMemoryWatcher::RunL()
+ {
+ FUNC_LOG;
+
+ TInt status = iStatus.Int();
+
+ if (status < 0)
+ {
+ User::Leave(status);
+ }
+
+ // Check for memory status change.
+ if (status & EChangesFreeMemory)
+ {
+ iLafShutdown.FreeMemThresholdCrossedL();
+ }
+
+ // We are not active until FreeMemThresholdCrossedL returns.
+ Start();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oompanic.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Panic codes for OOM monitor.
+*
+*/
+
+#include "oompanic.h"
+
+#include <e32std.h>
+
+void OomMonitorPanic(TOomMonitorPanic aReason)
+ {
+ _LIT(KCat, "OomMonitor");
+ User::Panic(KCat, aReason);
+ }
+
+void OomConfigParserPanic(TInt aReason)
+ {
+ _LIT(KParserCat, "OomParser");
+ User::Panic(KParserCat, aReason);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oompluginwaiter.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,55 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+
+#include "oompluginwaiter.h"
+#include "oomrunplugin.h"
+#include "oomtraces.h"
+#include "oomconstants.hrh"
+
+COomPluginWaiter* COomPluginWaiter::NewL(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass)
+ {
+ FUNC_LOG;
+
+ COomPluginWaiter* self = new (ELeave) COomPluginWaiter(aMillisecondsToWait, aCallbackClass);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+COomPluginWaiter::COomPluginWaiter(TInt aMillisecondsToWait, COomRunPlugin& aCallbackClass) : CTimer(EPriorityStandard), iMillisecondsToWait(aMillisecondsToWait), iCallbackClass(aCallbackClass)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+// Start the timer, it will call the plugin back when it expires
+void COomPluginWaiter::Start()
+ {
+ FUNC_LOG;
+
+ HighRes(iMillisecondsToWait * KMicrosecondsInMillisecond);
+ }
+
+void COomPluginWaiter::RunL()
+ {
+ FUNC_LOG;
+
+ iCallbackClass.WaitCompleted();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomrunplugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,96 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Classes for executing OOM actions (e.g. closing applications and running plugins).
+*
+*/
+
+#include "oomrunplugin.h"
+#include "OomTraces.h"
+#include "oommemorymonitor.h"
+#include "oommonitorplugin.h"
+#include "oompanic.h"
+
+COomRunPlugin* COomRunPlugin::NewL(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin)
+ {
+ FUNC_LOG;
+
+ COomRunPlugin* self = new (ELeave) COomRunPlugin(aPluginId, aConfig, aStateChangeObserver, aPlugin, aV2Plugin);
+ CleanupStack::PushL(self);
+ self->ConstructL(aConfig);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// Run the OOM plugin in order to free memory
+// Call the COomAction::MemoryFreed when it is done
+void COomRunPlugin::FreeMemory(TInt aBytesRequested)
+ {
+ FUNC_LOG;
+ TRACES1("COomRunPlugin::FreeMemory: iPluginId = %x", iPluginId);
+
+ // Ask the plugin to free some memory
+
+ // Do we have a V2 plugin, if so then use it
+ if (iV2Plugin)
+ iV2Plugin->FreeRam(aBytesRequested);
+ else
+ // If we only have a V1 plugin then use that
+ iPlugin.FreeRam();
+
+ iFreeMemoryCalled = ETrue;
+
+ // Wait for the required time before we signal completion.
+ __ASSERT_DEBUG(!iPluginWaiter->IsActive(), OomMonitorPanic(KStartingActivePluginWaiter));
+ iPluginWaiter->Start();
+ }
+
+// Call the memory good function on the plugin but...
+// only if there is an outstanding FreeMemory request
+void COomRunPlugin::MemoryGood()
+ {
+ FUNC_LOG;
+
+ if (iFreeMemoryCalled)
+ {
+ iPlugin.MemoryGood();
+ iFreeMemoryCalled = EFalse;
+ }
+ }
+
+COomRunPlugin::~COomRunPlugin()
+ {
+ FUNC_LOG;
+
+ delete iPluginWaiter;
+ }
+
+COomRunPlugin::COomRunPlugin(TUint aPluginId, COomRunPluginConfig& aConfig, MOomActionObserver& aStateChangeObserver, COomMonitorPlugin& aPlugin, COomMonitorPluginV2* aV2Plugin) : COomAction(aStateChangeObserver), iPluginId(aPluginId), iPlugin(aPlugin), iConfig(aConfig), iV2Plugin(aV2Plugin)
+ {
+ FUNC_LOG;
+ }
+
+void COomRunPlugin::ConstructL(COomRunPluginConfig& aPluginConfig)
+ {
+ FUNC_LOG;
+
+ TInt waitDuration = CMemoryMonitor::GlobalConfig().iDefaultWaitAfterPlugin;
+
+ if (aPluginConfig.WaitAfterPluginDefined())
+ {
+ // If the wait duration for this plugin is overridden then use the overridden value
+ waitDuration = aPluginConfig.WaitAfterPlugin();
+ }
+
+ iPluginWaiter = COomPluginWaiter::NewL(waitDuration, *this);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomrunpluginconfig.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,54 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Configuration representation classes for Out of Memory Monitor.
+*
+*/
+
+
+#include "oomrunpluginconfig.h"
+#include "oomwindowgrouplist.h"
+#include "oomtraces.h"
+
+COomRunPluginConfig* COomRunPluginConfig::NewL(TUint aPluginId, TOomPluginType aPluginType)
+ {
+ FUNC_LOG;
+
+ COomRunPluginConfig* self = new (ELeave) COomRunPluginConfig(aPluginId, aPluginType);
+ return self;
+ }
+
+TUint COomRunPluginConfig::CalculatePluginPriority(const COomWindowGroupList& aWindowGroupList)
+ {
+ FUNC_LOG;
+
+ // Call the Priority function on the CActionConfig base class
+ // This function will check if any rules match the current system state and then adjust the priority if they do
+ // Rules may apply to system plugins or application plugins
+ return Priority(aWindowGroupList, aWindowGroupList.GetIndexFromAppId(iTargetAppId));
+ }
+
+
+COomRunPluginConfig::~COomRunPluginConfig()
+ {
+ FUNC_LOG;
+ }
+
+
+COomRunPluginConfig::COomRunPluginConfig(TUint aPluginId, TOomPluginType aPluginType) : COomActionConfig(aPluginId), iPluginId(aPluginId), iPluginType(aPluginType)
+ {
+ FUNC_LOG;
+
+ iSyncMode = EContinueIgnoreMaxBatchSize;
+ iCallIfTargetAppNotRunning = ETrue;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomsubscribehelper.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,96 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+#include <e32property.h>
+#include "oomsubscribehelper.h"
+#include "oomtraces.h"
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+CSubscribeHelper::CSubscribeHelper(TCallBack aCallBack, RProperty& aProperty)
+ : CActive(EPriorityNormal), iCallBack(aCallBack), iProperty(aProperty)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+CSubscribeHelper::~CSubscribeHelper()
+ {
+ FUNC_LOG;
+
+ Cancel();
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CSubscribeHelper::Subscribe()
+ {
+ FUNC_LOG;
+
+ if (!IsActive())
+ {
+ iProperty.Subscribe(iStatus);
+ SetActive();
+ }
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CSubscribeHelper::StopSubscribe()
+ {
+ FUNC_LOG;
+
+ Cancel();
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CSubscribeHelper::RunL()
+ {
+ FUNC_LOG;
+
+ if (iStatus.Int() == KErrNone)
+ {
+ iCallBack.CallBack();
+ Subscribe();
+ }
+ }
+
+// ---------------------------------------------------------
+//
+// ---------------------------------------------------------
+//
+void CSubscribeHelper::DoCancel()
+ {
+ FUNC_LOG;
+
+ iProperty.Cancel();
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomwindowgrouplist.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,480 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: A wrapper for the window group list, adding additional functionality required by OOM Monitor v2.
+*
+*/
+
+#include <w32std.h>
+#include <e32std.h>
+#include <apgtask.h>
+#include <apgwgnam.h>
+
+#include "oomwindowgrouplist.h"
+#include "OomTraces.h"
+#include "oomconstants.hrh"
+#include "oompanic.h"
+
+_LIT(KDummyWgName, "20");
+const TInt KPreallocatedSpaceForAppList = 50;
+
+const TUint KOomTicksPerSecond = 1000;
+
+COomWindowGroupList::TOomWindowGroupProperties::TOomWindowGroupProperties() : iIdleTickTime(0), iDynamicPriority(EOomPriorityNormal)
+ {
+ FUNC_LOG;
+ }
+
+// Update the list of window groups
+void COomWindowGroupList::Refresh()
+ {
+ FUNC_LOG;
+
+#ifdef _DEBUG
+ TRAPD(err, RefreshL());
+ if (err)
+ {
+ TRACES1("COomWindowGroupList::Refresh(): RefreshL leave %d", err);
+ }
+#else
+ TRAP_IGNORE(RefreshL());
+ // Ignore any error
+ // Errors are very unlikely, the only possibility is OOM errors (which should be very unlikely due to pre-created, re-reserved lists)
+ // The outcome of any error is that the most foreground operations will be missing from the list
+ // meaning that they will not be considered candidates for closing
+#endif
+ }
+
+// Update the list of window groups
+// Should be called whenever the
+void COomWindowGroupList::RefreshL()
+ {
+ FUNC_LOG;
+
+ // Refresh window group list
+ // get all window groups, with info about parents
+ TInt numGroups = iWs.NumWindowGroups(0);
+ iWgIds.ReserveL(numGroups);
+ User::LeaveIfError(iWs.WindowGroupList(0, &iWgIds));
+
+ // Remove all child window groups, promote parents to foremost child position
+ CollapseWindowGroupTree();
+
+ // Note the current foreground window ID (if there is one)
+ TBool oldForegroundWindowExists = EFalse;
+
+ TInt oldForegroundWindowId;
+ if (iWgIds.Count() > 0)
+ {
+ oldForegroundWindowId = iWgIds[0].iId;
+ oldForegroundWindowExists = ETrue;
+ }
+
+ // Cleanup the idletime hash map to remove idle times for any windows that have closed
+ RemovePropertiesForClosedWindowsL();
+
+ // Update the idle tick on the old foreground application (which might now be in the background)
+ // This will be set to the current system tick count and will be used later to determine the idle time
+ if (oldForegroundWindowExists)
+ {
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(oldForegroundWindowId);
+ if (wgProperties)
+ {
+ wgProperties->iIdleTickTime = User::NTickCount();
+ }
+
+ // If there is no idle tick entry for this window ID then it will be created in the next step...
+ }
+
+ TInt index = iWgIds.Count();
+
+ while (index--)
+ {
+ // See if there is a tick count entry for each window in the list
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[index].iId);
+
+ if (!wgProperties)
+ {
+ TOomWindowGroupProperties wgProperties;
+ wgProperties.iIdleTickTime = User::NTickCount();
+ // If there is no idle tick entry for this window then add one
+ iWgToPropertiesMapping.InsertL(iWgIds[index].iId, wgProperties);
+ }
+ }
+ }
+
+
+
+void COomWindowGroupList::RemovePropertiesForClosedWindowsL()
+ {
+ FUNC_LOG;
+
+ // First, clear the existing set of window IDs (it would be quicker to delete it BUT we have reserved memory for it and don't want to be allocating in low memory conditions)
+ RHashSet<TInt>::TIter windowIdSetIter(iExistingWindowIds);
+ while (windowIdSetIter.Next())
+ {
+ windowIdSetIter.RemoveCurrent();
+ }
+
+ // Create the set of existing window IDs (this saves expensive/repeated searching later on)
+ TInt index = iWgIds.Count();
+ while (index--)
+ {
+ iExistingWindowIds.InsertL(iWgIds[index].iId);
+ }
+
+ // Iterate the idle-time hash map - remove any items where the window no longer exists
+ RHashMap<TInt, TOomWindowGroupProperties>::TIter wgToIdleIterator(iWgToPropertiesMapping);
+ while (wgToIdleIterator.NextKey())
+ {
+ // If the current key (window ID) does not exist in the set then remove the idle-time as it is no longer relevant
+ if (!iExistingWindowIds.Find(*(wgToIdleIterator.CurrentKey())))
+ wgToIdleIterator.RemoveCurrent();
+ }
+ }
+
+
+TUint COomWindowGroupList::AppId(TInt aIndex, TBool aResolveFromThread) const
+ {
+ FUNC_LOG;
+
+ // get the app's details
+ TPtr wgPtr(iWgNameBuf->Des());
+
+ TUid uid;
+
+ __ASSERT_DEBUG(aIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ TInt wgId = iWgIds[aIndex].iId;
+
+ TInt err = iWs.GetWindowGroupNameFromIdentifier(wgId, wgPtr);
+
+ if (KErrNone != err)
+ // If there is an error then set the UID to 0;
+ {
+ uid.iUid = 0;
+ }
+ else
+ {
+ iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf
+ uid = iWgName->AppUid(); // This UID comes from the app, not the mmp!
+ if (aResolveFromThread && uid.iUid == 0)
+ {
+ TApaTask task(iWs);
+ task.SetWgId(wgId);
+ TThreadId threadId = task.ThreadId();
+
+ TUint resolvedUid = 0;
+ RThread appThread;
+ TInt err = appThread.Open( threadId );
+ if ( err == KErrNone )
+ {
+ resolvedUid = appThread.SecureId().iId;
+ }
+ appThread.Close();
+ TRACES2("COomWindowGroupList::AppId: NULL wg UID, taking from thread; resolvedUid = %x aIndex = %d", resolvedUid, aIndex);
+ return resolvedUid;
+ }
+ }
+
+ return uid.iUid;
+ }
+
+
+TTimeIntervalSeconds COomWindowGroupList::IdleTime(TInt aIndex) const
+ {
+ FUNC_LOG;
+
+ TUint32 currentTickCount = User::NTickCount();
+
+ __ASSERT_DEBUG(aIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ const TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[aIndex].iId);
+
+ TTimeIntervalSeconds idleTime = 0;
+
+ if (wgProperties)
+ {
+ // This should also handle the case where the current tick count has wrapped to a lower value than the idle tick time
+ // It will only work if it has wrapped once, but
+ TUint32 differenceBetweenTickCounts = currentTickCount - wgProperties->iIdleTickTime;
+ idleTime = differenceBetweenTickCounts / KOomTicksPerSecond;
+ }
+
+ return idleTime;
+ }
+
+
+
+void COomWindowGroupList::CollapseWindowGroupTree()
+ {
+ FUNC_LOG;
+
+ // start from the front, wg count can reduce as loop runs
+ for (TInt ii=0; ii<iWgIds.Count();)
+ {
+ RWsSession::TWindowGroupChainInfo& info = iWgIds[ii];
+ if (info.iParentId > 0) // wg has a parent
+ {
+ // Look for the parent position
+ TInt parentPos = ii; // use child pos as not-found signal
+ TInt count = iWgIds.Count();
+ for (TInt jj=0; jj<count; jj++)
+ {
+ if (iWgIds[jj].iId == info.iParentId)
+ {
+ parentPos = jj;
+ break;
+ }
+ }
+
+ if (parentPos > ii) // parent should be moved forward
+ {
+ iWgIds[ii] = iWgIds[parentPos];
+ iWgIds.Remove(parentPos);
+ }
+ else if (parentPos < ii) // parent is already ahead of child, remove child
+ iWgIds.Remove(ii);
+ else // parent not found, skip
+ ii++;
+ }
+ else // wg does not have a parent, skip
+ ii++;
+ }
+ }
+
+
+
+COomWindowGroupList::COomWindowGroupList(RWsSession& aWs) : iWs(aWs)
+ {
+ FUNC_LOG;
+ }
+
+
+
+void COomWindowGroupList::ConstructL()
+ {
+ FUNC_LOG;
+
+ // Reserve enough space to build an app list later.
+ iWgIds.ReserveL(KPreallocatedSpaceForAppList);
+ iUncollapsedWgIds.ReserveL(KPreallocatedSpaceForAppList);
+
+ // Reserve enough space for the WG to idle tick mapping
+ iWgToPropertiesMapping.ReserveL(KPreallocatedSpaceForAppList);
+
+ // Reserve enough space for CApaWindowGroupName.
+ iWgName = CApaWindowGroupName::NewL(iWs);
+ iWgNameBuf = HBufC::NewL(CApaWindowGroupName::EMaxLength);
+ (*iWgNameBuf) = KDummyWgName;
+ iWgName->SetWindowGroupName(iWgNameBuf); // iWgName takes ownership of iWgNameBuf
+
+ RefreshL();
+ }
+
+
+
+COomWindowGroupList* COomWindowGroupList::NewL(RWsSession& aWs)
+ {
+ FUNC_LOG;
+
+ COomWindowGroupList* self = new (ELeave) COomWindowGroupList(aWs);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+
+
+COomWindowGroupList::~COomWindowGroupList()
+ {
+ FUNC_LOG;
+
+ iWgIds.Close();
+ iUncollapsedWgIds.Close();
+ iWgToPropertiesMapping.Close();
+ iExistingWindowIds.Close();
+ delete iWgName;
+ }
+
+
+void COomWindowGroupList::SetPriorityBusy(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ Refresh();
+
+ TInt parentId;
+ TRAPD(err, parentId = FindParentIdL(aWgId));
+ if (err)
+ {
+ parentId = aWgId;
+ }
+
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId);
+ if (wgProperties)
+ {
+ wgProperties->iDynamicPriority = EOomPriorityBusy;
+ }
+
+ // If we can't find the window group then ignore it
+ }
+
+
+TInt COomWindowGroupList::FindParentIdL(TInt aWgId)
+ {
+ TInt numGroups = iWs.NumWindowGroups(0);
+ iUncollapsedWgIds.ReserveL(numGroups);
+ User::LeaveIfError(iWs.WindowGroupList(0, &iUncollapsedWgIds));
+
+ TInt parentPos = KErrNotFound;
+
+ //loop through the window group list
+ for (TInt i=0; i<numGroups; i++)
+ {
+ //find the index for the required aWgId
+ __ASSERT_DEBUG(i < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ if (iUncollapsedWgIds[i].iId == aWgId)
+ {
+ parentPos = i;
+ break;
+ }
+ }
+
+ if (parentPos >=0 )
+ {
+ __ASSERT_DEBUG(parentPos < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ while (iUncollapsedWgIds[parentPos].iParentId > 0)
+ {
+ // find the index for the parent
+ for (TInt j=0; j<numGroups; j++)
+ {
+ __ASSERT_DEBUG(j < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ if (iUncollapsedWgIds[j].iId == iUncollapsedWgIds[parentPos].iParentId)
+ {
+ parentPos = j;
+ __ASSERT_DEBUG(parentPos < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ break; // break out of inner loop
+ }
+ }
+ }
+ __ASSERT_DEBUG(parentPos < iUncollapsedWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ return iUncollapsedWgIds[parentPos].iId;
+ }
+ else
+ {
+ return KErrNotFound;
+ }
+ }
+
+
+TBool COomWindowGroupList::IsBusy(TInt aWgIndex)
+ {
+ TBool isBusy = EFalse;
+ __ASSERT_DEBUG(aWgIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[aWgIndex].iId);
+ if (wgProperties)
+ {
+ isBusy = (wgProperties->iDynamicPriority == EOomPriorityBusy);
+ }
+
+ return isBusy;
+ }
+
+// Returns ETrue if an application has registered itself as high priority at runtime
+TBool COomWindowGroupList::IsDynamicHighPriority(TInt aWgIndex)
+ {
+ FUNC_LOG;
+
+ TBool isHighPriority = EFalse;
+ __ASSERT_DEBUG(aWgIndex < iWgIds.Count(), OomMonitorPanic(KWindowGroupArrayIndexOutOfBounds));
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(iWgIds[aWgIndex].iId);
+ if (wgProperties)
+ {
+ isHighPriority = (wgProperties->iDynamicPriority == EOomPriorityHigh);
+ }
+
+ return isHighPriority;
+ }
+
+CApaWindowGroupName* COomWindowGroupList::WgName() const
+ {
+ return iWgName;
+ }
+
+void COomWindowGroupList::SetPriorityNormal(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ Refresh();
+
+ TInt parentId;
+ TRAPD(err, parentId = FindParentIdL(aWgId));
+ if (err)
+ {
+ parentId = aWgId;
+ }
+
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId);
+ if (wgProperties)
+ {
+ wgProperties->iDynamicPriority = EOomPriorityNormal;
+ }
+
+ // If we can't find the window group then ignore it
+ }
+
+
+void COomWindowGroupList::SetPriorityHigh(TInt aWgId)
+ {
+ FUNC_LOG;
+
+ Refresh();
+
+ TInt parentId;
+ TRAPD(err, parentId = FindParentIdL(aWgId));
+ if (err)
+ {
+ parentId = aWgId;
+ }
+
+ TOomWindowGroupProperties* wgProperties = iWgToPropertiesMapping.Find(parentId);
+ if (wgProperties)
+ {
+ wgProperties->iDynamicPriority = EOomPriorityHigh;
+ }
+
+ // If we can't find the window group then ignore it
+ }
+
+// Find the specificed application in the window group list and return the index
+TInt COomWindowGroupList::GetIndexFromAppId(TUint aAppId) const
+ {
+ FUNC_LOG;
+
+ TInt indexInGroupList = Count();
+ TBool appFoundInWindowGroupList = EFalse;
+
+ while (indexInGroupList--)
+ {
+ if (AppId(indexInGroupList, ETrue) == aAppId)
+ {
+ appFoundInWindowGroupList = ETrue;
+ break;
+ }
+ }
+
+ if (!appFoundInWindowGroupList)
+ indexInGroupList = KAppNotInWindowGroupList;
+
+ return indexInGroupList;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/src/oomwserveventreceiver.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,90 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Main classes for Out of Memory Monitor.
+*
+*/
+
+#include <akneiksrvc.h>
+#include <apgwgnam.h>
+#include "oomwserveventreceiver.h"
+#include "oommemorymonitor.h"
+#include "oomtraces.h"
+#include "oomconstants.hrh"
+
+#include "apgwgnam.h"
+
+CWservEventReceiver::CWservEventReceiver(CMemoryMonitor& aMonitor, RWsSession& aWs)
+: CActive(CActive::EPriorityStandard), iMonitor(aMonitor), iWs(aWs), iWg(aWs)
+ {
+ FUNC_LOG;
+
+ CActiveScheduler::Add(this);
+ }
+
+CWservEventReceiver::~CWservEventReceiver()
+ {
+ FUNC_LOG;
+
+ Cancel();
+ iWg.Close();
+ }
+
+void CWservEventReceiver::ConstructL()
+ {
+ FUNC_LOG;
+
+ User::LeaveIfError(iWg.Construct((TUint32)this, EFalse));
+ iWg.SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront);
+ iWg.EnableFocusChangeEvents();
+ Queue();
+ }
+
+void CWservEventReceiver::Queue()
+ {
+ FUNC_LOG;
+
+ iWs.EventReady(&iStatus);
+ SetActive();
+ }
+
+void CWservEventReceiver::DoCancel()
+ {
+ FUNC_LOG;
+
+ iWs.EventReadyCancel();
+ }
+
+void CWservEventReceiver::RunL()
+ {
+ FUNC_LOG;
+
+ TWsEvent event;
+ iWs.GetEvent(event);
+ if (event.Type() == EEventFocusGroupChanged)
+ {
+ // The following is done in order to avoid changing application threshholds when fastswap is activated
+ // 1) get the new focused app's details
+ // 2) we check to see if the fastswap uid caused the change
+ // 3a) If it didn't we proceed as normal: handleFocusedWgChangeL is called
+ // 3b) If not, we skip handleFocusedWgChangeL
+ CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(iWs, iWs.GetFocusWindowGroup());
+ if(wgName->AppUid() != KUidFastSwap)
+ {
+ iMonitor.HandleFocusedWgChangeL();
+ }
+ CleanupStack::PopAndDestroy(wgName);
+ }
+
+ Queue();
+ }
--- a/sysresmonitoring/oommonitor/tsrc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/conf/oomtest.cfg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,3 @@
+[StifSettings]
+CheckHeapBalance= on
+[EndStifSettings]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/data/oomconfig.xml Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,89 @@
+<!--
+ Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ This component and the accompanying materials are made available
+ under the terms of the License "Eclipse Public License v1.0"
+ which accompanies this distribution, and is available
+ at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
+ Initial Contributors:
+ Nokia Corporation - initial contribution.
+
+ Contributors:
+
+ Description:
+
+-->
+
+
+
+
+<oom_config>
+
+ <global_settings low_ram_threshold="4096" good_ram_threshold="5000" max_app_close_batch="4" default_wait_after_plugin="10" max_app_exit_time="5000">
+ <force_check priority="8"></force_check>
+ </global_settings>
+
+ <app_specific_thresholds>
+ <app uid="E6CFBA08" low_ram_threshold="8192" good_ram_threshold="10000"></app>
+ </app_specific_thresholds>
+
+ <app_close_settings>
+ <close_app uid="DEFAULT_APP" priority="9" sync_mode="check">
+ <app_close_idle_priority idle_time="30" priority="9"></app_close_idle_priority>
+ </close_app>
+
+ <close_app uid="BUSY_APP" priority="NEVER_CLOSE" sync_mode="check"></close_app>
+ <close_app uid="HIGH_PRIORITY_APP" priority="10" sync_mode="check"></close_app>
+
+ <close_app uid="E6CFBA03" priority="7" sync_mode="check">
+ <foreground_app_priority if_foreground_app_id="E6CFBA02" priority="9"></foreground_app_priority>
+ </close_app>
+
+ <close_app uid="E6CFBA02" priority="8" sync_mode="check"></close_app>
+
+ <close_app uid="E6CFBA01" priority="9" sync_mode="check">
+ <app_close_idle_priority idle_time="30" priority="2"></app_close_idle_priority>
+ </close_app>
+
+ <close_app uid="E6CFBA09" priority="7" sync_mode="continue"></close_app>
+ <close_app uid="E6CFBA04" priority="7" sync_mode="check"></close_app>
+ <close_app uid="E6CFBA05" priority="7" sync_mode="check"></close_app>
+
+ <close_app uid="E6CFBA07" priority="NEVER_CLOSE" sync_mode="check"></close_app>
+ <close_app uid="E6CFBA06" priority="NEVER_CLOSE" sync_mode="check"></close_app>
+ <close_app uid="E6CFBA0A" priority="NEVER_CLOSE" sync_mode="check"></close_app>
+ <close_app uid="101f4cd5" priority="NEVER_CLOSE" sync_mode="check"></close_app><!-- log -->
+ <close_app uid="1028311d" priority="NEVER_CLOSE" sync_mode="check"></close_app><!-- test app 39 for uishellservices_menucontentservice. related to content harvester panic -->
+ <close_app uid="101f4cd2" priority="NEVER_CLOSE" sync_mode="check"></close_app><!-- application shell menu -->
+ </app_close_settings>
+
+
+ <system_plugin_settings>
+ <system_plugin uid="DEFAULT_PLUGIN" priority="10"></system_plugin>
+ <system_plugin uid="10286A34" priority="5"></system_plugin>
+
+ <system_plugin uid="10286A35" priority="6">
+ <plugin_foreground_app_priority target_app_id="E6CFBA07" priority="9"></plugin_foreground_app_priority>
+ </system_plugin>
+
+ <system_plugin uid="10286A36" priority="7"></system_plugin>
+ <system_plugin uid="10286A37" priority="8" wait="1000" sync_mode="check"></system_plugin>
+ <system_plugin uid="10286A3C" priority="4"></system_plugin>
+ <system_plugin uid="10286A3D" priority="9"></system_plugin>
+ </system_plugin_settings>
+
+ <app_plugin_settings>
+ <app_plugin uid="10286A3A" target_app_id="E6CFBA02" priority="4" sync_mode="check" call_if_target_app_not_running="false"></app_plugin>
+ <app_plugin uid="10286A3B" target_app_id="E6CFBA03" priority="3" call_if_target_app_not_running="true"></app_plugin>
+ <app_plugin uid="10286A38" target_app_id="E6CFBA03" priority="9" call_if_target_app_not_running="false">
+ <plugin_idle_priority idle_time="30" priority="1"></plugin_idle_priority>
+ </app_plugin>
+
+ <app_plugin uid="10286A39" target_app_id="E6CFBA01" priority="10">
+ <plugin_foreground_app_priority target_app_id="TARGET_APP" priority="1"></plugin_foreground_app_priority>
+ </app_plugin>
+
+ </app_plugin_settings>
+
+</oom_config>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,40 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+../init/oomtest.ini /epoc32/winscw/c/testframework/testframework.ini
+../conf/oomtest.cfg /epoc32/winscw/c/testframework/oomtest.cfg
+../data/oomconfig.xml /epoc32/release/winscw/udeb/z/private/10207218/oomconfig.xml
+../data/oomconfig.xml /epoc32/release/winscw/urel/z/private/10207218/oomconfig.xml
+
+PRJ_TESTMMPFILES
+#include "../t_oomallocserver/group/bld.inf"
+#include "../t_oomdummyapp/group/bld.inf"
+#include "../t_oomdummyplugin/group/bld.inf"
+#include "../t_oomdummyplugin2/group/bld.inf"
+//#include "../t_oomharness/group/bld.inf"
+#include "../t_oomtestapp/group/bld.inf"
+#include "../t_oomharness_stif/group/bld.inf"
+
+// End of File
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,68 @@
+;Languages
+&EN
+
+#{"t_oomharness_stif"},(0x101FB3E7),1,0,0,TYPE=SA
+
+;Localised Vendor name
+%{"t_oomharness_stif EN"}
+
+; Vendor name
+: "t_oomharness_stif"
+
+"\epoc32\release\armv5\urel\t_oomharness_stif.dll"-"c:\sys\bin\t_oomharness_stif.dll"
+"..\init\oomtest.ini"-"c:\testframework\oomtest.ini"
+"..\conf\oomtest.cfg"-"c:\testframework\oomtest.cfg"
+;"..\data\oomconfig.xml"-"c:\private\10207218\oomconfig.xml"
+
+"\epoc32\release\armv5\urel\t_oomclient.dll"-"c:\sys\bin\t_oomclient.dll"
+"\epoc32\release\armv5\urel\t_oomallocserver.exe"-"c:\sys\bin\t_oomallocserver.exe"
+
+"\epoc32\release\armv5\urel\t_oomdummyapp_0xE6CFBA00.exe"-"c:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe"
+"\epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"-"c:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomdummyplugin.dll"-"c:\sys\bin\t_oomdummyplugin.dll"
+"\epoc32\data\z\resource\plugins\t_oomdummyplugin.rsc"-"c:\resource\plugins\t_oomdummyplugin.rsc"
+
+"\epoc32\release\armv5\urel\t_oomdummyplugin2.dll"-"c:\sys\bin\t_oomdummyplugin2.dll"
+"\epoc32\data\z\resource\plugins\t_oomdummyplugin2.rsc"-"c:\resource\plugins\t_oomdummyplugin2.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"c:\sys\bin\t_oomtestapp.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"c:\resource\apps\t_oomtestapp.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"c:\sys\bin\t_oomtestapp2.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"c:\resource\apps\t_oomtestapp2.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"c:\sys\bin\t_oomtestapp3.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"c:\resource\apps\t_oomtestapp3.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"c:\sys\bin\t_oomtestapp4.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"c:\resource\apps\t_oomtestapp4.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"c:\sys\bin\t_oomtestapp5.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"c:\resource\apps\t_oomtestapp5.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"c:\sys\bin\t_oomtestapp6.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"c:\resource\apps\t_oomtestapp6.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"c:\sys\bin\t_oomtestapp7.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"c:\resource\apps\t_oomtestapp7.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"c:\sys\bin\t_oomtestapp8.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"c:\resource\apps\t_oomtestapp8.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"c:\sys\bin\t_oomtestapp9.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"c:\resource\apps\t_oomtestapp9.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"c:\sys\bin\t_oomtestapp10.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"c:\resource\apps\t_oomtestapp10.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,68 @@
+;Languages
+&EN
+
+#{"t_oomharness_stif"},(0x101FB3E7),1,0,0,TYPE=SA
+
+;Localised Vendor name
+%{"t_oomharness_stif EN"}
+
+; Vendor name
+: "t_oomharness_stif"
+
+"\epoc32\release\armv5\urel\t_oomharness_stif.dll"-"c:\sys\bin\t_oomharness_stif.dll"
+"..\init\oomtest.ini"-"c:\testframework\oomtest.ini"
+"..\conf\oomtest.cfg"-"c:\testframework\oomtest.cfg"
+"..\data\oomconfig.xml"-"c:\data\oomconfig.xml"
+
+"\epoc32\release\armv5\urel\t_oomclient.dll"-"c:\sys\bin\t_oomclient.dll"
+"\epoc32\release\armv5\urel\t_oomallocserver.exe"-"c:\sys\bin\t_oomallocserver.exe"
+
+"\epoc32\release\armv5\urel\t_oomdummyapp_0xE6CFBA00.exe"-"c:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe"
+"\epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"-"c:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomdummyplugin.dll"-"c:\sys\bin\t_oomdummyplugin.dll"
+"\epoc32\data\z\resource\plugins\t_oomdummyplugin.rsc"-"c:\resource\plugins\t_oomdummyplugin.rsc"
+
+"\epoc32\release\armv5\urel\t_oomdummyplugin2.dll"-"c:\sys\bin\t_oomdummyplugin2.dll"
+"\epoc32\data\z\resource\plugins\t_oomdummyplugin2.rsc"-"c:\resource\plugins\t_oomdummyplugin2.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"c:\sys\bin\t_oomtestapp.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"c:\resource\apps\t_oomtestapp.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"c:\sys\bin\t_oomtestapp2.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"c:\resource\apps\t_oomtestapp2.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"c:\sys\bin\t_oomtestapp3.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"c:\resource\apps\t_oomtestapp3.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"c:\sys\bin\t_oomtestapp4.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"c:\resource\apps\t_oomtestapp4.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"c:\sys\bin\t_oomtestapp5.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"c:\resource\apps\t_oomtestapp5.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"c:\sys\bin\t_oomtestapp6.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"c:\resource\apps\t_oomtestapp6.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"c:\sys\bin\t_oomtestapp7.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"c:\resource\apps\t_oomtestapp7.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"c:\sys\bin\t_oomtestapp8.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"c:\resource\apps\t_oomtestapp8.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"c:\sys\bin\t_oomtestapp9.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"c:\resource\apps\t_oomtestapp9.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"c:\sys\bin\t_oomtestapp10.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"c:\resource\apps\t_oomtestapp10.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"c:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc"
Binary file sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sis has changed
Binary file sysresmonitoring/oommonitor/tsrc/oomtest/group/oomtest_manualtestrun.sisx has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/group/readme.txt Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,13 @@
+To test in emulator:
+ 1) bldmake bldfiles + abld test build
+ 2) start emulator
+ 3) run "consoleui" from "eshell"
+
+To test (manually) in HW:
+ 1) bldmake bldfiles + abld test build
+ 2) create and sign sis from oomtest_manualtestrun.pkg (note that oomtest.pkg is for automated testing)
+ 3) install sis into phone
+ 4) select OOM test config xml from c:\data\ (use t_oomtestapp -> Options -> Select...)
+ 5) reboot phone (config xml is taken in use)
+ 6) rename oomtest.ini in c:\testframework to testframework.ini (use FileBrowse)
+ 7) run "consoleui" from "eshell"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomclient.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,38 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_CLIENT_H__
+#define __T_CLIENT_H__
+
+#include <e32std.h>
+
+class ROOMAllocSession : public RSessionBase
+ {
+public:
+ IMPORT_C TInt Connect();
+ IMPORT_C TInt Reset();
+ IMPORT_C TInt StartAllocating();
+ IMPORT_C TInt StopAllocating();
+ IMPORT_C TInt Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit);
+ IMPORT_C TInt MemoryLow(TUid aPlugin);
+ IMPORT_C TInt MemoryGood(TUid aPlugin);
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,36 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#ifndef DUMMYPLUGIN_PROPETIES_H_
+#define DUMMYPLUGIN_PROPETIES_H_
+
+const TUid KUidOomPropertyCategory = {0x10286A3E};
+
+//The key is the UID of the implementation instance, i.e. 10286A34 To 10286A3D
+const TInt KUidOOMDummyPluginFirstImplementation(0x10286A34);
+const TInt KUidOOMDummyPluginLastImplementation(0x10286A3D);
+
+const TUint KOOMDummyPluginImplementationCount = 10;
+
+const TUint KOOMDummyPluginLowMemoryCount = 0;
+const TUint KOOMDummyPluginGoodMemoryCount = 1 * KOOMDummyPluginImplementationCount;
+const TUint KOOMDummyPluginCurrentAllocationBytes = 2 * KOOMDummyPluginImplementationCount;
+const TUint KOOMDummyPluginBytesRequested = 3 * KOOMDummyPluginImplementationCount;
+
+#endif /* DUMMYPLUGIN_PROPETIES_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/inc/t_oomdummyplugin_properties2.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,21 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/init/oomtest.ini Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,173 @@
+#
+# This is STIFTestFramework initialization file
+# Comment lines start with '#'-character.
+# See STIF TestFramework users guide.doc for instructions
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set following test engine settings:
+# - Set Test Reporting mode. TestReportMode's possible values are:
+# + 'Summary': Summary of the tested test cases.
+# + 'Environment': Hardware and software info.
+# + 'TestCases': Test case report.
+# + 'FullReport': Set of all above ones.
+# + Example 'TestReportMode= Summary TestCases'
+#
+# - CreateTestReport setting controls report creation mode
+# + YES, Test report will created.
+# + NO, No Test report.
+#
+# - File path indicates the base path of the test report.
+# - File name indicates the name of the test report.
+#
+# - File format indicates the type of the test report.
+# + TXT, Test report file will be txt type, for example 'TestReport.txt'.
+# + HTML, Test report will be html type, for example 'TestReport.html'.
+#
+# - File output indicates output source of the test report.
+# + FILE, Test report logging to file.
+# + RDEBUG, Test report logging to using rdebug.
+#
+# - File Creation Mode indicates test report overwriting if file exist.
+# + OVERWRITE, Overwrites if the Test report file exist.
+# + APPEND, Continue logging after the old Test report information if
+# report exist.
+
+[Engine_Defaults]
+
+TestReportMode= FullReport # Possible values are:
+ # 'Summary', 'Environment', 'TestCases' or 'FullReport'
+
+CreateTestReport= YES # Possible values: YES or NO
+
+TestReportFilePath= C:\LOGS\TestFramework\
+TestReportFileName= TestReport
+
+TestReportFormat= TXT # Possible values: TXT or HTML
+TestReportOutput= FILE # Possible values: FILE or RDEBUG
+TestReportFileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+[End_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Module configurations start
+# Modules are added between module tags
+# tags. Module name is specified after ModuleName= tag, like
+# ModuleName= XXXXXXXXX
+# Modules might have initialisation file, specified as
+# IniFile= YYYYYY
+# Modules might have several configuration files, like
+# TestCaseFile= NormalCases.txt
+# TestCaseFile= SmokeCases.txt
+# TestCaseFile= ManualCases.txt
+
+# (TestCaseFile is synonym for old term ConfigFile)
+
+# Following case specifies demo module settings. Demo module
+# does not read any settings from file, so tags
+# IniFile and TestCaseFile are not used.
+# In the simplest case it is enough to specify only the
+# name of the test module when adding new test module
+
+[New_Module]
+ModuleName= t_oomharness_stif
+TestCaseFile= c:\testframework\oomtest.cfg
+[End_Module]
+
+
+#Load testmoduleXXX, optionally with initialization file and/or test case files
+#[New_Module]
+#ModuleName= testmodulexxx
+
+#TestModuleXXX used initialization file
+#IniFile= init.txt
+
+#TestModuleXXX used configuration file(s)
+#TestCaseFile= testcases1.cfg
+#TestCaseFile= testcases2.cfg
+#TestCaseFile= manualtestcases.cfg
+
+#[End_Module]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+# Set STIFTestFramework logging overwrite parameters for Logger.
+# Hardware and emulator environment logging path and styles can
+# be configured from here to overwrite the Logger's implemented values.
+#
+# Settings description:
+# - Indicates option for creation log directory/directories. If log directory/directories
+# is/are not created by user they will make by software.
+# + YES, Create log directory/directories if not allready exist.
+# + NO, Log directory/directories not created. Only created one is used.
+#
+# - Overwrite emulator path setting.
+# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined
+# Logger's path 'D:\\LOGS\\Module\\' with those definition the path
+# will be 'C:\LOGS\TestFramework\LOGS\Module\'
+#
+# - Overwrite emulator's logging format.
+# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
+# + HTML, Log file(s) will be html type(s), for example 'Module.html'.
+#
+# - Overwrited emulator logging output source.
+# + FILE, Logging to file(s).
+# + RDEBUG, Logging to using rdebug(s).
+#
+# - Overwrite hardware path setting (Same description as above in emulator path).
+# - Overwrite hardware's logging format(Same description as above in emulator format).
+# - Overwrite hardware's logging output source(Same description as above in emulator output).
+#
+# - File Creation Mode indicates file overwriting if file exist.
+# + OVERWRITE, Overwrites if file(s) exist.
+# + APPEND, Continue logging after the old logging information if file(s) exist.
+#
+# - Will thread id include to the log filename.
+# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
+# + NO, No thread id to log file(s), Example filename 'Module.txt'.
+#
+# - Will time stamps include the to log file.
+# + YES, Time stamp added to each line in log file(s). Time stamp is
+# for example'12.Nov.2003 115958 LOGGING INFO'
+# + NO, No time stamp(s).
+#
+# - Will line breaks include to the log file.
+# + YES, Each logging event includes line break and next log event is in own line.
+# + NO, No line break(s).
+#
+# - Will event ranking include to the log file.
+# + YES, Event ranking number added to each line in log file(s). Ranking number
+# depends on environment's tics, for example(includes time stamp also)
+# '012 12.Nov.2003 115958 LOGGING INFO'
+# + NO, No event ranking.
+#
+
+[Logger_Defaults]
+
+#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#'
+
+#CreateLogDirectories= YES # Possible values: YES or NO
+
+#EmulatorBasePath= C:\LOGS\TestFramework\
+#EmulatorFormat= HTML # Possible values: TXT or HTML
+#EmulatorOutput= FILE # Possible values: FILE or RDEBUG
+
+#HardwareBasePath= D:\LOGS\TestFramework\
+#HardwareFormat= HTML # Possible values: TXT or HTML
+#HardwareOutput= FILE # Possible values: FILE or RDEBUG
+
+#FileCreationMode= OVERWRITE # Possible values: OVERWRITE or APPEND
+
+#ThreadIdToLogFile= YES # Possible values: YES or NO
+#WithTimeStamp= YES # Possible values: YES or NO
+#WithLineBreak= YES # Possible values: YES or NO
+#WithEventRanking= YES # Possible values: YES or NO
+
+[End_Logger_Defaults]
+# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+# End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/stub/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTEXPORTS
+../../data/oomconfig.xml /epoc32/data/Z/private/10207218/oomconfig.xml
+
+PRJ_TESTMMPFILES
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/bwins/t_oomclientu.def Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,9 @@
+EXPORTS
+ ?Configure@ROOMAllocSession@@QAEHVTUid@@III@Z @ 1 NONAME ; int ROOMAllocSession::Configure(class TUid, unsigned int, unsigned int, unsigned int)
+ ?Connect@ROOMAllocSession@@QAEHXZ @ 2 NONAME ; int ROOMAllocSession::Connect(void)
+ ?MemoryGood@ROOMAllocSession@@QAEHVTUid@@@Z @ 3 NONAME ; int ROOMAllocSession::MemoryGood(class TUid)
+ ?MemoryLow@ROOMAllocSession@@QAEHVTUid@@@Z @ 4 NONAME ; int ROOMAllocSession::MemoryLow(class TUid)
+ ?Reset@ROOMAllocSession@@QAEHXZ @ 5 NONAME ; int ROOMAllocSession::Reset(void)
+ ?StartAllocating@ROOMAllocSession@@QAEHXZ @ 6 NONAME ; int ROOMAllocSession::StartAllocating(void)
+ ?StopAllocating@ROOMAllocSession@@QAEHXZ @ 7 NONAME ; int ROOMAllocSession::StopAllocating(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/clisrc/client.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,101 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include "t_oomclient.h"
+#include "../inc/clientserver.h"
+
+const TInt KServerDefaultMessageSlots = 1; //Number of message slots available per session.
+const TInt KServerRetryCount = 2;
+
+static TInt StartServer()
+//
+// Start the server process. Simultaneous launching
+// of two such processes should be detected when the second one attempts to
+// create the server object, failing with KErrAlreadyExists.
+//
+ {
+ const TUidType serverUid(KNullUid,KNullUid,KServerUid3);
+ RProcess server;
+ TInt r=server.Create(KAllocServerImg,KNullDesC,serverUid);
+ if (r!=KErrNone)
+ return r;
+ TRequestStatus stat;
+ server.Rendezvous(stat);
+ if (stat!=KRequestPending)
+ server.Kill(0); // abort startup
+ else
+ server.Resume(); // logon OK - start the server
+ User::WaitForRequest(stat); // wait for start or death
+ // we can't use the 'exit reason' if the server panicked as this
+ // is the panic 'reason' and may be '0' which cannot be distinguished
+ // from KErrNone
+ r=(server.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
+ server.Close();
+ return r;
+ }
+
+EXPORT_C TInt ROOMAllocSession::Connect()
+//
+// Connect to the server, attempting to start it if necessary
+//
+ {
+ TInt retry=KServerRetryCount;
+ for (;;)
+ {
+ TInt r=CreateSession(KAllocServerName,TVersion(0,0,0),KServerDefaultMessageSlots);
+ if (r!=KErrNotFound && r!=KErrServerTerminated)
+ return r;
+ if (--retry==0)
+ return r;
+ r=StartServer();
+ if (r!=KErrNone && r!=KErrAlreadyExists)
+ return r;
+ }
+ }
+
+EXPORT_C TInt ROOMAllocSession::Reset()
+ {
+ return SendReceive(EAllocServReset);
+ }
+
+EXPORT_C TInt ROOMAllocSession::StartAllocating()
+ {
+ return SendReceive(EAllocServStart);
+ }
+
+EXPORT_C TInt ROOMAllocSession::StopAllocating()
+ {
+ return SendReceive(EAllocServStop);
+ }
+
+EXPORT_C TInt ROOMAllocSession::MemoryLow(TUid aPlugin)
+ {
+ return SendReceive(EAllocServMemoryLow, TIpcArgs(aPlugin.iUid));
+ }
+
+EXPORT_C TInt ROOMAllocSession::MemoryGood(TUid aPlugin)
+ {
+ return SendReceive(EAllocServMemoryGood, TIpcArgs(aPlugin.iUid));
+ }
+
+EXPORT_C TInt ROOMAllocSession::Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit)
+ {
+ return SendReceive(EAllocServConfig,TIpcArgs(aPlugin.iUid, aAllocRate, aAllocInitial, aAllocLimit));
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/eabi/t_oomclientu.def Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,9 @@
+EXPORTS
+ _ZN16ROOMAllocSession10MemoryGoodE4TUid @ 1 NONAME
+ _ZN16ROOMAllocSession14StopAllocatingEv @ 2 NONAME
+ _ZN16ROOMAllocSession15StartAllocatingEv @ 3 NONAME
+ _ZN16ROOMAllocSession5ResetEv @ 4 NONAME
+ _ZN16ROOMAllocSession7ConnectEv @ 5 NONAME
+ _ZN16ROOMAllocSession9ConfigureE4TUidjjj @ 6 NONAME
+ _ZN16ROOMAllocSession9MemoryLowE4TUid @ 7 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,29 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+t_oomallocserver.mmp
+t_oomallocclient.mmp
+
+PRJ_TESTEXPORTS
+../inc/t_oomclient.h ../../inc/t_oomclient.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocclient.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,40 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+target t_oomclient.dll
+targettype dll
+
+capability ALL -TCB
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+//project server
+sourcepath ..\clisrc\
+
+source client.cpp
+
+library euser.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/group/t_oomallocserver.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,42 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET t_oomallocserver.exe
+TARGETTYPE exe
+UID 0 0x10286A3E
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE_UDEBONLY
+#endif
+SOURCEPATH ../srvsrc
+SOURCE server.cpp
+SOURCE CAllocManager.cpp
+
+library euser.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/CAllocManager.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,131 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#ifndef CALLOCMANAGER_H
+#define CALLOCMANAGER_H
+
+// INCLUDES
+#include <e32std.h>
+#include <e32base.h>
+
+// CLASS DECLARATION
+
+class CAllocSimulation : public CBase
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * Destructor.
+ */
+ ~CAllocSimulation();
+
+ /**
+ * Two-phased constructor.
+ */
+ static CAllocSimulation* NewL(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid);
+
+ /**
+ * Two-phased constructor.
+ */
+ static CAllocSimulation* NewLC(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid);
+
+ void SimulationTick();
+ void SetPaused(TBool aPaused);
+ void FreeMemory();
+
+ static TBool CompareTo(const TUint *aUid, const CAllocSimulation& aSelf);
+private:
+
+ /**
+ * Constructor for performing 1st stage construction
+ */
+ CAllocSimulation(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid);
+
+ /**
+ * EPOC default constructor for performing 2nd stage construction
+ */
+ void ConstructL();
+
+ TInt iAllocLimit;
+ TInt iAllocInitial;
+ TInt iAllocRate;
+ TUint iUid;
+ RChunk iChunk;
+ TBool iPaused;
+ TUint iAllocCurrent;
+ };
+
+/**
+ * CCAllocManager
+ *
+ */
+class CAllocManager : public CBase
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * Destructor.
+ */
+ ~CAllocManager();
+
+ /**
+ * Two-phased constructor.
+ */
+ static CAllocManager* NewL();
+
+ /**
+ * Two-phased constructor.
+ */
+ static CAllocManager* NewLC();
+
+ TInt Reset();
+ TInt StartAllocating();
+ TInt StopAllocating();
+ void ConfigureL(TUint aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit);
+ TInt MemoryLow(TUint aPlugin);
+ TInt MemoryGood(TUint aPlugin);
+private:
+
+ /**
+ * Constructor for performing 1st stage construction
+ */
+ CAllocManager();
+
+ /**
+ * EPOC default constructor for performing 2nd stage construction
+ */
+ void ConstructL();
+
+ static TInt SimulationTickStatic(TAny *aPtr);
+ void SimulationTick();
+
+ TInt FindSimulation(TUint aUid);
+
+ CPeriodic *iAllocationTimer;
+ RPointerArray<CAllocSimulation> iSimulations;
+ };
+
+#endif // CALLOCMANAGER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/clientserver.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,52 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#include <e32base.h>
+
+
+// server name
+
+_LIT(KAllocServerName,"t_oomAllocServer");
+_LIT(KAllocServerImg,"t_oomAllocServer");
+const TUid KServerUid3={0x10286A3E};
+
+// A version must be specifyed when creating a session with the server
+
+const TUint KCountServMajorVersionNumber=0;
+const TUint KCountServMinorVersionNumber=1;
+const TUint KCountServBuildVersionNumber=1;
+
+IMPORT_C TInt StartThread(RThread& aServerThread);
+
+
+// Function codes (opcodes) used in message passing between client and server
+enum TAllocServRqst
+ {
+ EAllocServReset,
+ EAllocServConfig,
+ EAllocServStart,
+ EAllocServStop,
+ EAllocServMemoryLow,
+ EAllocServMemoryGood
+ };
+
+enum TAllocServLeave
+{
+ ENonNumericString = 99
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/server.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,81 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <e32base.h>
+#include "clientserver.h"
+#include "callocmanager.h"
+
+enum TMyPanic
+ {
+ EPanicBadDescriptor,
+ EPanicIllegalFunction,
+ EPanicAlreadyReceiving
+ };
+
+void PanicClient(const RMessagePtr2& aMessage,TMyPanic TMyPanic);
+
+class CShutdown : public CTimer
+ {
+ enum {KMyShutdownDelay=0x200000}; // approx 2s
+public:
+ inline CShutdown();
+ inline void ConstructL();
+ inline void Start();
+private:
+ void RunL();
+ };
+
+class CMyServer : public CServer2
+ {
+public:
+ static CServer2* NewLC();
+ void AddSession();
+ void DropSession();
+ void Send(const TDesC& aMessage);
+ CAllocManager& AllocManager();
+ ~CMyServer();
+private:
+ CMyServer();
+ void ConstructL();
+ void DefinePropertiesL();
+ CSession2* NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const;
+private:
+ TInt iSessionCount;
+ CShutdown iShutdown;
+ CAllocManager *iAllocManager;
+ };
+
+class CMySession : public CSession2
+ {
+public:
+ CMySession();
+ void CreateL();
+ void Send(const TDesC& aMessage);
+private:
+ ~CMySession();
+ inline CMyServer& Server();
+ void ServiceL(const RMessage2& aMessage);
+ void ServiceError(const RMessage2& aMessage,TInt aError);
+ inline TBool ReceivePending() const;
+private:
+ RMessagePtr2 iReceiveMsg;
+ TInt iReceiveLen;
+ };
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/inc/t_oomclient.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,38 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_CLIENT_H__
+#define __T_CLIENT_H__
+
+#include <e32std.h>
+
+class ROOMAllocSession : public RSessionBase
+ {
+public:
+ IMPORT_C TInt Connect();
+ IMPORT_C TInt Reset();
+ IMPORT_C TInt StartAllocating();
+ IMPORT_C TInt StopAllocating();
+ IMPORT_C TInt Configure(TUid aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit);
+ IMPORT_C TInt MemoryLow(TUid aPlugin);
+ IMPORT_C TInt MemoryGood(TUid aPlugin);
+ };
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/CAllocManager.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,203 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include "CAllocManager.h"
+#include <e32property.h>
+#include "t_oomdummyplugin_properties.h"
+
+const TInt KOneSecond = 1000000;
+
+CAllocManager::CAllocManager()
+ {
+ // No implementation required
+ }
+
+CAllocManager::~CAllocManager()
+ {
+ delete iAllocationTimer;
+ iSimulations.ResetAndDestroy();
+ }
+
+CAllocManager* CAllocManager::NewLC()
+ {
+ CAllocManager* self = new (ELeave) CAllocManager();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+CAllocManager* CAllocManager::NewL()
+ {
+ CAllocManager* self = CAllocManager::NewLC();
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+void CAllocManager::ConstructL()
+ {
+ iAllocationTimer = CPeriodic::NewL(CActive::EPriorityStandard);
+ }
+
+TInt CAllocManager::SimulationTickStatic(TAny *aPtr)
+ {
+ ((CAllocManager*)aPtr)->SimulationTick();
+ return KErrNone;
+ }
+
+void CAllocManager::SimulationTick()
+ {
+ for(TInt i=iSimulations.Count()-1; i>=0; i--)
+ {
+ iSimulations[i]->SimulationTick();
+ }
+ }
+
+TInt CAllocManager::Reset()
+ {
+ StopAllocating();
+ iSimulations.ResetAndDestroy();
+ return KErrNone;
+ }
+
+TInt CAllocManager::StartAllocating()
+ {
+ iAllocationTimer->Cancel();
+ iAllocationTimer->Start(KOneSecond, KOneSecond, TCallBack(SimulationTickStatic, this));
+ return KErrNone;
+ }
+
+TInt CAllocManager::StopAllocating()
+ {
+ iAllocationTimer->Cancel();
+ return KErrNone;
+ }
+
+void CAllocManager::ConfigureL(TUint aPlugin, TUint aAllocRate, TUint aAllocInitial, TUint aAllocLimit)
+ {
+ TInt sim = FindSimulation(aPlugin);
+ if(sim>=0)
+ {
+ delete iSimulations[sim];
+ iSimulations.Remove(sim);
+ }
+ CAllocSimulation* newsim = CAllocSimulation::NewLC(aAllocLimit, aAllocInitial, aAllocRate, aPlugin);
+ iSimulations.AppendL(newsim);
+ CleanupStack::Pop(newsim);
+ }
+
+TInt CAllocManager::MemoryLow(TUint aPlugin)
+ {
+ TInt sim = FindSimulation(aPlugin);
+ if(sim>=0)
+ {
+ iSimulations[sim]->SetPaused(ETrue);
+ iSimulations[sim]->FreeMemory();
+ return KErrNone;
+ }
+ else return KErrNotFound;
+ }
+
+TInt CAllocManager::MemoryGood(TUint aPlugin)
+ {
+ TInt sim = FindSimulation(aPlugin);
+ if(sim>=0)
+ {
+ iSimulations[sim]->SetPaused(EFalse);
+ return KErrNone;
+ }
+ else return KErrNotFound;
+ }
+
+TInt CAllocManager::FindSimulation(TUint aUid)
+ {
+ return iSimulations.Find<TUint>(aUid, CAllocSimulation::CompareTo);
+ }
+
+CAllocSimulation::CAllocSimulation(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid) :
+ iAllocLimit(aAllocLimit),
+ iAllocInitial(aAllocInitial),
+ iAllocRate(aAllocRate),
+ iUid(aUid)
+ {
+ // No implementation required
+ }
+
+CAllocSimulation::~CAllocSimulation()
+ {
+ iChunk.Close();
+ }
+
+CAllocSimulation* CAllocSimulation::NewLC(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid)
+ {
+ CAllocSimulation* self = new (ELeave) CAllocSimulation(aAllocLimit, aAllocInitial,
+ aAllocRate, aUid);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+CAllocSimulation* CAllocSimulation::NewL(TInt aAllocLimit, TInt aAllocInitial,
+ TInt aAllocRate, TUint aUid)
+ {
+ CAllocSimulation* self = CAllocSimulation::NewLC(aAllocLimit, aAllocInitial,
+ aAllocRate, aUid);
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+void CAllocSimulation::ConstructL()
+ {
+ User::LeaveIfError(iChunk.CreateLocal(iAllocInitial, iAllocLimit));
+ }
+
+void CAllocSimulation::SimulationTick()
+ {
+ if(!iPaused)
+ {
+ TUint allocnext = iAllocCurrent + iAllocRate;
+ if(allocnext < iAllocInitial) allocnext = iAllocInitial;
+ else if(allocnext > iAllocLimit) allocnext = iAllocLimit;
+ if(iAllocCurrent != allocnext && KErrNone == iChunk.Adjust(iAllocCurrent))
+ {
+ iAllocCurrent = allocnext;
+ RProperty::Set(KUidOomPropertyCategory, iUid + KOOMDummyPluginCurrentAllocationBytes, iAllocCurrent);
+ }
+ }
+ }
+
+void CAllocSimulation::SetPaused(TBool aPaused)
+ {
+ iPaused = aPaused;
+ }
+
+void CAllocSimulation::FreeMemory()
+ {
+ iChunk.Adjust(0);
+ iAllocCurrent = 0;
+ RProperty::Set(KUidOomPropertyCategory, iUid + KOOMDummyPluginCurrentAllocationBytes, iAllocCurrent);
+ }
+
+TBool CAllocSimulation::CompareTo(const TUint* aUid, const CAllocSimulation& aSelf)
+ {
+ return *aUid==aSelf.iUid;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomallocserver/srvsrc/server.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,277 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include "server.h"
+#include <e32property.h>
+#include "t_oomdummyplugin_properties.h"
+
+inline CShutdown::CShutdown()
+ :CTimer(-1)
+ {CActiveScheduler::Add(this);}
+inline void CShutdown::ConstructL()
+ {CTimer::ConstructL();}
+inline void CShutdown::Start()
+ {After(KMyShutdownDelay);}
+
+inline CMyServer::CMyServer()
+ :CServer2(CActive::EPriorityStandard, ESharableSessions)
+ {}
+
+inline CMySession::CMySession()
+ {}
+inline CMyServer& CMySession::Server()
+ {return *static_cast<CMyServer*>(const_cast<CServer2*>(CSession2::Server()));}
+inline TBool CMySession::ReceivePending() const
+ {return !iReceiveMsg.IsNull();}
+
+
+///////////////////////
+
+void CMySession::CreateL()
+//
+// 2nd phase construct for sessions - called by the CServer framework
+//
+ {
+ Server().AddSession();
+ }
+
+CMySession::~CMySession()
+ {
+ Server().DropSession();
+ }
+
+void CMySession::Send(const TDesC& aMessage)
+//
+// Deliver the message to the client, truncating if required
+// If the write fails, panic the client, not the sender
+//
+ {
+ if (ReceivePending())
+ {
+ TPtrC m(aMessage);
+ if (iReceiveLen<aMessage.Length())
+ m.Set(m.Left(iReceiveLen));
+ TInt r=iReceiveMsg.Write(0,m);
+ if (r==KErrNone)
+ iReceiveMsg.Complete(KErrNone);
+ else
+ PanicClient(iReceiveMsg,EPanicBadDescriptor);
+ }
+ }
+
+void CMySession::ServiceL(const RMessage2& aMessage)
+//
+// Handle a client request.
+// Leaving is handled by CMyServer::ServiceError() which reports
+// the error code to the client
+//
+ {
+ switch (aMessage.Function())
+ {
+ case EAllocServReset:
+ aMessage.Complete(Server().AllocManager().Reset());
+ break;
+ case EAllocServConfig:
+ Server().AllocManager().ConfigureL(aMessage.Int0(),
+ aMessage.Int1(), aMessage.Int2(), aMessage.Int3());
+ aMessage.Complete(KErrNone);
+ break;
+ case EAllocServStart:
+ aMessage.Complete(Server().AllocManager().StartAllocating());
+ break;
+ case EAllocServStop:
+ aMessage.Complete(Server().AllocManager().StopAllocating());
+ break;
+ case EAllocServMemoryLow:
+ aMessage.Complete(Server().AllocManager().MemoryLow(aMessage.Int0()));
+ break;
+ case EAllocServMemoryGood:
+ aMessage.Complete(Server().AllocManager().MemoryGood(aMessage.Int0()));
+ break;
+ default:
+ PanicClient(aMessage, EPanicIllegalFunction);
+ break;
+ }
+ }
+
+void CMySession::ServiceError(const RMessage2& aMessage,TInt aError)
+//
+// Handle an error from CMySession::ServiceL()
+// A bad descriptor error implies a badly programmed client, so panic it;
+// otherwise use the default handling (report the error to the client)
+//
+ {
+ if (aError==KErrBadDescriptor)
+ PanicClient(aMessage,EPanicBadDescriptor);
+ CSession2::ServiceError(aMessage,aError);
+ }
+
+void CShutdown::RunL()
+//
+// Initiate server exit when the timer expires
+//
+ {
+ CActiveScheduler::Stop();
+ }
+
+CServer2* CMyServer::NewLC()
+ {
+ CMyServer* self=new(ELeave) CMyServer;
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+void CMyServer::ConstructL()
+//
+// 2nd phase construction - ensure the timer and server objects are running
+//
+ {
+ StartL(KAllocServerName);
+ iShutdown.ConstructL();
+ // ensure that the server still exits even if the 1st client fails to connect
+ iShutdown.Start();
+ DefinePropertiesL();
+ iAllocManager = CAllocManager::NewL();
+ }
+
+_LIT_SECURITY_POLICY_PASS(KAlwaysPass);
+
+void CMyServer::DefinePropertiesL()
+ {
+ TInt err;
+ for(TUint i=KUidOOMDummyPluginFirstImplementation;i<=KUidOOMDummyPluginLastImplementation;i++)
+ {
+ err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginLowMemoryCount, RProperty::EInt, KAlwaysPass, KAlwaysPass);
+ if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err);
+ err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginGoodMemoryCount, RProperty::EInt, KAlwaysPass, KAlwaysPass);
+ if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err);
+ err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginCurrentAllocationBytes, RProperty::EInt, KAlwaysPass, KAlwaysPass);
+ if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err);
+ err = RProperty::Define(KUidOomPropertyCategory, i + KOOMDummyPluginBytesRequested, RProperty::EInt, KAlwaysPass, KAlwaysPass);
+ if(err != KErrNone && err != KErrAlreadyExists) User::Leave(err);
+ }
+ }
+
+CSession2* CMyServer::NewSessionL(const TVersion&,const RMessage2&) const
+//
+// Cretae a new client session. This should really check the version number.
+//
+ {
+ return new(ELeave) CMySession();
+ }
+
+void CMyServer::AddSession()
+//
+// A new session is being created
+// Cancel the shutdown timer if it was running
+//
+ {
+ ++iSessionCount;
+ iShutdown.Cancel();
+ }
+
+void CMyServer::DropSession()
+//
+// A session is being destroyed
+// Start the shutdown timer if it is the last session.
+//
+ {
+ if (--iSessionCount==0)
+ iShutdown.Start();
+ }
+
+void CMyServer::Send(const TDesC& aMessage)
+//
+// Pass on the signal to all clients
+//
+ {
+ iSessionIter.SetToFirst();
+ CSession2* s;
+ while ((s=iSessionIter++)!=0)
+ static_cast<CMySession*>(s)->Send(aMessage);
+ }
+
+CMyServer::~CMyServer()
+ {
+ delete iAllocManager;
+ }
+
+CAllocManager& CMyServer::AllocManager()
+ {
+ return *iAllocManager;
+ }
+
+void PanicClient(const RMessagePtr2& aMessage,TMyPanic aPanic)
+//
+// RMessage::Panic() also completes the message. This is:
+// (a) important for efficient cleanup within the kernel
+// (b) a problem if the message is completed a second time
+//
+ {
+ _LIT(KPanic,"MyServer");
+ aMessage.Panic(KPanic,aPanic);
+ }
+
+static void RunServerL()
+//
+// Perform all server initialisation, in particular creation of the
+// scheduler and server and then run the scheduler
+//
+ {
+ // naming the server thread after the server helps to debug panics
+ User::LeaveIfError(RThread::RenameMe(KAllocServerName));
+ //
+ // create and install the active scheduler we need
+ CActiveScheduler* s=new(ELeave) CActiveScheduler;
+ CleanupStack::PushL(s);
+ CActiveScheduler::Install(s);
+ //
+ // create the server (leave it on the cleanup stack)
+ CMyServer::NewLC();
+ //
+ // Initialisation complete, now signal the client
+ RProcess::Rendezvous(KErrNone);
+ //
+ // Ready to run
+ CActiveScheduler::Start();
+ //
+ // Cleanup the server and scheduler
+ CleanupStack::PopAndDestroy(2);
+ }
+
+TInt E32Main()
+//
+// Server process entry-point
+//
+ {
+ __UHEAP_MARK;
+ //
+ CTrapCleanup* cleanup=CTrapCleanup::New();
+ TInt r=KErrNoMemory;
+ if (cleanup)
+ {
+ TRAP(r,RunServerL());
+ delete cleanup;
+ }
+ //
+ __UHEAP_MARKEND;
+ return r;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rls Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,49 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// LOCALISATION STRINGS
+
+// Caption string for app.
+#define qtn_caption_string "t_oomdummyapp"
+
+// First item in "Options" menu pane
+#define qtn_command1 "Message"
+
+// Second item in "Options" menu pane
+#define qtn_command2 "Message from file"
+
+#define qtn_help "Help"
+
+#define qtn_about "About"
+
+// Third item in "Options" menu pane
+#define qtn_exit "Exit"
+
+// When user requests ECommand1 event, text below is shown.
+#define qtn_command1_text "OOM dummy app"
+
+#define qtn_loc_resource_file_1 "\\resource\\apps\\t_oomdummyapp_0xE6CFBA00"
+
+#define qtn_about_dialog_title "About"
+
+#define qtn_about_dialog_text "t_oomdummyapp Version 1.0.0\n\nAuthor: \n\nSupport: support@mycompany.com\n\n(c) Your copyright notice"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,188 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+// RESOURCE IDENTIFIER
+NAME T_OO // 4 letter ID
+
+
+// INCLUDES
+#include <eikon.rh>
+#include <avkon.rsg>
+#include <avkon.rh>
+#include <appinfo.rh>
+#include "t_oomdummyapp.hrh"
+#include "t_oomdummyapp.rls"
+
+// RESOURCE DEFINITIONS
+// -----------------------------------------------------------------------------
+//
+// Define the resource file signature
+// This resource should be empty.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE RSS_SIGNATURE
+ {
+ }
+
+// -----------------------------------------------------------------------------
+//
+// Default Document Name
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF r_default_document_name
+ {
+ buf="T_OO";
+ }
+
+// -----------------------------------------------------------------------------
+//
+// Define default menu and CBA key.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE EIK_APP_INFO
+ {
+ menubar = r_menubar;
+ cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
+ }
+
+
+// -----------------------------------------------------------------------------
+//
+// r_menubar
+// Main menubar
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_BAR r_menubar
+ {
+ titles =
+ {
+ MENU_TITLE { menu_pane = r_menu; }
+ };
+ }
+
+
+// -----------------------------------------------------------------------------
+//
+// r_menu
+// Menu for "Options"
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE MENU_PANE r_menu
+ {
+ items =
+ {
+ // added the new Options menu command here
+ MENU_ITEM
+ {
+ command = ECommand1;
+ txt = qtn_command1;
+ },
+ MENU_ITEM
+ {
+ command = ECommand2;
+ txt = qtn_command2;
+ },
+ MENU_ITEM
+ {
+ command = EHelp;
+ txt = qtn_help;
+ },
+ MENU_ITEM
+ {
+ command = EAbout;
+ txt = qtn_about;
+ },
+ MENU_ITEM
+ {
+ command = EAknSoftkeyExit;
+ txt = qtn_exit;
+ }
+ };
+ }
+
+// -----------------------------------------------------------------------------
+//
+// About dialog resource.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE DIALOG r_about_query_dialog
+ {
+ flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
+ buttons = R_AVKON_SOFTKEYS_OK_EMPTY;
+ items=
+ {
+ DLG_LINE
+ {
+ type = EAknCtPopupHeadingPane;
+ id = EAknMessageQueryHeaderId;
+ itemflags = EEikDlgItemNonFocusing;
+ control = AVKON_HEADING
+ {
+ };
+ },
+ DLG_LINE
+ {
+ type = EAknCtMessageQuery;
+ id = EAknMessageQueryContentId;
+ control = AVKON_MESSAGE_QUERY
+ {
+ };
+ }
+ };
+ }
+
+
+// -----------------------------------------------------------------------------
+//
+// Resources for messages.
+//
+// -----------------------------------------------------------------------------
+//
+RESOURCE TBUF32 r_caption_string { buf=qtn_caption_string; }
+RESOURCE TBUF32 r_about_dialog_title { buf=qtn_about_dialog_title; }
+RESOURCE TBUF r_about_dialog_text { buf=qtn_about_dialog_text; }
+RESOURCE TBUF r_command1_text { buf=qtn_command1_text; }
+
+
+// ----------------------------------------------------------------------------
+//
+// r_localisable_app_info
+//
+// ----------------------------------------------------------------------------
+//
+RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info
+ {
+ short_caption = qtn_caption_string;
+ caption_and_icon =
+ CAPTION_AND_ICON_INFO
+ {
+ caption = qtn_caption_string;
+
+ number_of_icons = 1;
+ icon_file = "\\resource\\apps\\t_oomdummyapp_0xE6CFBA00.mif";
+ };
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/data/t_oomdummyapp_reg.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,38 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include "t_oomdummyapp.hrh"
+#include "t_oomdummyapp.rls"
+#include <appinfo.rh>
+#include <t_oomdummyapp_0xE6CFBA00.rsg>
+
+UID2 KUidAppRegistrationResourceFile
+UID3 _UID3
+
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file="t_oomdummyapp_0xE6CFBA00";
+ localisable_resource_file = qtn_loc_resource_file_1;
+ localisable_resource_id = R_LOCALISABLE_APP_INFO;
+
+ embeddability=KAppNotEmbeddable;
+ newfile=KAppDoesNotSupportNewFile;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/gfx/qgn_menu_t_oomdummyapp.svg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 88 87.999">
+<g>
+<g>
+<g>
+<g>
+<rect fill="none" width="88" height="87.999"/>
+</g>
+</g>
+<g>
+<linearGradient id="XMLID_7_" gradientUnits="userSpaceOnUse" x1="12.3042" y1="18.3799" x2="63.4113" y2="79.287">
+<stop offset="0" style="stop-color:#B3DDFF"/>
+<stop offset="0.8146" style="stop-color:#084296"/>
+<stop offset="1" style="stop-color:#084296"/>
+</linearGradient>
+<path fill="url(#XMLID_7_)" d="M32.135,7.415L14.363,17.432v23.167c0,0,8.926,15.351,10.468,18.001 c-2.386,1.704-15.44,11.03-15.44,11.03l21.613,12.652c0,0,12.907-9.85,14.71-11.226c1.979,1.109,16.231,9.101,16.231,9.101 l16.664-15.132c0,0-14.066-6.929-16.888-8.318c1.467-3.01,10.531-21.604,10.531-21.604l-22.298-9.59 c0,0-1.486,3.173-2.093,4.467c-2.046-0.88-6.573-2.826-6.573-2.826s-3.713,2.463-5.696,3.778 c-0.327-0.744-0.542-1.233-0.657-1.495c0.007-0.824,0.213-23.72,0.213-23.72L32.135,7.415z"/>
+<linearGradient id="XMLID_8_" gradientUnits="userSpaceOnUse" x1="40.8276" y1="52.1914" x2="16.1997" y2="21.1353">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_8_)" points="59.051,57.621 69.536,36.111 50.944,28.115 48.852,32.581 41.493,29.418 34.719,33.911 32.932,29.849 33.117,9.157 16.363,18.601 16.363,40.06 27.476,59.169 13.064,69.463 30.856,79.879 45.546,68.669 61.667,77.708 75.089,65.521 "/>
+<linearGradient id="XMLID_9_" gradientUnits="userSpaceOnUse" x1="60.585" y1="31.876" x2="53.8582" y2="45.1125">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_9_)" points="41.26,48.783 50.944,28.115 69.536,36.111 59.051,57.621 "/>
+<polygon fill="#0046B7" points="16.363,40.06 27.476,59.169 41.26,48.783 32.932,29.849 "/>
+<polygon fill="#3366CC" points="16.363,40.06 16.363,18.601 33.117,9.157 32.932,29.849 "/>
+<polygon fill="#CFECFF" points="26.696,39.23 41.493,29.418 59.523,37.168 45.546,47.954 "/>
+<path fill="#5AA7E0" d="M41.954,55.286"/>
+<polygon fill="#3366CC" points="26.696,39.23 27.476,59.169 45.546,68.669 45.546,47.954 "/>
+<polygon fill="#5AA7E0" points="13.064,69.463 27.476,59.169 45.546,68.669 30.856,79.879 "/>
+<linearGradient id="XMLID_10_" gradientUnits="userSpaceOnUse" x1="29.2085" y1="63.6836" x2="48.7102" y2="56.1976">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="0.0056" style="stop-color:#5AA7E0"/>
+<stop offset="0.85" style="stop-color:#3366CC"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_10_)" points="43.423,46.971 27.476,59.169 45.546,68.669 45.546,47.954 "/>
+<polygon fill="#0046B7" points="45.546,47.954 45.546,68.669 59.051,57.621 59.523,37.168 "/>
+<linearGradient id="XMLID_11_" gradientUnits="userSpaceOnUse" x1="45.3936" y1="59.5186" x2="59.0508" y2="59.5186">
+<stop offset="0" style="stop-color:#0046B7"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_11_)" points="45.394,50.368 45.546,68.669 59.051,57.621 "/>
+<linearGradient id="XMLID_12_" gradientUnits="userSpaceOnUse" x1="60.8945" y1="68.6807" x2="57.2953" y2="58.792">
+<stop offset="0" style="stop-color:#5AA7E0"/>
+<stop offset="0.4101" style="stop-color:#5AA7E0"/>
+<stop offset="1" style="stop-color:#3366CC"/>
+</linearGradient>
+<polygon fill="url(#XMLID_12_)" points="61.667,77.708 45.546,68.669 59.051,57.621 75.089,65.521 "/>
+</g>
+</g>
+</g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/Icons_scalable_dc.mk Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,54 @@
+# ============================================================================
+# Name : Icons_scalable_dc.mk
+# Part of : t_oomdummyapp
+#
+# Description: This is file for creating .mif file (scalable icon)
+#
+# ============================================================================
+
+
+ifeq (WINS,$(findstring WINS, $(PLATFORM)))
+ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z
+else
+ZDIR=$(EPOCROOT)epoc32\data\z
+endif
+
+TARGETDIR=$(ZDIR)\resource\apps
+ICONTARGETFILENAME=$(TARGETDIR)\t_oomdummyapp_0xE6CFBA00.mif
+
+ICONDIR=..\gfx
+
+do_nothing :
+ @rem do_nothing
+
+MAKMAKE : do_nothing
+
+BLD : do_nothing
+
+CLEAN : do_nothing
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+# ----------------------------------------------------------------------------
+# NOTE: if you have JUSTINTIME enabled for your S60 3rd FP1 or newer SDK
+# and this command crashes, consider adding "/X" to the command line.
+# See <http://forum.nokia.com/document/Forum_Nokia_Technical_Library_v1_35/contents/FNTL/Build_process_fails_at_mif_file_creation_in_S60_3rd_Ed_FP1_SDK.htm>
+# ----------------------------------------------------------------------------
+
+RESOURCE : $(ICONTARGETFILENAME)
+
+$(ICONTARGETFILENAME) : $(ICONDIR)\qgn_menu_t_oomdummyapp.svg
+ mifconv $(ICONTARGETFILENAME) \
+ /c32 $(ICONDIR)\qgn_menu_t_oomdummyapp.svg
+
+FREEZE : do_nothing
+
+SAVESPACE : do_nothing
+
+RELEASABLES :
+ @echo $(ICONTARGETFILENAME)
+
+FINAL : do_nothing
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+
+gnumakefile icons_scalable_dc.mk
+//gnumakefile ..\help\build_help.mk
+
+t_oomdummyapp.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/group/t_oomdummyapp.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,81 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET t_oomdummyapp_0xE6CFBA00.exe
+TARGETTYPE exe
+UID 0x100039CE 0xE6CFBA00
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+SOURCEPATH ../src
+SOURCE t_oomdummyapp.cpp
+SOURCE t_oomdummyappApplication.cpp
+SOURCE t_oomdummyappAppView.cpp
+SOURCE t_oomdummyappAppUi.cpp
+SOURCE t_oomdummyappDocument.cpp
+SOURCE CMsgHandler.cpp
+
+SOURCEPATH ../data
+
+START RESOURCE t_oomdummyapp.rss
+HEADER
+TARGET t_oomdummyapp_0xE6CFBA00
+TARGETPATH resource/apps
+END //RESOURCE
+
+START RESOURCE t_oomdummyapp_reg.rss
+TARGET t_oomdummyapp_0xE6CFBA00_reg
+TARGETPATH /private/10003a3f/apps
+END //RESOURCE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+USERINCLUDE ../help
+
+LIBRARY euser.lib
+LIBRARY apparc.lib
+LIBRARY cone.lib
+LIBRARY eikcore.lib
+LIBRARY avkon.lib
+LIBRARY commonengine.lib
+LIBRARY efsrv.lib
+LIBRARY estor.lib
+LIBRARY aknnotify.lib
+LIBRARY hlplch.lib
+LIBRARY oommonitor.lib
+
+LANG SC
+
+VENDORID 0
+SECUREID 0xE6CFBA00
+CAPABILITY ReadUserData WriteDeviceData
+
+#ifdef ENABLE_ABIV2_MODE
+ DEBUGGABLE_UDEBONLY
+#endif
+
+EPOCHEAPSIZE 0x1000 0x1000000
+EPOCSTACKSIZE 0x4000
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/Custom.xml Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE cshcust SYSTEM "/cshlpcmp/dtd/CSHcust.dtd">
+<?xml:stylesheet href="/cshlpcmp/xsl/cshcust.xsl" title="CS-Help customization" type="text/xsl"?>
+<cshcust>
+<parastyle name="body" font="sansserif" size="10"/>
+<parastyle name="tip" font="sansserif" size="10" left="20"></parastyle>
+<parastyle name="note" font="sansserif" size="10" left="20"></parastyle>
+<parastyle name="important" font="sansserif" size="10" left="20"></parastyle>
+<body style="body"/>
+<titlestyle fontstyle="sansserif" size="10"/>
+<listbullet1style bulletchar="8226"/>
+<listbullet2style bulletchar="8226"/>
+<lists leftindent="20"/>
+</cshcust>
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/build_help.mk Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,45 @@
+# ============================================================================
+# Name : build_help.mk
+# Part of : t_oomdummyapp
+# ============================================================================
+# Name : build_help.mk
+# Part of : t_oomdummyapp
+#
+# Description: This make file will build the application help file (.hlp)
+#
+# ============================================================================
+
+do_nothing :
+ @rem do_nothing
+
+# build the help from the MAKMAKE step so the header file generated
+# will be found by cpp.exe when calculating the dependency information
+# in the mmp makefiles.
+
+MAKMAKE : t_oomdummyapp_0xE6CFBA00.hlp
+t_oomdummyapp_0xE6CFBA00.hlp : t_oomdummyapp.xml t_oomdummyapp.cshlp Custom.xml
+ cshlpcmp t_oomdummyapp.cshlp
+ifeq (WINS,$(findstring WINS, $(PLATFORM)))
+ copy t_oomdummyapp_0xE6CFBA00.hlp $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help
+endif
+
+BLD : do_nothing
+
+CLEAN :
+ del t_oomdummyapp_0xE6CFBA00.hlp
+ del t_oomdummyapp_0xE6CFBA00.hlp.hrh
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+RESOURCE : do_nothing
+
+FREEZE : do_nothing
+
+SAVESPACE : do_nothing
+
+RELEASABLES :
+ @echo t_oomdummyapp_0xE6CFBA00.hlp
+
+FINAL : do_nothing
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.cshlp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE cshproj SYSTEM "/epoc32/tools/cshlpcmp/dtd/cshproj.dtd">
+<?xml:stylesheet href="/epoc32/tools/cshlpcmp/xsl/CSHproj.xsl" title="CS-Help project" type="text/xsl"?>
+<cshproj>
+<helpfileUID>0xE6CFBA00</helpfileUID>
+<directories>
+ <input></input>
+ <output></output>
+ <graphics></graphics>
+ <working>temp\</working>
+</directories>
+<files>
+ <source>
+ <xmlfile>t_oomdummyapp.xml</xmlfile>
+ </source>
+ <destination>t_oomdummyapp_0xE6CFBA00.hlp</destination>
+ <customization>custom.xml</customization>
+ </files>
+</cshproj>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/help/t_oomdummyapp.xml Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE asptml SYSTEM "/epoc32/tools/cshlpcmp/dtd/asptml.dtd">
+<?xml:stylesheet href="/epoc32/tools/cshlpcmp/xsl/asptml.xsl" title="asptml" type="text/xsl"?>
+<asptml>
+<uid value="0xE6CFBA00"/>
+<topic><category>t_oomdummyapp</category><topictitle>General Information</topictitle>
+<synonyms>General Information</synonyms>
+<context contextUID="General_Information"/>
+<index>General Information</index>
+<p>Insert your help here.</p>
+<p></p>
+</topic>
+</asptml>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/CMsgHandler.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,71 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef CMSGHANDLER_H
+#define CMSGHANDLER_H
+
+#include <e32base.h> // For CActive, link against: euser.lib
+#include <e32msgqueue.h>
+#include "t_oomdummyappAppUi.h"
+
+class CMsgHandler : public CActive
+ {
+public:
+ // Cancel and destroy
+ ~CMsgHandler();
+
+ // Two-phased constructor.
+ static CMsgHandler* NewL(Ct_oomdummyappAppUi& aOwner);
+
+ // Two-phased constructor.
+ static CMsgHandler* NewLC(Ct_oomdummyappAppUi& aOwner);
+
+public:
+ // New functions
+ // Function for making the initial request
+ void StartL();
+
+private:
+ // C++ constructor
+ CMsgHandler(Ct_oomdummyappAppUi& aOwner);
+
+ // Second-phase constructor
+ void ConstructL();
+
+private:
+ // From CActive
+ // Handle completion
+ void RunL();
+
+ // How to cancel me
+ void DoCancel();
+
+ // Override to handle leaves from RunL(). Default implementation causes
+ // the active scheduler to panic.
+ TInt RunError(TInt aError);
+
+private:
+ TInt iState; // State of the active object
+ RMsgQueue<TInt> iMsgQueue; // messages from the harness
+ Ct_oomdummyappAppUi& iOwner;
+
+ };
+
+#endif // CMSGHANDLER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPP_HRH__
+#define __T_OOMDUMMYAPP_HRH__
+
+#define _UID3 0xE6CFBA00
+
+// t_oomdummyapp enumerate command codes
+enum Tt_oomdummyappIds
+ {
+ ECommand1 = 0x6001, // start value must not be 0
+ ECommand2,
+ EHelp,
+ EAbout
+ };
+
+#endif // __T_OOMDUMMYAPP_HRH__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyapp.pan Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,37 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPP_PAN__
+#define __T_OOMDUMMYAPP_PAN__
+
+/** t_oomdummyapp application panic codes */
+enum Tt_oomdummyappPanics
+ {
+ Et_oomdummyappUi = 1
+ // add further panics here
+ };
+
+inline void Panic(Tt_oomdummyappPanics aReason)
+ {
+ _LIT(applicationName, "t_oomdummyapp");
+ User::Panic(applicationName, aReason);
+ }
+
+#endif // __T_OOMDUMMYAPP_PAN__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppUi.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,104 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPPAPPUI_h__
+#define __T_OOMDUMMYAPPAPPUI_h__
+
+// INCLUDES
+#include <aknappui.h>
+
+// FORWARD DECLARATIONS
+class Ct_oomdummyappAppView;
+class CMsgHandler;
+
+// CLASS DECLARATION
+/**
+ * Ct_oomdummyappAppUi application UI class.
+ * Interacts with the user through the UI and request message processing
+ * from the handler class
+ */
+class Ct_oomdummyappAppUi : public CAknAppUi
+ {
+public:
+
+ void SetPriorityBusy();
+ void SetPriorityHigh();
+ void SetPriorityNormal();
+
+ // Constructors and destructor
+
+ /**
+ * ConstructL.
+ * 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Ct_oomdummyappAppUi.
+ * C++ default constructor. This needs to be public due to
+ * the way the framework constructs the AppUi
+ */
+ Ct_oomdummyappAppUi();
+
+ /**
+ * ~Ct_oomdummyappAppUi.
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomdummyappAppUi();
+
+ void HandleHarnessCommandL(TInt aCommand);
+private:
+ // Functions from base classes
+
+ /**
+ * From CEikAppUi, HandleCommandL.
+ * Takes care of command handling.
+ * @param aCommand Command to be handled.
+ */
+ void HandleCommandL(TInt aCommand);
+
+ /**
+ * HandleStatusPaneSizeChange.
+ * Called by the framework when the application status pane
+ * size is changed.
+ */
+ void HandleStatusPaneSizeChange();
+
+ /**
+ * From CCoeAppUi, HelpContextL.
+ * Provides help context for the application.
+ * size is changed.
+ */
+ CArrayFix<TCoeHelpContext>* HelpContextL() const;
+
+private:
+ // Data
+
+ /**
+ * The application view
+ * Owned by Ct_oomdummyappAppUi
+ */
+ Ct_oomdummyappAppView* iAppView;
+ CMsgHandler* iMsgHandler;
+
+ };
+
+#endif // __T_OOMDUMMYAPPAPPUI_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappAppView.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,95 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPPAPPVIEW_h__
+#define __T_OOMDUMMYAPPAPPVIEW_h__
+
+// INCLUDES
+#include <coecntrl.h>
+
+// CLASS DECLARATION
+class Ct_oomdummyappAppView : public CCoeControl
+ {
+public:
+ // New methods
+
+ /**
+ * NewL.
+ * Two-phased constructor.
+ * Create a Ct_oomdummyappAppView object, which will draw itself to aRect.
+ * @param aRect The rectangle this view will be drawn to.
+ * @return a pointer to the created instance of Ct_oomdummyappAppView.
+ */
+ static Ct_oomdummyappAppView* NewL(const TRect& aRect);
+
+ /**
+ * NewLC.
+ * Two-phased constructor.
+ * Create a Ct_oomdummyappAppView object, which will draw itself
+ * to aRect.
+ * @param aRect Rectangle this view will be drawn to.
+ * @return A pointer to the created instance of Ct_oomdummyappAppView.
+ */
+ static Ct_oomdummyappAppView* NewLC(const TRect& aRect);
+
+ /**
+ * ~Ct_oomdummyappAppView
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomdummyappAppView();
+
+public:
+ // Functions from base classes
+
+ /**
+ * From CCoeControl, Draw
+ * Draw this Ct_oomdummyappAppView to the screen.
+ * @param aRect the rectangle of this view that needs updating
+ */
+ void Draw(const TRect& aRect) const;
+
+ /**
+ * From CoeControl, SizeChanged.
+ * Called by framework when the view size is changed.
+ */
+ virtual void SizeChanged();
+
+private:
+ // Constructors
+
+ /**
+ * ConstructL
+ * 2nd phase constructor.
+ * Perform the second phase construction of a
+ * Ct_oomdummyappAppView object.
+ * @param aRect The rectangle this view will be drawn to.
+ */
+ void ConstructL(const TRect& aRect);
+
+ /**
+ * Ct_oomdummyappAppView.
+ * C++ default constructor.
+ */
+ Ct_oomdummyappAppView();
+
+ };
+
+#endif // __T_OOMDUMMYAPPAPPVIEW_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappApplication.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,74 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPPAPPLICATION_H__
+#define __T_OOMDUMMYAPPAPPLICATION_H__
+
+// INCLUDES
+#include <aknapp.h>
+#include "t_oomdummyapp.hrh"
+
+// UID for the application;
+// this should correspond to the uid defined in the mmp file
+const TUid KUidt_oomdummyappApp =
+ {
+ _UID3
+ };
+
+// CLASS DECLARATION
+
+/**
+ * Ct_oomdummyappApplication application class.
+ * Provides factory to create concrete document object.
+ * An instance of Ct_oomdummyappApplication is the application part of the
+ * AVKON application framework for the t_oomdummyapp example application.
+ */
+class Ct_oomdummyappApplication : public CAknApplication
+ {
+public:
+ Ct_oomdummyappApplication(TUid aUid, TUint aAlloc);
+ // Functions from base classes
+
+ /**
+ * From CApaApplication, AppDllUid.
+ * @return Application's UID (KUidt_oomdummyappApp).
+ */
+ TUid AppDllUid() const;
+
+ ~Ct_oomdummyappApplication();
+protected:
+ // Functions from base classes
+
+ /**
+ * From CApaApplication, CreateDocumentL.
+ * Creates Ct_oomdummyappDocument document object. The returned
+ * pointer in not owned by the Ct_oomdummyappApplication object.
+ * @return A pointer to the created document object.
+ */
+ CApaDocument* CreateDocumentL();
+
+private:
+ TUid iUID;
+ TUint iAlloc;
+ TAny* iMemory;
+ };
+
+#endif // __T_OOMDUMMYAPPAPPLICATION_H__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappDocument.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,102 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMDUMMYAPPDOCUMENT_h__
+#define __T_OOMDUMMYAPPDOCUMENT_h__
+
+// INCLUDES
+#include <akndoc.h>
+
+// FORWARD DECLARATIONS
+class Ct_oomdummyappAppUi;
+class CEikApplication;
+
+// CLASS DECLARATION
+
+/**
+ * Ct_oomdummyappDocument application class.
+ * An instance of class Ct_oomdummyappDocument is the Document part of the
+ * AVKON application framework for the t_oomdummyapp example application.
+ */
+class Ct_oomdummyappDocument : public CAknDocument
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * NewL.
+ * Two-phased constructor.
+ * Construct a Ct_oomdummyappDocument for the AVKON application aApp
+ * using two phase construction, and return a pointer
+ * to the created object.
+ * @param aApp Application creating this document.
+ * @return A pointer to the created instance of Ct_oomdummyappDocument.
+ */
+ static Ct_oomdummyappDocument* NewL(CEikApplication& aApp);
+
+ /**
+ * NewLC.
+ * Two-phased constructor.
+ * Construct a Ct_oomdummyappDocument for the AVKON application aApp
+ * using two phase construction, and return a pointer
+ * to the created object.
+ * @param aApp Application creating this document.
+ * @return A pointer to the created instance of Ct_oomdummyappDocument.
+ */
+ static Ct_oomdummyappDocument* NewLC(CEikApplication& aApp);
+
+ /**
+ * ~Ct_oomdummyappDocument
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomdummyappDocument();
+
+public:
+ // Functions from base classes
+
+ /**
+ * CreateAppUiL
+ * From CEikDocument, CreateAppUiL.
+ * Create a Ct_oomdummyappAppUi object and return a pointer to it.
+ * The object returned is owned by the Uikon framework.
+ * @return Pointer to created instance of AppUi.
+ */
+ CEikAppUi* CreateAppUiL();
+
+private:
+ // Constructors
+
+ /**
+ * ConstructL
+ * 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Ct_oomdummyappDocument.
+ * C++ default constructor.
+ * @param aApp Application creating this document.
+ */
+ Ct_oomdummyappDocument(CEikApplication& aApp);
+
+ };
+
+#endif // __T_OOMDUMMYAPPDOCUMENT_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/inc/t_oomdummyappmsgs.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,8 @@
+#ifndef T_OOMDUMMAPPMSGS_H_
+#define T_OOMDUMMAPPMSGS_H_
+
+const TInt KOomDummyAppSetBusy = 5;
+const TInt KOomDummyAppSetNormalPriority = 6;
+const TInt KOomDummyAppSetHighPriority = 7;
+
+#endif /*T_OOMDUMMAPPMSGS_H_*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/backup_registration.xml Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="yes"?>
+<backup_registration>
+ <system_backup/>
+ <restore requires_reboot = "no"/>
+</backup_registration>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/sis/t_oomdummyapp_S60_3_X_v_1_0_0.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,37 @@
+; Installation file for t_oomdummyapp application
+;
+; This is an auto-generated PKG file by Carbide.
+; This file uses variables specific to Carbide builds that will not work
+; on command-line builds. If you want to use this generated PKG file from the
+; command-line tools you will need to modify the variables with the appropriate
+; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
+;
+;Language - standard language definitions
+&EN
+
+; standard SIS file header
+#{"t_oomdummyapp"},(0xE6CFBA00),1,0,0
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+;Supports Series 60 v 3.0
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+
+;Files to install
+;You should change the source paths to match that of your environment
+;<source> <destination>
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\t_oomdummyapp_0xE6CFBA00.exe" -"!:\sys\bin\t_oomdummyapp_0xE6CFBA00.exe"
+"$(EPOCROOT)Epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc" -"!:\resource\apps\t_oomdummyapp_0xE6CFBA00.rsc"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc" -"!:\private\10003a3f\import\apps\t_oomdummyapp_0xE6CFBA00_reg.rsc"
+"$(EPOCROOT)Epoc32\data\z\resource\apps\t_oomdummyapp_0xE6CFBA00.mif" -"!:\resource\apps\t_oomdummyapp_0xE6CFBA00.mif"
+"..\help\t_oomdummyapp_0xE6CFBA00.hlp" -"!:\resource\help\t_oomdummyapp_0xE6CFBA00.hlp"
+
+; Add any installation notes if applicable
+;"t_oomdummyapp.txt" -"!:\private\E6CFBA00\t_oomdummyapp.txt"
+
+;required for application to be covered by backup/restore facility
+"..\sis\backup_registration.xml" -"!:\private\E6CFBA00\backup_registration.xml"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/CMsgHandler.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,83 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include "CMsgHandler.h"
+
+CMsgHandler::CMsgHandler(Ct_oomdummyappAppUi& aOwner) :
+ CActive(EPriorityStandard), // Standard priority
+ iOwner(aOwner)
+ {
+ }
+
+CMsgHandler* CMsgHandler::NewLC(Ct_oomdummyappAppUi& aOwner)
+ {
+ CMsgHandler* self = new (ELeave) CMsgHandler(aOwner);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+CMsgHandler* CMsgHandler::NewL(Ct_oomdummyappAppUi& aOwner)
+ {
+ CMsgHandler* self = CMsgHandler::NewLC(aOwner);
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+void CMsgHandler::ConstructL()
+ {
+ User::LeaveIfError(iMsgQueue.Open(15)); // Initialize message queue from process parameters
+ CActiveScheduler::Add(this); // Add to scheduler
+ StartL();
+ }
+
+CMsgHandler::~CMsgHandler()
+ {
+ Cancel(); // Cancel any request, if outstanding
+ iMsgQueue.Close(); // Destroy the RMsgQueue object
+ // Delete instance variables if any
+ }
+
+void CMsgHandler::DoCancel()
+ {
+ iMsgQueue.CancelDataAvailable();
+ }
+
+void CMsgHandler::StartL()
+ {
+ Cancel(); // Cancel any request, just to be sure
+ iMsgQueue.NotifyDataAvailable(iStatus);
+ SetActive(); // Tell scheduler a request is active
+ }
+
+void CMsgHandler::RunL()
+ {
+ TInt command;
+ while(KErrNone==iMsgQueue.Receive(command))
+ {
+ iOwner.HandleHarnessCommandL(command);
+ }
+ StartL();
+ }
+
+TInt CMsgHandler::RunError(TInt aError)
+ {
+ return aError;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyapp.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,96 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <eikstart.h>
+#include "t_oomdummyappApplication.h"
+
+_LIT(KFakeUidParam,"uid=");
+_LIT(KAllocParam,"alloc=");
+LOCAL_C CApaApplication* NewApplication()
+ {
+ TUid uid(KUidt_oomdummyappApp);
+ TUint alloc = 0;
+ //override uid from command line (add "uid=6789ABCD" anywhere)
+ TInt cmdsize = User::CommandLineLength();
+ HBufC *cmdbuf = NULL;
+ if(cmdsize > 0) cmdbuf = HBufC::New(cmdsize);
+ if(cmdbuf)
+ {
+ TPtr cmdline(cmdbuf->Des());
+ User::CommandLine(cmdline);
+ TLex lex(*cmdbuf);
+ while(!lex.Eos())
+ {
+ lex.SkipSpaceAndMark();
+ while(!lex.Eos() && lex.Get() != '=')
+ {
+ }
+ if(lex.MarkedToken().CompareF(KFakeUidParam) == 0)
+ {
+ lex.SkipSpaceAndMark();
+ while(!lex.Eos() && lex.Get().IsHexDigit())
+ {
+ }
+ TUint id;
+ TLex num(lex.MarkedToken());
+ if(KErrNone==num.Val(id,EHex))
+ {
+ RDebug::Printf("\tapp uid override %x", id);
+ uid = TUid::Uid(id);
+ }
+ }
+ else if(lex.MarkedToken().CompareF(KAllocParam) == 0)
+ {
+ lex.SkipSpaceAndMark();
+ while(!lex.Eos() && lex.Get().IsHexDigit())
+ {
+ }
+ TLex num(lex.MarkedToken());
+ if(KErrNone!=num.Val(alloc,EHex))
+ {
+ alloc = 0;
+ }
+ }
+ }
+ /*
+ TInt offset = cmdbuf->Find(KFakeUidParam);
+ if(offset >=0 && offset + 12 <= cmdbuf->Length())
+ {
+ TLex lex(cmdbuf->Mid(offset+4,8));
+ TUint id;
+ if(KErrNone==lex.Val(id,EHex))
+ {
+ RDebug::Printf("\tapp uid override %x", id);
+ uid = TUid::Uid(id);
+ }
+ }
+ TInt offset = cmdbuf->Find(KAllocParam);
+ if(offset >=0 && offset + 12 <= cmdbuf->Length())*/
+ delete cmdbuf;
+ }
+ return new Ct_oomdummyappApplication(uid, alloc);
+ }
+
+GLDEF_C TInt E32Main()
+ {
+ return EikStart::RunApplication(NewApplication);
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppUi.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,271 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <avkon.hrh>
+#include <aknmessagequerydialog.h>
+#include <aknnotewrappers.h>
+#include <stringloader.h>
+#include <f32file.h>
+#include <s32file.h>
+#include <hlplch.h>
+
+#include <t_oomdummyapp_0xE6CFBA00.rsg>
+#include <oommonitorsession.h>
+
+//#include "t_oomdummyapp_0xE6CFBA00.hlp.hrh"
+#include "t_oomdummyapp.hrh"
+#include "t_oomdummyapp.pan"
+#include "t_oomdummyappApplication.h"
+#include "t_oomdummyappAppUi.h"
+#include "t_oomdummyappAppView.h"
+#include "CMsgHandler.h"
+#include "t_oomdummyappmsgs.h"
+
+_LIT( KFileName, "C:\\private\\E6CFBA00\\t_oomdummyapp.txt" );
+_LIT( KText, "OOM dummy app");
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppUi::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppUi::ConstructL()
+ {
+ // Initialise app UI with standard value.
+ BaseConstructL(CAknAppUi::EAknEnableSkin);
+
+ // Create view object
+ iAppView = Ct_oomdummyappAppView::NewL(ClientRect());
+
+ // Create a file to write the text to
+ TInt err = CCoeEnv::Static()->FsSession().MkDirAll(KFileName);
+ if ((KErrNone != err) && (KErrAlreadyExists != err))
+ {
+ return;
+ }
+
+ RFile file;
+ err = file.Replace(CCoeEnv::Static()->FsSession(), KFileName, EFileWrite);
+ CleanupClosePushL(file);
+ if (KErrNone != err)
+ {
+ CleanupStack::PopAndDestroy(1); // file
+ return;
+ }
+
+ RFileWriteStream outputFileStream(file);
+ CleanupClosePushL(outputFileStream);
+ outputFileStream << KText;
+
+ CleanupStack::PopAndDestroy(2); // outputFileStream, file
+
+ TRAP_IGNORE(iMsgHandler = CMsgHandler::NewL(*this)); //if not launched by test harness, the message queue won't exist
+ }
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppUi::Ct_oomdummyappAppUi()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppUi::Ct_oomdummyappAppUi()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppUi::~Ct_oomdummyappAppUi()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppUi::~Ct_oomdummyappAppUi()
+ {
+ if (iAppView)
+ {
+ delete iAppView;
+ iAppView = NULL;
+ }
+ delete iMsgHandler;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppUi::HandleCommandL()
+// Takes care of command handling.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppUi::HandleCommandL(TInt aCommand)
+ {
+ switch (aCommand)
+ {
+ case EEikCmdExit:
+ case EAknSoftkeyExit:
+ Exit();
+ break;
+
+ case ECommand1:
+ {
+
+ // Load a string from the resource file and display it
+ HBufC* textResource = StringLoader::LoadLC(R_COMMAND1_TEXT);
+ CAknInformationNote* informationNote;
+
+ informationNote = new (ELeave) CAknInformationNote;
+
+ // Show the information Note with
+ // textResource loaded with StringLoader.
+ informationNote->ExecuteLD(*textResource);
+
+ // Pop HBuf from CleanUpStack and Destroy it.
+ CleanupStack::PopAndDestroy(textResource);
+ }
+ break;
+ case ECommand2:
+ {
+ RFile rFile;
+
+ //Open file where the stream text is
+ User::LeaveIfError(rFile.Open(CCoeEnv::Static()->FsSession(),
+ KFileName, EFileStreamText));//EFileShareReadersOnly));// EFileStreamText));
+ CleanupClosePushL(rFile);
+
+ // copy stream from file to RFileStream object
+ RFileReadStream inputFileStream(rFile);
+ CleanupClosePushL(inputFileStream);
+
+ // HBufC descriptor is created from the RFileStream object.
+ HBufC* fileData = HBufC::NewLC(inputFileStream, 32);
+
+ CAknInformationNote* informationNote;
+
+ informationNote = new (ELeave) CAknInformationNote;
+ // Show the information Note
+ informationNote->ExecuteLD(*fileData);
+
+ // Pop loaded resources from the cleanup stack
+ CleanupStack::PopAndDestroy(3); // filedata, inputFileStream, rFile
+ }
+ break;
+ case EHelp:
+ {
+
+ CArrayFix<TCoeHelpContext>* buf = CCoeAppUi::AppHelpContextL();
+ HlpLauncher::LaunchHelpApplicationL(iEikonEnv->WsSession(), buf);
+ }
+ break;
+ case EAbout:
+ {
+
+ CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog();
+ dlg->PrepareLC(R_ABOUT_QUERY_DIALOG);
+ HBufC* title = iEikonEnv->AllocReadResourceLC(R_ABOUT_DIALOG_TITLE);
+ dlg->QueryHeading()->SetTextL(*title);
+ CleanupStack::PopAndDestroy(); //title
+ HBufC* msg = iEikonEnv->AllocReadResourceLC(R_ABOUT_DIALOG_TEXT);
+ dlg->SetMessageTextL(*msg);
+ CleanupStack::PopAndDestroy(); //msg
+ dlg->RunLD();
+ }
+ break;
+ default:
+ Panic(Et_oomdummyappUi);
+ break;
+ }
+ }
+
+void Ct_oomdummyappAppUi::HandleHarnessCommandL(TInt aCommand)
+ {
+ switch(aCommand)
+ {
+ case 0:
+ Exit();
+ break;
+ case 1:
+ ActivateTopViewL();
+ break;
+ case KOomDummyAppSetBusy:
+ SetPriorityBusy();
+ break;
+ case KOomDummyAppSetNormalPriority:
+ SetPriorityNormal();
+ break;
+ case KOomDummyAppSetHighPriority:
+ SetPriorityHigh();
+ break;
+ }
+ }
+
+void Ct_oomdummyappAppUi::SetPriorityBusy()
+ {
+ ROomMonitorSession oomSession;
+ oomSession.Connect();
+ oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityBusy);
+ oomSession.Close();
+ }
+
+void Ct_oomdummyappAppUi::SetPriorityNormal()
+ {
+ ROomMonitorSession oomSession;
+ oomSession.Connect();
+ oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityNormal);
+ oomSession.Close();
+ }
+
+void Ct_oomdummyappAppUi::SetPriorityHigh()
+ {
+ ROomMonitorSession oomSession;
+ oomSession.Connect();
+ oomSession.SetOomPriority(ROomMonitorSession::EOomPriorityHigh);
+ oomSession.Close();
+ }
+
+
+// -----------------------------------------------------------------------------
+// Called by the framework when the application status pane
+// size is changed. Passes the new client rectangle to the
+// AppView
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppUi::HandleStatusPaneSizeChange()
+ {
+ iAppView->SetRect(ClientRect());
+ }
+
+CArrayFix<TCoeHelpContext>* Ct_oomdummyappAppUi::HelpContextL() const
+ {
+ // Note: Help will not work if the application uid3 is not in the
+ // protected range. The default uid3 range for projects created
+ // from this template (0xE0000000 - 0xEFFFFFFF) are not in the protected range so that they
+ // can be self signed and installed on the device during testing.
+ // Once you get your official uid3 from Symbian Ltd. and find/replace
+ // all occurrences of uid3 in your project, the context help will
+ // work. Alternatively, a patch now exists for the versions of
+ // HTML help compiler in SDKs and can be found here along with an FAQ:
+ // http://www3.symbian.com/faq.nsf/AllByDate/E9DF3257FD565A658025733900805EA2?OpenDocument
+ CArrayFixFlat<TCoeHelpContext>* array = new (ELeave) CArrayFixFlat<
+ TCoeHelpContext> (1);
+ CleanupStack::PushL(array);
+ //array->AppendL(TCoeHelpContext(KUidt_oomdummyappApp, KGeneral_Information));
+ CleanupStack::Pop(array);
+ return array;
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappAppView.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,117 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// INCLUDE FILES
+#include <coemain.h>
+#include "t_oomdummyappAppView.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppView* Ct_oomdummyappAppView::NewL(const TRect& aRect)
+ {
+ Ct_oomdummyappAppView* self = Ct_oomdummyappAppView::NewLC(aRect);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppView* Ct_oomdummyappAppView::NewLC(const TRect& aRect)
+ {
+ Ct_oomdummyappAppView* self = new (ELeave) Ct_oomdummyappAppView;
+ CleanupStack::PushL(self);
+ self->ConstructL(aRect);
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppView::ConstructL(const TRect& aRect)
+ {
+ // Create a window for this application view
+ CreateWindowL();
+
+ // Set the windows size
+ SetRect(aRect);
+
+ // Activate the window, which makes it ready to be drawn
+ ActivateL();
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::Ct_oomdummyappAppView()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppView::Ct_oomdummyappAppView()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::~Ct_oomdummyappAppView()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappAppView::~Ct_oomdummyappAppView()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::Draw()
+// Draws the display.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppView::Draw(const TRect& /*aRect*/) const
+ {
+ // Get the standard graphics context
+ CWindowGc& gc = SystemGc();
+
+ // Gets the control's extent
+ TRect drawRect(Rect());
+
+ // Clears the screen
+ gc.Clear(drawRect);
+
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappAppView::SizeChanged()
+// Called by framework when the view size is changed.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappAppView::SizeChanged()
+ {
+ DrawNow();
+ }
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappApplication.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,62 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// INCLUDE FILES
+#include "t_oomdummyapp.hrh"
+#include "t_oomdummyappDocument.h"
+#include "t_oomdummyappApplication.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+Ct_oomdummyappApplication::Ct_oomdummyappApplication(TUid aUid, TUint aAlloc) : iUID(aUid), iAlloc(aAlloc)
+ {
+
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappApplication::CreateDocumentL()
+// Creates CApaDocument object
+// -----------------------------------------------------------------------------
+//
+CApaDocument* Ct_oomdummyappApplication::CreateDocumentL()
+ {
+ if(iAlloc > 0) iMemory = User::AllocL(iAlloc);
+ // Create an t_oomdummyapp document, and return a pointer to it
+ return Ct_oomdummyappDocument::NewL(*this);
+ }
+
+Ct_oomdummyappApplication::~Ct_oomdummyappApplication()
+ {
+ delete iMemory;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappApplication::AppDllUid()
+// Returns application UID
+// -----------------------------------------------------------------------------
+//
+TUid Ct_oomdummyappApplication::AppDllUid() const
+ {
+ // Return the UID for the t_oomdummyapp application
+ return iUID;
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyapp/src/t_oomdummyappDocument.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,97 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// INCLUDE FILES
+#include "t_oomdummyappAppUi.h"
+#include "t_oomdummyappDocument.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappDocument::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappDocument* Ct_oomdummyappDocument::NewL(CEikApplication& aApp)
+ {
+ Ct_oomdummyappDocument* self = NewLC(aApp);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappDocument::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappDocument* Ct_oomdummyappDocument::NewLC(CEikApplication& aApp)
+ {
+ Ct_oomdummyappDocument* self = new (ELeave) Ct_oomdummyappDocument(aApp);
+
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappDocument::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomdummyappDocument::ConstructL()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomdummyappDocument::Ct_oomdummyappDocument()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomdummyappDocument::Ct_oomdummyappDocument(CEikApplication& aApp) :
+ CAknDocument(aApp)
+ {
+ // No implementation required
+ }
+
+// ---------------------------------------------------------------------------
+// Ct_oomdummyappDocument::~Ct_oomdummyappDocument()
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+Ct_oomdummyappDocument::~Ct_oomdummyappDocument()
+ {
+ // No implementation required
+ }
+
+// ---------------------------------------------------------------------------
+// Ct_oomdummyappDocument::CreateAppUiL()
+// Constructs CreateAppUi.
+// ---------------------------------------------------------------------------
+//
+CEikAppUi* Ct_oomdummyappDocument::CreateAppUiL()
+ {
+ // Create the application user interface, and return a pointer to it;
+ // the framework takes ownership of this object
+ return new (ELeave) Ct_oomdummyappAppUi;
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/data/t_oomdummyplugin.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,102 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#include <ecom\registryinfo.rh>
+#include <oommonitorplugin.hrh>
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x10286A33;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KOomPluginInterfaceUidValue;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A34;
+ version_no = 1;
+ display_name = "dummy 1";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A35;
+ version_no = 1;
+ display_name = "dummy 2";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A36;
+ version_no = 1;
+ display_name = "dummy 3";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A37;
+ version_no = 1;
+ display_name = "dummy 4";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A38;
+ version_no = 1;
+ display_name = "dummy 5";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A39;
+ version_no = 1;
+ display_name = "dummy 6";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A3A;
+ version_no = 1;
+ display_name = "dummy 7";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A3B;
+ version_no = 1;
+ display_name = "dummy 8";
+ default_data = "";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+t_oomdummyplugin.mmp
+
+PRJ_TESTEXPORTS
+../inc/t_oomdummyplugin_properties.h ../../inc/t_oomdummyplugin_properties.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/group/t_oomdummyplugin.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,52 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET t_oomdummyplugin.dll
+TARGETTYPE PLUGIN
+// UID2 = 0x10009d8d for ECOM plugins.
+// UID3 = the 'DLL UID' (see resource file)
+UID 0x10009d8d 0x10286A33
+CAPABILITY CAP_GENERAL_DLL
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+LIBRARY euser.lib
+LIBRARY t_oomclient.lib
+LIBRARY oommonitor.lib
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+
+SOURCEPATH ../data
+RESOURCE t_oomdummyplugin.rss
+
+SOURCEPATH ../src
+SOURCE ecom_entry.cpp
+SOURCE dummyplugin.cpp
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/debug.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,36 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef DEBUG_H_
+#define DEBUG_H_
+
+#include <e32debug.h>
+
+#ifdef _DEBUG
+#define TRACE_FUNC RDebug::Printf("\t%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#define TRACE_FUNC_ENTRY RDebug::Printf("\t+%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#define TRACE_FUNC_EXIT RDebug::Printf("\t-%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#else
+#define TRACE_FUNC
+#define TRACE_FUNC_ENTRY
+#define TRACE_FUNC_EXIT
+#endif
+
+#endif /* DEBUG_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/dummyplugin.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,69 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef DUMMYPLUGIN_H_
+#define DUMMYPLUGIN_H_
+
+#include <oommonitorplugin.h>
+#include "t_oomclient.h"
+
+class CDummyOomPlugin : public COomMonitorPlugin
+ {
+public:
+ static CDummyOomPlugin* NewL(TInt aInstance);
+ ~CDummyOomPlugin();
+private:
+ CDummyOomPlugin(TInt aInstance);
+ void ConstructL();
+ //from COomMonitorPlugin
+ virtual void FreeRam();
+ virtual void MemoryGood();
+
+private:
+ TInt iInstance;
+ TInt iLowMemoryCallCount;
+ TInt iGoodMemoryCallCount;
+ ROOMAllocSession iAllocServer;
+ };
+
+
+/*
+class CDummyOomPluginV2 : public COomMonitorPluginV2
+ {
+public:
+ static CDummyOomPluginV2* NewL(TInt aInstance);
+ ~CDummyOomPluginV2();
+private:
+ CDummyOomPluginV2(TInt aInstance);
+ void ConstructL();
+ //from COomMonitorPlugin
+ virtual void FreeRam(TInt aBytesRequested);
+ virtual void MemoryGood();
+
+private:
+ TInt iInstance;
+ TInt iLowMemoryCallCount;
+ TInt iGoodMemoryCallCount;
+ ROOMAllocSession iAllocServer;
+ };
+*/
+
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/inc/t_oomdummyplugin_properties.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,37 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef DUMMYPLUGIN_PROPETIES_H_
+#define DUMMYPLUGIN_PROPETIES_H_
+
+const TUid KUidOomPropertyCategory = {0x10286A3E};
+
+//The key is the UID of the implementation instance, i.e. 10286A34 To 10286A3D
+const TInt KUidOOMDummyPluginFirstImplementation(0x10286A34);
+const TInt KUidOOMDummyPluginLastImplementation(0x10286A3D);
+
+const TUint KOOMDummyPluginImplementationCount = 10;
+
+const TUint KOOMDummyPluginLowMemoryCount = 0;
+const TUint KOOMDummyPluginGoodMemoryCount = 1 * KOOMDummyPluginImplementationCount;
+const TUint KOOMDummyPluginCurrentAllocationBytes = 2 * KOOMDummyPluginImplementationCount;
+const TUint KOOMDummyPluginBytesRequested = 3 * KOOMDummyPluginImplementationCount;
+
+#endif /* DUMMYPLUGIN_PROPETIES_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/dummyplugin.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,69 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <e32property.h>
+#include <e32cmn.h>
+#include "dummyplugin.h"
+#include "debug.h"
+#include "t_oomdummyplugin_properties.h"
+
+CDummyOomPlugin* CDummyOomPlugin::NewL(TInt aInstance)
+ {
+ CDummyOomPlugin* self = new(ELeave)CDummyOomPlugin(aInstance);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CDummyOomPlugin::CDummyOomPlugin(TInt aInstance) :
+iInstance(aInstance)
+ {
+
+ }
+
+void CDummyOomPlugin::ConstructL()
+ {
+ TRACE_FUNC_ENTRY;
+ //connect to alloc server
+ User::LeaveIfError(iAllocServer.Connect());
+ TRACE_FUNC_EXIT;
+ }
+
+CDummyOomPlugin::~CDummyOomPlugin()
+ {
+ TRACE_FUNC;
+ }
+
+void CDummyOomPlugin::FreeRam()
+ {
+ TRACE_FUNC;
+ iLowMemoryCallCount++;
+ RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginLowMemoryCount, iLowMemoryCallCount);
+ iAllocServer.MemoryLow(TUid::Uid(iInstance));
+ }
+
+void CDummyOomPlugin::MemoryGood()
+ {
+ TRACE_FUNC;
+ iGoodMemoryCallCount++;
+ RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginGoodMemoryCount, iGoodMemoryCallCount);
+ iAllocServer.MemoryGood(TUid::Uid(iInstance));
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin/src/ecom_entry.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,62 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <ecom\implementationproxy.h>
+#include "dummyplugin.h"
+
+#define DECLARE_CREATE_INSTANCE(UID) CDummyOomPlugin* CreateInstance##UID() { return CDummyOomPlugin::NewL(UID); }
+#define IMPLEMENTATION_INSTANCE(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID)
+
+// #define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); }
+// #define IMPLEMENTATION_INSTANCEV2(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID)
+
+//ECOM factory functions
+DECLARE_CREATE_INSTANCE(0x10286A34)
+DECLARE_CREATE_INSTANCE(0x10286A35)
+DECLARE_CREATE_INSTANCE(0x10286A36)
+DECLARE_CREATE_INSTANCE(0x10286A37)
+DECLARE_CREATE_INSTANCE(0x10286A38)
+DECLARE_CREATE_INSTANCE(0x10286A39)
+DECLARE_CREATE_INSTANCE(0x10286A3A)
+DECLARE_CREATE_INSTANCE(0x10286A3B)
+// DECLARE_CREATE_INSTANCEV2(0x10286A3C)
+// DECLARE_CREATE_INSTANCEV2(0x10286A3D)
+
+// Define the private interface UIDs
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_INSTANCE(0x10286A34),
+ IMPLEMENTATION_INSTANCE(0x10286A35),
+ IMPLEMENTATION_INSTANCE(0x10286A36),
+ IMPLEMENTATION_INSTANCE(0x10286A37),
+ IMPLEMENTATION_INSTANCE(0x10286A38),
+ IMPLEMENTATION_INSTANCE(0x10286A39),
+ IMPLEMENTATION_INSTANCE(0x10286A3A),
+ IMPLEMENTATION_INSTANCE(0x10286A3B)// ,
+ // IMPLEMENTATION_INSTANCEV2(0x10286A3C),
+ // IMPLEMENTATION_INSTANCEV2(0x10286A3D)
+ };
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/data/t_oomdummyplugin2.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,55 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+
+#include <ecom\registryinfo.rh>
+#include <oommonitorplugin.hrh>
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = 0x10286A81;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KOomPluginInterfaceV2UidValue;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A3C;
+ version_no = 1;
+ display_name = "dummyv2 1";
+ default_data = "";
+ opaque_data = "";
+ },
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = 0x10286A3D;
+ version_no = 1;
+ display_name = "dummyv2 2";
+ default_data = "";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+t_oomdummyplugin2.mmp
+
+PRJ_TESTEXPORTS
+../inc/t_oomdummyplugin_properties2.h ../../inc/t_oomdummyplugin_properties2.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/group/t_oomdummyplugin2.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,51 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET t_oomdummyplugin2.dll
+TARGETTYPE PLUGIN
+// UID2 = 0x10009d8d for ECOM plugins.
+// UID3 = the 'DLL UID' (see resource file)
+UID 0x10009d8d 0x10286A81
+CAPABILITY CAP_GENERAL_DLL
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+LIBRARY euser.lib
+LIBRARY t_oomclient.lib
+LIBRARY oommonitor.lib
+
+SOURCEPATH ../data
+RESOURCE t_oomdummyplugin2.rss
+
+SOURCEPATH ../src
+SOURCE ecom_entry2.cpp
+SOURCE dummyplugin2.cpp
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/debug.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,36 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef DEBUG_H_
+#define DEBUG_H_
+
+#include <e32debug.h>
+
+#ifdef _DEBUG
+#define TRACE_FUNC RDebug::Printf("\t%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#define TRACE_FUNC_ENTRY RDebug::Printf("\t+%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#define TRACE_FUNC_EXIT RDebug::Printf("\t-%s[%x]", __PRETTY_FUNCTION__, iInstance);
+#else
+#define TRACE_FUNC
+#define TRACE_FUNC_ENTRY
+#define TRACE_FUNC_EXIT
+#endif
+
+#endif /* DEBUG_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/dummyplugin2.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,50 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef DUMMYPLUGIN2_H_
+#define DUMMYPLUGIN2_H_
+
+#include <oommonitorplugin.h>
+#include "t_oomclient.h"
+
+
+
+class CDummyOomPluginV2 : public COomMonitorPluginV2
+ {
+public:
+ static CDummyOomPluginV2* NewL(TInt aInstance);
+ ~CDummyOomPluginV2();
+private:
+ CDummyOomPluginV2(TInt aInstance);
+ void ConstructL();
+ //from COomMonitorPlugin
+ virtual void FreeRam(TInt aBytesRequested);
+ virtual void MemoryGood();
+
+private:
+ TInt iInstance;
+ TInt iLowMemoryCallCount;
+ TInt iGoodMemoryCallCount;
+ ROOMAllocSession iAllocServer;
+ };
+
+
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/inc/t_oomdummyplugin_properties2.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,21 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/dummyplugin2.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,71 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <e32property.h>
+#include <e32cmn.h>
+#include "dummyplugin2.h"
+#include "debug.h"
+#include "t_oomdummyplugin_properties.h"
+
+
+CDummyOomPluginV2* CDummyOomPluginV2::NewL(TInt aInstance)
+ {
+ CDummyOomPluginV2* self = new(ELeave)CDummyOomPluginV2(aInstance);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+CDummyOomPluginV2::CDummyOomPluginV2(TInt aInstance) :
+iInstance(aInstance)
+ {
+
+ }
+
+void CDummyOomPluginV2::ConstructL()
+ {
+ TRACE_FUNC_ENTRY;
+ //connect to alloc server
+ User::LeaveIfError(iAllocServer.Connect());
+ TRACE_FUNC_EXIT;
+ }
+
+CDummyOomPluginV2::~CDummyOomPluginV2()
+ {
+ TRACE_FUNC;
+ }
+
+void CDummyOomPluginV2::FreeRam(TInt aBytesRequested)
+ {
+ TRACE_FUNC;
+ iLowMemoryCallCount++;
+ RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginLowMemoryCount, iLowMemoryCallCount);
+ TInt err = RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginBytesRequested, aBytesRequested);
+ iAllocServer.MemoryLow(TUid::Uid(iInstance));
+ }
+
+void CDummyOomPluginV2::MemoryGood()
+ {
+ TRACE_FUNC;
+ iGoodMemoryCallCount++;
+ RProperty::Set(KUidOomPropertyCategory, iInstance + KOOMDummyPluginGoodMemoryCount, iGoodMemoryCallCount);
+ iAllocServer.MemoryGood(TUid::Uid(iInstance));
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomdummyplugin2/src/ecom_entry2.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,43 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <ecom\implementationproxy.h>
+#include "dummyplugin2.h"
+
+#define DECLARE_CREATE_INSTANCEV2(UID) CDummyOomPluginV2* CreateInstance##UID() { return CDummyOomPluginV2::NewL(UID); }
+#define IMPLEMENTATION_INSTANCEV2(UID) IMPLEMENTATION_PROXY_ENTRY(UID, CreateInstance##UID)
+
+//ECOM factory functions
+DECLARE_CREATE_INSTANCEV2(0x10286A3C)
+DECLARE_CREATE_INSTANCEV2(0x10286A3D)
+
+// Define the private interface UIDs
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_INSTANCEV2(0x10286A3C),
+ IMPLEMENTATION_INSTANCEV2(0x10286A3D)
+ };
+
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+t_oomharness.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/group/t_oomharness.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,50 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET t_oomharness.exe
+TARGETTYPE exe
+UID 0 0xEF1971CE
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+SOURCEPATH ../src
+SOURCE t_oomharness.cpp
+SOURCE CDummyApplicationHandle.cpp
+
+LIBRARY euser.lib
+LIBRARY t_oomclient.lib
+LIBRARY hal.lib
+LIBRARY oommonitor.lib
+
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE
+#endif
+
+EPOCHEAPSIZE 0x4000 0x4000000
+CAPABILITY WriteDeviceData
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/CDummyApplicationHandle.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,91 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef CDUMMYAPPLICATIONHANDLE_H
+#define CDUMMYAPPLICATIONHANDLE_H
+
+// INCLUDES
+#include <e32std.h>
+#include <e32base.h>
+#include <e32msgqueue.h>
+
+// a few uids...use appuidlister to extract from the app_reg.rsc files
+const TUid KUidAbout = {0x10005a22};
+const TUid KUidBLID = {0x101f85a0};
+const TUid KUidBrowserNG = {0x10008d39};
+const TUid KUidCalendar = {0x10005901};
+const TUid KUidClock = {0x10005903};
+const TUid KUidGallery = {0x101f8599};
+const TUid KUidPhonebook2 = {0x101f4cce};
+const TUid KUidProfileApp = {0x100058f8};
+
+// CLASS DECLARATION
+
+/**
+ * CCDummyApplicationHandle
+ * A helper class for launching dummy apps and checking their status
+ */
+class CCDummyApplicationHandle : public CBase
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * Destructor.
+ */
+ ~CCDummyApplicationHandle();
+
+ /**
+ * Two-phased constructor.
+ */
+ static CCDummyApplicationHandle* NewL(TUid aUid, TInt aExtraMemoryAllocation = 0);
+
+ /**
+ * Two-phased constructor.
+ */
+ static CCDummyApplicationHandle* NewLC(TUid aUid, TInt aExtraMemoryAllocation = 0);
+
+ inline RProcess& Process() { return iProcess; }
+ inline const TUid& Uid() { return iUid; }
+
+ void SendMessage(TInt aMessage);
+
+ void BringToForeground();
+
+ static TBool CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue);
+private:
+
+ /**
+ * Constructor for performing 1st stage construction
+ */
+ CCDummyApplicationHandle(TUid aUid);
+
+ /**
+ * EPOC default constructor for performing 2nd stage construction
+ */
+ void ConstructL(TInt aExtraMemoryAllocation = 0);
+
+ RProcess iProcess;
+ //a channel for sending control messages to the dummy app...
+ RMsgQueue<TInt> iMsgQueue;
+ TUid iUid;
+ };
+
+#endif // CDUMMYAPPLICATIONHANDLE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+ */
+
+template <class T>
+class CleanupResetAndDestroy
+ {
+public:
+ inline static void PushL(T& aRef);
+private:
+ static void ResetAndDestroy(TAny *aPtr);
+ };
+
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef);
+
+
+#include "cleanuputils.inl"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/cleanuputils.inl Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,37 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+template <class T>
+inline void CleanupResetAndDestroy<T>::PushL(T& aRef)
+ {
+ CleanupStack::PushL(TCleanupItem(&ResetAndDestroy,&aRef));
+ }
+
+template <class T>
+void CleanupResetAndDestroy<T>::ResetAndDestroy(TAny *aPtr)
+ {
+ static_cast<T*>(aPtr)->ResetAndDestroy();
+ }
+
+template <class T>
+inline void CleanupResetAndDestroyPushL(T& aRef)
+ {
+ CleanupResetAndDestroy<T>::PushL(aRef);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/inc/t_oomharness.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,308 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef __T_OOMHARNESS_H__
+#define __T_OOMHARNESS_H__
+
+// Include Files
+
+#include <e32base.h>
+#include <e32hashtab.h>
+#include <e32cmn.h>
+
+#include "CDummyApplicationHandle.h"
+#include "t_oomclient.h"
+#include <oommonitorsession.h>
+
+const TTimeIntervalMicroSeconds32 KSettlingTime = 500000;
+
+// Function Prototypes
+
+GLDEF_C TInt E32Main();
+
+class COomTestHarness : public CBase
+ {
+public:
+ // Constructors and destructor
+ static COomTestHarness* NewLC();
+
+ ~COomTestHarness();
+
+ void StartL();
+
+private:
+
+// Test setup functions...
+
+ // Close any dummy apps
+ // Free all memory being eaten by the server
+ // Update the call counts on the plugins (add them if they're not there already)
+ void ResetL();
+
+ void EatMemoryL(TInt aKBytesToLeaveFree);
+
+ // Set up the plugins and applications - this is the starting point for many test cases
+ // 5 applications are started with approx 1 MB used for each
+ // 1MB (approx) of memory is reserved for each one of the plugins
+ void CommonSetUpL();
+
+ void StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs);
+
+// Results checking functions...
+
+ // Returns KErrNone if we get the expected result
+ TInt AppIsRunning(TInt32 aUid, TBool aExpectedResult);
+
+ // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+ // Returns KErrNone if we get the expected result
+ TInt PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult);
+
+ // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+ // Returns KErrNone if we get the expected result
+ TInt PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult);
+
+// Utility functions
+
+ // Wait a while for the system to settle down
+ inline void Settle();
+
+ TInt BringAppToForeground(TInt32 aUid);
+
+ void EatMemoryUntilWeAreStuckUnderTheLowThresholdL();
+
+// The tests...
+
+ // Test normal application closure for a single app
+ // Start three applications
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ // The middle application should be configured to eat 5MB of memory
+ // A low memory event is triggered and the middle application only should be closed
+ TInt AppCloseTest1L();
+
+ // Tests the idle time rule mechanism for app closure
+ // Start three applications
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ // After an idle period the highest priority app is configured to become the lowest priority
+ // The middle and highest application should be configured to eat 5MB of memory
+ // A low memory event is triggered and the middle application only should be closed
+ // Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed
+ TInt AppCloseIdleTimeTest1L();
+
+ // Test system plugins and continue mode
+ // Simulate a low memory event
+ // Two system plugins should free enough memory, but four will be run because they work in "continue" mode
+ TInt PluginTest1L();
+
+ // Test application plugins
+ // Start two target apps
+ // Simulate a low memory event
+ // The one of the application plugins should now be run, displacing one of the system plugins
+ // The target apps are of sufficiently high priority that they will not be closed
+ TInt PluginTest2L();
+
+ // Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins
+ // Initialise P4 plugin to consume 5MB of memory
+ // No other plugins are configured to release memory
+ // Simulate a low memory event (go just below the low threshold)
+ // Check that the P4 plugin has been called
+ // Check that the P4 plugin has received a request for > 500K and less than <1500K
+ TInt PluginV2Test1L();
+
+ // Test simple prioritisation of application plugins
+ // Start two target applications
+ // Configure all plugins to consume 0.5MB
+ // Simulate a low memory event
+ // Some of the low priority app plugins with those target applications should be called
+ // The highest priority app with that target application should not be called (the lower priority plugins should free enough memory)
+ TInt AppPluginTest1L();
+
+ // Test simple prioritisation of application plugins
+ // Start two target applications
+ // Configure all plugins to consume 0.5MB
+ // The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time
+ // Wait until the idle time rule applies
+ // Simulate a low memory event
+ // The plugin that initially had the highest priority (but now has the lowest priority) should be called
+ // Note that this test should be the same as AppPluginTest1L with the addition of the idle period
+ TInt AppPluginIdleTimeTest1L();
+
+ // Test idle time handling for plugins
+ // Start two target apps
+ // Simulate a low memory event
+ // The one of the application plugins should now be run, displacing one of the system plugins
+ // The target apps are of sufficiently high priority that they will not be closed
+ TInt PluginIdleTimeTest2L();
+
+ // Test the optional allocation mechanism
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 12MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just below the good memory level
+ // Request an optional allocation of 10MB referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required memory
+ TInt OptionalAllocationTest1L();
+
+
+ // Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 5MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required minimum amount memory
+ // The returned available memory should be about 5MB ( > 3MB and < 7MB )
+ TInt OptionalAllocationTest2L();
+
+ // Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 3MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed but it won't free enough memory
+ // The optional allocation should fail with KErrNoMemory
+ TInt OptionalAllocationTest3L();
+
+
+ // Test the async optional allocation mechanism
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 12MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just below the good memory level
+ // Request an optional allocation of 10MB referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required memory
+ TInt OptionalAllocationAsyncTest1L();
+
+
+ // Test the async optional allocation mechanism - minimum requested RAM behaviour - successful request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 5MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required minimum amount memory
+ // The returned available memory should be about 5MB ( > 3MB and < 7MB )
+ TInt OptionalAllocationAsyncTest2L();
+
+ // Test the async optional allocation mechanism - minimum requested RAM behaviour - failed request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 3MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed but it won't free enough memory
+ // The optional allocation should fail with KErrNoMemory
+ TInt OptionalAllocationAsyncTest3L();
+
+
+ // Test that force priority check applies (only) to selected priorities
+ // Setup three plugins (priorities 7, 8 & 9)to eat 5MB each
+ // The configuration file should force a check after priority 8
+ // Drop just under the low threshold
+ // Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory)
+ // Plugin P9 should not be called because enou
+ TInt ForcePriorityCheck1L();
+
+ // Test the Busy API on the OOM server
+ // Start three applications
+ // Ensure that the lowest priority app is not in the foreground
+ // Call the busy API on the OOM monitor for the lowest priority app
+ // Simulate a low memory event by going just under the low threshold
+ // The busy application should not be closed
+ // The other (non-foreground) application should be closed
+ TInt BusyApplicationTest1L();
+
+ // Test the Normal-priority API on the OOM server
+ // Start three applications
+ // Ensure that the lowest priority app is not in the foreground
+ // Call the busy API on the OOM monitor for the lowest priority app
+ // Then call the not-busy API on the OOM monitor for the lowest priority app
+ // Simulate a low memory event by going just under the low threshold
+ // The lowest priority app should be closed (because it is no longer busy)
+ TInt NormalPriorityApplicationTest1L();
+
+ // Test that sync mode configuration is working for system plugins
+ // Configure three system plugins to release 5MB of memory each.
+ // The plugins are configured as follows
+ // Plugin 1: Priority 7, sync mode continue
+ // Plugin 2: Priority 8, sync mode check
+ // Plugin 3: Priority 9, sync mode continue
+ // Drop just under the low threshold
+ // Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM)
+ // Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed
+ TInt PluginSyncModeTest1L();
+
+
+ // Start three applications
+ // One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground
+ // Configure applications not to release any memory
+ // Go just significantly under the low memory threshold
+ // Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low.
+ // Check that the low priority application is closed
+ // Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold)
+ TInt NeverCloseTest1L();
+
+ TInt GetFreeMemory();
+
+ // Utility function which calls the async version of optional RAM request and makes it behave like the sync version
+ TInt RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable);
+
+private:
+ COomTestHarness();
+
+ void ConstructL();
+
+private:
+
+ struct TPluginCallCount
+ {
+ TInt iFreeRamCallCount;
+ TInt iMemoryGoodCallCount;
+ };
+
+ RHashMap<TInt32, TPluginCallCount> iPluginCallCounts;
+
+ RPointerArray<CCDummyApplicationHandle> iApps;
+
+ ROOMAllocSession iAllocServer;
+
+ RChunk iChunk;
+ TInt iChunkSize;
+
+ ROomMonitorSession iOomSession;
+ };
+
+#endif // __T_OOMHARNESS_H__
+
+inline void COomTestHarness::Settle()
+ {
+ //wait for oom system to settle
+ User::After(KSettlingTime);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/sis/t_oomharness_EKA2.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,24 @@
+; Installation file for Symbian OS 9.x for generic console application
+; Installation file for t_oomharness EXE
+;
+; This is an auto-generated PKG file by Carbide.
+; This file uses variables specific to Carbide builds that will not work
+; on command-line builds. If you want to use this generated PKG file from the
+; command-line tools you will need to modify the variables with the appropriate
+; values: $(EPOCROOT), $(PLATFORM), $(TARGET)
+;
+
+;
+; UID is the exe's UID
+;
+#{"t_oomharness EXE"},(0xEF1971CE),1,0,0
+
+
+;Localised Vendor name
+%{"Vendor-EN"}
+
+;Unique Vendor name
+:"Vendor"
+
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\t_oomharness.exe" -"!:\sys\bin\t_oomharness.exe"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/CDummyApplicationHandle.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,78 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <w32std.h>
+#include "CDummyApplicationHandle.h"
+
+CCDummyApplicationHandle::CCDummyApplicationHandle(TUid aUid)
+: iUid(aUid)
+ {
+ // No implementation required
+ }
+
+CCDummyApplicationHandle::~CCDummyApplicationHandle()
+ {
+ if(iMsgQueue.Handle())
+ {
+ iMsgQueue.SendBlocking(0);
+ iMsgQueue.Close();
+ }
+ iProcess.Close();
+ }
+
+CCDummyApplicationHandle* CCDummyApplicationHandle::NewLC(TUid aUid, TInt aExtraMemoryAllocation)
+ {
+ CCDummyApplicationHandle* self = new (ELeave) CCDummyApplicationHandle(aUid);
+ CleanupStack::PushL(self);
+ self->ConstructL(aExtraMemoryAllocation);
+ return self;
+ }
+
+CCDummyApplicationHandle* CCDummyApplicationHandle::NewL(TUid aUid, TInt aExtraMemoryAllocation)
+ {
+ CCDummyApplicationHandle* self = CCDummyApplicationHandle::NewLC(aUid, aExtraMemoryAllocation);
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+void CCDummyApplicationHandle::ConstructL(TInt aExtraMemoryAllocation)
+ {
+ TBuf<28> params;
+ params.Format(_L("uid=%08x alloc=%x"), iUid, aExtraMemoryAllocation);
+ User::LeaveIfError(iProcess.Create(_L("z:\\sys\\bin\\t_oomdummyapp_0xE6CFBA00.exe"), params));
+ User::LeaveIfError(iMsgQueue.CreateGlobal(KNullDesC, 4));
+ User::LeaveIfError(iProcess.SetParameter(15, iMsgQueue));
+ iProcess.Resume();
+ }
+
+void CCDummyApplicationHandle::SendMessage(TInt aMessage)
+ {
+ iMsgQueue.SendBlocking(aMessage);
+ }
+
+TBool CCDummyApplicationHandle::CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue)
+ {
+ return aValue.iUid == *aKey;
+ }
+
+void CCDummyApplicationHandle::BringToForeground()
+ {
+ SendMessage(1);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness/src/t_oomharness.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,1715 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// Include Files
+
+#include "t_oomharness.h"
+#include "CDummyApplicationHandle.h"
+#include "cleanuputils.h"
+#include "t_oomdummyplugin_properties.h"
+#include <e32base.h>
+#include <e32std.h>
+#include <e32cons.h> // Console
+#include <e32hal.h>
+#include <e32property.h>
+#include <e32cmn.h>
+#include <hal.h>
+#include "t_oomdummyplugin_properties.h"
+#include "../../t_oomdummyapp/inc/t_oomdummyappmsgs.h"
+
+
+// Constants
+
+_LIT(KTextConsoleTitle, "Console");
+_LIT(KTextFailed, " failed, leave code = %d");
+_LIT(KTextPressAnyKey, " [press any key]\n");
+
+const TInt KOomLowMemoryThreshold = 4096;
+const TInt KOomJustUnderLowMemoryThreshold = 4000;
+const TInt KOomSignificantlyUnderLowMemoryThreshold = 2024;
+const TInt KOomJustAboveGoodMemoryThreshold = 5100;
+const TInt KOomHarnessInitialEatenMemory = 1024; // Just eat 1K of memory initially, this can grow later
+
+const TInt KOomTestFirstIdlePeriod = 40000000; // 40 seconds
+
+const TInt KOomHarnessMaxEatenMemory = 64 * 1024 * 1024;
+
+// Global Variables
+
+LOCAL_D CConsoleBase* console; // write all messages to this
+
+
+void COomTestHarness::StartL()
+ {
+ ResetL();
+
+ TInt err = KErrNone;
+ TBool testsFailed = EFalse;
+
+ err = AppCloseTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = AppCloseIdleTimeTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = PluginTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+
+ err = PluginTest2L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = AppPluginTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = AppPluginIdleTimeTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationTest2L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationTest3L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = PluginV2Test1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = ForcePriorityCheck1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = PluginSyncModeTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = NeverCloseTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationAsyncTest1L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationAsyncTest2L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+ err = OptionalAllocationAsyncTest3L();
+ if (err != KErrNone)
+ testsFailed = ETrue;
+
+ ResetL();
+
+// if (err == KErrNone)
+// err = BusyApplicationTest1L();
+
+ ResetL();
+
+// if (err == KErrNone)
+// err = NormalPriorityApplicationTest1L();
+
+ if (!testsFailed)
+ console->Printf(_L("All tests passed\n"));
+ else
+ console->Printf(_L("Tests failed\n"));
+ }
+
+// Test normal application closure for a single app
+// Start three applications
+// The lowest priority app should be in the foregound
+// ... with the next lowest behind it
+// ... followed by the highest priority application at the back
+// The middle and highest priority application should be configured to eat 5MB of memory
+// A low memory event is triggered and the middle application only should be closed
+TInt COomTestHarness::AppCloseTest1L()
+ {
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ StartApplicationL(0x101f8599, 5 * 1024); // P9 app
+ StartApplicationL(0x10005901, 5 * 1024); // P8 app, configure it to eat 5MB
+ StartApplicationL(0x10005a22, 0); // P7 app
+
+ BringAppToForeground(0x10005a22);
+
+ Settle();
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ Settle();
+
+ TInt err = KErrNone;
+
+ // The P8 application should be closed
+ err = AppIsRunning(0x10005901, EFalse);
+
+ // The P7 app should still be running because it was in the foreground
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, ETrue);
+
+ // The P9 app should still be running because the P8 application freed enough memory
+ if (err == KErrNone)
+ err = AppIsRunning(0x101f8599, ETrue);
+
+ if (err == KErrNone)
+ console->Printf(_L("App Close Test 1 passed\n"));
+ else
+ console->Printf(_L("App Close Test 1 failed\n"));
+
+ return err;
+
+ }
+
+// Tests the idle time rule mechanism for app closure
+// Start three applications
+// The lowest priority app should be in the foregound
+// ... with the next lowest behind it
+// ... followed by the highest priority application at the back
+// After an idle period the highest priority app is configured to become the lowest priority
+// The middle and highest application should be configured to eat 5MB of memory
+// A low memory event is triggered and the middle application only should be closed
+// Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed
+TInt COomTestHarness::AppCloseIdleTimeTest1L()
+ {
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ StartApplicationL(0x101f8599, 5 * 1024); // P9 app (which becomes a P2 app after the idle time)
+ StartApplicationL(0x10005901, 5 * 1024); // P8 app, configure it to eat 5MB
+ StartApplicationL(0x10005a22, 0); // P7 app
+
+ BringAppToForeground(0x10005a22);
+
+ Settle();
+
+ // Wait for the first set of idle time rules to apply
+ User::After(KOomTestFirstIdlePeriod);
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first two system plugins should have been closed, releasing the required memory
+ // The following two system plugins won't be called (the app plugins will now take their place)
+ TInt err = KErrNone;
+
+ // The P9 app should have become a P2 app after the idle period, therefore it should have been the first candidate for closure
+ if (err == KErrNone)
+ err = AppIsRunning(0x101f8599, EFalse);
+
+ // The P8 application should still be running because the P9 app (that has become a P2 app) has freed the required memory
+ err = AppIsRunning(0x10005901, ETrue);
+
+ // The P7 app should still be running because it was in the foreground
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, ETrue);
+
+ if (err == KErrNone)
+ console->Printf(_L("App Close Idle Time Test 1 passed\n"));
+ else
+ console->Printf(_L("App Close Idle Time Test 1 failed\n"));
+
+ return err;
+
+ }
+
+
+
+TInt COomTestHarness::PluginTest1L()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first four system plugins should have been run, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation + 1, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(KUidOOMDummyPluginFirstImplementation + 2, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3C, ETrue);
+
+
+ // Finally check that the plugins have been notified of the final good memory state
+ if (err == KErrNone)
+ err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation, ETrue);
+
+ if (err == KErrNone)
+ err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation + 1, ETrue);
+
+ if (err == KErrNone)
+ err = PluginMemoryGoodCalledL(KUidOOMDummyPluginFirstImplementation + 2, ETrue);
+
+ if (err == KErrNone)
+ err = PluginMemoryGoodCalledL(0x10286A3C, ETrue);
+
+ if (err == KErrNone)
+ console->Printf(_L("Plugin Test 1 passed\n"));
+ else
+ console->Printf(_L("Plugin Test 1 failed\n"));
+
+ return err;
+ }
+
+
+// Test application plugins
+// Start two target apps
+// Simulate a low memory event
+// The one of the application plugins should now be run, displacing one of the system plugins
+// The target apps are of sufficiently high priority that they will not be closed
+TInt COomTestHarness::PluginTest2L()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005901, 0);
+ StartApplicationL(0x10005a22, 0);
+ StartApplicationL(0x101f8599, 0);
+
+ BringAppToForeground(0x101f8599);
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first two system plugins should have been closed, releasing the required memory
+ // The following two system plugins won't be called (the app plugins will now take their place)
+ TInt err = KErrNone;
+
+ // The following plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+ // System plugins: 10286A3C(v2 plugin) 10286A34
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+
+ // Plugins and apps with higher priorities will not be called/closed because 0x10286A3A is configured to check memory before running anything else
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3C, EFalse);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, EFalse);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, EFalse);
+
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, ETrue);
+
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005901, ETrue);
+
+ if (err == KErrNone)
+ err = AppIsRunning(0x101f8599, ETrue);
+
+
+ if (err == KErrNone)
+ console->Printf(_L("Plugin Test 2 passed\n"));
+ else
+ console->Printf(_L("Plugin Test 2 failed\n"));
+
+ return err;
+
+ }
+
+
+
+// Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins
+// Initialise P4 plugin to consume 5MB of memory
+// No other plugins are configured to release memory
+// Simulate a low memory event (go just below the low threshold)
+// Check that the P4 plugin has been called
+// Check that the P4 plugin has received a request for > 500K and less than <1500K
+TInt COomTestHarness::PluginV2Test1L()
+ {
+ // Configure the P4 V2 plugin to eat 5MB:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3C), 0, 0x500000, 0x500000));
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ // Check that the P4 plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3C, ETrue);
+
+ // Check that the request for memory was about right
+ // Note: regular system variation makes it impossible to test for an exact number
+ TInt requestedMemory = 0;
+ err = RProperty::Get(KUidOomPropertyCategory, 0x10286A3C + KOOMDummyPluginBytesRequested, requestedMemory);
+ if ((requestedMemory < 512 * 1024)
+ || (requestedMemory > 1500 * 1024))
+ err = KErrGeneral;
+
+ // Check that the higher priority V2 plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Plugin V2 Test 1 passed\n"));
+ else
+ console->Printf(_L("Plugin V2 Test 1 failed\n"));
+
+ return err;
+ }
+
+
+// Test simple prioritisation of application plugins
+// Start two target applications
+// Configure all plugins to consume 0.5MB
+// Simulate a low memory event
+// Some of the low priority app plugins with those target applications should be called
+// The highest priority app with that target application should not be called (the lower priority plugins should free enough memory)
+TInt COomTestHarness::AppPluginTest1L()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005901, 0);
+ StartApplicationL(0x10005a22, 0);
+ StartApplicationL(0x101f8599, 0);
+
+ TInt err = KErrNone;
+
+ // Check that all of the apps are running
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005901, ETrue);
+
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, ETrue);
+
+ if (err == KErrNone)
+ err = AppIsRunning(0x101f8599, ETrue);
+
+ if (err == KErrNone)
+ console->Printf(_L("Apps started\n"));
+ else
+ console->Printf(_L("Apps not started\n"));
+
+
+
+ BringAppToForeground(0x101f8599);
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The following application plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // The following plugin should not be called because other plugins (including some unchecked system plugins) have freed enough memory
+ // 10286A38
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A38, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("App Plugin Test 1 passed\n"));
+ else
+ console->Printf(_L("App Plugin Test 1 failed\n"));
+
+ return err;
+
+ }
+
+// Test simple prioritisation of application plugins
+// Start two target applications
+// Configure all plugins to consume 0.5MB
+// The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time
+// Wait until the idle time rule applies
+// Simulate a low memory event
+// The plugin that initially had the highest priority (but now has the lowest priority) should be called
+// Note that this test should be the same as AppPluginTest1L with the addition of the idle period
+TInt COomTestHarness::AppPluginIdleTimeTest1L()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005901, 0);
+ StartApplicationL(0x10005a22, 0);
+ StartApplicationL(0x101f8599, 0);
+
+ BringAppToForeground(0x101f8599);
+
+ TInt err = KErrNone;
+
+ Settle();
+
+ User::After(KOomTestFirstIdlePeriod);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The following application plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // The following plugin should also be called (its priority was initially too high but has been reduced after the idle time)
+ // 10286A38
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A38, ETrue);
+
+ if (err == KErrNone)
+ console->Printf(_L("Plugin Idle Time Test 1 passed\n"));
+ else
+ console->Printf(_L("Plugin Idle Time Test 1 failed\n"));
+
+ return err;
+
+ }
+
+
+// Test the optional allocation mechanism
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 12MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required memory
+TInt COomTestHarness::OptionalAllocationTest1L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 12MB of RAM
+ StartApplicationL(0x10005A22, 12 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ TInt bytesAvailable;
+ TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation Test 1 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation Test 1 failed\n"));
+
+
+ return err;
+ }
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 5MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required minimum amount memory
+// The returned available memory should be about 5MB ( > 3MB and < 7MB )
+TInt COomTestHarness::OptionalAllocationTest2L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(0x10005A22, 5 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if (err == KErrNone)
+ {
+ // Check that the reported bytes available is > 3MB and < 7MB
+ if ((bytesAvailable < 3 * 1024 * 1024)
+ || (bytesAvailable > 7 * 1024 * 1024))
+ {
+ err = KErrGeneral;
+ }
+ }
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation Test 2 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation Test 2 failed\n"));
+
+
+ return err;
+ }
+
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 3MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed but it won't free enough memory
+// The optional allocation should fail with KErrNoMemory
+TInt COomTestHarness::OptionalAllocationTest3L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(0x10005A22, 3 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ TInt err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // We expect an error because it has not been possible to free the minimum memory
+ if (err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+ else
+ {
+ err = KErrGeneral;
+ }
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation Test 3 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation Test 3 failed\n"));
+
+
+ return err;
+ }
+
+
+// Test that force priority check applies (only) to selected priorities
+// Setup three plugins (priorities 7, 8 & 9)to eat 5MB each
+// The configuration file should force a check after priority 8
+// Drop just under the low threshold
+// Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory)
+// Plugin P9 should not be called because enou
+TInt COomTestHarness::ForcePriorityCheck1L()
+ {
+ // Configure the P7, P8 and P9 plugins to eat 5MB each:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x500000, 0x500000)); // P7
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x500000, 0x500000)); // P8
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x500000, 0x500000)); // P9
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ TInt err = KErrNone;
+
+ // The P7 plugin should have been called and is the first to release RAM
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // The P8 plugin should be called even though the P7 plugin has already released enough memory because the plugin runs in continue mode and there is no forced check
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, ETrue);
+
+ // The P9 plugin should not be called because of the force priority check (the P7 & P8 plugins have already released plenty of RAM)
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Force Prioirty Check Test 1 passed\n"));
+ else
+ console->Printf(_L("Force Prioirty Check Test 1 failed\n"));
+
+ return err;
+
+ }
+
+
+
+// Test the Busy API on the OOM server
+// Start three applications
+// Ensure that the lowest priority app is not in the foreground
+// Call the busy API on the OOM monitor for the lowest priority app
+// Simulate a low memory event by going just under the low threshold
+// The busy application should not be closed
+// The other (non-foreground) application should be closed
+TInt COomTestHarness::BusyApplicationTest1L()
+ {
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005901, 0);
+ StartApplicationL(0x101f8599, 0);
+ StartApplicationL(0x10005a22, 0); // Lowest priority app
+
+ BringAppToForeground(0x101f8599); // TODO: this doesn't seem to be working - message not getting through to the dummy application
+
+ Settle();
+
+ // Send the second app a message to make itself busy
+ TInt id = iApps.Find<TUid>(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->SendMessage(KOomDummyAppSetBusy);
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ // Check that the busy application is still running
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, ETrue);
+
+ // Check that the higher priority but non-busy application has been close
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005901, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Busy Application Test 1 passed\n"));
+ else
+ console->Printf(_L("Busy Application Test 1 failed\n"));
+
+ return err;
+ }
+
+
+// Test the NotBusy API on the OOM server
+// Start three applications
+// Ensure that the lowest priority app is not in the foreground
+// Call the busy API on the OOM monitor for the lowest priority app
+// Then call the not-busy API on the OOM monitor for the lowest priority app
+// Simulate a low memory event by going just under the low threshold
+// The lowest priority app should be closed (because it is no longer busy)
+TInt COomTestHarness::NormalPriorityApplicationTest1L()
+ {
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005901, 0);
+ StartApplicationL(0x10005a22, 0); // Lowest priority app
+ StartApplicationL(0x101f8599, 0);
+
+ BringAppToForeground(0x101f8599);
+
+ Settle();
+
+ // Send the second app a message to make itself busy
+ TInt id = iApps.Find<TUid>(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ // TODO: temp removed - needs to be put back
+// iApps[id]->SendMessage(KOomDummyAppSetBusy);
+
+ // Send the second app a message to make itself normal priority
+ id = iApps.Find<TUid>(TUid::Uid(0x10005a22), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->SendMessage(KOomDummyAppSetNormalPriority);
+
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ // Check that the no-longer-busy application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Normal Priority Application Test 1 passed\n"));
+ else
+ console->Printf(_L("Normal Priority Application Test 2 failed\n"));
+
+ return err;
+ }
+
+
+
+// Start three applications
+// One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground
+// Configure applications not to release any memory
+// Go just significantly under the low memory threshold
+// Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low.
+// Check that the low priority application is closed
+// Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold)
+TInt COomTestHarness::NeverCloseTest1L()
+ {
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(0x10005a22, 0); // Lowest priority app
+ StartApplicationL(0x10008d39, 0); // NEVER_CLOSE application
+ StartApplicationL(0x101f8599, 0);
+
+ BringAppToForeground(0x101f8599);
+
+ Settle();
+
+ EatMemoryUntilWeAreStuckUnderTheLowThresholdL();
+
+ Settle();
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ // The NEVER_CLOSE app should still be running (even though we are still below the low threshold)
+ if (err == KErrNone)
+ err = AppIsRunning(0x10008d39, ETrue);
+
+ // The low priority app should still be closed (even though we are still below the low threshold)
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005a22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Never Close Test 1 passed\n"));
+ else
+ console->Printf(_L("Never Close Test 2 failed\n"));
+
+ return err;
+ }
+
+
+
+
+
+// Test that sync mode configuration is working for system plugins
+// Configure three system plugins to release 5MB of memory each.
+// The plugins are configured as follows
+// Plugin 1: Priority 7, sync mode continue
+// Plugin 2: Priority 8, sync mode check
+// Plugin 3: Priority 9, sync mode continue
+// Drop just under the low threshold
+// Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM)
+// Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed
+TInt COomTestHarness::PluginSyncModeTest1L()
+ {
+ // Configure three plugins to eat 5MB each:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x500000, 0x500000));
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x500000, 0x500000));
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x500000, 0x500000));
+
+ Settle();
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ Settle();
+
+ // The first four system plugins should have been run, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+ TInt err = KErrNone;
+
+ // Check that the first two plugins have been called, but not the third
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Plugin Sync Mode Test 1 passed\n"));
+ else
+ console->Printf(_L("Plugin Sync Mode Test 1 failed\n"));
+
+ return err;
+ }
+
+
+
+
+// Test the optional allocation mechanism
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 12MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required memory
+TInt COomTestHarness::OptionalAllocationAsyncTest1L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 12MB of RAM
+ StartApplicationL(0x10005A22, 12 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ TInt bytesAvailable;
+ TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation (Async) Test 1 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation (Async) Test 1 failed\n"));
+
+
+ return err;
+ }
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 5MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required minimum amount memory
+// The returned available memory should be about 5MB ( > 3MB and < 7MB )
+TInt COomTestHarness::OptionalAllocationAsyncTest2L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(0x10005A22, 5 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if (err == KErrNone)
+ {
+ // Check that the reported bytes available is > 3MB and < 7MB
+ if ((bytesAvailable < 3 * 1024 * 1024)
+ || (bytesAvailable > 7 * 1024 * 1024))
+ {
+ err = KErrGeneral;
+ }
+ }
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation (Async) Test 2 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation (Async) Test 2 failed\n"));
+
+
+ return err;
+ }
+
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 3MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed but it won't free enough memory
+// The optional allocation should fail with KErrNoMemory
+TInt COomTestHarness::OptionalAllocationAsyncTest3L()
+ {
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(0x10005A22, 3 * 1024);
+ StartApplicationL(0x101F8599, 0);
+
+ BringAppToForeground(0x101F8599);
+
+ Settle();
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ TInt err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // We expect an error because it has not been possible to free the minimum memory
+ if (err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+ else
+ {
+ err = KErrGeneral;
+ }
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+
+ // This the P8 system plugin has not been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+
+ // Check that the low priority app plugin has been called
+ if (err == KErrNone)
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+
+ // Check that the P7 application has been closed
+ if (err == KErrNone)
+ err = AppIsRunning(0x10005A22, EFalse);
+
+ if (err == KErrNone)
+ console->Printf(_L("Optional Allocation (Async) Test 3 passed\n"));
+ else
+ console->Printf(_L("Optional Allocation (Async) Test 3 failed\n"));
+
+
+ return err;
+ }
+
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+
+
+TInt COomTestHarness::BringAppToForeground(TInt32 aUid)
+ {
+ //bring app to foreground
+ TInt id = iApps.Find<TUid>(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->BringToForeground();
+ User::After(KSettlingTime);
+ }
+
+
+COomTestHarness* COomTestHarness::NewLC()
+ {
+ COomTestHarness* self = new (ELeave) COomTestHarness();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+void COomTestHarness::ConstructL()
+ {
+ User::LeaveIfError(iAllocServer.Connect());
+ User::LeaveIfError(iOomSession.Connect());
+
+ User::LeaveIfError(iChunk.CreateLocal(KOomHarnessInitialEatenMemory, KOomHarnessMaxEatenMemory));
+ iChunkSize = KOomHarnessInitialEatenMemory;
+
+ ResetL();
+ }
+
+
+COomTestHarness::~COomTestHarness()
+ {
+ iApps.ResetAndDestroy();
+ iAllocServer.Close();
+ iChunk.Close();
+ iPluginCallCounts.Close();
+ }
+
+
+void COomTestHarness::ResetL()
+ {
+ Settle();
+
+ // Close any dummy apps
+ iApps.ResetAndDestroy();
+
+ Settle();
+
+ // Free all memory being eaten by the server
+ iChunk.Adjust(KOomHarnessInitialEatenMemory); // Just eat 1K of memory initially, this can grow later
+ iChunkSize = KOomHarnessInitialEatenMemory;
+
+ User::LeaveIfError(iAllocServer.Reset());
+
+ // Wait for the system to settle before getting the call counts (freeing the memory could cause some more movement).
+ Settle();
+
+ // Update the call counts on the plugins (add them if they're not there already)
+ for (TInt pluginUid = KUidOOMDummyPluginFirstImplementation; pluginUid <= KUidOOMDummyPluginLastImplementation; pluginUid++)
+ {
+ TInt lowMemoryCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginLowMemoryCount, lowMemoryCount);
+
+ TInt goodMemoryCallCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginGoodMemoryCount, goodMemoryCallCount);
+
+ TPluginCallCount pluginCallCount;
+ pluginCallCount.iFreeRamCallCount = lowMemoryCount;
+ pluginCallCount.iMemoryGoodCallCount = goodMemoryCallCount;
+
+ iPluginCallCounts.InsertL(pluginUid, pluginCallCount);
+ };
+ }
+
+void COomTestHarness::EatMemoryL(TInt aKBytesToLeaveFree)
+ {
+ Settle();
+
+ TMemoryInfoV1Buf meminfo;
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+
+ // Resize the dummy chunk to consume the correct ammount of memory
+ iChunkSize = freeMem + iChunkSize - (aKBytesToLeaveFree * 1024);
+ TInt err = iChunk.Adjust(iChunkSize);
+ User::LeaveIfError(err);
+ }
+
+// Set up the plugins and applications - this is the starting point for many test cases
+// 5 applications are started with approx 0.5 MB used for each
+// 0.5MB (approx) of memory is reserved for each one of the plugins
+void COomTestHarness::CommonSetUpL()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+ }
+
+void COomTestHarness::StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs)
+ {
+ User::ResetInactivityTime();
+ CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(TUid::Uid(aUid), aInitialAllocationInKBs * 1024);
+ iApps.AppendL(app);
+ CleanupStack::Pop(app);
+ Settle();
+ }
+
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::AppIsRunning(TInt32 aUid, TBool aExpectedResult)
+ {
+ TBool appRunning = ETrue;
+
+ TInt id = iApps.Find<TUid>(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo);
+ if (id < 0)
+ appRunning = EFalse;
+ else if(iApps[id]->Process().ExitType() != EExitPending)
+ appRunning = EFalse;
+
+ TInt err = KErrNone;
+
+ if (aExpectedResult != appRunning)
+ err = KErrGeneral;
+
+ if (aExpectedResult != appRunning)
+ {
+ console->Printf(_L("Application running state not as expected %x \n"), aUid);
+ err = KErrGeneral;
+ }
+
+ return err;
+ }
+
+
+// Utility function which calls the async version of optional RAM request and makes it behave like the sync version
+TInt COomTestHarness::RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable)
+ {
+ TInt err = KErrNone;
+ TRequestStatus status;
+ iOomSession.RequestOptionalRam(aBytesRequested, aMinimumBytesNeeded, aPluginId, status);
+ User::WaitForRequest(status);
+
+ if (status.Int() < 0)
+ err = status.Int();
+ else
+ aBytesAvailable = status.Int();
+
+ return err;
+ }
+
+
+TInt COomTestHarness::GetFreeMemory()
+ {
+ User::CompressAllHeaps();
+
+ TInt current = 0;
+ HAL::Get( HALData::EMemoryRAMFree, current );
+
+ return current;
+ }
+
+// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult)
+ {
+ TInt newLowMemoryCount = 0;
+ TInt err = RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginLowMemoryCount, newLowMemoryCount);
+
+ if (err != KErrNone)
+ console->Printf(_L("Unable to get plugin FreeRam count\n"));
+
+ TBool freeRamHasBeenCalledOnPlugin = EFalse;
+ TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid);
+
+ if (pluginCallCount)
+ {
+ freeRamHasBeenCalledOnPlugin = (pluginCallCount->iFreeRamCallCount != newLowMemoryCount);
+
+ if (freeRamHasBeenCalledOnPlugin)
+ {
+ // Update the list of old counts with the current value so we can see if it has changed next time this function is called
+ pluginCallCount->iFreeRamCallCount = newLowMemoryCount;
+ iPluginCallCounts.InsertL(aUid, *pluginCallCount);
+ }
+ }
+ else
+ {
+ console->Printf(_L("Unable to find call count.\n"));
+ err = KErrNotFound;
+ }
+
+ if (aExpectedResult != freeRamHasBeenCalledOnPlugin)
+ {
+ console->Printf(_L("Plugin FreeRam count not as expected %x \n"), aUid);
+ err = KErrGeneral;
+ }
+
+ return err;
+ }
+
+// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult)
+ {
+ TInt newGoodMemoryCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginGoodMemoryCount, newGoodMemoryCount);
+
+ TBool memoryGoodHasBeenCalledOnPlugin = EFalse;
+ TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid);
+
+ if (pluginCallCount)
+ {
+ memoryGoodHasBeenCalledOnPlugin = (pluginCallCount->iMemoryGoodCallCount != newGoodMemoryCount);
+
+ if (memoryGoodHasBeenCalledOnPlugin)
+ {
+ // Update the list of old counts with the current value so we can see if it has changed next time this function is called
+ pluginCallCount->iMemoryGoodCallCount = newGoodMemoryCount;
+ iPluginCallCounts.InsertL(aUid, *pluginCallCount);
+ }
+ }
+
+ TInt err = KErrNone;
+
+ if (aExpectedResult != memoryGoodHasBeenCalledOnPlugin)
+ err = KErrGeneral;
+
+ return err;
+ }
+
+void COomTestHarness::EatMemoryUntilWeAreStuckUnderTheLowThresholdL()
+ {
+ while (ETrue)
+ {
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+ Settle();
+ // If we are still under the memory threshold then the OOM monitor has not been able to recover,
+ // so our job here is done...
+ if (GetFreeMemory() < (KOomLowMemoryThreshold * 1024))
+ break;
+
+ // If memory has been released to take us above the low memory threshold then go again...
+ }
+ }
+
+
+COomTestHarness::COomTestHarness()
+ {
+ // TODO
+ }
+
+
+// Local Functions
+LOCAL_C void MainL()
+ {
+ COomTestHarness* testHarness = COomTestHarness::NewLC();
+
+ testHarness->StartL();
+
+ CleanupStack::PopAndDestroy(testHarness);
+ }
+
+// Local Functions
+LOCAL_C void OldMainL()
+ {
+ //
+ // add your program code here, example code below
+ //
+ const TInt implementations(KUidOOMDummyPluginLastImplementation-KUidOOMDummyPluginFirstImplementation+1);
+ TInt initialLowCount[implementations];
+ TInt initialGoodCount[implementations];
+ TInt finalLowCount[implementations];
+ TInt finalGoodCount[implementations];
+ TInt tmp;
+ TBuf<80> line;
+ TBool pass = ETrue;
+ ROOMAllocSession allocServer;
+ TMemoryInfoV1Buf meminfo;
+ //connect to alloc server
+ User::LeaveIfError(allocServer.Connect());
+ CleanupClosePushL(allocServer);
+ //configure alloc server
+ User::LeaveIfError(allocServer.Reset());
+/* User::LeaveIfError(allocServer.Configure(TUid::Uid(KUidOOMDummyPluginFirstImplementation), 0x100000, 0x1000, 0x400000));
+ User::LeaveIfError(allocServer.Configure(TUid::Uid(KUidOOMDummyPluginFirstImplementation+3), 0x100000, 0x1000, 0x400000));
+ User::LeaveIfError(allocServer.StartAllocating());
+ for(TInt i=0;i<5;i++)
+ {
+ UserHal::MemoryInfo(meminfo);
+ console->Printf(_L("free mem %d"), meminfo().iFreeRamInBytes);
+ User::After(1000000);
+ }*/
+ //create dummy apps (note app with that UID *must* exist or apparc won't allow contruction due to missing app_reg.rsc)
+ RPointerArray<CCDummyApplicationHandle> apps;
+ CleanupResetAndDestroyPushL(apps);
+ CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(KUidCalendar, 0x100000);
+ apps.AppendL(app);
+ CleanupStack::Pop(app);
+ app = CCDummyApplicationHandle::NewLC(KUidClock, 0x100000);
+ apps.AppendL(app);
+ CleanupStack::Pop(app);
+ app = CCDummyApplicationHandle::NewLC(KUidAbout, 0x100000);
+ apps.AppendL(app);
+ CleanupStack::Pop(app);
+
+ //wait for oom system to settle
+ User::After(KSettlingTime);
+
+ //verify apps started OK
+ for(TInt i=0;i<apps.Count();i++)
+ {
+ if(apps[i]->Process().ExitType() != EExitPending)
+ {
+ pass = EFalse;
+ console->Printf(_L("app %x not running (status %d)\n"),apps[i]->Uid().iUid,apps[i]->Process().ExitType());
+ }
+ }
+
+ //bring calendar to foreground
+ TInt id = apps.Find<TUid>(KUidCalendar, CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ apps[id]->BringToForeground();
+ User::After(KSettlingTime);
+
+ //eat memory to invoke low memory handler
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+ TAny *ptr = User::Alloc(freeMem - 247 * 1024);
+ CleanupStack::PushL(ptr);
+
+ //wait for oom system to settle
+ User::After(KSettlingTime);
+
+ //verify some apps were closed
+ for(TInt i=0;i<apps.Count();i++)
+ {
+ if(apps[i]->Process().ExitType() != EExitPending)
+ {
+ console->Printf(_L("app %x not running (status %d)\n"),apps[i]->Uid().iUid,apps[i]->Process().ExitType());
+ }
+ else
+ {
+ console->Printf(_L("app %x still running\n"),apps[i]->Uid().iUid);
+ }
+ }
+
+ //release memory to invoke good memory handler
+ CleanupStack::PopAndDestroy(ptr);
+
+ //wait for oom system to settle
+ User::After(KSettlingTime);
+
+/* console->Write(_L("Initial Counts\n"));
+ for(TInt id=0;id<KOOMDummyPluginImplementationCount;id++)
+ {
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginLowMemoryCount, tmp));
+ initialLowCount[id] = tmp;
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginGoodMemoryCount, tmp));
+ initialGoodCount[id] = tmp;
+ line.Format(_L("%x %d %d\n"), KUidOOMDummyPluginFirstImplementation + id, initialLowCount[id], initialGoodCount[id]);
+ console->Write(line);
+ }
+ //check status of dummy apps
+ User::After(2000000);
+ line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType());
+ console->Write(line);
+ if(app1.ExitType() != EExitPending || app2.ExitType() != EExitPending) pass = EFalse;
+ if(pass)
+ console->Write(_L("verdict: pass"));
+ else
+ console->Write(_L("verdict: fail"));
+ console->Getch();
+
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+ TAny *ptr = User::Alloc(freeMem - 260000);
+ CleanupStack::PushL(ptr);
+ console->Write(_L("Counts after alloc\n"));
+ for(TInt id=0;id<KOOMDummyPluginImplementationCount;id++)
+ {
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginLowMemoryCount, tmp));
+ finalLowCount[id] = tmp;
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginGoodMemoryCount, tmp));
+ finalGoodCount[id] = tmp;
+ line.Format(_L("%x %d %d\n"), KUidOOMDummyPluginFirstImplementation + id, finalLowCount[id], finalGoodCount[id]);
+ console->Write(line);
+ if(finalLowCount[id] - initialLowCount[id] != 1) pass = EFalse;
+ }
+ //check status of dummy apps
+ User::After(2000000);
+ line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType());
+ console->Write(line);
+ if(app1.ExitType() == EExitPending || app2.ExitType() == EExitPending) pass = EFalse;
+ if(pass)
+ console->Write(_L("verdict: pass"));
+ else
+ console->Write(_L("verdict: fail"));
+ console->Getch();
+ CleanupStack::PopAndDestroy(ptr);
+ console->Write(_L("Counts after free\n"));
+ for(TInt id=0;id<KOOMDummyPluginImplementationCount;id++)
+ {
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginLowMemoryCount, tmp));
+ finalLowCount[id] = tmp;
+ User::LeaveIfError(RProperty::Get(KUidOomPropertyCategory, id + KUidOOMDummyPluginFirstImplementation + KOOMDummyPluginGoodMemoryCount, tmp));
+ finalGoodCount[id] = tmp;
+ line.Format(_L("%x %d %d\n"), KUidOOMDummyPluginFirstImplementation + id, finalLowCount[id], finalGoodCount[id]);
+ console->Write(line);
+ if(finalGoodCount[id] - initialGoodCount[id] != 1) pass = EFalse;
+ }
+ //check status of dummy apps
+ User::After(2000000);
+ line.Format(_L("app1 %d app2 %d\n"), app1.ExitType(), app2.ExitType());
+ console->Write(line);
+ if(app1.ExitType() == EExitPending || app2.ExitType() == EExitPending) pass = EFalse;*/
+ if(pass)
+ console->Write(_L("verdict: pass"));
+ else
+ console->Write(_L("verdict: fail"));
+ console->Getch();
+ allocServer.Reset();
+ CleanupStack::PopAndDestroy(2);//apps, allocServer
+ }
+
+LOCAL_C void DoStartL()
+ {
+ // Create active scheduler (to run active objects)
+ CActiveScheduler* scheduler = new (ELeave) CActiveScheduler();
+ CleanupStack::PushL(scheduler);
+ CActiveScheduler::Install(scheduler);
+
+ MainL();
+
+ // Delete active scheduler
+ CleanupStack::PopAndDestroy(scheduler);
+ }
+
+// Global Functions
+
+GLDEF_C TInt E32Main()
+ {
+ // Create cleanup stack
+ __UHEAP_MARK;
+ CTrapCleanup* cleanup = CTrapCleanup::New();
+
+ // Create output console
+ TRAPD(createError, console = Console::NewL(KTextConsoleTitle, TSize(
+ KConsFullScreen, KConsFullScreen)));
+ if (createError)
+ return createError;
+
+ // Run application code inside TRAP harness, wait keypress when terminated
+ TRAPD(mainError, DoStartL());
+ if (mainError)
+ console->Printf(KTextFailed, mainError);
+ console->Printf(KTextPressAnyKey);
+ console->Getch();
+
+ delete console;
+ delete cleanup;
+ __UHEAP_MARKEND;
+ return KErrNone;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/BWINS/t_oomharness_stifu.def Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,3 @@
+EXPORTS
+ ?LibEntryL@@YAPAVCTestModuleBase@@XZ @ 1 NONAME ; class CTestModuleBase * LibEntryL(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/EABI/t_oomharness_stifu.def Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,3 @@
+EXPORTS
+ _Z9LibEntryLv @ 1 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+PRJ_PLATFORMS
+// specify the platforms your component needs to be built for here
+// defaults to WINS MARM so you can ignore this if you just build these
+DEFAULT
+
+PRJ_TESTEXPORTS
+
+PRJ_TESTMMPFILES
+t_oomharness_stif.mmp
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/group/t_oomharness_stif.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,54 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+//uncomment to enable tests which require CLIENT_REQUEST_QUEUE
+macro CLIENT_REQUEST_QUEUE
+
+TARGET t_oomharness_stif.dll
+TARGETTYPE dll
+// First UID is DLL UID, Second UID is STIF Test Framework UID
+UID 0x1000008D 0x101FB3E7
+
+VENDORID VID_DEFAULT
+
+CAPABILITY ALL -TCB
+
+// This is a SYSTEMINCLUDE macro containing the middleware
+// layer specific include directories
+MW_LAYER_SYSTEMINCLUDE
+
+USERINCLUDE ../inc
+USERINCLUDE ../../inc
+
+
+SOURCEPATH ../src
+SOURCE t_oomharness.cpp
+SOURCE t_oomharnessCases.cpp
+SOURCE CDummyApplicationHandle.cpp
+
+LIBRARY euser.lib
+LIBRARY stiftestinterface.lib
+LIBRARY stiftestengine.lib
+LIBRARY t_oomclient.lib
+LIBRARY hal.lib
+LIBRARY oommonitor.lib
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/CDummyApplicationHandle.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,94 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef CDUMMYAPPLICATIONHANDLE_H
+#define CDUMMYAPPLICATIONHANDLE_H
+
+// INCLUDES
+#include <e32std.h>
+#include <e32base.h>
+#include <e32msgqueue.h>
+
+// a few uids...use appuidlister to extract from the app_reg.rsc files
+// and mappings to uids not used by tests anymore
+const TInt KOomTestAppUid = 0xE6CFBA01; // 0x101f8599
+const TInt KOomTestApp2Uid = 0xE6CFBA02; // 0x10005901
+const TInt KOomTestApp3Uid = 0xE6CFBA03; // 0x10005a22
+const TInt KOomTestApp4Uid = 0xE6CFBA04; // 0x101f4cd5
+const TInt KOomTestApp5Uid = 0xE6CFBA05; // 0x10005234
+const TInt KOomTestApp6Uid = 0xE6CFBA06; // 0x10207218
+const TInt KOomTestApp7Uid = 0xE6CFBA07; // 0x10008d39
+const TInt KOomTestApp8Uid = 0xE6CFBA08; // 0x10005903
+const TInt KOomTestApp9Uid = 0xE6CFBA09; // 0x101f4cce
+const TInt KOomTestApp10Uid = 0xE6CFBA0A; // 0x101f4cd2
+
+// CLASS DECLARATION
+
+/**
+ * CCDummyApplicationHandle
+ * A helper class for launching dummy apps and checking their status
+ */
+NONSHARABLE_CLASS ( CCDummyApplicationHandle ) : public CBase
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * Destructor.
+ */
+ ~CCDummyApplicationHandle();
+
+ /**
+ * Two-phased constructor.
+ */
+ static CCDummyApplicationHandle* NewL(TUid aUid, TInt aExtraMemoryAllocation = 0);
+
+ /**
+ * Two-phased constructor.
+ */
+ static CCDummyApplicationHandle* NewLC(TUid aUid, TInt aExtraMemoryAllocation = 0);
+
+ inline RProcess& Process() { return iProcess; }
+ inline const TUid& Uid() { return iUid; }
+
+ void SendMessage(TInt aMessage);
+
+ void BringToForeground();
+
+ static TBool CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue);
+private:
+
+ /**
+ * Constructor for performing 1st stage construction
+ */
+ CCDummyApplicationHandle(TUid aUid);
+
+ /**
+ * EPOC default constructor for performing 2nd stage construction
+ */
+ void ConstructL(TInt aExtraMemoryAllocation = 0);
+
+ RProcess iProcess;
+ //a channel for sending control messages to the dummy app...
+ RMsgQueue<TInt> iMsgQueue;
+ TUid iUid;
+ };
+
+#endif // CDUMMYAPPLICATIONHANDLE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/inc/t_oomharness.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,681 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+#ifndef T_OOMHARNESS_H
+#define T_OOMHARNESS_H
+
+// INCLUDES
+#include "StifTestModule.h"
+#include <StifLogger.h>
+#include <e32hashtab.h>
+#include <e32cmn.h>
+#include "CDummyApplicationHandle.h"
+#include "t_oomclient.h"
+#include <oommonitorsession.h>
+#include <e32property.h>
+
+// CONSTANTS
+
+const TInt KSettlingTime = 2000000;
+const TInt KOomHarnessInitialEatenMemory= 1024; // Just eat 1K of memory initially, this can grow later
+const TInt KOomHarnessMaxEatenMemory = 64 * 1024 * 1024;
+
+const TInt KTimeout = 20000000; //20 secs
+
+enum TTestStates
+ {
+ // EInit: Test initialisation phase
+ ETestInit,
+
+ // EPossiblePass: In the case of memorymonitor reporting EAboveTreshhold
+ ETestAbove,
+
+ // EFail: All other cases including timeout
+ ETestBelow,
+
+ ETestTimeout
+ };
+
+// MACROS
+// None
+
+// Logging path
+_LIT( KT_OomHarnessLogPath, "\\logs\\testframework\\T_OomHarness\\" );
+// Log file
+_LIT( KT_OomHarnessLogFile, "T_OomHarness.txt" );
+_LIT( KT_OomHarnessLogFileWithTitle, "T_OomHarness_[%S].txt" );
+
+// Function pointer related internal definitions
+// Rounding known bug in GCC
+#define GETPTR &
+#define ENTRY(str,func) {_S(str), GETPTR func,0,0,0}
+#define FUNCENTRY(func) {_S(#func), GETPTR func,0,0,0}
+#define OOM_ENTRY(str,func,a,b,c) {_S(str), GETPTR func,a,b,c}
+#define OOM_FUNCENTRY(func,a,b,c) {_S(#func), GETPTR func,a,b,c}
+
+// FUNCTION PROTOTYPES
+// None
+
+// FORWARD DECLARATIONS
+class COomTestHarness;
+class CMemoryMonitorStatusWatcher;
+class CMemoryMonitorTimeoutWatcher;
+
+// DATA TYPES
+// None
+
+// A typedef for function that does the actual testing,
+// function is a type
+// TInt COomTestHarness::<NameOfFunction> ( TTestResult& aResult )
+typedef TInt (COomTestHarness::* TestFunction)(TTestResult&);
+
+// CLASS DECLARATION
+
+/**
+* An internal structure containing a test case name and
+* the pointer to function doing the test
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+class TCaseInfoInternal
+ {
+ public:
+ const TText* iCaseName;
+ TestFunction iMethod;
+ TBool iIsOOMTest;
+ TInt iFirstMemoryAllocation;
+ TInt iLastMemoryAllocation;
+ };
+
+// CLASS DECLARATION
+
+/**
+* A structure containing a test case name and
+* the pointer to function doing the test
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+class TCaseInfo
+ {
+ public:
+ TPtrC iCaseName;
+ TestFunction iMethod;
+ TBool iIsOOMTest;
+ TInt iFirstMemoryAllocation;
+ TInt iLastMemoryAllocation;
+
+ TCaseInfo( const TText* a ) : iCaseName( (TText*) a )
+ {
+ };
+
+ };
+
+// CLASS DECLARATION
+
+/**
+* This a T_OomHarness class.
+* ?other_description_lines
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+NONSHARABLE_CLASS(COomTestHarness) : public CTestModuleBase
+ {
+ public: // Constructors and destructor
+
+
+ /**
+ * Two-phased constructor.
+ */
+ static COomTestHarness* NewL();
+
+ /**
+ * Destructor.
+ */
+ virtual ~COomTestHarness();
+
+ public: // New functions
+ // None
+
+ public: // Functions from base classes
+
+ /**
+ * From CTestModuleBase InitL is used to initialize the
+ * T_OomHarness. It is called once for every instance of
+ * TestModule T_OomHarness after its creation.
+ * @since ?Series60_version
+ * @param aIniFile Initialization file for the test module (optional)
+ * @param aFirstTime Flag is true when InitL is executed for first
+ * created instance of T_OomHarness.
+ * @return Symbian OS error code
+ */
+ TInt InitL( TFileName& aIniFile, TBool aFirstTime );
+
+ /**
+ * From CTestModuleBase GetTestCasesL is used to inquiry test cases
+ * from T_OomHarness.
+ * @since ?Series60_version
+ * @param aTestCaseFile Test case file (optional)
+ * @param aTestCases Array of TestCases returned to test framework
+ * @return Symbian OS error code
+ */
+ TInt GetTestCasesL( const TFileName& aTestCaseFile,
+ RPointerArray<TTestCaseInfo>& aTestCases );
+
+ /**
+ * From CTestModuleBase RunTestCaseL is used to run an individual
+ * test case.
+ * @since ?Series60_version
+ * @param aCaseNumber Test case number
+ * @param aTestCaseFile Test case file (optional)
+ * @param aResult Test case result returned to test framework (PASS/FAIL)
+ * @return Symbian OS error code (test case execution error, which is
+ * not reported in aResult parameter as test case failure).
+ */
+ TInt RunTestCaseL( const TInt aCaseNumber,
+ const TFileName& aTestCaseFile,
+ TTestResult& aResult );
+
+ /**
+ * From CTestModuleBase; OOMTestQueryL is used to specify is particular
+ * test case going to be executed using OOM conditions
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @param aFailureType OOM failure type (optional)
+ * @param aFirstMemFailure The first heap memory allocation failure value (optional)
+ * @param aLastMemFailure The last heap memory allocation failure value (optional)
+ * @return TBool
+ */
+ virtual TBool OOMTestQueryL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TOOMFailureType& aFailureType,
+ TInt& /* aFirstMemFailure */,
+ TInt& /* aLastMemFailure */ );
+
+ /**
+ * From CTestModuleBase; OOMTestInitializeL may be used to initialize OOM
+ * test environment
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @return None
+ */
+ virtual void OOMTestInitializeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ );
+ /**
+ * From CTestModuleBase; OOMTestFinalizeL may be used to finalize OOM
+ * test environment
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @return None
+ */
+ virtual void OOMTestFinalizeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ );
+
+ /**
+ * From CTestModuleBase; OOMHandleWarningL
+ * @param aTestCaseFile Test case file (optional)
+ * @param aCaseNumber Test case number (optional)
+ * @param aFailNextValue FailNextValue for OOM test execution (optional)
+ * @return None
+ */
+ virtual void OOMHandleWarningL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TInt& /* aFailNextValue */);
+ void AllocateMemoryL(TInt aKBytes);
+
+ protected: // New functions
+ // None
+
+ protected: // Functions from base classes
+ // None
+
+ private:
+
+ /**
+ * C++ default constructor.
+ */
+ COomTestHarness();
+
+ /**
+ * By default Symbian 2nd phase constructor is private.
+ */
+ void ConstructL();
+
+ // Prohibit copy constructor if not deriving from CBase.
+ // ?classname( const ?classname& );
+ // Prohibit assigment operator if not deriving from CBase.
+ // ?classname& operator=( const ?classname& );
+
+ /**
+ * Function returning test case name and pointer to test case function.
+ * @since ?Series60_version
+ * @param aCaseNumber test case number
+ * @return TCaseInfo
+ */
+ const TCaseInfo Case ( const TInt aCaseNumber ) const;
+
+ // Test setup functions...
+
+ // Close any dummy apps
+ // Free all memory being eaten by the server
+ // Update the call counts on the plugins (add them if they're not there already)
+ void ResetL();
+
+ void EatMemoryL(TInt aKBytesToLeaveFree);
+
+ // Set up the plugins and applications - this is the starting point for many test cases
+ // 5 applications are started with approx 1 MB used for each
+ // 1MB (approx) of memory is reserved for each one of the plugins
+ void CommonSetUpL();
+
+ void StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs);
+
+ // Results checking functions...
+
+ // Returns KErrNone if we get the expected result
+ TInt AppIsRunning(TInt32 aUid, TBool aExpectedResult);
+
+ // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+ // Returns KErrNone if we get the expected result
+ TInt PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult);
+
+ // Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+ // Returns KErrNone if we get the expected result
+ TInt PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult);
+
+ // Utility functions
+
+ // Wait a while for the system to settle down
+ inline void Settle();
+
+ void BringAppToForeground(TInt32 aUid);
+
+
+ TInt GetFreeMemory();
+
+ // Utility function which calls the async version of optional RAM request and makes it behave like the sync version
+ TInt RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable);
+
+ // Utility function which starts the memory monitor property watcher.
+ // The watcher stops the active scheduler when the monitor status changes
+ void StartMemoryMonitorStatusWatcher(TInt& aTestState);
+
+ // Utility function which starts the timeout watcher and the active scheduler
+ // The watcher stops the active scheduler when the monitor status changes
+ // This function also cancels any pending requests when we are done
+ void StartTimerAndRunWatcher(TInt& aTestState);
+
+ // The tests...
+
+ // Test normal application closure for a single app
+ // Start three applications
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ // The middle application should be configured to eat 5MB of memory
+ // A low memory event is triggered and the middle application only should be closed
+ TInt AppCloseTest1L(TTestResult& aResult);
+
+ // Tests the idle time rule mechanism for app closure
+ // Start three applications
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ // After an idle period the highest priority app is configured to become the lowest priority
+ // The middle and highest application should be configured to eat 5MB of memory
+ // A low memory event is triggered and the middle application only should be closed
+ // Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed
+ TInt AppCloseIdleTimeTest1L(TTestResult& aResult);
+
+ //Tests the that window group z order is considered when closing apps.
+ //Start 3 apps of equal priority, ensuring their z order is known
+ //Starts another lower priority app and puts that in the foreground
+ //A low memory event is triggered such that only one app needs to be closed
+ //The closed app should be the one furthest from the foreground in the z order
+ TInt AppCloseEqualPrioritiesL(TTestResult& aResult);
+
+ // Test system plugins and continue mode
+ // Simulate a low memory event
+ // Two system plugins should free enough memory, but four will be run because they work in "continue" mode
+ TInt PluginTest1L(TTestResult& aResult);
+
+ // Test application plugins
+ // Start two target apps
+ // Simulate a low memory event
+ // The one of the application plugins should now be run, displacing one of the system plugins
+ // The target apps are of sufficiently high priority that they will not be closed
+ TInt PluginTest2L(TTestResult& aResult);
+
+ // Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins
+ // Initialise P4 plugin to consume 5MB of memory
+ // No other plugins are configured to release memory
+ // Simulate a low memory event (go just below the low threshold)
+ // Check that the P4 plugin has been called
+ // Check that the P4 plugin has received a request for > 500K and less than <1500K
+ TInt PluginV2Test1L(TTestResult& aResult);
+
+ // Test simple prioritisation of application plugins
+ // Start two target applications
+ // Configure all plugins to consume 0.5MB
+ // Simulate a low memory event
+ // Some of the low priority app plugins with those target applications should be called
+ // The highest priority app with that target application should not be called (the lower priority plugins should free enough memory)
+ TInt AppPluginTest1L(TTestResult& aResult);
+
+ // Test simple prioritisation of application plugins
+ // Start two target applications
+ // Configure all plugins to consume 0.5MB
+ // The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time
+ // Wait until the idle time rule applies
+ // Simulate a low memory event
+ // The plugin that initially had the highest priority (but now has the lowest priority) should be called
+ // Note that this test should be the same as AppPluginTest1L with the addition of the idle period
+ TInt AppPluginIdleTimeTest1L(TTestResult& aResult);
+
+ // Test idle time handling for plugins
+ // Start two target apps
+ // Simulate a low memory event
+ // The one of the application plugins should now be run, displacing one of the system plugins
+ // The target apps are of sufficiently high priority that they will not be closed
+ TInt PluginIdleTimeTest2L(TTestResult& aResult);
+
+ // Test the optional allocation mechanism
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 12MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just below the good memory level
+ // Request an optional allocation of 10MB referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required memory
+ TInt OptionalAllocationTest1L(TTestResult& aResult);
+
+
+ // Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 5MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required minimum amount memory
+ // The returned available memory should be about 5MB ( > 3MB and < 7MB )
+ TInt OptionalAllocationTest2L(TTestResult& aResult);
+
+ // Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 3MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed but it won't free enough memory
+ // The optional allocation should fail with KErrNoMemory
+ TInt OptionalAllocationTest3L(TTestResult& aResult);
+
+
+ // Test that force priority check applies (only) to selected priorities
+ // Setup three plugins (priorities 7, 8 & 9)to eat 5MB each
+ // The configuration file should force a check after priority 8
+ // Drop just under the low threshold
+ // Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory)
+ // Plugin P9 should not be called because enou
+ TInt ForcePriorityCheck1L(TTestResult& aResult);
+
+ // Test the Busy API on the OOM server
+ // Start three applications
+ // Ensure that the lowest priority app is not in the foreground
+ // Call the busy API on the OOM monitor for the lowest priority app
+ // Simulate a low memory event by going just under the low threshold
+ // The busy application should not be closed
+ // The other (non-foreground) application should be closed
+ TInt BusyApplicationTest1L(TTestResult& aResult);
+
+ // Test the Normal-priority API on the OOM server
+ // Start three applications
+ // Ensure that the lowest priority app is not in the foreground
+ // Call the busy API on the OOM monitor for the lowest priority app
+ // Then call the not-busy API on the OOM monitor for the lowest priority app
+ // Simulate a low memory event by going just under the low threshold
+ // The lowest priority app should be closed (because it is no longer busy)
+ TInt NormalPriorityApplicationTest1L(TTestResult& aResult);
+
+ // Test the async optional allocation mechanism
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 12MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just below the good memory level
+ // Request an optional allocation of 10MB referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required memory
+ TInt OptionalAllocationAsyncTest1L(TTestResult& aResult);
+
+
+ // Test the async optional allocation mechanism - minimum requested RAM behaviour - successful request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 5MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed freeing the required minimum amount memory
+ // The returned available memory should be about 5MB ( > 3MB and < 7MB )
+ TInt OptionalAllocationAsyncTest2L(TTestResult& aResult);
+
+ // Test the async optional allocation mechanism - minimum requested RAM behaviour - failed request
+ // Configure the plugins not to release any RAM when FreeRam is called
+ // Configure one priority 7 application to release 3MB when FreeRam is called
+ // Start this application (plus another one so it isn't in the foreground)
+ // Drop just above the good memory level
+ // Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+ // All of the plugins below P8 should be called
+ // The P7 application should be closed but it won't free enough memory
+ // The optional allocation should fail with KErrNoMemory
+ TInt OptionalAllocationAsyncTest3L(TTestResult& aResult);
+
+ // Test that sync mode configuration is working for system plugins
+ // Configure three system plugins to release 5MB of memory each.
+ // The plugins are configured as follows
+ // Plugin 1: Priority 7, sync mode continue
+ // Plugin 2: Priority 8, sync mode check
+ // Plugin 3: Priority 9, sync mode continue
+ // Drop just under the low threshold
+ // Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM)
+ // Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed
+ TInt PluginSyncModeTest1L(TTestResult& aResult);
+
+
+ // Start three applications
+ // One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground
+ // Configure applications not to release any memory
+ // Go just significantly under the low memory threshold
+ // Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low.
+ // Check that the low priority application is closed
+ // Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold)
+ TInt NeverCloseTest1L(TTestResult& aResult);
+
+ TInt AppCloseTwoSessionsL(TTestResult& aResult);
+
+ TInt CallIfTargetAppNotRunningTest1L(TTestResult& aResult);
+
+ TInt AppCloseSpecificThresholdTest1L(TTestResult& aResult);
+
+ // test that the plugins are left in the off state if a request for optional RAM
+ // cannot be granted
+ TInt PluginTestInsufficientMemoryFreedL(TTestResult& aResult);
+
+ // test that the plugins are left in the off state if a request for optional RAM
+ // cannot be granted
+ // The test makes the optional RAM call from a state where memory is between the
+ // global low and good thresholds
+ TInt PluginTestInsufficientMemoryFreed2L(TTestResult& aResult);
+
+
+ public: // Data
+ // None
+
+ protected: // Data
+ // None
+
+ private: // Data
+ // Pointer to test (function) to be executed
+ TestFunction iMethod;
+
+ // Pointer to logger
+ CStifLogger * iLog;
+
+ // Normal logger
+ CStifLogger* iStdLog;
+
+ // Test case logger
+ CStifLogger* iTCLog;
+
+ // Flag saying if test case title should be added to log file name
+ TBool iAddTestCaseTitleToLogName;
+
+ // ?one_line_short_description_of_data
+ //?data_declaration;
+
+ // Reserved pointer for future extension
+ //TAny* iReserved;
+
+ struct TPluginCallCount
+ {
+ TInt iFreeRamCallCount;
+ TInt iMemoryGoodCallCount;
+ };
+
+ RHashMap<TInt32, TPluginCallCount> iPluginCallCounts;
+
+ RPointerArray<CCDummyApplicationHandle> iApps;
+
+ ROOMAllocSession iAllocServer;
+
+ RChunk iChunk;
+ TInt iChunkSize;
+
+ RChunk iDummyChunk;
+ TInt iDummyChunkSize;
+
+ ROomMonitorSession iOomSession;
+
+ //CActiveScheduler needed by the memory monitor watchers
+ CActiveScheduler* iScheduler;
+
+ //The watchers
+ CMemoryMonitorStatusWatcher* iStatusWatcher;
+ CMemoryMonitorTimeoutWatcher* iTimeoutWatcher;
+
+
+ public: // Friend classes
+ // None
+
+ protected: // Friend classes
+ // None
+
+ private: // Friend classes
+ // None
+
+ };
+
+/**
+* This CMemoryMonitorStatusWatcher class signals a client if the memorymonitor status becomes different from EFreeingMemory.
+* ?other_description_lines
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+NONSHARABLE_CLASS(CMemoryMonitorStatusWatcher) : public CActive
+ {
+ public:
+ static CMemoryMonitorStatusWatcher* NewL();
+ ~CMemoryMonitorStatusWatcher();
+ void Start(TInt* aWatcherState);
+ private:
+ CMemoryMonitorStatusWatcher();
+ void ConstructL();
+ void DoCancel();
+ void RunL();
+ private:
+ RProperty iMonitorProperty;
+ TInt* iTestState;
+ };
+
+/**
+* This CMemoryMonitorTimeoutWatcher class signals a client if the memorymonitor takes too long to leave EFreeingMemory state.
+* ?other_description_lines
+*
+* @lib ?library
+* @since ?Series60_version
+*/
+NONSHARABLE_CLASS(CMemoryMonitorTimeoutWatcher) : public CTimer
+ {
+public:
+ static CMemoryMonitorTimeoutWatcher* NewL();
+ ~CMemoryMonitorTimeoutWatcher();
+ void Start(TInt* aTestState, const TTimeIntervalMicroSeconds32& aTimeout);
+
+private:
+ CMemoryMonitorTimeoutWatcher();
+ void ConstructL();
+ void DoCancel();
+ void RunL();
+private:
+ TInt* iTestState;
+ };
+
+struct TReturnStatus
+ {
+ TInt iId;
+ TBool iCompleted;
+ TInt iReturnStatus;
+ };
+
+
+NONSHARABLE_CLASS(CAsyncRequester) : public CActive
+ {
+public:
+ static CAsyncRequester* NewL(RChunk aChunk, TInt aChunkSize);
+ ~CAsyncRequester();
+ void Start(TInt aBytesToRequest, TReturnStatus* aReturnStatus);
+
+private:
+ CAsyncRequester(RChunk aChunk, TInt aChunkSize);
+ void ConstructL();
+ void DoCancel();
+ void RunL();
+private:
+ ROomMonitorSession iSession;
+ TReturnStatus* iReturnStatus;
+ RChunk iChunk;
+ TInt iChunkSize;
+ };
+
+
+
+inline void COomTestHarness::Settle()
+ {
+ //wait for oom system to settle
+ User::After(TTimeIntervalMicroSeconds32(KSettlingTime));
+ }
+
+#endif // T_OOMHARNESS_H
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/CDummyApplicationHandle.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,78 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <w32std.h>
+#include "CDummyApplicationHandle.h"
+
+CCDummyApplicationHandle::CCDummyApplicationHandle(TUid aUid)
+: iUid(aUid)
+ {
+ // No implementation required
+ }
+
+CCDummyApplicationHandle::~CCDummyApplicationHandle()
+ {
+ if(iMsgQueue.Handle())
+ {
+ iMsgQueue.SendBlocking(0);
+ iMsgQueue.Close();
+ }
+ iProcess.Close();
+ }
+
+CCDummyApplicationHandle* CCDummyApplicationHandle::NewLC(TUid aUid, TInt aExtraMemoryAllocation)
+ {
+ CCDummyApplicationHandle* self = new (ELeave) CCDummyApplicationHandle(aUid);
+ CleanupStack::PushL(self);
+ self->ConstructL(aExtraMemoryAllocation);
+ return self;
+ }
+
+CCDummyApplicationHandle* CCDummyApplicationHandle::NewL(TUid aUid, TInt aExtraMemoryAllocation)
+ {
+ CCDummyApplicationHandle* self = CCDummyApplicationHandle::NewLC(aUid, aExtraMemoryAllocation);
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+void CCDummyApplicationHandle::ConstructL(TInt aExtraMemoryAllocation)
+ {
+ TBuf<28> params;
+ params.Format(_L("uid=%08x alloc=%x"), iUid, aExtraMemoryAllocation);
+ User::LeaveIfError(iProcess.Create(_L("t_oomdummyapp_0xE6CFBA00.exe"), params));
+ User::LeaveIfError(iMsgQueue.CreateGlobal(KNullDesC, 4));
+ User::LeaveIfError(iProcess.SetParameter(15, iMsgQueue));
+ iProcess.Resume();
+ }
+
+void CCDummyApplicationHandle::SendMessage(TInt aMessage)
+ {
+ iMsgQueue.SendBlocking(aMessage);
+ }
+
+TBool CCDummyApplicationHandle::CompareTo(const TUid* aKey, const CCDummyApplicationHandle& aValue)
+ {
+ return aValue.iUid == *aKey;
+ }
+
+void CCDummyApplicationHandle::BringToForeground()
+ {
+ SendMessage(1);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharness.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,584 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// INCLUDE FILES
+#include <Stiftestinterface.h>
+#include "t_oomharness.h"
+#include <e32math.h>
+#include "SettingServerClient.h"
+#include <e32property.h>
+
+// EXTERNAL DATA STRUCTURES
+// None
+
+// EXTERNAL FUNCTION PROTOTYPES
+// None
+
+// CONSTANTS
+// None
+
+// MACROS
+// None
+
+// LOCAL CONSTANTS AND MACROS
+// None
+
+// MODULE DATA STRUCTURES
+// None
+
+// LOCAL FUNCTION PROTOTYPES
+// None
+
+// FORWARD DECLARATIONS
+// None
+
+// ==================== LOCAL FUNCTIONS =======================================
+
+
+/*
+-------------------------------------------------------------------------------
+
+ DESCRIPTION
+
+ This file (t_oomharness.cpp) contains all test framework related parts of
+ this test module. Actual test cases are implemented in file
+ t_oomharnesscases.cpp.
+
+ COomTestHarness is an example of test module implementation. This example
+ uses hard coded test cases (i.e it does not have any test case
+ configuration file).
+
+ Example uses function pointers to call test cases. This provides an easy
+ method to add new test cases.
+
+ See function Cases in file t_oomharnesscases.cpp for instructions how to
+ add new test cases. It is not necessary to modify this file when adding
+ new test cases.
+
+ To take this module into use, add following lines to test framework
+ initialisation file:
+
+# t_oomharness_stif
+[New_Module]
+ModuleName= t_oomharness_stif
+[End_Module]
+
+-------------------------------------------------------------------------------
+*/
+
+// ================= MEMBER FUNCTIONS =========================================
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: COomTestHarness
+
+ Description: C++ default constructor can NOT contain any code, that
+ might leave.
+
+ Parameters: None
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+COomTestHarness::COomTestHarness()
+ {
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: ConstructL
+
+ Description: Symbian 2nd phase constructor that can leave.
+
+ Note: If OOM test case uses STIF Logger, then STIF Logger must be created
+ with static buffer size parameter (aStaticBufferSize). Otherwise Logger
+ allocates memory from heap and therefore causes error situations with OOM
+ testing. For more information about STIF Logger construction, see STIF
+ Users Guide.
+
+ Parameters: None
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+void COomTestHarness::ConstructL()
+ {
+ //Read logger settings to check whether test case name is to be
+ //appended to log file name.
+ RSettingServer settingServer;
+ TInt ret = settingServer.Connect();
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Struct to StifLogger settigs.
+ TLoggerSettings loggerSettings;
+ // Parse StifLogger defaults from STIF initialization file.
+ ret = settingServer.GetLoggerSettings(loggerSettings);
+ if(ret != KErrNone)
+ {
+ User::Leave(ret);
+ }
+ // Close Setting server session
+ settingServer.Close();
+ iAddTestCaseTitleToLogName = loggerSettings.iAddTestCaseTitle;
+
+ // Constructing static buffer size logger, needed with OOM testing because
+ // normally logger allocates memory from heap!
+ iStdLog = CStifLogger::NewL( KT_OomHarnessLogPath,
+ KT_OomHarnessLogFile,
+ CStifLogger::ETxt,
+ CStifLogger::EFile,
+ ETrue,
+ ETrue,
+ ETrue,
+ EFalse,
+ ETrue,
+ EFalse,
+ 100 );
+ iLog = iStdLog;
+
+ // Sample how to use logging
+ _LIT( KLogInfo, "t_oomharness logging starts!" );
+ iLog->Log( KLogInfo );
+
+ User::LeaveIfError(iAllocServer.Connect());
+ User::LeaveIfError(iOomSession.Connect());
+
+ User::LeaveIfError(iChunk.CreateLocal(KOomHarnessInitialEatenMemory, KOomHarnessMaxEatenMemory));
+ iChunkSize = KOomHarnessInitialEatenMemory;
+
+ iScheduler = new (ELeave) CActiveScheduler;
+ CActiveScheduler::Install( iScheduler );
+
+ iStatusWatcher = CMemoryMonitorStatusWatcher::NewL();
+ iTimeoutWatcher = CMemoryMonitorTimeoutWatcher::NewL();
+
+ ResetL();
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: NewL
+
+ Description: Two-phased constructor. Constructs new COomTestHarness
+ instance and returns pointer to it.
+
+ Parameters: None
+
+ Return Values: COomTestHarness*: new object.
+
+ Errors/Exceptions: Leaves if memory allocation fails or ConstructL leaves.
+
+ Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+COomTestHarness* COomTestHarness::NewL()
+ {
+ COomTestHarness* self = new (ELeave) COomTestHarness;
+
+ CleanupStack::PushL( self );
+ self->ConstructL();
+ CleanupStack::Pop();
+
+ return self;
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: ~COomTestHarness
+
+ Description: Destructor.
+
+ Parameters: None
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Approved
+
+-------------------------------------------------------------------------------
+*/
+COomTestHarness::~COomTestHarness()
+ {
+ iLog = NULL;
+ delete iStdLog;
+ iStdLog = NULL;
+ delete iTCLog;
+ iTCLog = NULL;
+ iApps.ResetAndDestroy();
+ iAllocServer.Close();
+ iChunk.Close();
+ iPluginCallCounts.Close();
+ delete iScheduler;
+ delete iStatusWatcher;
+ delete iTimeoutWatcher;
+ }
+
+/*
+-------------------------------------------------------------------------------
+ Class: COomTestHarness
+
+ Method: InitL
+
+ Description: Method for test case initialization
+
+ Parameters: None
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Approved
+-------------------------------------------------------------------------------
+*/
+TInt COomTestHarness::InitL( TFileName& /*aIniFile*/,
+ TBool /*aFirstTime*/ )
+ {
+ return KErrNone;
+
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: GetTestCases
+
+ Description: GetTestCases is used to inquire test cases
+ from the test module. Because this test module has hard coded test cases
+ (i.e cases are not read from file), paramter aConfigFile is not used.
+
+ This function loops through all cases defined in Cases() function and
+ adds corresponding items to aTestCases array.
+
+ Parameters: const TFileName& : in: Configuration file name. Not used
+ RPointerArray<TTestCaseInfo>& aTestCases: out:
+ Array of TestCases.
+
+ Return Values: KErrNone: No error
+
+ Errors/Exceptions: Function leaves if any memory allocation operation fails
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+TInt COomTestHarness::GetTestCasesL( const TFileName& /*aConfig*/,
+ RPointerArray<TTestCaseInfo>& aTestCases )
+ {
+ // Loop through all test cases and create new
+ // TTestCaseInfo items and append items to aTestCase array
+ for( TInt i = 0; Case(i).iMethod != NULL; i++ )
+ {
+ // Allocate new TTestCaseInfo from heap for a testcase definition.
+ TTestCaseInfo* newCase = new( ELeave ) TTestCaseInfo();
+
+ // PushL TTestCaseInfo to CleanupStack.
+ CleanupStack::PushL( newCase );
+
+ // Set number for the testcase.
+ // When the testcase is run, this comes as a parameter to RunTestCaseL.
+ newCase->iCaseNumber = i;
+
+ // Set title for the test case. This is shown in UI to user.
+ newCase->iTitle.Copy( Case(i).iCaseName );
+
+ // Append TTestCaseInfo to the testcase array. After appended
+ // successfully the TTestCaseInfo object is owned (and freed)
+ // by the TestServer.
+ User::LeaveIfError(aTestCases.Append ( newCase ) );
+
+ // Pop TTestCaseInfo from the CleanupStack.
+ CleanupStack::Pop( newCase );
+ }
+
+ return KErrNone;
+
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: RunTestCase
+
+ Description: Run a specified testcase.
+
+ Function runs a test case specified by test case number. Test case file
+ parameter is not used.
+
+ If case number is valid, this function runs a test case returned by
+ function Cases().
+
+ Parameters: const TInt aCaseNumber: in: Testcase number
+ const TFileName& : in: Configuration file name. Not used
+ TTestResult& aResult: out: Testcase result
+
+ Return Values: KErrNone: Testcase ran.
+ KErrNotFound: Unknown testcase
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+TInt COomTestHarness::RunTestCaseL( const TInt aCaseNumber,
+ const TFileName& /* aConfig */,
+ TTestResult& aResult )
+ {
+ // Return value
+ TInt execStatus = KErrNone;
+
+ // Get the pointer to test case function
+ TCaseInfo tmp = Case ( aCaseNumber );
+
+ _LIT( KLogInfo, "Starting testcase [%S]" );
+ iLog->Log( KLogInfo, &tmp.iCaseName);
+
+ // Check that case number was valid
+ if ( tmp.iMethod != NULL )
+ {
+ //Open new log file with test case title in file name
+ if(iAddTestCaseTitleToLogName)
+ {
+ //delete iLog; //Close currently opened log
+ //iLog = NULL;
+ //Delete test case logger if exists
+ if(iTCLog)
+ {
+ delete iTCLog;
+ iTCLog = NULL;
+ }
+
+ TFileName logFileName;
+ TName title;
+ TestModuleIf().GetTestCaseTitleL(title);
+
+ logFileName.Format(KT_OomHarnessLogFileWithTitle, &title);
+
+ iTCLog = CStifLogger::NewL(KT_OomHarnessLogPath,
+ logFileName,
+ CStifLogger::ETxt,
+ CStifLogger::EFile,
+ ETrue,
+ ETrue,
+ ETrue,
+ EFalse,
+ ETrue,
+ EFalse,
+ 100);
+ iLog = iTCLog;
+ }
+
+ // Valid case was found, call it via function pointer
+ iMethod = tmp.iMethod;
+ //execStatus = ( this->*iMethod )( aResult );
+ TRAPD(err, execStatus = ( this->*iMethod )( aResult ));
+ if(iAddTestCaseTitleToLogName)
+ {
+ //Restore standard log and destroy test case logger
+ iLog = iStdLog;
+ delete iTCLog; //Close currently opened log
+ iTCLog = NULL;
+ }
+ User::LeaveIfError(err);
+
+ }
+ else
+ {
+ // Valid case was not found, return error.
+ execStatus = KErrNotFound;
+ }
+
+ // Return case execution status (not the result of the case execution)
+ return execStatus;
+
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: OOMTestQueryL
+
+ Description: Checks test case information for OOM execution.
+
+ Return Values: TBool
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+TBool COomTestHarness::OOMTestQueryL( const TFileName& /* aTestCaseFile */,
+ const TInt aCaseNumber,
+ TOOMFailureType& /* aFailureType */,
+ TInt& aFirstMemFailure,
+ TInt& aLastMemFailure )
+ {
+ _LIT( KLogInfo, "COomTestHarness::OOMTestQueryL" );
+ iLog->Log( KLogInfo );
+
+ aFirstMemFailure = Case( aCaseNumber ).iFirstMemoryAllocation;
+ aLastMemFailure = Case( aCaseNumber ).iLastMemoryAllocation;
+
+ return Case( aCaseNumber ).iIsOOMTest;
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: OOMTestInitializeL
+
+ Description: Used to perform the test environment setup for a particular
+ OOM test case. Test Modules may use the initialization file to read
+ parameters for Test Module initialization but they can also have their own
+ configure file or some other routine to initialize themselves.
+
+ NOTE: User may add implementation for OOM test environment initialization.
+ Usually no implementation is required.
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+void COomTestHarness::OOMTestInitializeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ )
+ {
+ _LIT( KLogInfo, "COomTestHarness::OOMTestInitializeL" );
+ iLog->Log( KLogInfo );
+
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: OOMHandleWarningL
+
+ Description: Used in OOM testing to provide a way to the derived TestModule
+ to handle warnings related to non-leaving or TRAPped allocations.
+
+ In some cases the allocation should be skipped, either due to problems in
+ the OS code or components used by the code being tested, or even inside the
+ tested components which are implemented this way on purpose (by design), so
+ it is important to give the tester a way to bypass allocation failures.
+
+ NOTE: User may add implementation for OOM test warning handling. Usually no
+ implementation is required.
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+void COomTestHarness::OOMHandleWarningL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */,
+ TInt& /* aFailNextValue */ )
+ {
+ _LIT( KLogInfo, "COomTestHarness::OOMHandleWarningL" );
+ iLog->Log( KLogInfo );
+
+ }
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: OOMTestFinalizeL
+
+ Description: Used to perform the test environment cleanup for a particular OOM
+ test case.
+
+ NOTE: User may add implementation for OOM test environment finalization.
+ Usually no implementation is required.
+
+ Return Values: None
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+void COomTestHarness::OOMTestFinalizeL( const TFileName& /* aTestCaseFile */,
+ const TInt /* aCaseNumber */ )
+ {
+ _LIT( KLogInfo, "COomTestHarness::OOMTestFinalizeL" );
+ iLog->Log( KLogInfo );
+
+ }
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point
+// Returns: CTestModuleBase*: Pointer to Test Module object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CTestModuleBase* LibEntryL()
+ {
+ return COomTestHarness::NewL();
+
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomharness_stif/src/t_oomharnesscases.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,3332 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+// INCLUDE FILES
+#include <e32hal.h> //User::HAL
+#include <e32property.h> //RProperty
+#include "t_oomharness.h"
+#include "CDummyApplicationHandle.h"
+#include "../../t_oomdummyapp/inc/t_oomdummyappmsgs.h"
+#include "t_oomdummyplugin_properties.h"
+#include <hal.h>
+
+// EXTERNAL DATA STRUCTURES
+// None
+
+// EXTERNAL FUNCTION PROTOTYPES
+// None
+
+// CONSTANTS
+// None
+
+// MACROS
+// None
+
+// LOCAL CONSTANTS AND MACROS
+
+const TInt KOomJustUnderLowMemoryThreshold = 4000;
+const TInt KOomSignificantlyUnderLowMemoryThreshold = 2024;
+const TInt KOomBetweenLowAndGoodThresholds = 4300;
+const TInt KOomJustAboveGoodMemoryThreshold = 5100;
+
+const TInt KOomTestFirstIdlePeriod = 40000000; // 40 seconds
+
+
+// MODULE DATA STRUCTURES
+// None
+
+// LOCAL FUNCTION PROTOTYPES
+// None
+
+// FORWARD DECLARATIONS
+// None
+
+// ==================== LOCAL FUNCTIONS =======================================
+
+/*
+-------------------------------------------------------------------------------
+
+ DESCRIPTION
+
+ This module contains the implementation of COomTestHarness class
+ member functions that does the actual tests.
+
+-------------------------------------------------------------------------------
+*/
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+/*
+-------------------------------------------------------------------------------
+
+ Class: COomTestHarness
+
+ Method: Case
+
+ Description: Returns a test case by number.
+
+ This function contains an array of all available test cases
+ i.e pair of case name and test function. If case specified by parameter
+ aCaseNumber is found from array, then that item is returned.
+
+ The reason for this rather complicated function is to specify all the
+ test cases only in one place. It is not necessary to understand how
+ function pointers to class member functions works when adding new test
+ cases. See function body for instructions how to add new test case.
+
+ Parameters: const TInt aCaseNumber :in: Test case number
+
+ Return Values: const TCaseInfo Struct containing case name & function
+
+ Errors/Exceptions: None
+
+ Status: Proposal
+
+-------------------------------------------------------------------------------
+*/
+const TCaseInfo COomTestHarness::Case (
+ const TInt aCaseNumber ) const
+ {
+
+ /*
+ * To add new test cases, implement new test case function and add new
+ * line to KCases array specify the name of the case and the function
+ * doing the test case
+ * In practice, do following
+ *
+ * 1) Make copy of existing test case function and change its name
+ * and functionality. Note that the function must be added to
+ * OOMHard.cpp file and to OOMHard.h
+ * header file.
+ *
+ * 2) Add entry to following KCases array either by using:
+ *
+ * 2.1: FUNCENTRY or ENTRY macro
+ * ENTRY macro takes two parameters: test case name and test case
+ * function name.
+ *
+ * FUNCENTRY macro takes only test case function name as a parameter and
+ * uses that as a test case name and test case function name.
+ *
+ * Or
+ *
+ * 2.2: OOM_FUNCENTRY or OOM_ENTRY macro. Note that these macros are used
+ * only with OOM (Out-Of-Memory) testing!
+ *
+ * OOM_ENTRY macro takes five parameters: test case name, test case
+ * function name, TBool which specifies is method supposed to be run using
+ * OOM conditions, TInt value for first heap memory allocation failure and
+ * TInt value for last heap memory allocation failure.
+ *
+ * OOM_FUNCENTRY macro takes test case function name as a parameter and uses
+ * that as a test case name, TBool which specifies is method supposed to be
+ * run using OOM conditions, TInt value for first heap memory allocation
+ * failure and TInt value for last heap memory allocation failure.
+ */
+
+ static TCaseInfoInternal const KCases[] =
+ {
+ // To add new test cases, add new items to this array
+
+ // NOTE: When compiled to GCCE, there must be Classname::
+ // declaration in front of the method name, e.g.
+ // COomTestHarness::PrintTest. Otherwise the compiler
+ // gives errors.
+
+ ENTRY( "App Close Test 1", COomTestHarness::AppCloseTest1L ),
+ ENTRY( "App Close Idle Time", COomTestHarness::AppCloseIdleTimeTest1L ),
+ ENTRY( "App Close Equal Priorities", COomTestHarness::AppCloseEqualPrioritiesL ),
+ ENTRY( "Plugin Test 1", COomTestHarness::PluginTest1L ),
+ ENTRY( "Plugin Test 2", COomTestHarness::PluginTest2L ),
+ ENTRY( "App Plugin Test 1", COomTestHarness::AppPluginTest1L ),
+ ENTRY( "App Plugin Idle Time Test 1", COomTestHarness::AppPluginIdleTimeTest1L ),
+ ENTRY( "Optional Allocation Test 1", COomTestHarness::OptionalAllocationTest1L ),
+ ENTRY( "Optional Allocation Test 2", COomTestHarness::OptionalAllocationTest2L ),
+ ENTRY( "Optional Allocation Test 3", COomTestHarness::OptionalAllocationTest3L ),
+ ENTRY( "Plugin V2 Test 1", COomTestHarness::PluginV2Test1L ),
+ ENTRY( "Force Priority Check Test 1", COomTestHarness::ForcePriorityCheck1L ),
+ ENTRY( "Plugin Sync Mode Test 1", COomTestHarness::PluginSyncModeTest1L ),
+ ENTRY( "Never Close Test 1", COomTestHarness::NeverCloseTest1L ),
+ ENTRY( "Optional Allocation Async Test 1", COomTestHarness::OptionalAllocationAsyncTest1L ),
+ ENTRY( "Optional Allocation Async Test 2", COomTestHarness::OptionalAllocationAsyncTest2L ),
+ ENTRY( "Optional Allocation Async Test 3", COomTestHarness::OptionalAllocationAsyncTest3L ),
+#ifdef CLIENT_REQUEST_QUEUE
+ ENTRY( "App Close Two Client Sessions", COomTestHarness::AppCloseTwoSessionsL ),
+#endif
+ ENTRY( "Call If Target App Not Running Test 1", COomTestHarness::CallIfTargetAppNotRunningTest1L ),
+#ifdef __WINS__
+ ENTRY( "App Close Specific Threshold Test 1", COomTestHarness::AppCloseSpecificThresholdTest1L ),
+#endif
+ ENTRY( "Plugin Test Insufficient Memory Freed", COomTestHarness::PluginTestInsufficientMemoryFreedL ),
+ ENTRY( "Plugin Test Insufficient Memory Freed 2", COomTestHarness::PluginTestInsufficientMemoryFreed2L ),
+ };
+
+ // Verify that case number is valid
+ if( (TUint) aCaseNumber >= sizeof( KCases ) /
+ sizeof( TCaseInfoInternal ) )
+ {
+
+ // Invalid case, construct empty object
+ TCaseInfo null( (const TText*) L"" );
+ null.iMethod = NULL;
+ null.iIsOOMTest = EFalse;
+ null.iFirstMemoryAllocation = 0;
+ null.iLastMemoryAllocation = 0;
+ return null;
+
+ }
+
+ // Construct TCaseInfo object and return it
+ TCaseInfo tmp ( KCases[ aCaseNumber ].iCaseName );
+ tmp.iMethod = KCases[ aCaseNumber ].iMethod;
+ tmp.iIsOOMTest = KCases[ aCaseNumber ].iIsOOMTest;
+ tmp.iFirstMemoryAllocation = KCases[ aCaseNumber ].iFirstMemoryAllocation;
+ tmp.iLastMemoryAllocation = KCases[ aCaseNumber ].iLastMemoryAllocation;
+ return tmp;
+
+ }
+
+TInt COomTestHarness::AppCloseTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ StartApplicationL(KOomTestAppUid, 5 * 1024); // P9 app
+ StartApplicationL(KOomTestApp2Uid, 5 * 1024); // P8 app, configure it to eat 5MB
+ StartApplicationL(KOomTestApp3Uid, 0); // P7 app
+
+ BringAppToForeground(KOomTestApp3Uid);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ err = AppIsRunning(KOomTestApp2Uid, EFalse);
+
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P8 App KOomTestApp2Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P7 app should still be running because it was in the foreground
+ _LIT( KResult ,"(P7 App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestAppUid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P9 app should still be running because the P8 application freed enough memory
+ _LIT( KResult ,"P9 App KOomTestAppUid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+ ResetL();
+ return KErrNone;
+ }
+
+// Tests the idle time rule mechanism for app closure
+// Start three applications
+// The lowest priority app should be in the foregound
+// ... with the next lowest behind it
+// ... followed by the highest priority application at the back
+// After an idle period the highest priority app is configured to become the lowest priority
+// The middle and highest application should be configured to eat 5MB of memory
+// A low memory event is triggered and the middle application only should be closed
+// Note that this test should be the same as AppCloseTest1L, with the exception of the idle period which causes different apps to be closed
+TInt COomTestHarness::AppCloseIdleTimeTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // The lowest priority app should be in the foregound
+ // ... with the next lowest behind it
+ // ... followed by the highest priority application at the back
+ StartApplicationL(KOomTestAppUid, 5 * 1024); // P9 app (which becomes a P2 app after the idle time)
+ StartApplicationL(KOomTestApp2Uid, 5 * 1024); // P8 app, configure it to eat 5MB
+ StartApplicationL(KOomTestApp3Uid, 0); // P7 app
+
+ BringAppToForeground(KOomTestApp3Uid);
+
+ // Wait for the first set of idle time rules to apply
+ User::After(KOomTestFirstIdlePeriod);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ err = AppIsRunning(KOomTestAppUid, EFalse);
+
+ if (err != KErrNone)
+ {
+ // The P9 app should have become a P2 app after the idle period, therefore it should have been the first candidate for closure
+ _LIT( KResult ,"P9->P2 App KOomTestAppUid running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp2Uid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P8 application should still be running because the P9 app (that has become a P2 app) has freed the required memory
+ _LIT( KResult ,"P8 App KOomTestApp2Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P7 app should still be running because it was in the foreground
+ _LIT( KResult ,"P7 App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+TInt COomTestHarness::AppCloseEqualPrioritiesL(TTestResult& aResult)
+ {
+ ResetL();
+
+ StartApplicationL(KOomTestApp4Uid, 3 * 1024); // P7 app1, configure it to eat 5MB
+
+ Settle();
+
+ StartApplicationL(KOomTestApp3Uid, 3 * 1024); // P7 app2, configure it to eat 5MB
+
+ Settle();
+
+ StartApplicationL(KOomTestApp5Uid, 3 * 1024); // P7 app3, configure it to eat 5MB
+
+ Settle();
+
+ StartApplicationL(KOomTestAppUid, 0); //P9 app
+
+ Settle();
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ err = AppIsRunning(KOomTestApp4Uid, EFalse);
+ if (err != KErrNone)
+ {
+ // The P7 app furthest to the back in the z order should be closed.
+ // This should release sufficient memory.
+ _LIT( KResult ,"P7 App KOomTestApp4Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ // the other 3 apps should all still be running
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp5Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"App KOomTestApp5Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestAppUid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P9 app should still be running because the P8 application freed enough memory
+ _LIT( KResult ,"P9 App KOomTestAppUid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+TInt COomTestHarness::PluginTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 0.6MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x96000, 0x96000));
+ }
+ //start application so that plugin 0x10286A3A which does the check can be called
+ StartApplicationL(KOomTestApp2Uid, 0);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // The first two app plugins should have been run, releasing
+ // the required memory. The second app plugin to be run - 10286A3A - has a check,
+ // so no other plugins should have run.
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3A FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // These two plugins should not be called
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A38, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A38 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A34, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A34 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // Finally check that the plugins have been notified of the final good memory state
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3A, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3A MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A34, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 MemoryGood incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // MemoryGood should not be called on this plugin because FreeMemory was never called on it
+ // 10286A38
+ err = PluginMemoryGoodCalledL(0x10286A38, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A38 MemoryGood incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test application plugins
+// Start two target apps
+// Simulate a low memory event
+// The one of the application plugins should now be run, displacing one of the system plugins
+// The target apps are of sufficiently high priority that they will not be closed
+TInt COomTestHarness::PluginTest2L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp2Uid, 0);
+ StartApplicationL(KOomTestApp3Uid, 0);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // The first two system plugins should have been closed, releasing the required memory
+ // The following two system plugins won't be called (the app plugins will now take their place)
+
+ // The following plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+ // System plugins: 10286A3C(v2 plugin) 10286A34
+
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B not called ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3A not called ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Plugins and apps with higher priorities will not be called/closed because 0x10286A3A is configured to check memory before running anything else
+ err = PluginFreeRamCalledL(0x10286A3C, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3C incorrectly called ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A34, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // The following plugin should also be called (max_batch_size only applies to application closures, not running plugins)
+ // 10286A35
+ err = PluginFreeRamCalledL(0x10286A35, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A35 incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp2Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"App KOomTestApp2Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestAppUid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin KOomTestAppUid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+// Test that the aBytesRequested is correctly passed to the FreeMemory function of V2 plugins
+// Initialise P4 plugin to consume 5MB of memory
+// No other plugins are configured to release memory
+// Simulate a low memory event (go just below the low threshold)
+// Check that the P4 plugin has been called
+// Check that the P4 plugin has received a request for > 500K and less than <1500K
+TInt COomTestHarness::PluginV2Test1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the P4 V2 plugin to eat 5MB:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3C), 0, 0x500000, 0x500000));
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+
+ // Check that the P4 plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3C, ETrue);
+
+ // Check that the request for memory was about right
+ // Note: regular system variation makes it impossible to test for an exact number
+ TInt requestedMemory = 0;
+ err = RProperty::Get(KUidOomPropertyCategory, 0x10286A3C + KOOMDummyPluginBytesRequested, requestedMemory);
+ if ((requestedMemory < 512 * 1024) || (requestedMemory > 1500 * 1024))
+ {
+ _LIT( KResult ,"requestedMemory incorrect");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the higher priority V2 plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3D incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test simple prioritisation of application plugins
+// Start two target applications
+// Configure all plugins to consume 0.5MB
+// Simulate a low memory event
+// Some of the low priority app plugins with those target applications should be called
+// The highest priority app with that target application should not be called (the lower priority plugins should free enough memory)
+TInt COomTestHarness::AppPluginTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp2Uid, 0);
+ StartApplicationL(KOomTestApp3Uid, 0);
+ StartApplicationL(KOomTestAppUid, 0);
+
+
+ TInt err = KErrNone;
+
+ // Check that all of the apps are running
+ err = AppIsRunning(KOomTestApp2Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"app KOomTestApp2Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"app KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestAppUid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"app KOomTestAppUid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // Now eat some memory till we are below treshhold and wait for the memory monitor to bring us above treshhold again
+ TInt memTestState = ETestInit;
+
+ if (err == KErrNone)
+ {
+ BringAppToForeground(KOomTestAppUid);
+
+ //start watchers
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ // fail tests if watchers failed or memory was not freed
+ if (memTestState != ETestAbove)
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ //if memteststate is not desired signal to other cases that they should not pass
+ if (err == KErrNone)
+ {
+ err = KErrGeneral;
+ }
+ }
+ }
+
+ // Check plugins for memory free calls
+ // The following application plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3A FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // The following plugin should not be called because other plugins (including some unchecked system plugins) have freed enough memory
+ // 10286A38
+ err = PluginFreeRamCalledL(0x10286A38, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A38 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+// Test simple prioritisation of application plugins
+// Start two target applications
+// Configure all plugins to consume 0.5MB
+// The app plugin with the highest priority is configured to be assigned the lowest priority after an idle time
+// Wait until the idle time rule applies
+// Simulate a low memory event
+// The plugin that initially had the highest priority (but now has the lowest priority) should be called
+// Note that this test should be the same as AppPluginTest1L with the addition of the idle period
+TInt COomTestHarness::AppPluginIdleTimeTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp2Uid, 0);
+ StartApplicationL(KOomTestApp3Uid, 0);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ User::After(KOomTestFirstIdlePeriod);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // The following application plugins should be called...
+ // Application plugins: 10286A3A 10286A3B
+
+ err = PluginFreeRamCalledL(0x10286A3A, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3A FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // The following plugin should also be called (its priority was initially too high but has been reduced after the idle time)
+ // 10286A38
+ err = PluginFreeRamCalledL(0x10286A38, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A38 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test the optional allocation mechanism
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 12MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required memory
+TInt COomTestHarness::OptionalAllocationTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 12MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 12 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ TInt bytesAvailable;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if(err == KErrNone)
+ {
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // Check that all system plugins below P8 have been called
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A35 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"low prioirity app 0x10286A3B not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 app KOomTestApp3Uid not closed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 5MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required minimum amount memory
+// The returned available memory should be about 5MB ( > 3MB and < 7MB )
+TInt COomTestHarness::OptionalAllocationTest2L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 5 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if(err == KErrNone)
+ {
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ if (err == KErrNone)
+ {
+ // Check that the reported bytes available is > 3MB and < 7MB
+ if ((bytesAvailable < 3 * 1024 * 1024)
+ || (bytesAvailable > 7 * 1024 * 1024))
+ {
+ _LIT( KResult ,"reported bytes not > 3MB and < 7MB");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A34 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ { err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A35 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A37 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 app KOomTestApp3Uid not closed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 3MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed but it won't free enough memory
+// The optional allocation should fail with KErrNoMemory
+TInt COomTestHarness::OptionalAllocationTest3L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 3 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+ err = iOomSession.RequestOptionalRam(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+ // We expect an error because it has not been possible to free the minimum memory
+ if (err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+
+ if(err == KErrNone)
+ {
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // Check that all system plugins below P8 have been called
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A34 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A35 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A37 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid not closed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test that force priority check applies (only) to selected priorities
+// Setup three plugins (priorities 7, 8 & 9)to eat 5MB each
+// The configuration file should force a check after priority 8
+// Drop just under the low threshold
+// Plugins P7 & P8 should be called (P8 is called even though the P7 plugin freed enough memory)
+// Plugin P9 should not be called because enou
+TInt COomTestHarness::ForcePriorityCheck1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the P7, P8 and P9 plugins to eat 5MB each:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x300000, 0x300000)); // P7
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x300000, 0x300000)); // P8
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x300000, 0x300000)); // P9
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+
+ // The P7 plugin should have been called and is the first to release RAM
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 Plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ // The P8 plugin should be called even though the P7 plugin has already released enough memory because the plugin runs in continue mode and there is no forced check
+ err = PluginFreeRamCalledL(0x10286A37, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P8 Plugin 0x10286A37 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // The P9 plugin should not be called because of the force priority check (the P7 & P8 plugins have already released plenty of RAM)
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P9 Plugin 0x10286A3D FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+// Test the Busy API on the OOM server
+// Start three applications
+// Ensure that the lowest priority app is not in the foreground
+// Call the busy API on the OOM monitor for the lowest priority app
+// Simulate a low memory event by going just under the low threshold
+// The busy application should not be closed
+// The other (non-foreground) application should be closed
+TInt COomTestHarness::BusyApplicationTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp2Uid, 0);
+ StartApplicationL(KOomTestAppUid, 0);
+ StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app
+
+ BringAppToForeground(KOomTestAppUid); // TODO: this doesn't seem to be working - message not getting through to the dummy application
+
+ Settle();
+
+ // Send the second app a message to make itself busy
+ TInt id = iApps.Find<TUid>(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->SendMessage(KOomDummyAppSetBusy);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+
+ // Check that the busy application is still running
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the higher priority but non-busy application has been close
+ err = AppIsRunning(KOomTestApp2Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp2Uid not closed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test the NotBusy API on the OOM server
+// Start three applications
+// Ensure that the lowest priority app is not in the foreground
+// Call the busy API on the OOM monitor for the lowest priority app
+// Then call the not-busy API on the OOM monitor for the lowest priority app
+// Simulate a low memory event by going just under the low threshold
+// The lowest priority app should be closed (because it is no longer busy)
+TInt COomTestHarness::NormalPriorityApplicationTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp2Uid, 0);
+ StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ Settle();
+
+ // Send the second app a message to make itself busy
+ TInt id = iApps.Find<TUid>(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ // TODO: temp removed - needs to be put back
+// iApps[id]->SendMessage(KOomDummyAppSetBusy);
+
+ // Send the second app a message to make itself normal priority
+ id = iApps.Find<TUid>(TUid::Uid(KOomTestApp3Uid), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->SendMessage(KOomDummyAppSetNormalPriority);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+
+ // The first four system plugins should have been closed, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+
+ // Check that the no-longer-busy application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"App KOomTestApp3Uid not closed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+// Start three applications
+// One is set to NEVER_CLOSE, one is low priority, one is a dummy app to ensure that the first two are not in the foreground
+// Configure applications not to release any memory
+// Go just significantly under the low memory threshold
+// Wait for the system to recover, if we have moved above the low memory threshold then go significantly under it again. Repeat this step until we no longer go above low.
+// Check that the low priority application is closed
+// Check that the NEVER_CLOSE application is not closed (even though we're still below the low theshold)
+TInt COomTestHarness::NeverCloseTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start the two target applications (plus a third so that the target apps are not in the foreground)
+ StartApplicationL(KOomTestApp3Uid, 0); // Lowest priority app
+ StartApplicationL(KOomTestApp7Uid, 0); // NEVER_CLOSE application
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ TInt attemps = 10;
+
+ while (memTestState != ETestBelow && attemps > 0)
+ {
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // eat memory
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ attemps--;
+ }
+
+ if (err == KErrNone && memTestState == ETestBelow)
+ {
+
+ // The NEVER_CLOSE app should still be running (even though we are still below the low threshold)
+ err = AppIsRunning(KOomTestApp7Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"NEVER_CLOSE app KOomTestApp7Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ // The low priority app should still be closed (even though we are still below the low threshold)
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"low priority app KOomTestApp3Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Incorrectly Above Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+
+
+// Test that sync mode configuration is working for system plugins
+// Configure three system plugins to release 5MB of memory each.
+// The plugins are configured as follows
+// Plugin 1: Priority 7, sync mode continue
+// Plugin 2: Priority 8, sync mode check
+// Plugin 3: Priority 9, sync mode continue
+// Drop just under the low threshold
+// Plugins 1 & 2 should be called (even though plugin 1 alone has freed enough RAM)
+// Plugin 3 won't be called because the check on the priority 8 plugin discovers that enough RAM has been freed
+TInt COomTestHarness::PluginSyncModeTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure three plugins to eat 5MB each:
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A36), 0, 0x300000, 0x300000));
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A37), 0, 0x300000, 0x300000));
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(0x10286A3D), 0, 0x300000, 0x300000));
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+
+ // The first four system plugins should have been run, releasing the required memory
+ // All four plugins should be called, even though the first two will release enough memory (this is because
+ // plugins are always run in continue mode)
+
+ // Check that the first two plugins have been called, but not the third
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A36 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A37, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3D Free Ram incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+
+// Test the optional allocation mechanism
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 12MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required memory
+TInt COomTestHarness::OptionalAllocationAsyncTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 12MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 12 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ TInt bytesAvailable;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 10 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if (err == KErrNone)
+ {
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ // Check that all system plugins below P8 have been called
+
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A35 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A36 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - successful request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 5MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed freeing the required minimum amount memory
+// The returned available memory should be about 5MB ( > 3MB and < 7MB )
+TInt COomTestHarness::OptionalAllocationAsyncTest2L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 5 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+ TInt bytesAvailable;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ if (err == KErrNone)
+ {
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+ if (err == KErrNone)
+ {
+ // Check that the reported bytes available is > 3MB and < 7MB
+ if ((bytesAvailable < 3 * 1024 * 1024)
+ || (bytesAvailable > 7 * 1024 * 1024))
+ {
+ _LIT( KResult ,"bytesAvailable not ( > 3MB and < 7MB )");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that all system plugins below P8 have been called
+
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A35 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A36 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"RequestOptionalRam failed or Memory Still Below Treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+// Test the optional allocation mechanism - minimum requested RAM behaviour - failed request
+// Configure the plugins not to release any RAM when FreeRam is called
+// Configure one priority 7 application to release 3MB when FreeRam is called
+// Start this application (plus another one so it isn't in the foreground)
+// Drop just above the good memory level
+// Request an optional allocation of 10MB (5MB minimum) referencing a priority 8 plugin
+// All of the plugins below P8 should be called
+// The P7 application should be closed but it won't free enough memory
+// The optional allocation should fail with KErrNoMemory
+TInt COomTestHarness::OptionalAllocationAsyncTest3L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Start an application (plus a second so that the first app is not in the foreground)
+ // The first application is set to consume 5MB of RAM
+ StartApplicationL(KOomTestApp3Uid, 3 * 1024);
+ StartApplicationL(KOomTestAppUid, 0);
+
+ BringAppToForeground(KOomTestAppUid);
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Request 10 MB of data, using the priority of the referenced plugin (constant priority 8)
+ // Say that 5MB is the minimum we need
+ TInt bytesAvailable;
+
+ err = RequestOptionalRamASyncWrapper(10 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+ // We expect an error because it has not been possible to free the minimum memory
+ if(err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+
+ if (err == KErrNone)
+ {
+ //start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+ }
+
+ if (err == KErrNone && memTestState == ETestAbove)
+ {
+
+ if (err == KErrNone)
+ {
+ // Check that all system plugins below P8 have been called
+
+ err = PluginFreeRamCalledL(0x10286A34, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A34 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A35, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A35 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A36 Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // This the P8 system plugin has not been called
+ err = PluginFreeRamCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 Free Ram incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the low priority app plugin has been called
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B Free Ram not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // Check that the P7 application has been closed
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"minimum memory unexpectedly freed or still below treshhold or could not start watchers");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+
+
+
+
+
+
+void COomTestHarness::BringAppToForeground(TInt32 aUid)
+ {
+ //bring app to foreground
+ TInt id = iApps.Find<TUid>(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo);
+ User::LeaveIfError(id);
+ iApps[id]->BringToForeground();
+ User::After(TTimeIntervalMicroSeconds32(KSettlingTime));
+ }
+
+
+void COomTestHarness::ResetL()
+ {
+ Settle();
+
+ // Close any dummy apps
+ iApps.ResetAndDestroy();
+
+ Settle();
+
+ // Free all memory being eaten by the server
+ iChunk.Adjust(KOomHarnessInitialEatenMemory); // Just eat 1K of memory initially, this can grow later
+ iChunkSize = KOomHarnessInitialEatenMemory;
+
+ iDummyChunk.Close();
+ iDummyChunkSize = 0;
+
+ User::LeaveIfError(iAllocServer.Reset());
+
+ // Wait for the system to settle before getting the call counts (freeing the memory could cause some more movement).
+ Settle();
+
+ // Update the call counts on the plugins (add them if they're not there already)
+ for (TInt pluginUid = KUidOOMDummyPluginFirstImplementation; pluginUid <= KUidOOMDummyPluginLastImplementation; pluginUid++)
+ {
+ TInt lowMemoryCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginLowMemoryCount, lowMemoryCount);
+
+ TInt goodMemoryCallCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, pluginUid + KOOMDummyPluginGoodMemoryCount, goodMemoryCallCount);
+
+ TPluginCallCount pluginCallCount;
+ pluginCallCount.iFreeRamCallCount = lowMemoryCount;
+ pluginCallCount.iMemoryGoodCallCount = goodMemoryCallCount;
+
+ iPluginCallCounts.InsertL(pluginUid, pluginCallCount);
+ };
+ }
+
+void COomTestHarness::EatMemoryL(TInt aKBytesToLeaveFree)
+ {
+ Settle();
+
+ TMemoryInfoV1Buf meminfo;
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+
+ // Resize the dummy chunk to consume the correct ammount of memory
+ iChunkSize = freeMem + iChunkSize - (aKBytesToLeaveFree * 1024);
+
+ if( iChunkSize > KOomHarnessMaxEatenMemory)
+ {
+ TInt dummy = (iChunkSize - KOomHarnessMaxEatenMemory)+ 2*1024*1024;
+ /*
+ if(dummy > (2 *1024 * 1024))
+ {
+ //User::LeaveIfError(iDummyChunk.CreateLocal(KOomHarnessInitialEatenMemory, ((dummy-(2*1024*1024)));
+ dummy = dummy - 2*1024*1024;
+ }
+ */
+ User::LeaveIfError(iDummyChunk.CreateLocal(KOomHarnessInitialEatenMemory, dummy));
+ iDummyChunkSize = KOomHarnessInitialEatenMemory;
+ TInt err1 = iDummyChunk.Adjust(dummy-1024);
+ UserHal::MemoryInfo(meminfo);
+ freeMem = meminfo().iFreeRamInBytes;
+ iChunkSize = freeMem + KOomHarnessInitialEatenMemory - (aKBytesToLeaveFree * 1024);
+ }
+
+
+ TInt err = iChunk.Adjust(iChunkSize);
+ User::LeaveIfError(err);
+ }
+
+void COomTestHarness::AllocateMemoryL(TInt aKBytes)
+ {
+ TInt err = iChunk.Allocate(aKBytes * 1024);
+ User::LeaveIfError(err);
+ }
+
+// Set up the plugins and applications - this is the starting point for many test cases
+// 5 applications are started with approx 0.5 MB used for each
+// 0.5MB (approx) of memory is reserved for each one of the plugins
+void COomTestHarness::CommonSetUpL()
+ {
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+ }
+
+void COomTestHarness::StartApplicationL(TInt32 aUid, TInt aInitialAllocationInKBs)
+ {
+ User::ResetInactivityTime();
+ CCDummyApplicationHandle *app = CCDummyApplicationHandle::NewLC(TUid::Uid(aUid), aInitialAllocationInKBs * 1024);
+ iApps.AppendL(app);
+ CleanupStack::Pop(app);
+ Settle();
+ }
+
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::AppIsRunning(TInt32 aUid, TBool aExpectedResult)
+ {
+ TBool appRunning = ETrue;
+
+ TInt id = iApps.Find<TUid>(TUid::Uid(aUid), CCDummyApplicationHandle::CompareTo);
+ if (id < 0)
+ appRunning = EFalse;
+ else if(iApps[id]->Process().ExitType() != EExitPending)
+ appRunning = EFalse;
+
+ TInt err = KErrNone;
+
+ if (aExpectedResult != appRunning)
+ err = KErrGeneral;
+
+ if (aExpectedResult != appRunning)
+ {
+ err = KErrGeneral;
+ }
+
+ return err;
+ }
+
+// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::PluginFreeRamCalledL(TInt32 aUid, TBool aExpectedResult)
+ {
+ TInt newLowMemoryCount = 0;
+ TInt err = RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginLowMemoryCount, newLowMemoryCount);
+
+ //handle error?
+
+ TBool freeRamHasBeenCalledOnPlugin = EFalse;
+ TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid);
+
+ if (pluginCallCount)
+ {
+ freeRamHasBeenCalledOnPlugin = (pluginCallCount->iFreeRamCallCount != newLowMemoryCount);
+
+ if (freeRamHasBeenCalledOnPlugin)
+ {
+ // Update the list of old counts with the current value so we can see if it has changed next time this function is called
+ pluginCallCount->iFreeRamCallCount = newLowMemoryCount;
+ iPluginCallCounts.InsertL(aUid, *pluginCallCount);
+ }
+ }
+ else
+ {
+ err = KErrNotFound;
+ }
+
+ if (aExpectedResult != freeRamHasBeenCalledOnPlugin)
+ {
+ err = KErrGeneral;
+ }
+
+ return err;
+ }
+
+// Has FreeRam been called on this plugin since the last call to this function (or since the whole class has been reset)?
+// Returns KErrNone if we get the expected result
+TInt COomTestHarness::PluginMemoryGoodCalledL(TInt32 aUid, TBool aExpectedResult)
+ {
+ TInt newGoodMemoryCount = 0;
+ RProperty::Get(KUidOomPropertyCategory, aUid + KOOMDummyPluginGoodMemoryCount, newGoodMemoryCount);
+
+ TBool memoryGoodHasBeenCalledOnPlugin = EFalse;
+ TPluginCallCount* pluginCallCount = iPluginCallCounts.Find(aUid);
+
+ if (pluginCallCount)
+ {
+ memoryGoodHasBeenCalledOnPlugin = (pluginCallCount->iMemoryGoodCallCount != newGoodMemoryCount);
+
+ if (memoryGoodHasBeenCalledOnPlugin)
+ {
+ // Update the list of old counts with the current value so we can see if it has changed next time this function is called
+ pluginCallCount->iMemoryGoodCallCount = newGoodMemoryCount;
+ iPluginCallCounts.InsertL(aUid, *pluginCallCount);
+ }
+ }
+
+ TInt err = KErrNone;
+
+ if (aExpectedResult != memoryGoodHasBeenCalledOnPlugin)
+ err = KErrGeneral;
+
+ return err;
+ }
+
+// Utility function which calls the async version of optional RAM request and makes it behave like the sync version
+TInt COomTestHarness::RequestOptionalRamASyncWrapper(TInt aBytesRequested, TInt aMinimumBytesNeeded, TInt aPluginId, TInt& aBytesAvailable)
+ {
+ TInt err = KErrNone;
+ TRequestStatus status;
+ iOomSession.RequestOptionalRam(aBytesRequested, aMinimumBytesNeeded, aPluginId, status);
+ User::WaitForRequest(status);
+
+ if (status.Int() < 0)
+ err = status.Int();
+ else
+ aBytesAvailable = status.Int();
+
+ return err;
+ }
+
+void COomTestHarness::StartMemoryMonitorStatusWatcher(TInt& aTestState)
+ {
+ iStatusWatcher->Start(&aTestState);
+ }
+
+void COomTestHarness::StartTimerAndRunWatcher(TInt& aTestState)
+ {
+ //start timer
+ iTimeoutWatcher->Start(&aTestState, KTimeout);
+
+ //start active scheduler to catch mem monitor status changes
+ CActiveScheduler::Start();
+
+ //One of the active objects has fired. Cancelling all pending requests
+ iStatusWatcher->Cancel();
+ iTimeoutWatcher->Cancel();
+ }
+
+TInt COomTestHarness::GetFreeMemory()
+ {
+ User::CompressAllHeaps();
+
+ TInt current = 0;
+ HAL::Get( HALData::EMemoryRAMFree, current );
+
+ return current;
+ }
+
+
+CMemoryMonitorStatusWatcher* CMemoryMonitorStatusWatcher::NewL()
+ {
+ CMemoryMonitorStatusWatcher* self = new (ELeave) CMemoryMonitorStatusWatcher();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+CMemoryMonitorStatusWatcher::~CMemoryMonitorStatusWatcher()
+ {
+ Cancel();
+ iMonitorProperty.Close();
+ }
+
+void CMemoryMonitorStatusWatcher::Start(TInt* aTestState)
+ {
+ iMonitorProperty.Subscribe(iStatus);
+ SetActive();
+
+ iTestState = aTestState;
+ }
+
+CMemoryMonitorStatusWatcher::CMemoryMonitorStatusWatcher() : CActive(CActive::EPriorityStandard)
+ {
+ }
+
+void CMemoryMonitorStatusWatcher::ConstructL()
+ {
+ CActiveScheduler::Add(this); // Add to scheduler
+ User::LeaveIfError(iMonitorProperty.Attach(KOomMemoryMonitorStatusPropertyCategory, KOomMemoryMonitorStatusPropertyKey));
+ }
+
+void CMemoryMonitorStatusWatcher::DoCancel()
+ {
+ iMonitorProperty.Cancel();
+ }
+
+void CMemoryMonitorStatusWatcher::RunL()
+ {
+ iMonitorProperty.Subscribe(iStatus);
+ SetActive();
+
+ TInt monitorState = EFreeingMemory;
+ User::LeaveIfError(iMonitorProperty.Get(monitorState));
+
+ if (monitorState != EFreeingMemory)
+ {
+ //Do not reschedule - signal client that request has completed
+ Cancel();
+ if(monitorState == EBelowTreshHold)
+ {
+ *iTestState = ETestBelow;
+ }
+ else
+ {
+ *iTestState = ETestAbove;
+ }
+ CActiveScheduler::Stop();
+ }
+ }
+
+CMemoryMonitorTimeoutWatcher* CMemoryMonitorTimeoutWatcher::NewL()
+ {
+ CMemoryMonitorTimeoutWatcher* self = new (ELeave) CMemoryMonitorTimeoutWatcher();
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+CMemoryMonitorTimeoutWatcher::~CMemoryMonitorTimeoutWatcher()
+ {
+ Cancel();
+ }
+
+void CMemoryMonitorTimeoutWatcher::Start(TInt* aTestState, const TTimeIntervalMicroSeconds32& aTimeout)
+ {
+ iTestState = aTestState;
+ After(aTimeout);
+ }
+
+void CMemoryMonitorTimeoutWatcher::ConstructL()
+ {
+ CTimer::ConstructL();
+ CActiveScheduler::Add(this); // Add to scheduler
+ }
+
+CMemoryMonitorTimeoutWatcher::CMemoryMonitorTimeoutWatcher() : CTimer(CActive::EPriorityStandard)
+ {
+ }
+
+void CMemoryMonitorTimeoutWatcher::DoCancel()
+ {
+ CTimer::DoCancel();
+ }
+
+void CMemoryMonitorTimeoutWatcher::RunL()
+ {
+ Cancel();
+ *iTestState = ETestTimeout;
+ CActiveScheduler::Stop();
+ }
+
+////////
+
+CAsyncRequester* CAsyncRequester::NewL(RChunk aChunk, TInt aChunkSize)
+ {
+ CAsyncRequester* self = new (ELeave) CAsyncRequester(aChunk, aChunkSize);
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ CleanupStack::Pop(); // self;
+ return self;
+ }
+
+CAsyncRequester::~CAsyncRequester()
+ {
+ Cancel();
+ iSession.Close();
+ }
+
+void CAsyncRequester::Start(TInt aBytesToRequest, TReturnStatus* aReturnStatus)
+ {
+ iReturnStatus = aReturnStatus;
+ //Request 2.8MB which will close KOomTestApp3Uid
+ iSession.RequestOptionalRam(aBytesToRequest, 0, 0x10286A3D, iStatus);
+ SetActive();
+ }
+
+void CAsyncRequester::ConstructL()
+ {
+ User::LeaveIfError(iSession.Connect());
+ CActiveScheduler::Add(this); // Add to scheduler
+ }
+
+CAsyncRequester::CAsyncRequester(RChunk aChunk, TInt aChunkSize)
+ : CActive(CActive::EPriorityStandard),
+ iChunk(aChunk),
+ iChunkSize(aChunkSize)
+ {
+ }
+
+void CAsyncRequester::DoCancel()
+ {
+ }
+
+void CAsyncRequester::RunL()
+ {
+ iReturnStatus->iCompleted = ETrue;
+ iReturnStatus->iReturnStatus = iStatus.Int();
+ if (iReturnStatus->iId == 1)
+ {
+ TMemoryInfoV1Buf meminfo;
+ UserHal::MemoryInfo(meminfo);
+ TInt freeMem = meminfo().iFreeRamInBytes;
+
+ // Resize the dummy chunk to consume the correct ammount of memory
+ iChunkSize = freeMem + iChunkSize - (KOomJustAboveGoodMemoryThreshold * 1024);
+ TInt err = iChunk.Adjust(iChunkSize);
+ User::LeaveIfError(err);
+ }
+ else
+ {
+ CActiveScheduler::Stop();
+ }
+ }
+
+/////////
+
+
+TInt COomTestHarness::AppCloseTwoSessionsL(TTestResult& aResult)
+ {
+ ResetL();
+
+ StartApplicationL(KOomTestApp2Uid, 3 * 1024); // P8 app to be closed
+ StartApplicationL(KOomTestAppUid, 3 * 1024); // P9 app should not be closed
+ StartApplicationL(KOomTestApp3Uid, 3 * 1024); // P7 app to be closed
+ StartApplicationL(KOomTestApp4Uid, 3 * 1024); // P7 app foreground should not be closed
+
+ // Go just above the good memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ Settle();
+
+ TInt err = KErrNone;
+ CAsyncRequester* req1 = CAsyncRequester::NewL(iChunk, iChunkSize);
+ CleanupStack::PushL(req1);
+ CAsyncRequester* req2 = CAsyncRequester::NewL(iChunk, iChunkSize);
+ CleanupStack::PushL(req2);
+ TReturnStatus status1;
+ status1.iId = 1;
+ TReturnStatus status2;
+ status2.iId = 2;
+
+ TInt memTestState = ETestInit;
+ iTimeoutWatcher->Start(&memTestState, KTimeout);
+
+ //This request should close KOomTestApp3Uid
+ //On return the active object will allocate the memory it requested
+ req1->Start(3 * 1024 * 1024, &status1);
+
+ //The second request should be queued until the first request has completed, there will then be
+ //a pause for the memory to be allocated before the request is properly serviced.
+ req2->Start(3 * 1024 * 1024, &status2);
+
+ CActiveScheduler::Start();
+
+ //The active scheduler is stopped, we should return here once both AOs have been completed.
+ iTimeoutWatcher->Cancel();
+
+ if (memTestState == ETestTimeout)
+ {
+ err = KErrTimedOut;
+ _LIT( KResult ,"Test has timed out, requests have not been completed");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp4Uid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Foreground App KOomTestApp4Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestAppUid, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P9 App KOomTestAppUid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp3Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp2Uid, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P7 App KOomTestApp2Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+
+ CleanupStack::PopAndDestroy(2);
+ ResetL();
+ return KErrNone;
+ }
+
+
+TInt COomTestHarness::CallIfTargetAppNotRunningTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 0.5MB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x80000, 0x80000));
+ }
+
+ StartApplicationL(KOomTestApp3Uid, 0);
+
+
+ TInt err = KErrNone;
+
+ // Now eat some memory till we are below treshhold and wait for the memory monitor to bring us above treshhold again
+ TInt memTestState = ETestInit;
+
+ //start watchers
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go just under the low memory threshold
+ EatMemoryL(KOomJustUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ // fail tests if watchers failed or memory was not freed
+ if (memTestState != ETestAbove)
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ //if memteststate is not desired signal to other cases that they should not pass
+ err = KErrGeneral;
+ }
+
+ // The following application plugins should be called...
+ // Application plugins: 10286A3B
+ // The following application plugins should not be called...
+ // Application plugins: 10286A3A, 0x10286A38
+ if (err == KErrNone)
+ {
+ //target app not running for this priority 3 app plugin
+ err = PluginFreeRamCalledL(0x10286A3A, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3A FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ //target app is running for this priority 4 app plugin
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ //By the time we get to this priority 9 plugin, the app plugins and other sys plugins
+ // have freed enough memory and a sys plugin with "check ram" has been called
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A38, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A38 FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+//Test that an app that has an app_specific_thresholds but no close_app can still be closed
+//
+//This test only works on emulator. On hw there are many more apps started which have default priority
+//and these are closed before KOomTestApp8Uid as they are behind it in the z order, freeing sufficient memory
+//before we would get to KOomTestApp8Uid
+TInt COomTestHarness::AppCloseSpecificThresholdTest1L(TTestResult& aResult)
+ {
+ ResetL();
+
+ StartApplicationL(KOomTestApp8Uid, 5 * 1024); // app with app_specific_thresholds but no close_app
+ StartApplicationL(KOomTestApp3Uid, 0); // P7 foreground app. Will not be closed
+
+ BringAppToForeground(KOomTestApp3Uid);
+
+ //start watchers
+ TInt memTestState = ETestInit;
+ TInt err = KErrNone;
+
+ StartMemoryMonitorStatusWatcher(memTestState);
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomSignificantlyUnderLowMemoryThreshold);
+
+ //start timer, start scheduler & stop watchers when done
+ StartTimerAndRunWatcher(memTestState);
+
+ if (memTestState == ETestAbove)
+ {
+ err = AppIsRunning(KOomTestApp8Uid, EFalse);
+
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"P8 App KOomTestApp2Uid incorrectly running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ if (err == KErrNone)
+ {
+ err = AppIsRunning(KOomTestApp3Uid, ETrue);
+ if (err != KErrNone)
+ {
+ // The P7 app should still be running because it was in the foreground
+ _LIT( KResult ,"(P7 App KOomTestApp3Uid not running");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+ }
+ else
+ {
+ _LIT( KResult ,"Watchers failed to start or Application Timeout or Memory Still Below Treshhold ");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // case was not executed or case was executed but never finished or failed
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+TInt COomTestHarness::PluginTestInsufficientMemoryFreedL(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 1kB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x400, 0x400));
+ }
+
+ //start watchers
+ TInt err = KErrNone;
+ TInt bytesAvailable;
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomJustAboveGoodMemoryThreshold);
+
+ // Request 5 MB of data, using the priority of the referenced plugin (constant priority 8)
+ err = iOomSession.RequestOptionalRam(5 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // There should be nothing that can be done to free this memory
+ if (err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+ else
+ {
+ _LIT( KResult ,"There should not have been actions available to successfully complete request");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ //Check a couple of plugins that should have been called
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // This plugin should not be called as it is priority 9
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3D FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ //This plugins should not be called as the target app is not running
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3A, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3A FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // MemoryGood should have been called on all plugins which were run as the request to
+ // go below memory was triggered by an optional RAM request
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3C, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3C MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // MemoryGood should not be called on this plugin because FreeMemory was never called on it
+ err = PluginMemoryGoodCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 MemoryGood incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+TInt COomTestHarness::PluginTestInsufficientMemoryFreed2L(TTestResult& aResult)
+ {
+ ResetL();
+
+ // Configure the plugins to eat 1kB each:
+ for (TInt pluginIndex = KUidOOMDummyPluginFirstImplementation; pluginIndex <= KUidOOMDummyPluginLastImplementation - 2; pluginIndex++)
+ {
+ User::LeaveIfError(iAllocServer.Configure(TUid::Uid(pluginIndex), 0, 0x400, 0x400));
+ }
+
+ //start watchers
+ TInt err = KErrNone;
+ TInt bytesAvailable;
+
+ // Go significantly under the low memory threshold
+ EatMemoryL(KOomBetweenLowAndGoodThresholds);
+
+ // Request 5 MB of data, using the priority of the referenced plugin (constant priority 8)
+ err = iOomSession.RequestOptionalRam(5 * 1024 * 1024, 5 * 1024 * 1024, 0x10286A37, bytesAvailable);
+
+ // There should be nothing that can be done to free this memory
+ if (err == KErrNoMemory)
+ {
+ err = KErrNone;
+ }
+ else
+ {
+ _LIT( KResult ,"There should not have been actions available to successfully complete request");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+
+ //Check a couple of plugins that should have been called
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A36, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A36 FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3B FreeRam not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // This plugin should not be called as it is priority 9
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3D, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3D FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+ //This plugins should not be called as the target app is not running
+ if (err == KErrNone)
+ {
+ err = PluginFreeRamCalledL(0x10286A3A, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"Plugin 0x10286A3A FreeRam incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ // MemoryGood should have been called on all plugins which were run as the request to
+ // go below memory was triggered by an optional RAM request
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3B, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3B MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ err = PluginMemoryGoodCalledL(0x10286A3C, ETrue);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A3C MemoryGood not called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ // MemoryGood should not be called on this plugin because FreeMemory was never called on it
+ err = PluginMemoryGoodCalledL(0x10286A37, EFalse);
+ if (err != KErrNone)
+ {
+ _LIT( KResult ,"plugin 0x10286A37 MemoryGood incorrectly called");
+ aResult.iResultDes.Copy( KResult );
+ aResult.iResult = KErrGeneral;
+ // Case was executed but failed
+ }
+ }
+
+ if (err == KErrNone)
+ {
+ _LIT( KDescription , "Test case passed");
+ aResult.SetResult( KErrNone, KDescription );
+ }
+
+ ResetL();
+ return KErrNone;
+ }
+
+// ================= OTHER EXPORTED FUNCTIONS =================================
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,171 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// RESOURCE IDENTIFIER
+NAME T_OT // 4 letter ID
+
+// INCLUDES
+#include <eikon.rh>
+#include <avkon.rsg>
+#include <avkon.rh>
+#include <appinfo.rh>
+#include <commondialogs.hrh>
+#include <commondialogs.rh>
+#include "t_oomtestappcmd.hrh"
+
+// RESOURCE DEFINITIONS
+RESOURCE RSS_SIGNATURE
+ {
+ }
+
+RESOURCE TBUF r_default_document_name
+ {
+ buf="T_OT";
+ }
+
+RESOURCE EIK_APP_INFO
+ {
+ menubar = r_menubar;
+ cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
+ }
+
+RESOURCE MENU_BAR r_menubar
+ {
+ titles =
+ {
+ MENU_TITLE { menu_pane = r_menu; }
+ };
+ }
+
+RESOURCE MENU_PANE r_menu
+ {
+ items =
+ {
+ MENU_ITEM
+ {
+ command = EOomTestAppSelectConfig;
+ txt = "Select config xml";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppToggleSystem;
+ txt = "Toggle system";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppAllocMemory;
+ txt = "Alloc memory";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppFreeMemory;
+ txt = "Free memory";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppAllocMemWithPermission;
+ txt = "Alloc memory with permission";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppSetPriority;
+ cascade = r_priority_menu;
+ txt = "Set priority";
+ },
+ MENU_ITEM
+ {
+ command = EAknSoftkeyExit;
+ txt = "Exit";
+ }
+ };
+ }
+
+RESOURCE MENU_PANE r_priority_menu
+ {
+ items =
+ {
+ MENU_ITEM
+ {
+ command = EOomTestAppSetPriorityNormal;
+ txt = "Normal";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppSetPriorityHigh;
+ txt = "High";
+ },
+ MENU_ITEM
+ {
+ command = EOomTestAppSetPriorityBusy;
+ txt = "Busy";
+ }
+ };
+ }
+
+RESOURCE MEMORYSELECTIONDIALOG r_memory_selection
+ {
+ title = "";
+ softkey_1 = "Ok";
+ }
+
+RESOURCE FILESELECTIONDIALOG r_file_selection
+ {
+ title = "Select xml";
+ softkey_1_file = "Select";
+ softkey_1_folder = "Open";
+ softkey_2_root_level = "Cancel";
+ softkey_2_subfolder = "Back";
+ filters =
+ {
+ FILTER
+ {
+ filter_type = EFilenameFilter;
+ filter_style = EInclusiveFilter;
+ filter_data = { "*.xml" };
+ }
+ };
+ }
+
+RESOURCE DIALOG r_alloc_query
+ {
+ flags = EAknGeneralQueryFlags;
+ buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
+ items =
+ {
+ DLG_LINE
+ {
+ type = EAknCtQuery;
+ id = EGeneralQuery;
+ control = AVKON_DATA_QUERY
+ {
+ layout = ENumberLayout;
+ label = "KBs to allocate";
+ control = AVKON_INTEGER_EDWIN
+ {
+ maxlength=10;
+ min = 0;
+ max = 0x7fffffff; // KMaxTInt
+ };
+ };
+ }
+ };
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/data/t_oomtestapp_reg.rss Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <appinfo.rh>
+#include "t_oomtestapp.hrh"
+
+UID2 KUidAppRegistrationResourceFile
+UID3 T_OOM_TESTAPP_UID
+
+RESOURCE APP_REGISTRATION_INFO
+ {
+ app_file = T_OOM_TESTAPP_NAME_STRING;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/bld.inf Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,35 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_TESTMMPFILES
+t_oomtestapp.mmp
+t_oomtestapp2.mmp
+t_oomtestapp3.mmp
+t_oomtestapp4.mmp
+t_oomtestapp5.mmp
+t_oomtestapp6.mmp
+t_oomtestapp7.mmp
+t_oomtestapp8.mmp
+t_oomtestapp9.mmp
+t_oomtestapp10.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.pkg Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,50 @@
+;Languages
+&EN
+
+#{"t_oomtestapps"},(0x101FB3E7),1,0,0,TYPE=SA
+
+;Localised Vendor name
+%{"t_oomtestapps EN"}
+
+; Vendor name
+: "t_oomtestapps"
+
+"\epoc32\release\armv5\urel\t_oomtestapp.exe"-"!:\sys\bin\t_oomtestapp.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp.rsc"-"!:\resource\apps\t_oomtestapp.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp2.exe"-"!:\sys\bin\t_oomtestapp2.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp2.rsc"-"!:\resource\apps\t_oomtestapp2.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp2_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp2_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp3.exe"-"!:\sys\bin\t_oomtestapp3.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp3.rsc"-"!:\resource\apps\t_oomtestapp3.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp3_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp3_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp4.exe"-"!:\sys\bin\t_oomtestapp4.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp4.rsc"-"!:\resource\apps\t_oomtestapp4.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp4_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp4_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp5.exe"-"!:\sys\bin\t_oomtestapp5.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp5.rsc"-"!:\resource\apps\t_oomtestapp5.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp5_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp5_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp6.exe"-"!:\sys\bin\t_oomtestapp6.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp6.rsc"-"!:\resource\apps\t_oomtestapp6.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp6_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp6_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp7.exe"-"!:\sys\bin\t_oomtestapp7.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp7.rsc"-"!:\resource\apps\t_oomtestapp7.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp7_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp7_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp8.exe"-"!:\sys\bin\t_oomtestapp8.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp8.rsc"-"!:\resource\apps\t_oomtestapp8.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp8_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp8_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp9.exe"-"!:\sys\bin\t_oomtestapp9.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp9.rsc"-"!:\resource\apps\t_oomtestapp9.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp9_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp9_reg.rsc"
+
+"\epoc32\release\armv5\urel\t_oomtestapp10.exe"-"!:\sys\bin\t_oomtestapp10.exe"
+"\epoc32\data\z\resource\apps\t_oomtestapp10.rsc"-"!:\resource\apps\t_oomtestapp10.rsc"
+"\epoc32\data\z\private\10003a3f\apps\t_oomtestapp10_reg.rsc"-"!:\private\10003a3f\import\apps\t_oomtestapp10_reg.rsc"
Binary file sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/oomtestapps.sisx has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,60 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#include <platform_paths.hrh>
+
+TARGET T_OOM_TESTAPP_NAME_EXE
+TARGETTYPE exe
+EPOCHEAPSIZE 0x10000 0x4000000 // Min 64KB, Max 64MB
+UID 0x100039CE T_OOM_TESTAPP_UID
+CAPABILITY WriteDeviceData AllFiles
+
+SOURCEPATH ../src
+SOURCE t_oomtestappapplication.cpp
+SOURCE t_oomtestappappview.cpp
+SOURCE t_oomtestappappui.cpp
+SOURCE t_oomtestappdocument.cpp
+
+SOURCEPATH ../data
+START RESOURCE t_oomtestapp.rss
+HEADER
+TARGET T_OOM_TESTAPP_NAME
+TARGETPATH resource/apps
+END
+
+START RESOURCE t_oomtestapp_reg.rss
+TARGET T_OOM_TESTAPP_NAME_REG
+TARGETPATH /private/10003a3f/apps
+END
+
+MW_LAYER_SYSTEMINCLUDE
+T_OOM_TEST_APPDEFS_INCLUDE
+USERINCLUDE ../inc
+
+LIBRARY euser.lib
+LIBRARY apparc.lib
+LIBRARY cone.lib
+LIBRARY eikcore.lib
+LIBRARY avkon.lib
+LIBRARY efsrv.lib
+LIBRARY oommonitor.lib
+LIBRARY commondialogs.lib
+
+// End of File
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs
+#include "../inc/appdefs/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp10.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs10
+#include "../inc/appdefs10/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp2.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,26 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs2
+#include "../inc/appdefs2/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp3.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs3
+#include "../inc/appdefs3/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp4.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs4
+#include "../inc/appdefs4/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp5.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs5
+#include "../inc/appdefs5/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp6.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs6
+#include "../inc/appdefs6/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp7.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs7
+#include "../inc/appdefs7/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp8.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs8
+#include "../inc/appdefs8/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/group/t_oomtestapp9.mmp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,25 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#define T_OOM_TEST_APPDEFS_INCLUDE USERINCLUDE ../inc/appdefs9
+#include "../inc/appdefs9/t_oomtestapp.hrh"
+#include "t_oomtestapp.mmh"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA01
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs10/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp10
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp10.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp10"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp10_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA0A
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs2/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp2
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp2.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp2"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp2_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA02
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs3/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp3
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp3.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp3"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp3_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA03
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs4/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp4
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp4.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp4"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp4_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA04
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs5/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp5
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp5.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp5"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp5_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA05
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs6/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp6
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp6.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp6"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp6_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA06
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs7/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp7
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp7.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp7"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp7_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA07
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs8/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp8
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp8.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp8"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp8_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA08
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/appdefs9/t_oomtestapp.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+#ifndef T_OOMTESTAPP_HRH
+#define T_OOMTESTAPP_HRH
+
+#define T_OOM_TESTAPP_NAME t_oomtestapp9
+#define T_OOM_TESTAPP_NAME_EXE t_oomtestapp9.exe
+#define T_OOM_TESTAPP_NAME_STRING "t_oomtestapp9"
+#define T_OOM_TESTAPP_NAME_REG t_oomtestapp9_reg
+#define T_OOM_TESTAPP_UID 0xE6CFBA09
+
+#endif // T_OOMTESTAPP_HRH
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappapplication.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,52 @@
+/*
+ ============================================================================
+ Name : t_oomtestappApplication.h
+ Author :
+ Copyright : Your copyright notice
+ Description : Declares main application class.
+ ============================================================================
+ */
+
+#ifndef __T_OOMTESTAPPAPPLICATION_H__
+#define __T_OOMTESTAPPAPPLICATION_H__
+
+// INCLUDES
+#include <aknapp.h>
+
+// CLASS DECLARATION
+
+/**
+ * Ct_oomtestappApplication application class.
+ * Provides factory to create concrete document object.
+ * An instance of Ct_oomtestappApplication is the application part of the
+ * AVKON application framework for the t_oomtestapp example application.
+ */
+class Ct_oomtestappApplication : public CAknApplication
+ {
+public:
+ Ct_oomtestappApplication();
+ // Functions from base classes
+
+ /**
+ * From CApaApplication, AppDllUid.
+ * @return Application's UID
+ */
+ TUid AppDllUid() const;
+
+ ~Ct_oomtestappApplication();
+protected:
+ // Functions from base classes
+
+ /**
+ * From CApaApplication, CreateDocumentL.
+ * Creates Ct_oomtestappDocument document object. The returned
+ * pointer in not owned by the Ct_oomtestappApplication object.
+ * @return A pointer to the created document object.
+ */
+ CApaDocument* CreateDocumentL();
+
+private:
+ };
+
+#endif // __T_OOMTESTAPPAPPLICATION_H__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappui.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,92 @@
+/*
+ ============================================================================
+ Name : t_oomtestappAppUi.h
+ Author :
+ Copyright : Your copyright notice
+ Description : Declares UI class for application.
+ ============================================================================
+ */
+
+#ifndef __T_OOMTESTAPPAPPUI_h__
+#define __T_OOMTESTAPPAPPUI_h__
+
+// INCLUDES
+#include <aknappui.h>
+#include <oommonitorsession.h>
+
+// FORWARD DECLARATIONS
+class Ct_oomtestappAppView;
+
+const TInt KKiloByte = 1024;
+
+// CLASS DECLARATION
+/**
+ * Ct_oomtestappAppUi application UI class.
+ * Interacts with the user through the UI and request message processing
+ * from the handler class
+ */
+class Ct_oomtestappAppUi : public CAknAppUi
+ {
+public:
+
+ // Constructors and destructor
+
+ /**
+ * ConstructL.
+ * 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Ct_oomtestappAppUi.
+ * C++ default constructor. This needs to be public due to
+ * the way the framework constructs the AppUi
+ */
+ Ct_oomtestappAppUi();
+
+ /**
+ * ~Ct_oomtestappAppUi.
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomtestappAppUi();
+
+ TInt AllocatedHeap() const;
+
+ TPtrC Priority() const;
+
+private:
+ // Functions from base classes
+
+ /**
+ * From CEikAppUi, HandleCommandL.
+ * Takes care of command handling.
+ * @param aCommand Command to be handled.
+ */
+ void HandleCommandL(TInt aCommand);
+
+ /**
+ * HandleStatusPaneSizeChange.
+ * Called by the framework when the application status pane
+ * size is changed.
+ */
+ void HandleStatusPaneSizeChange();
+
+private:
+ // Data
+
+ /**
+ * The application view
+ * Owned by Ct_oomtestappAppUi
+ */
+ Ct_oomtestappAppView* iAppView;
+
+ ROomMonitorSession iOomSession;
+
+ TAny* iMem;
+
+ ROomMonitorSession::TOomPriority iPriority;
+
+ };
+
+#endif // __T_OOMTESTAPPAPPUI_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappappview.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,81 @@
+/*
+ ============================================================================
+ Name : t_oomtestappAppView.h
+ Author :
+ Copyright : Your copyright notice
+ Description : Declares view class for application.
+ ============================================================================
+ */
+
+#ifndef __T_OOMTESTAPPAPPVIEW_h__
+#define __T_OOMTESTAPPAPPVIEW_h__
+
+// INCLUDES
+#include <coecntrl.h>
+
+class Ct_oomtestappAppUi;
+
+// CLASS DECLARATION
+class Ct_oomtestappAppView : public CCoeControl
+ {
+public:
+ // New methods
+
+ /**
+ * NewL.
+ * Two-phased constructor.
+ * Create a Ct_oomtestappAppView object, which will draw itself to aRect.
+ * @param aRect The rectangle this view will be drawn to.
+ * @return a pointer to the created instance of Ct_oomtestappAppView.
+ */
+ static Ct_oomtestappAppView* NewL(const TRect& aRect, Ct_oomtestappAppUi& aAppUi);
+
+ /**
+ * ~Ct_oomtestappAppView
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomtestappAppView();
+
+public:
+ // Functions from base classes
+
+ /**
+ * From CCoeControl, Draw
+ * Draw this Ct_oomtestappAppView to the screen.
+ * @param aRect the rectangle of this view that needs updating
+ */
+ void Draw(const TRect& aRect) const;
+
+ /**
+ * From CoeControl, SizeChanged.
+ * Called by framework when the view size is changed.
+ */
+ virtual void SizeChanged();
+
+private:
+ // Constructors
+
+ /**
+ * ConstructL
+ * 2nd phase constructor.
+ * Perform the second phase construction of a
+ * Ct_oomtestappAppView object.
+ * @param aRect The rectangle this view will be drawn to.
+ */
+ void ConstructL(const TRect& aRect);
+
+ /**
+ * Ct_oomtestappAppView.
+ * C++ default constructor.
+ */
+ Ct_oomtestappAppView( Ct_oomtestappAppUi& aAppUi );
+
+private:
+ Ct_oomtestappAppUi& iAppUi;
+
+ const CFont* iFont; // not own
+
+ };
+
+#endif // __T_OOMTESTAPPAPPVIEW_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappcmd.hrh Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,27 @@
+/*
+============================================================================
+ Name : t_oomtestappcmd.hrh
+ Author :
+ Copyright : Your copyright notice
+ Description : This file contains all the resources for the t_oomtestapp.
+============================================================================
+*/
+
+
+#ifndef T_OOMTESTAPPCMD_HRH
+#define T_OOMTESTAPPCMD_HRH
+
+enum TOomTestAppCmds
+ {
+ EOomTestAppSelectConfig = 1000,
+ EOomTestAppToggleSystem,
+ EOomTestAppAllocMemory,
+ EOomTestAppFreeMemory,
+ EOomTestAppAllocMemWithPermission,
+ EOomTestAppSetPriority,
+ EOomTestAppSetPriorityNormal,
+ EOomTestAppSetPriorityHigh,
+ EOomTestAppSetPriorityBusy
+ };
+
+#endif // T_OOMTESTAPPCMD_HRH
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/inc/t_oomtestappdocument.h Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,91 @@
+/*
+ ============================================================================
+ Name : t_oomtestappDocument.h
+ Author :
+ Copyright : Your copyright notice
+ Description : Declares document class for application.
+ ============================================================================
+ */
+
+#ifndef __T_OOMTESTAPPDOCUMENT_h__
+#define __T_OOMTESTAPPDOCUMENT_h__
+
+// INCLUDES
+#include <akndoc.h>
+
+// FORWARD DECLARATIONS
+class Ct_oomtestappAppUi;
+class CEikApplication;
+
+// CLASS DECLARATION
+
+/**
+ * Ct_oomtestappDocument application class.
+ * An instance of class Ct_oomtestappDocument is the Document part of the
+ * AVKON application framework for the t_oomtestapp example application.
+ */
+class Ct_oomtestappDocument : public CAknDocument
+ {
+public:
+ // Constructors and destructor
+
+ /**
+ * NewL.
+ * Two-phased constructor.
+ * Construct a Ct_oomtestappDocument for the AVKON application aApp
+ * using two phase construction, and return a pointer
+ * to the created object.
+ * @param aApp Application creating this document.
+ * @return A pointer to the created instance of Ct_oomtestappDocument.
+ */
+ static Ct_oomtestappDocument* NewL(CEikApplication& aApp);
+
+ /**
+ * NewLC.
+ * Two-phased constructor.
+ * Construct a Ct_oomtestappDocument for the AVKON application aApp
+ * using two phase construction, and return a pointer
+ * to the created object.
+ * @param aApp Application creating this document.
+ * @return A pointer to the created instance of Ct_oomtestappDocument.
+ */
+ static Ct_oomtestappDocument* NewLC(CEikApplication& aApp);
+
+ /**
+ * ~Ct_oomtestappDocument
+ * Virtual Destructor.
+ */
+ virtual ~Ct_oomtestappDocument();
+
+public:
+ // Functions from base classes
+
+ /**
+ * CreateAppUiL
+ * From CEikDocument, CreateAppUiL.
+ * Create a Ct_oomtestappAppUi object and return a pointer to it.
+ * The object returned is owned by the Uikon framework.
+ * @return Pointer to created instance of AppUi.
+ */
+ CEikAppUi* CreateAppUiL();
+
+private:
+ // Constructors
+
+ /**
+ * ConstructL
+ * 2nd phase constructor.
+ */
+ void ConstructL();
+
+ /**
+ * Ct_oomtestappDocument.
+ * C++ default constructor.
+ * @param aApp Application creating this document.
+ */
+ Ct_oomtestappDocument(CEikApplication& aApp);
+
+ };
+
+#endif // __T_OOMTESTAPPDOCUMENT_h__
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappapplication.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,68 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <eikstart.h>
+#include "t_oomtestappDocument.h"
+#include "t_oomtestappApplication.h"
+#include "t_oomtestapp.hrh"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+Ct_oomtestappApplication::Ct_oomtestappApplication()
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappApplication::CreateDocumentL()
+// Creates CApaDocument object
+// -----------------------------------------------------------------------------
+//
+CApaDocument* Ct_oomtestappApplication::CreateDocumentL()
+ {
+ return Ct_oomtestappDocument::NewL(*this);
+ }
+
+Ct_oomtestappApplication::~Ct_oomtestappApplication()
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappApplication::AppDllUid()
+// Returns application UID
+// -----------------------------------------------------------------------------
+//
+TUid Ct_oomtestappApplication::AppDllUid() const
+ {
+ // Return the UID for the t_oomtestapp application
+ return TUid::Uid( T_OOM_TESTAPP_UID );
+ }
+
+EXPORT_C CApaApplication* NewApplication()
+ {
+ return new Ct_oomtestappApplication;
+ }
+
+GLDEF_C TInt E32Main()
+ {
+ return EikStart::RunApplication(NewApplication);
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappui.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,260 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <avkon.hrh>
+#include <aknquerydialog.h>
+#include <commondialogs.hrh>
+#include <akncommondialogsdynmem.h>
+#include <f32file.h>
+#include <t_oomtestapp.rsg>
+#include "t_oomtestappcmd.hrh"
+#include "t_oomtestappApplication.h"
+#include "t_oomtestappAppUi.h"
+#include "t_oomtestappAppView.h"
+
+_LIT( KOomConfigTargetFile, "c:\\private\\10207218\\oomconfig.xml" );
+_LIT( KOomPriorityNormal, "normal" );
+_LIT( KOomPriorityHigh, "high" );
+_LIT( KOomPriorityBusy, "busy" );
+const TInt KInitialAllocSize = 2048;
+
+// ---------------------------------------------------------------------------
+// AskPathL
+// ---------------------------------------------------------------------------
+//
+static TBool AskPathL( TDes& aPath )
+ {
+ TParsePtr parse( aPath );
+ TPtrC rootFolder = parse.DriveAndPath();
+ TBool ret = AknCommonDialogsDynMem::RunSelectDlgLD(
+ AknCommonDialogsDynMem::EMemoryTypePhone |
+ AknCommonDialogsDynMem::EMemoryTypeMMC,
+ aPath,
+ rootFolder,
+ R_MEMORY_SELECTION,
+ R_FILE_SELECTION );
+ return ret;
+ }
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppUi::ConstructL()
+ {
+ // Initialise app UI with standard value.
+ BaseConstructL(CAknAppUi::EAknEnableSkin);
+
+ User::LeaveIfError( iOomSession.Connect() );
+
+ // Create view object
+ iAppView = Ct_oomtestappAppView::NewL(ClientRect(), *this);
+
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::Ct_oomtestappAppUi()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappAppUi::Ct_oomtestappAppUi()
+ {
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::~Ct_oomtestappAppUi()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappAppUi::~Ct_oomtestappAppUi()
+ {
+ delete iAppView;
+ iOomSession.Close();
+ User::Free(iMem);
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::HandleCommandL()
+// Takes care of command handling.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppUi::HandleCommandL(TInt aCommand)
+ {
+ switch (aCommand)
+ {
+ case EOomTestAppSelectConfig:
+ {
+ TFileName fileName;
+ if ( AskPathL( fileName ) )
+ {
+ RFs& fs( iEikonEnv->FsSession() );
+ fs.MkDirAll( KOomConfigTargetFile ); // Ignore error
+ CFileMan* fileMan = CFileMan::NewL( fs );
+ CleanupStack::PushL( fileMan );
+ User::LeaveIfError( fileMan->Copy( fileName, KOomConfigTargetFile ) );
+ CleanupStack::PopAndDestroy( fileMan );
+ }
+ break;
+ }
+ case EOomTestAppToggleSystem:
+ {
+ iEikonEnv->SetSystem( !(iEikonEnv->IsSystem()) );
+ iAppView->DrawDeferred();
+ break;
+ }
+ case EOomTestAppAllocMemory:
+ {
+ TInt size(KInitialAllocSize);
+ CAknNumberQueryDialog* query = CAknNumberQueryDialog::NewL(size);
+ if ( query->ExecuteLD( R_ALLOC_QUERY ) )
+ {
+ User::Free(iMem);
+ iMem = NULL;
+ size *= KKiloByte;
+ iMem = User::AllocL(size);
+ iAppView->DrawDeferred();
+ }
+ break;
+ }
+ case EOomTestAppFreeMemory:
+ {
+ User::Free(iMem);
+ iMem = NULL;
+ iAppView->DrawDeferred();
+ break;
+ }
+ case EOomTestAppAllocMemWithPermission:
+ {
+ TInt size(KInitialAllocSize);
+ CAknNumberQueryDialog* query = CAknNumberQueryDialog::NewL(size);
+ if ( query->ExecuteLD( R_ALLOC_QUERY ) )
+ {
+ User::Free(iMem);
+ iMem = NULL;
+ size *= KKiloByte;
+ if ( iPriority != ROomMonitorSession::EOomPriorityBusy )
+ {
+ // Prevent OOM to close this app while it is freeing memory
+ iOomSession.SetOomPriority(ROomMonitorSession::EOomPriorityBusy);
+ }
+ iOomSession.RequestFreeMemory( size );
+ if ( iPriority != ROomMonitorSession::EOomPriorityBusy )
+ {
+ // Allow OOM to close this app again
+ iOomSession.SetOomPriority(iPriority);
+ }
+ iMem = User::AllocL(size);
+ iAppView->DrawDeferred();
+ }
+ break;
+ }
+ case EOomTestAppSetPriorityNormal:
+ {
+ iPriority = ROomMonitorSession::EOomPriorityNormal;
+ iOomSession.SetOomPriority(iPriority);
+ iAppView->DrawDeferred();
+ break;
+ }
+ case EOomTestAppSetPriorityHigh:
+ {
+ iPriority = ROomMonitorSession::EOomPriorityHigh;
+ iOomSession.SetOomPriority(iPriority);
+ iAppView->DrawDeferred();
+ break;
+ }
+ case EOomTestAppSetPriorityBusy:
+ {
+ iPriority = ROomMonitorSession::EOomPriorityBusy;
+ iOomSession.SetOomPriority(iPriority);
+ iAppView->DrawDeferred();
+ break;
+ }
+ case EEikCmdExit:
+ case EAknSoftkeyExit: // Fall through
+ {
+ Exit();
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+ }
+
+// -----------------------------------------------------------------------------
+// Called by the framework when the application status pane
+// size is changed. Passes the new client rectangle to the
+// AppView
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppUi::HandleStatusPaneSizeChange()
+ {
+ iAppView->SetRect(ClientRect());
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::AllocatedHeap
+// -----------------------------------------------------------------------------
+//
+TInt Ct_oomtestappAppUi::AllocatedHeap() const
+ {
+ TInt ret( 0 );
+ RHeap& heap( User::Heap() );
+ heap.AllocSize( ret );
+ return ret;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppUi::Priority
+// -----------------------------------------------------------------------------
+//
+TPtrC Ct_oomtestappAppUi::Priority() const
+ {
+ switch ( iPriority )
+ {
+ case ROomMonitorSession::EOomPriorityNormal:
+ {
+ return KOomPriorityNormal();
+ }
+ case ROomMonitorSession::EOomPriorityHigh:
+ {
+ return KOomPriorityHigh();
+ }
+ case ROomMonitorSession::EOomPriorityBusy:
+ {
+ return KOomPriorityBusy();
+ }
+ default:
+ {
+ break;
+ }
+ }
+ return KNullDesC();
+ }
+
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappappview.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,134 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include <coemain.h>
+#include <eikenv.h>
+#include <aknutils.h>
+#include "t_oomtestappAppUi.h"
+#include "t_oomtestappAppView.h"
+
+_LIT( KTextSystemOn, "System on" );
+_LIT( KTextSystemOff, "System off" );
+const TInt KTextBufferSize = 100;
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappAppView* Ct_oomtestappAppView::NewL(const TRect& aRect, Ct_oomtestappAppUi& aAppUi)
+ {
+ Ct_oomtestappAppView* self = new ( ELeave ) Ct_oomtestappAppView( aAppUi );
+ CleanupStack::PushL(self);
+ self->ConstructL( aRect );
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppView::ConstructL(const TRect& aRect)
+ {
+ // Create a window for this application view
+ CreateWindowL();
+
+ // Set the windows size
+ SetRect(aRect);
+
+ iFont = AknLayoutUtils::FontFromId( EAknLogicalFontPrimarySmallFont );
+
+ // Activate the window, which makes it ready to be drawn
+ ActivateL();
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::Ct_oomtestappAppView()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappAppView::Ct_oomtestappAppView( Ct_oomtestappAppUi& aAppUi ) :
+ iAppUi( aAppUi )
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::~Ct_oomtestappAppView()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappAppView::~Ct_oomtestappAppView()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::Draw()
+// Draws the display.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppView::Draw(const TRect& /*aRect*/) const
+ {
+ // Get the standard graphics context
+ CWindowGc& gc = SystemGc();
+
+ // Gets the control's extent
+ TRect drawRect(Rect());
+
+ // Clears the screen
+ gc.Clear(drawRect);
+
+ gc.UseFont(iFont);
+
+ TBuf<KTextBufferSize> buffer;
+ TInt allocSize( iAppUi.AllocatedHeap() / KKiloByte );
+ TPtrC priority( iAppUi.Priority() );
+ if ( CEikonEnv::Static()->IsSystem() )
+ {
+ buffer.Format( _L("%S : Heap %d KB : Priority %S"),
+ &(KTextSystemOn()), allocSize, &priority );
+ }
+ else
+ {
+ buffer.Format( _L("%S : Heap %d KB : Priority %S"),
+ &(KTextSystemOff()), allocSize, &priority );
+ }
+ TPoint textPos( 0, drawRect.Height() / 2 );
+ gc.DrawText( buffer, textPos );
+ gc.DiscardFont();
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappAppView::SizeChanged()
+// Called by framework when the view size is changed.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappAppView::SizeChanged()
+ {
+ DrawDeferred();
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysresmonitoring/oommonitor/tsrc/oomtest/t_oomtestapp/src/t_oomtestappdocument.cpp Fri Feb 26 17:43:11 2010 +0000
@@ -0,0 +1,96 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+
+
+// INCLUDE FILES
+#include "t_oomtestappAppUi.h"
+#include "t_oomtestappDocument.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappDocument::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappDocument* Ct_oomtestappDocument::NewL(CEikApplication& aApp)
+ {
+ Ct_oomtestappDocument* self = NewLC(aApp);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappDocument::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappDocument* Ct_oomtestappDocument::NewLC(CEikApplication& aApp)
+ {
+ Ct_oomtestappDocument* self = new (ELeave) Ct_oomtestappDocument(aApp);
+
+ CleanupStack::PushL(self);
+ self->ConstructL();
+ return self;
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappDocument::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void Ct_oomtestappDocument::ConstructL()
+ {
+ // No implementation required
+ }
+
+// -----------------------------------------------------------------------------
+// Ct_oomtestappDocument::Ct_oomtestappDocument()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+Ct_oomtestappDocument::Ct_oomtestappDocument(CEikApplication& aApp) :
+ CAknDocument(aApp)
+ {
+ // No implementation required
+ }
+
+// ---------------------------------------------------------------------------
+// Ct_oomtestappDocument::~Ct_oomtestappDocument()
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+Ct_oomtestappDocument::~Ct_oomtestappDocument()
+ {
+ // No implementation required
+ }
+
+// ---------------------------------------------------------------------------
+// Ct_oomtestappDocument::CreateAppUiL()
+// Constructs CreateAppUi.
+// ---------------------------------------------------------------------------
+//
+CEikAppUi* Ct_oomtestappDocument::CreateAppUiL()
+ {
+ // Create the application user interface, and return a pointer to it;
+ // the framework takes ownership of this object
+ return new (ELeave) Ct_oomtestappAppUi;
+ }
+
+// End of File
--- a/sysresmonitoring/oommonitor/tsrc/public/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/adv/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/BWINS/MT_OomMonitorU.DEF Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-EXPORTS
- ?CreateTestSuiteL@@YAPAVMEUnitTest@@XZ @ 1 NONAME ; class MEUnitTest * __cdecl CreateTestSuiteL(void)
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/EABI/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/EABI/MT_OomMonitorU.DEF Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- _Z16CreateTestSuiteLv @ 1 NONAME
-
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.cpp Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-// CLASS HEADER
-#include "MT_COomMonitorPlugin.h"
-
-// EXTERNAL INCLUDES
-#include <EUnitMacros.h>
-#include <EUnitDecorators.h>
-#include <oommonitorplugin.h>
-#include <oommonitor.h>
-
-
-
-MT_COomMonitorPlugin* MT_COomMonitorPlugin::NewL()
- {
- MT_COomMonitorPlugin* self = MT_COomMonitorPlugin::NewLC();
- CleanupStack::Pop();
-
- return self;
- }
-
-MT_COomMonitorPlugin* MT_COomMonitorPlugin::NewLC()
- {
- MT_COomMonitorPlugin* self = new( ELeave ) MT_COomMonitorPlugin();
- CleanupStack::PushL( self );
-
- self->ConstructL();
-
- return self;
- }
-
-// Destructor (virtual by CBase)
-MT_COomMonitorPlugin::~MT_COomMonitorPlugin()
- {
- }
-
-// Default constructor
-MT_COomMonitorPlugin::MT_COomMonitorPlugin()
- {
- }
-
-// Second phase construct
-void MT_COomMonitorPlugin::ConstructL()
- {
- // The ConstructL from the base class CEUnitTestSuiteClass must be called.
- // It generates the test case table.
- CEUnitTestSuiteClass::ConstructL();
- }
-
-// METHODS
-
-void MT_COomMonitorPlugin::BasicSetupL( )
- {
- iMonitor = CMemoryMonitor::NewL();
- }
-
-
-void MT_COomMonitorPlugin::BasicTeardown( )
- {
- delete iMonitor;
- iMonitor = NULL;
- }
-
-void MT_COomMonitorPlugin::SetupL( )
- {
- BasicSetupL();
-
- const TUid KMyAppUid = { 0x01234567};
- iCOomMonitorPlugin = CAppOomMonitorPlugin::NewL( KMyAppUid );
- }
-
-
-void MT_COomMonitorPlugin::Teardown( )
- {
- BasicTeardown();
-
- delete iCOomMonitorPlugin;
- iCOomMonitorPlugin = NULL;
- }
-
-
-void MT_COomMonitorPlugin::T_CAppOomMonitorPlugin_NewLL( )
- {
- const TUid KMyAppUid = { 0x01234567};
- CAppOomMonitorPlugin* plugin = CAppOomMonitorPlugin::NewL( KMyAppUid );
- CleanupStack::PushL( plugin );
-
- EUNIT_ASSERT_DESC( plugin, "CAppOomMonitorPlugin instance not created!" );
- CleanupStack::PopAndDestroy( plugin );
- }
-
-void MT_COomMonitorPlugin::T_COomMonitorPlugin_FreeRamL( )
- {
- // private function in CAppOomMonitorPlugin, couldn't be tested
- //iCOomMonitorPlugin->FreeRam( );
- }
-
-void MT_COomMonitorPlugin::T_COomMonitorPlugin_MemoryGoodL( )
- {
- // private function in CAppOomMonitorPlugin, couldn't be tested
- //iCOomMonitorPlugin->MemoryGood( );
- }
-
-void MT_COomMonitorPlugin::T_COomMonitorPlugin_FsSessionL( )
- {
- iCOomMonitorPlugin->FsSession( );
- }
-
-void MT_COomMonitorPlugin::T_COomMonitorPlugin_WsSessionL( )
- {
- iCOomMonitorPlugin->WsSession( );
- }
-
-void MT_COomMonitorPlugin::T_COomMonitorPlugin_ExtensionInterfaceL( )
- {
- CTestOomMonitorPlugin* plugin = new(ELeave) CTestOomMonitorPlugin;
- CleanupStack::PushL(plugin);
- plugin->ConstructL();
-
- const TUid KTestUid = { 0x01234567 }; // a nonsense UID for testing
- TAny* any = NULL;
- plugin->ExtensionInterface( KTestUid, any );
-
- CleanupStack::PopAndDestroy(plugin);
- }
-
-
-// TEST TABLE
-EUNIT_BEGIN_TEST_TABLE(
- MT_COomMonitorPlugin,
- "COomMonitorPlugin test suite",
- "MODULE" )
-
-EUNIT_TEST(
- "NewL - test",
- "COomMonitorPlugin",
- "CAppOomMonitorPlugin NewL and COomMonitorPlugin Constructor, Destructor",
- "FUNCTIONALITY",
- BasicSetupL, T_CAppOomMonitorPlugin_NewLL, BasicTeardown)
-
-EUNIT_TEST(
- "FsSession - test",
- "COomMonitorPlugin",
- "FsSession",
- "FUNCTIONALITY",
- SetupL, T_COomMonitorPlugin_FsSessionL, Teardown)
-
-EUNIT_TEST(
- "WsSession - test",
- "COomMonitorPlugin",
- "WsSession",
- "FUNCTIONALITY",
- SetupL, T_COomMonitorPlugin_WsSessionL, Teardown)
-
-EUNIT_TEST(
- "ExtensionInterface - test",
- "COomMonitorPlugin",
- "ExtensionInterface",
- "FUNCTIONALITY",
- SetupL, T_COomMonitorPlugin_ExtensionInterfaceL, Teardown)
-
-EUNIT_END_TEST_TABLE
-
-// END OF FILE
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_COomMonitorPlugin.h Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2002 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef __MT_COOMMONITORPLUGIN_H__
-#define __MT_COOMMONITORPLUGIN_H__
-
-// EXTERNAL INCLUDES
-#include <CEUnitTestSuiteClass.h>
-#include <EUnitDecorators.h>
-#include <oommonitorplugin.h>
-
-// INTERNAL INCLUDES
-
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DEFINITION
-NONSHARABLE_CLASS( MT_COomMonitorPlugin )
- : public CEUnitTestSuiteClass
- {
- public: // Constructors and destructors
-
- /**
- * Two phase construction
- */
- static MT_COomMonitorPlugin* NewL();
- static MT_COomMonitorPlugin* NewLC();
- /**
- * Destructor
- */
- ~MT_COomMonitorPlugin();
-
- private: // Constructors and destructors
-
- MT_COomMonitorPlugin();
- void ConstructL();
-
- private: // New methods
-
-
- void SetupL();
-
- void Teardown();
-
- void BasicSetupL();
-
- void BasicTeardown();
-
- void T_CAppOomMonitorPlugin_NewLL();
-
- void T_COomMonitorPlugin_FreeRamL();
-
- void T_COomMonitorPlugin_MemoryGoodL();
-
- void T_COomMonitorPlugin_FsSessionL();
-
- void T_COomMonitorPlugin_WsSessionL();
-
- void T_COomMonitorPlugin_ExtensionInterfaceL();
-
-
- private: // Data
-
- CAppOomMonitorPlugin* iCOomMonitorPlugin;
- CMemoryMonitor* iMonitor;
-
- EUNIT_DECLARE_TEST_TABLE;
-
- };
-
-
-NONSHARABLE_CLASS( CTestOomMonitorPlugin ) : public COomMonitorPlugin
- {
-public:
- CTestOomMonitorPlugin()
- {
- }
-
- ~CTestOomMonitorPlugin()
- {
- }
-
- void ConstructL()
- {
- COomMonitorPlugin::ConstructL();
- }
-
-public:
- void FreeRam()
- {
- }
-
- void MemoryGood()
- {
- }
-
- void ExtensionInterface(TUid aInterfaceId, TAny*& aImplementaion)
- {
- COomMonitorPlugin::ExtensionInterface(aInterfaceId, aImplementaion);
- }
- };
-
-
-#endif // __MT_COOMMONITORPLUGIN_H__
-
-// End of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.cpp Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-// CLASS HEADER
-#include "MT_OomMonitor.h"
-
-// EXTERNAL INCLUDES
-#include <EUnitMacros.h>
-#include <EUnitDecorators.h>
-#include <oommonitorsession.h>
-
-// INTERNAL INCLUDES
-
-
-// CONSTRUCTION
-MT_OomMonitor* MT_OomMonitor::NewL()
- {
- MT_OomMonitor* self = MT_OomMonitor::NewLC();
- CleanupStack::Pop();
-
- return self;
- }
-
-MT_OomMonitor* MT_OomMonitor::NewLC()
- {
- MT_OomMonitor* self = new( ELeave ) MT_OomMonitor();
- CleanupStack::PushL( self );
-
- self->ConstructL();
-
- return self;
- }
-
-// Destructor (virtual by CBase)
-MT_OomMonitor::~MT_OomMonitor()
- {
- }
-
-// Default constructor
-MT_OomMonitor::MT_OomMonitor()
- {
- }
-
-// Second phase construct
-void MT_OomMonitor::ConstructL()
- {
- // The ConstructL from the base class CEUnitTestSuiteClass must be called.
- // It generates the test case table.
- CEUnitTestSuiteClass::ConstructL();
- }
-
-// METHODS
-
-void MT_OomMonitor::EmptySetupL( )
- {
- }
-
-void MT_OomMonitor::EmptyTeardown( )
- {
- }
-
-void MT_OomMonitor::SetupL( )
- {
- iROomMonitorSession.Connect();
- }
-
-
-void MT_OomMonitor::Teardown( )
- {
- iROomMonitorSession.Close();
- }
-
-
-void MT_OomMonitor::T_ROomMonitorSession_ConnectL( )
- {
- EUNIT_ASSERT_DESC( iROomMonitorSession.Connect( ) == KErrNone, "Session should have been connected");
- iROomMonitorSession.Close();
- }
-
-void MT_OomMonitor::T_ROomMonitorSession_RequestFreeMemoryL( )
- {
- TInt rtn = iROomMonitorSession.RequestFreeMemory( 1024 );
- EUNIT_ASSERT_DESC( rtn == KErrNone || rtn == KErrNoMemory, "OOM monitor should free 1024 bytes");
- }
-
-void MT_OomMonitor::T_ROomMonitorSession_RequestFreeMemory2L( )
- {
- TRequestStatus status;
- iROomMonitorSession.RequestFreeMemory( 1024, status );
- User::WaitForRequest( status );
- EUNIT_ASSERT_DESC( status == KErrNone || status == KErrNoMemory, "OOM monitor should free 1024 bytes");
- }
-
-void MT_OomMonitor::T_ROomMonitorSession_CancelRequestFreeMemoryL( )
- {
- TRequestStatus status;
- iROomMonitorSession.RequestFreeMemory( 1024, status );
- iROomMonitorSession.CancelRequestFreeMemory( );
- User::WaitForRequest( status );
- }
-
-void MT_OomMonitor::T_ROomMonitorSession_ThisAppIsNotExitingL( )
- {
- iROomMonitorSession.ThisAppIsNotExiting( 1 );
- }
-
-
-// TEST TABLE
-EUNIT_BEGIN_TEST_TABLE(
- MT_OomMonitor,
- "ROomMonitorSession test suite",
- "MODULE" )
-
-EUNIT_TEST(
- "Connect - test",
- "ROomMonitorSession",
- "Connect",
- "FUNCTIONALITY",
- EmptySetupL, T_ROomMonitorSession_ConnectL, EmptyTeardown)
-
-EUNIT_TEST(
- "RequestFreeMemory -synchronous test",
- "ROomMonitorSession",
- "RequestFreeMemory - synchronous version",
- "FUNCTIONALITY",
- SetupL, T_ROomMonitorSession_RequestFreeMemoryL, Teardown)
-
-EUNIT_TEST(
- "RequestFreeMemory - asynchronous test",
- "ROomMonitorSession",
- "RequestFreeMemory - asynchronous version",
- "FUNCTIONALITY",
- SetupL, T_ROomMonitorSession_RequestFreeMemory2L, Teardown)
-
-EUNIT_TEST(
- "CancelRequestFreeMemory - test",
- "ROomMonitorSession",
- "CancelRequestFreeMemory",
- "FUNCTIONALITY",
- SetupL, T_ROomMonitorSession_CancelRequestFreeMemoryL, Teardown)
-
-EUNIT_TEST(
- "ThisAppIsNotExiting -test",
- "ROomMonitorSession",
- "ThisAppIsNotExiting",
- "FUNCTIONALITY",
- SetupL, T_ROomMonitorSession_ThisAppIsNotExitingL, Teardown)
-
-
-EUNIT_END_TEST_TABLE
-
-// END OF FILE
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor.h Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef __MT_OOMMONITOR_H__
-#define __MT_OOMMONITOR_H__
-
-// EXTERNAL INCLUDES
-#include <CEUnitTestSuiteClass.h>
-#include <EUnitDecorators.h>
-#include <oommonitorsession.h>
-
-// INTERNAL INCLUDES
-
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DEFINITION
-/**
- * Auto-generated EUnit test suite
- *
- */
-NONSHARABLE_CLASS( MT_OomMonitor )
- : public CEUnitTestSuiteClass
- {
- public: // Constructors and destructors
-
- /**
- * Two phase construction
- */
- static MT_OomMonitor* NewL();
- static MT_OomMonitor* NewLC();
- /**
- * Destructor
- */
- ~MT_OomMonitor();
-
- private: // Constructors and destructors
-
- MT_OomMonitor();
- void ConstructL();
-
- private: // New methods
-
- void EmptySetupL();
-
- void EmptyTeardown();
-
- void SetupL();
-
- void Teardown();
-
- void T_ROomMonitorSession_ConnectL();
-
- void T_ROomMonitorSession_RequestFreeMemoryL();
-
- void T_ROomMonitorSession_RequestFreeMemory2L();
-
- void T_ROomMonitorSession_CancelRequestFreeMemoryL();
-
- void T_ROomMonitorSession_ThisAppIsNotExitingL();
-
-
- private: // Data
-
- ROomMonitorSession iROomMonitorSession;
- EUNIT_DECLARE_TEST_TABLE;
-
- };
-
-#endif // __MT_OOMMONITOR_H__
-
-// End of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/MT_OomMonitor_DllMain.cpp Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-// CLASS HEADER
-#include "MT_OomMonitor.h"
-#include "MT_COomMonitorPlugin.h"
-
-// EXTERNAL INCLUDES
-#include <CEUnitTestSuite.h>
-
-EXPORT_C MEUnitTest* CreateTestSuiteL()
- {
- CEUnitTestSuite* rootSuite = CEUnitTestSuite::NewLC( _L("OomMonitor API tests") );
-
- rootSuite->AddL( MT_OomMonitor::NewLC() );
- CleanupStack::Pop();
-
- rootSuite->AddL( MT_COomMonitorPlugin::NewLC() );
- CleanupStack::Pop();
-
- CleanupStack::Pop( rootSuite );
- return rootSuite;
- }
-/*
-#ifndef EKA2
-GLDEF_C TInt E32Dll( TDllReason )
- {
- return KErrNone;
- }
-#endif
-*/
-// END OF FILE
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/MT_OomMonitor/stub_MemoryMonitor.cpp Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include <oommonitor.h>
-#include <oommonitorplugin.h>
-
-CMemoryMonitor* CMemoryMonitor::NewL()
- {
- CMemoryMonitor* self = new(ELeave) CMemoryMonitor();
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-CMemoryMonitor::CMemoryMonitor():iCurrentTask(iWs)
- {
- SetMemoryMonitorTls(this);
- }
-
-void CMemoryMonitor::ConstructL()
- {
-
- }
-
-CMemoryMonitor::~CMemoryMonitor()
- {
- }
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/MT_OomMonitor.mmp Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET MT_OomMonitor.dll
-TARGETTYPE dll
-UID 0x1000af5a 0x01700000
-
-CAPABILITY ALL -TCB -DRM
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../MT_OomMonitor
-SOURCE MT_OomMonitor.cpp
-SOURCE MT_COomMonitorPlugin.cpp
-SOURCE stub_MemoryMonitor.cpp
-
-// Sources required by the test suite
-SOURCEPATH ../MT_OomMonitor
-SOURCE MT_OomMonitor_DllMain.cpp
-
-USERINCLUDE ../MT_OomMonitor
-
-MW_LAYER_SYSTEMINCLUDE
-
-SYSTEMINCLUDE /epoc32/include/Digia/EUnit
-
-// System include folders required by the tested code
-
-
-LIBRARY EUnit.lib
-LIBRARY EUnitUtil.lib
-LIBRARY euser.lib
-LIBRARY oommonitor.lib
-LIBRARY ws32.lib
-LIBRARY apgrfx.lib // TApaTask
-
-// End of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/group/bld.inf Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2004 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-PRJ_PLATFORMS
- ARMV5 GCCE WINSCW
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-
-
-PRJ_TESTMMPFILES
-MT_OomMonitor.mmp
-
-
-// End of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/init/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/sysresmonitoring/oommonitor/tsrc/public/basic/test.xml Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<test>
- <name>oommonitor Automated Tests</name>
- <target>
- <device rank="none" alias="DEFAULT">
- <property name="HARNESS" value="EUNIT" />
- <property name="TYPE" value="Ariane" />
- </device>
- </target>
- <plan name="oommonitor Automated Test Plan" harness="EUNIT" enabled="true" passrate="100">
- <session name="session" harness="EUNIT" enabled="true" passrate="100">
- <set name="set" harness="EUNIT" enabled="true" passrate="100">
- <target>
- <device rank="master" alias="DEFAULT"/>
- </target>
- <case name="Test Case 1" harness="EUNIT" enabled="true" passrate="100">
- <flash target-alias="DEFAULT" images="ATS3Drop/images/sydo_oommonitor_ats3_image.fpsx" />
- <flash target-alias="DEFAULT" images="ATS3Drop/images/sydo_oommonitor_ats3_image_udaerase.fpsx" />
-
- <!-- Create CTC coverage result folder -->
- <step name="Create CTC log dir" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>makedir</command>
- <params>
- <param dir="c:\data\ctc\"/>
- </params>
- </step>
-
-
- <!-- Install testmodule MT_OomMonitor -->
- <step name="Install testmodule MT_OomMonitor DLL" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>install</command>
- <params>
- <param component-path="ATS3Drop"/>
- <param type="binary"/>
- <param src="MT_OomMonitor.dll"/>
- <param dst="c:\sys\bin\MT_OomMonitor.dll"/>
- </params>
- </step>
-
- <!-- Start CTC manager -->
- <step name="CTC start" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>execute</command>
- <params>
- <param file="z:\sys\bin\ctcman.exe"/>
- </params>
- </step>
-
- <!-- Create EUnit log dir -->
- <step name="Create EUnit log dir" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>makedir</command>
- <params>
- <param dir="c:\shared\eunit\logs\"/>
- </params>
- </step>
-
- <!-- Execute tests -->
- <step name="Execute tests" harness="EUNIT" enabled="true" passrate="100" significant="true">
- <command>execute</command>
- <params>
- <param parameters="/l xml MT_OomMonitor"/>
- <param timeout="360"/>
- <param result-file="c:\shared\eunit\logs\EUnit_log.xml"/>
- <param file="z:\sys\bin\EUNITEXERUNNER.EXE"/>
- </params>
- </step>
-
- <!-- Save CTC coverage data -->
- <step name="Save CTC data" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>execute</command>
- <params>
- <param parameters="writefile"/>
- <param file="z:\sys\bin\ctcman.exe"/>
- </params>
- </step>
-
- <!-- Fetch and clean CTC data -->
- <step name="Fetch and clean CTC data" harness="EUNIT" enabled="true" passrate="100" significant="false">
- <command>fetch-log</command>
- <params>
- <param delete="true"/>
- <param path="c:\data\ctc\ctcdata.txt"/>
- </params>
- </step>
- </case>
- </set>
- </session>
- </plan>
- <files>
- <file>ATS3Drop/images/sydo_oommonitor_ats3_image.fpsx</file>
- <file>ATS3Drop/images/sydo_oommonitor_ats3_image_udaerase.fpsx</file>
-
- <file>ATS3Drop/armv5_urel/MT_OomMonitor.dll</file>
- </files>
-
- <postAction>
- <type>SendEmailAction</type>
- <params>
- <param name="type" value="ATS3_REPORT"/>
- <param name="to" value="ext-yang.1.lu@nokia.com"/>
- <param name="subject" value="ATS3 report for §RUN_NAME§ §RUN_START_DATE§ §RUN_START_TIME§"/>
- <param name="send-files" value="true"/>
- </params>
- </postAction>
-
- <postAction>
- <type>FileStoreAction</type>
- <params>
- <param name="to-folder" value="\\ousrv058\data$\ATS3Reports\S60_5_0\SyDo\appexts\oommonitor\"/>
- </params>
- </postAction>
-</test>
--- a/systemsettings/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/rom/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/GSAccessoryPlugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/cenrep/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/conf/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/data/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/group/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/loc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/rom/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/gssensorplugin/src/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/systemsettings/inc/Distribution.Policy.S60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/Release/Data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/Release/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file tzpcside/tzcompiler/documentation/SGL.GT0197.232 App-Services Tz 9.1 How-To Create the Tz Database.doc has changed
--- a/tzpcside/tzcompiler/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/TestTzCompiler Description Document.doc has changed
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test1/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test10/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test11/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test12/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test13/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test2/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test3/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test4/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test5/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test6/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test7/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test8/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzpcside/tzcompiler/test/integration/TzCompilerTests/testdata/Test9/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzdatabase/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzdatabase/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file tzservices/tzloc/documentation/SGL.GT0284.216 - Time Zone Services CR1606 How-To.doc has changed
--- a/tzservices/tzloc/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/tzservices/tzloc/group/backup_registration.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" standalone="yes"?>
<!--
- Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
@@ -21,4 +21,4 @@
<backup_registration>
<dbms_backup policy="10206A8B"/>
-</backup_registration>
\ No newline at end of file
+</backup_registration>
--- a/tzservices/tzloc/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/res/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/TzLocalTestServer/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/tztestscripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_post.bat Mon Feb 08 13:38:38 2010 +0000
+++ b/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_post.bat Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,18 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
REM Move the required localization files from temporary directory to original directory
move \epoc32\release\winscw\udeb\z\resource\temp\timezones.r01 \epoc32\release\winscw\udeb\z\resource\timezonelocalization\timezones.r01
--- a/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_pre.bat Mon Feb 08 13:38:38 2010 +0000
+++ b/tzservices/tzloc/test/integration/tztestscripts/tzlocnoresource_pre.bat Fri Feb 26 17:43:11 2010 +0000
@@ -1,3 +1,18 @@
+@rem
+@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description:
+@rem
REM Create a temporary directory to store the original localization resource files
mkdir \epoc32\release\winscw\udeb\z\resource\temp
--- a/tzservices/tzloc/test/rtest/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/rtest/timezonelocalization/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/rtest/timezonelocalization/locale/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/rtest/timezonelocalization/modified/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/tzltestres/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/Scripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/TzLocalizationTestServer/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzloc/test/unit/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzlocrscfactory/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzlocrscfactory/res/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/Client/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/Client/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/Server/Include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/Server/Source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/analysis/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/conf/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
Binary file tzservices/tzserver/documentation/SGL.GT0197.233 App-Services Tz 9.1 How-To Use the APIs.doc has changed
Binary file tzservices/tzserver/documentation/SGL.GT0403.210 SOS v9.5 Time Zone Services PREQ1776 How-To.doc has changed
--- a/tzservices/tzserver/documentation/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/group/backup_registration.xml Mon Feb 08 13:38:38 2010 +0000
+++ b/tzservices/tzserver/group/backup_registration.xml Fri Feb 26 17:43:11 2010 +0000
@@ -1,10 +1,10 @@
<?xml version="1.0" standalone="yes"?>
<!--
- Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
which accompanies this distribution, and is available
at the URL "http://www.eclipse.org/legal/epl-v10.html".
--- a/tzservices/tzserver/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/swiobserverplugin/include/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/swiobserverplugin/source/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Common/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Common/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/bmarm/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/docs/PREQ234.mdl Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,652 +0,0 @@
-
-(object Petal
- version 43
- _written "Rose 6.1.9113.5"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- quid "41F0C7120101"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "41F0C7120103"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "41F0C7130299"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "41F0C7120102"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "41F0C7120104"
- logical_models (list unit_reference_list
- (object Class "CTestServer"
- quid "41F0C7460084"
- operations (list Operations
- (object Operation "CreateTestStep"
- quid "41F0D37B0324"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "CDstTestServer"
- quid "41F0C75D01EC"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41F0C7690278"
- supplier "Logical View::CTestServer"
- quidu "41F0C7460084")))
- (object Class "CUtcOffsetChangeEventNotifier"
- quid "41F0C7750392"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "421466E20021"
- supplier "Logical View::CActive"
- quidu "4214665601D7")))
- (object Class "CDstIntServer"
- quid "41F0C7D20084"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41F0C7DC0055"
- supplier "Logical View::CDstTestServer"
- quidu "41F0C75D01EC"))
- used_nodes (list uses_relationship_list
- (object Uses_Relationship
- quid "41F0C80D00E2"
- supplier "Logical View::CTestStep"
- quidu "41F0C7FB0343"
- supplier_cardinality (value cardinality "1..n"))))
- (object Class "CTestStep"
- quid "41F0C7FB0343"
- operations (list Operations
- (object Operation "doTestStepL"
- quid "41F0CAB300B3"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "doTestStepPreambleL"
- quid "41F0CAD10046"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "doTestStepPostambleL"
- quid "41F0CADB0382"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "CDSTAutoUpdate"
- quid "41F0C8AC02F5"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41F0C8BE00A4"
- supplier "Logical View::CTestStep"
- quidu "41F0C7FB0343")))
- (object Class "CUTCOffset"
- quid "41F0CA190065"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41F0CA2D0334"
- supplier "Logical View::CTestStep"
- quidu "41F0C7FB0343")))
- (object Class "CAutoUpdateNotification"
- quid "421466310179"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "4214664F00AE"
- supplier "Logical View::CTestStep"
- quidu "41F0C7FB0343")
- (object Inheritance_Relationship
- quid "42146661014A"
- supplier "Logical View::CActive"
- quidu "4214665601D7"))
- used_nodes (list uses_relationship_list
- (object Uses_Relationship
- quid "421466A50031"
- supplier "Logical View::CUtcOffsetChangeEventNotifier"
- quidu "41F0C7750392"
- supplier_cardinality (value cardinality "1..1"))))
- (object Class "CActive"
- quid "4214665601D7")
- (object Class "CUTCAlarm"
- quid "421B055F001D"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "421B076B0087"
- supplier "Logical View::CTestStep"
- quidu "41F0C7FB0343"))
- used_nodes (list uses_relationship_list
- (object Uses_Relationship
- quid "421B0780027B"
- supplier "Logical View::CAlarmNotifier"
- quidu "421B072C03E3"
- supplier_cardinality (value cardinality "1..1"))))
- (object Class "CAlarmNotifier"
- quid "421B072C03E3"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "421B078B0077"
- supplier "Logical View::CActive"
- quidu "4214665601D7"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "41F0C71302A7"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::CTestServer" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (400, 128)
- label (object ItemLabel
- Parent_View @1
- location (221, 47)
- fill_color 13434879
- nlines 1
- max_width 358
- justify 0
- label "CTestServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C7460084"
- compartment (object Compartment
- Parent_View @1
- location (221, 108)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 365)
- width 376
- height 186
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CDstTestServer" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (400, 512)
- label (object ItemLabel
- Parent_View @2
- location (241, 461)
- fill_color 13434879
- nlines 1
- max_width 318
- justify 0
- label "CDstTestServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C75D01EC"
- width 336
- height 126
- annotation 8
- autoResize TRUE)
- (object InheritView "" @3
- stereotype TRUE
- line_color 3342489
- quidu "41F0C7690278"
- client @2
- supplier @1
- line_style 0)
- (object ClassView "Class" "Logical View::CDstIntServer" @4
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (400, 880)
- label (object ItemLabel
- Parent_View @4
- location (259, 828)
- fill_color 13434879
- nlines 1
- max_width 282
- justify 0
- label "CDstIntServer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C7D20084"
- width 300
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritView "" @5
- stereotype TRUE
- line_color 3342489
- quidu "41F0C7DC0055"
- client @4
- supplier @2
- line_style 0)
- (object ClassView "Class" "Logical View::CTestStep" @6
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1008, 464)
- label (object ItemLabel
- Parent_View @6
- location (724, 327)
- fill_color 13434879
- nlines 1
- max_width 569
- justify 0
- label "CTestStep")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C7FB0343"
- compartment (object Compartment
- Parent_View @6
- location (724, 388)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 506)
- width 587
- height 299
- annotation 8
- autoResize TRUE)
- (object UsesView "" @7
- stereotype TRUE
- line_color 3342489
- quidu "41F0C80D00E2"
- client @4
- supplier @6
- line_style 0)
- (object ClassView "Class" "Logical View::CDSTAutoUpdate" @8
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (400, 1408)
- label (object ItemLabel
- Parent_View @8
- location (212, 1289)
- fill_color 13434879
- nlines 1
- max_width 376
- justify 0
- label "CDSTAutoUpdate")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C8AC02F5"
- width 394
- height 262
- annotation 8
- autoResize TRUE)
- (object InheritView "" @9
- stereotype TRUE
- line_color 3342489
- quidu "41F0C8BE00A4"
- client @8
- supplier @6
- line_style 0)
- (object ClassView "Class" "Logical View::CUTCOffset" @10
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (864, 1408)
- label (object ItemLabel
- Parent_View @10
- location (686, 1289)
- fill_color 13434879
- nlines 1
- max_width 357
- justify 0
- label "CUTCOffset")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0CA190065"
- width 375
- height 262
- annotation 8
- autoResize TRUE)
- (object InheritView "" @11
- stereotype TRUE
- line_color 3342489
- quidu "41F0CA2D0334"
- client @10
- supplier @6
- line_style 0)
- (object NoteView @12
- location (1792, 432)
- label (object ItemLabel
- Parent_View @12
- location (1373, 348)
- fill_color 13434879
- nlines 3
- max_width 802
- label "CTestServer and CTestStep are TestExecute framework base classes")
- line_color 3342489
- fill_color 13434879
- width 862
- height 181)
- (object ClassView "Class" "Logical View::CAutoUpdateNotification" @13
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1920, 1392)
- label (object ItemLabel
- Parent_View @13
- location (1673, 1273)
- fill_color 13434879
- nlines 1
- max_width 494
- justify 0
- label "CAutoUpdateNotification")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "421466310179"
- width 512
- height 263
- annotation 8
- autoResize TRUE)
- (object InheritView "" @14
- stereotype TRUE
- line_color 3342489
- quidu "4214664F00AE"
- client @13
- supplier @6
- line_style 0)
- (object ClassView "Class" "Logical View::CActive" @15
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1568, 2032)
- label (object ItemLabel
- Parent_View @15
- location (1452, 1972)
- fill_color 13434879
- nlines 1
- max_width 232
- justify 0
- label "CActive")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "4214665601D7"
- width 250
- height 144
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CUtcOffsetChangeEventNotifier" @16
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1920, 1760)
- label (object ItemLabel
- Parent_View @16
- location (1620, 1681)
- fill_color 13434879
- nlines 1
- max_width 600
- justify 0
- label "CUtcOffsetChangeEventNotifier")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41F0C7750392"
- width 618
- height 182
- annotation 8
- autoResize TRUE)
- (object UsesView "" @17
- stereotype TRUE
- line_color 3342489
- quidu "421466A50031"
- client @13
- supplier @16
- line_style 0)
- (object InheritView "" @18
- stereotype TRUE
- line_color 3342489
- quidu "421466E20021"
- client @16
- supplier @15
- line_style 0)
- (object ClassView "Class" "Logical View::CUTCAlarm" @19
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1280, 1408)
- label (object ItemLabel
- Parent_View @19
- location (1145, 1292)
- fill_color 13434879
- nlines 1
- max_width 270
- justify 0
- label "CUTCAlarm")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "421B055F001D"
- width 288
- height 256
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CAlarmNotifier" @20
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1280, 1760)
- label (object ItemLabel
- Parent_View @20
- location (1114, 1678)
- fill_color 13434879
- nlines 1
- max_width 332
- justify 0
- label "CAlarmNotifier")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "421B072C03E3"
- width 350
- height 188
- annotation 8
- autoResize TRUE)
- (object InheritView "" @21
- stereotype TRUE
- line_color 3342489
- quidu "421B076B0087"
- client @19
- supplier @6
- line_style 0)
- (object UsesView "" @22
- stereotype TRUE
- line_color 3342489
- quidu "421B0780027B"
- client @19
- supplier @20
- line_style 0)
- (object InheritView "" @23
- stereotype TRUE
- line_color 3342489
- quidu "421B078B0077"
- client @20
- supplier @15
- line_style 0)))))
- root_subsystem (object SubSystem "Component View"
- quid "41F0C7120104"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "41F0C7130298"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "41F0C7120105"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "41F0C7120111"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "DDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "DDL"
- name "DataBase"
- value ("DataBaseSet" 800))
- (object Attribute
- tool "DDL"
- name "DataBaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ANSI"
- value 800)
- (object Attribute
- tool "DDL"
- name "Oracle"
- value 801)
- (object Attribute
- tool "DDL"
- name "SQLServer"
- value 802)
- (object Attribute
- tool "DDL"
- name "Sybase"
- value 803)
- (object Attribute
- tool "DDL"
- name "Watcom"
- value 804)))
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnName"
- value "Id")
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnType"
- value "NUMBER(5)")
- (object Attribute
- tool "DDL"
- name "ViewName"
- value "V_")
- (object Attribute
- tool "DDL"
- name "TableName"
- value "T_")
- (object Attribute
- tool "DDL"
- name "InheritSuffix"
- value "_V")
- (object Attribute
- tool "DDL"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "BaseViews"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "DDLScriptFilename"
- value "DDL1.SQL")))
- (object Attribute
- tool "DDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ColumnType"
- value "VARCHAR")
- (object Attribute
- tool "DDL"
- name "Length"
- value "")
- (object Attribute
- tool "DDL"
- name "NullsOK"
- value TRUE)
- (object Attribute
- tool "DDL"
- name "PrimaryKey"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "Unique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "DDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE))
- quid "41F0C7120106"))
Binary file tzservices/tzserver/test/Integration/docs/SGL.GT0228.234 PREQ 234 App-Services Tz Daylight Saving Integration Test Design has changed
Binary file tzservices/tzserver/test/Integration/docs/SGL.GT0228.714 PREQ 234 Time Auto Update Test Specification has changed
--- a/tzservices/tzserver/test/Integration/docs/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-3
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/dstscripts/NextDSTChange.ini Mon Feb 08 13:38:38 2010 +0000
+++ b/tzservices/tzserver/test/Integration/dstscripts/NextDSTChange.ini Fri Feb 26 17:43:11 2010 +0000
@@ -1,7 +1,21 @@
-// TestNextDSTChange.ini
+//
+// Copyright (c) 2007-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
//
-// Copyright (c) Symbian Software Ltd 2008 All rights reserved
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
//
+// Description:
+//
+//
+
+
[LondonDSTStart]
timezone =Europe/London
@@ -101,4 +115,4 @@
expected_system_time_utc =20070927:010000.000000
expected_new_offset =0
expected_previous_dst_utc =20070224:010000.000000
-expected_previous_offset =0
\ No newline at end of file
+expected_previous_offset =0
--- a/tzservices/tzserver/test/Integration/dstscripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/teststeps/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Integration/teststeps/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/bmarm/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/dstscripts/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/resource/hardware/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/teststeps/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/Unit/teststeps/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/component/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/component/testresourcefiles/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/bwins/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/data/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/eabi/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/group/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/inc/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file
--- a/tzservices/tzserver/test/switest/src/distribution.policy.s60 Mon Feb 08 13:38:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7
\ No newline at end of file