commit 2b5a40ba8073fe67111d8cdc4c0b9e58c30fafe4
author Jeremy Manson <jeremymanson@google.com> Tue Jan 07 13:31:33 2014 +0100
committer Thomas Schatzl <tschatzl@openjdk.org> Tue Jan 07 13:31:33 2014 +0100
tree b540ce8c2a9710b417672a16521950648c2bbff9
parent 49fe45fbe1b1e6c4f86cce4757d801e43efa7292

8027364: PSScavenge accounts too large code section to StringTable unlink

Correct timing measurement by modifying the scope of the GCTraceTime instance.

Reviewed-by: ysr, tamao

hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp

diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
index 66b23c4..8f47d58 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -466,10 +466,12 @@
       }
     }
 
-    GCTraceTime tm("StringTable", false, false, &_gc_timer);
-    // Unlink any dead interned Strings and process the remaining live ones.
-    PSScavengeRootsClosure root_closure(promotion_manager);
-    StringTable::unlink_or_oops_do(&_is_alive_closure, &root_closure);
+    {
+      GCTraceTime tm("StringTable", false, false, &_gc_timer);
+      // Unlink any dead interned Strings and process the remaining live ones.
+      PSScavengeRootsClosure root_closure(promotion_manager);
+      StringTable::unlink_or_oops_do(&_is_alive_closure, &root_closure);
+    }
 
     // Finally, flush the promotion_manager's labs, and deallocate its stacks.
     promotion_failure_occurred = PSPromotionManager::post_scavenge(_gc_tracer);