# HG changeset patch
# User zgu
# Date 1367611228 25200
# Node ID bafc72bc89ff156f76afe16d0498a9d42da9edab
# Parent  41a66b33c624f2f1b653c60fcfbe83fced38aa82# Parent  7e956b7a3e876572e78085f61a6f5ddca29ef36a
Merge

diff -r 41a66b33c624 -r bafc72bc89ff hotspot/src/share/vm/prims/perf.cpp
--- a/hotspot/src/share/vm/prims/perf.cpp	Fri May 03 05:17:15 2013 -0700
+++ b/hotspot/src/share/vm/prims/perf.cpp	Fri May 03 13:00:28 2013 -0700
@@ -142,20 +142,20 @@
   }
 
   switch(variability) {
-  case 1:  /* V_Constant */
+  case PerfData::V_Constant:
     pl = PerfDataManager::create_long_constant(NULL_NS, (char *)name_utf,
                                                (PerfData::Units)units, value,
                                                CHECK_NULL);
     break;
 
-  case 2:  /* V_Variable */
-    pl = PerfDataManager::create_long_variable(NULL_NS, (char *)name_utf,
+  case PerfData::V_Monotonic:
+    pl = PerfDataManager::create_long_counter(NULL_NS, (char *)name_utf,
                                                (PerfData::Units)units, value,
                                                CHECK_NULL);
     break;
 
-  case 3:  /* V_Monotonic Counter */
-    pl = PerfDataManager::create_long_counter(NULL_NS, (char *)name_utf,
+  case PerfData::V_Variable:
+    pl = PerfDataManager::create_long_variable(NULL_NS, (char *)name_utf,
                                               (PerfData::Units)units, value,
                                               CHECK_NULL);
     break;