comparison src/share/vm/runtime/mutexLocker.cpp @ 6152:958bb4b7be49

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 0a10d80352d5
children 51111665eda6 da91efe96a93
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
1 /* 1 /*
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 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.
124 Mutex* OopMapCacheAlloc_lock = NULL; 124 Mutex* OopMapCacheAlloc_lock = NULL;
125 125
126 Mutex* FreeList_lock = NULL; 126 Mutex* FreeList_lock = NULL;
127 Monitor* SecondaryFreeList_lock = NULL; 127 Monitor* SecondaryFreeList_lock = NULL;
128 Mutex* OldSets_lock = NULL; 128 Mutex* OldSets_lock = NULL;
129 Monitor* RootRegionScan_lock = NULL;
129 Mutex* MMUTracker_lock = NULL; 130 Mutex* MMUTracker_lock = NULL;
130 Mutex* HotCardCache_lock = NULL; 131 Mutex* HotCardCache_lock = NULL;
131 132
132 Monitor* GCTaskManager_lock = NULL; 133 Monitor* GCTaskManager_lock = NULL;
133 134
197 def(Shared_DirtyCardQ_lock , Mutex, nonleaf, true ); 198 def(Shared_DirtyCardQ_lock , Mutex, nonleaf, true );
198 199
199 def(FreeList_lock , Mutex, leaf , true ); 200 def(FreeList_lock , Mutex, leaf , true );
200 def(SecondaryFreeList_lock , Monitor, leaf , true ); 201 def(SecondaryFreeList_lock , Monitor, leaf , true );
201 def(OldSets_lock , Mutex , leaf , true ); 202 def(OldSets_lock , Mutex , leaf , true );
203 def(RootRegionScan_lock , Monitor, leaf , true );
202 def(MMUTracker_lock , Mutex , leaf , true ); 204 def(MMUTracker_lock , Mutex , leaf , true );
203 def(HotCardCache_lock , Mutex , special , true ); 205 def(HotCardCache_lock , Mutex , special , true );
204 def(EvacFailureStack_lock , Mutex , nonleaf , true ); 206 def(EvacFailureStack_lock , Mutex , nonleaf , true );
205 } 207 }
206 def(ParGCRareEvent_lock , Mutex , leaf , true ); 208 def(ParGCRareEvent_lock , Mutex , leaf , true );