Bug 842679 - Part 2: Add PROCESS_PRIORITY_UNKNOWN to hal. r=cjones

paveltkv · Feb 23, 2013 · 619ff92 · 619ff92
1 parent 4db7b8a
commit 619ff92
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/hal/Hal.cpp b/hal/Hal.cpp
@@ -860,6 +860,8 @@ ProcessPriorityToString(ProcessPriority aPriority)
     return "BACKGROUND_HOMESCREEN";
   case PROCESS_PRIORITY_BACKGROUND:
     return "BACKGROUND";
+  case PROCESS_PRIORITY_UNKNOWN:
+    return "UNKNOWN";
   default:
     MOZ_ASSERT(false);
     return "???";

diff --git a/hal/HalTypes.h b/hal/HalTypes.h
@@ -76,7 +76,10 @@ enum SwitchState {
 
 typedef Observer<SwitchEvent> SwitchObserver;
 
+// Note that we rely on the order of this enum's entries.  Higher priorities
+// should have larger int values.
 enum ProcessPriority {
+  PROCESS_PRIORITY_UNKNOWN = -1,
   PROCESS_PRIORITY_BACKGROUND,
   PROCESS_PRIORITY_BACKGROUND_HOMESCREEN,
   PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE,
@@ -261,7 +264,7 @@ struct ParamTraits<mozilla::hal::SwitchDevice>:
 template <>
 struct ParamTraits<mozilla::hal::ProcessPriority>:
   public EnumSerializer<mozilla::hal::ProcessPriority,
-                        mozilla::hal::PROCESS_PRIORITY_BACKGROUND,
+                        mozilla::hal::PROCESS_PRIORITY_UNKNOWN,
                         mozilla::hal::NUM_PROCESS_PRIORITY> {
 };
 

diff --git a/hal/gonk/GonkHal.cpp b/hal/gonk/GonkHal.cpp
@@ -1135,7 +1135,10 @@ SetProcessPriority(int aPid, ProcessPriority aPriority)
     priorityStr = "master";
     break;
   default:
-    MOZ_NOT_REACHED();
+    // PROCESS_PRIORITY_UNKNOWN ends up in this branch, along with invalid enum
+    // values.
+    NS_ERROR("Invalid process priority!");
+    return;
   }
 
   // Notice that you can disable oom_adj and renice by deleting the prefs