8204834: Fix confusing "allocate" naming in OopStorage

Allocate_list => allocation_list and so on.

Reviewed-by: dholmes, tschatzl, coleenp
This commit is contained in:
Kim Barrett 2018-07-09 13:35:55 -04:00
parent 66e825aa41
commit 051f4ed627
5 changed files with 185 additions and 185 deletions

View file

@ -73,7 +73,7 @@ class outputStream;
class OopStorage : public CHeapObj<mtGC> {
public:
OopStorage(const char* name, Mutex* allocate_mutex, Mutex* active_mutex);
OopStorage(const char* name, Mutex* allocation_mutex, Mutex* active_mutex);
~OopStorage();
// These count and usage accessors are racy unless at a safepoint.
@ -94,12 +94,12 @@ public:
ALLOCATED_ENTRY
};
// Locks _allocate_mutex.
// Locks _allocation_mutex.
// precondition: ptr != NULL.
EntryStatus allocation_status(const oop* ptr) const;
// Allocates and returns a new entry. Returns NULL if memory allocation
// failed. Locks _allocate_mutex.
// failed. Locks _allocation_mutex.
// postcondition: *result == NULL.
oop* allocate();
@ -152,7 +152,7 @@ public:
// Block cleanup functions are for the exclusive use of the GC.
// Both stop deleting if there is an in-progress concurrent iteration.
// Concurrent deletion locks both the allocate_mutex and the active_mutex.
// Concurrent deletion locks both the _allocation_mutex and the _active_mutex.
void delete_empty_blocks_safepoint();
void delete_empty_blocks_concurrent();
@ -172,20 +172,20 @@ public:
NOT_AIX( private: )
class Block; // Fixed-size array of oops, plus bookkeeping.
class ActiveArray; // Array of Blocks, plus bookkeeping.
class AllocateEntry; // Provides AllocateList links in a Block.
class AllocationListEntry; // Provides AllocationList links in a Block.
// Doubly-linked list of Blocks.
class AllocateList {
class AllocationList {
const Block* _head;
const Block* _tail;
// Noncopyable.
AllocateList(const AllocateList&);
AllocateList& operator=(const AllocateList&);
AllocationList(const AllocationList&);
AllocationList& operator=(const AllocationList&);
public:
AllocateList();
~AllocateList();
AllocationList();
~AllocationList();
Block* head();
Block* tail();
@ -219,10 +219,10 @@ NOT_AIX( private: )
private:
const char* _name;
ActiveArray* _active_array;
AllocateList _allocate_list;
AllocationList _allocation_list;
Block* volatile _deferred_updates;
Mutex* _allocate_mutex;
Mutex* _allocation_mutex;
Mutex* _active_mutex;
// Volatile for racy unlocked accesses.