1.1 --- a/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Fri Jul 16 10:09:15 2010 -0700 1.2 +++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Fri Jul 16 21:33:21 2010 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -33,8 +33,8 @@ 1.11 // but they must be here to allow ParScanClosure::do_oop_work to be defined 1.12 // in genOopClosures.inline.hpp. 1.13 1.14 -typedef OopTaskQueue ObjToScanQueue; 1.15 -typedef OopTaskQueueSet ObjToScanQueueSet; 1.16 +typedef Padded<OopTaskQueue> ObjToScanQueue; 1.17 +typedef GenericTaskQueueSet<ObjToScanQueue> ObjToScanQueueSet; 1.18 1.19 // Enable this to get push/pop/steal stats. 1.20 const int PAR_STATS_ENABLED = 0; 1.21 @@ -304,12 +304,6 @@ 1.22 friend class ParEvacuateFollowersClosure; 1.23 1.24 private: 1.25 - // XXX use a global constant instead of 64! 1.26 - struct ObjToScanQueuePadded { 1.27 - ObjToScanQueue work_queue; 1.28 - char pad[64 - sizeof(ObjToScanQueue)]; // prevent false sharing 1.29 - }; 1.30 - 1.31 // The per-worker-thread work queues 1.32 ObjToScanQueueSet* _task_queues; 1.33