commit 4f8ee27b3592351cd71897d192065758340932d1
author Chris Sosa <sosa@chromium.org> Fri Nov 30 13:01:54 2012 -0800
committer Gerrit <chrome-bot@google.com> Wed Dec 05 20:33:12 2012 -0800
tree 0872af59f6eeac2c4301bafdf9cb8115cb59f7f5
parent b3f5540ee27bd53a28e3a3f87e2f5e80fb2a4876

Modify priority tweaking to use CGroups.

This modifies the behavior of setpriority and getpriority
to use CGroups rather than niceness levels.

I've removed the unittest comparing priorities as its not
really valid any more as we are just writing numbers to files.

I've also refactored references to priority to reference cpu
shares etc.

BUG=chromium-os:36229
TEST=Unittest + doing end to end test in bgnd
CQ-DEPEND=I6a0e56073e7281268e0550919c9ec9202b18db26

Change-Id: I48c8270c2065f1e0677e5e53df3557131577b97c
Reviewed-on: https://gerrit.chromium.org/gerrit/39147
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>

utils_unittest.cc

diff --git a/utils_unittest.cc b/utils_unittest.cc
index 39ae150..39c8ad7 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -184,31 +184,15 @@
   EXPECT_EQ("3", utils::PartitionNumber("/dev/mmc0p3"));
 }
 
-
-TEST(UtilsTest, RunAsRootSetProcessPriorityTest) {
-  // getpriority may return -1 on error so the getpriority logic needs to be
-  // enhanced if any of the pre-defined priority constants are changed to -1.
-  ASSERT_NE(-1, utils::kProcessPriorityLow);
-  ASSERT_NE(-1, utils::kProcessPriorityNormal);
-  ASSERT_NE(-1, utils::kProcessPriorityHigh);
-  EXPECT_EQ(utils::kProcessPriorityNormal, getpriority(PRIO_PROCESS, 0));
-  EXPECT_TRUE(utils::SetProcessPriority(utils::kProcessPriorityHigh));
-  EXPECT_EQ(utils::kProcessPriorityHigh, getpriority(PRIO_PROCESS, 0));
-  EXPECT_TRUE(utils::SetProcessPriority(utils::kProcessPriorityLow));
-  EXPECT_EQ(utils::kProcessPriorityLow, getpriority(PRIO_PROCESS, 0));
-  EXPECT_TRUE(utils::SetProcessPriority(utils::kProcessPriorityNormal));
-  EXPECT_EQ(utils::kProcessPriorityNormal, getpriority(PRIO_PROCESS, 0));
-}
-
-TEST(UtilsTest, ComparePrioritiesTest) {
-  EXPECT_LT(utils::ComparePriorities(utils::kProcessPriorityLow,
-                                     utils::kProcessPriorityNormal), 0);
-  EXPECT_GT(utils::ComparePriorities(utils::kProcessPriorityNormal,
-                                     utils::kProcessPriorityLow), 0);
-  EXPECT_EQ(utils::ComparePriorities(utils::kProcessPriorityNormal,
-                                     utils::kProcessPriorityNormal), 0);
-  EXPECT_GT(utils::ComparePriorities(utils::kProcessPriorityHigh,
-                                     utils::kProcessPriorityNormal), 0);
+TEST(UtilsTest, CompareCpuSharesTest) {
+  EXPECT_LT(utils::CompareCpuShares(utils::kCpuSharesLow,
+                                    utils::kCpuSharesNormal), 0);
+  EXPECT_GT(utils::CompareCpuShares(utils::kCpuSharesNormal,
+                                    utils::kCpuSharesLow), 0);
+  EXPECT_EQ(utils::CompareCpuShares(utils::kCpuSharesNormal,
+                                    utils::kCpuSharesNormal), 0);
+  EXPECT_GT(utils::CompareCpuShares(utils::kCpuSharesHigh,
+                                    utils::kCpuSharesNormal), 0);
 }
 
 TEST(UtilsTest, FuzzIntTest) {