Mercurial > hg > truffle

diff src/share/vm/runtime/vm_operations.hpp @ 360:5d254928c888

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ysr
date Wed, 27 Aug 2008 11:20:46 -0700
parents 1ee8caae33af
children 96b229c54d1e
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_operations.hpp	Wed Aug 27 10:56:33 2008 -0700
+++ b/src/share/vm/runtime/vm_operations.hpp	Wed Aug 27 11:20:46 2008 -0700
@@ -53,8 +53,13 @@
   template(ParallelGCFailedAllocation)            \
   template(ParallelGCFailedPermanentAllocation)   \
   template(ParallelGCSystemGC)                    \
+  template(CGC_Operation)                         \
   template(CMS_Initial_Mark)                      \
   template(CMS_Final_Remark)                      \
+  template(G1CollectFull)                         \
+  template(G1CollectForAllocation)                \
+  template(G1IncCollectionPause)                  \
+  template(G1PopRegionCollectionPause)            \
   template(EnableBiasedLocking)                   \
   template(RevokeBias)                            \
   template(BulkRevokeBias)                        \