comparison src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents be0ac0e8f6e7
children 89152779163c
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
1 /* 1 /*
2 * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
63 break; 63 break;
64 64
65 case threads: 65 case threads:
66 { 66 {
67 ResourceMark rm; 67 ResourceMark rm;
68 CLDClosure* cld_closure = NULL; // Not needed. All CLDs are already visited. 68 CLDToOopClosure* cld_closure = NULL; // Not needed. All CLDs are already visited.
69 Threads::oops_do(&roots_closure, cld_closure, NULL); 69 Threads::oops_do(&roots_closure, cld_closure, NULL);
70 } 70 }
71 break; 71 break;
72 72
73 case object_synchronizer: 73 case object_synchronizer:
120 void ThreadRootsTask::do_it(GCTaskManager* manager, uint which) { 120 void ThreadRootsTask::do_it(GCTaskManager* manager, uint which) {
121 assert(Universe::heap()->is_gc_active(), "called outside gc"); 121 assert(Universe::heap()->is_gc_active(), "called outside gc");
122 122
123 PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which); 123 PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
124 PSScavengeRootsClosure roots_closure(pm); 124 PSScavengeRootsClosure roots_closure(pm);
125 CLDClosure* roots_from_clds = NULL; // Not needed. All CLDs are already visited. 125 CLDToOopClosure* roots_from_clds = NULL; // Not needed. All CLDs are already visited.
126 CodeBlobToOopClosure roots_in_blobs(&roots_closure, /*do_marking=*/ true); 126 CodeBlobToOopClosure roots_in_blobs(&roots_closure, /*do_marking=*/ true);
127 127
128 if (_java_thread != NULL) 128 if (_java_thread != NULL)
129 _java_thread->oops_do(&roots_closure, roots_from_clds, &roots_in_blobs); 129 _java_thread->oops_do(&roots_closure, roots_from_clds, &roots_in_blobs);
130 130