stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8050228: Rename 'rem_size' in compactibleFreeListSpace.cpp because of name clashes on AIX

Browse Source 
Reviewed-by: dholmes, jmasa
This commit is contained in:
Volker Simonis 2014-07-17 11:32:09 +02:00
parent 5de58bc127
commit c17cd0d39f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotspot/src/os/aix/vm/os_aix.inline.hpp
View File

@ -36,9 +36,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netdb.h> #include <netdb.h>
// Defined in the system headers included above.
#undef rem_size
inline void* os::thread_local_storage_at(int index) { inline void* os::thread_local_storage_at(int index) {
return pthread_getspecific((pthread_key_t)index); return pthread_getspecific((pthread_key_t)index);
} }

18
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
View File

@ -1904,12 +1904,12 @@ CompactibleFreeListSpace::splitChunkAndReturnRemainder(FreeChunk* chunk,
assert(size > new_size, "Split from a smaller block?"); assert(size > new_size, "Split from a smaller block?");
assert(is_aligned(chunk), "alignment problem"); assert(is_aligned(chunk), "alignment problem");
assert(size == adjustObjectSize(size), "alignment problem"); assert(size == adjustObjectSize(size), "alignment problem");
size_t rem_size = size - new_size; size_t rem_sz = size - new_size;
assert(rem_size == adjustObjectSize(rem_size), "alignment problem"); assert(rem_sz == adjustObjectSize(rem_sz), "alignment problem");
assert(rem_size >= MinChunkSize, "Free chunk smaller than minimum"); assert(rem_sz >= MinChunkSize, "Free chunk smaller than minimum");
FreeChunk* ffc = (FreeChunk*)((HeapWord*)chunk + new_size); FreeChunk* ffc = (FreeChunk*)((HeapWord*)chunk + new_size);
assert(is_aligned(ffc), "alignment problem"); assert(is_aligned(ffc), "alignment problem");
ffc->set_size(rem_size); ffc->set_size(rem_sz);
ffc->link_next(NULL); ffc->link_next(NULL);
ffc->link_prev(NULL); // Mark as a free block for other (parallel) GC threads. ffc->link_prev(NULL); // Mark as a free block for other (parallel) GC threads.
// Above must occur before BOT is updated below. // Above must occur before BOT is updated below.
@ -1917,18 +1917,18 @@ CompactibleFreeListSpace::splitChunkAndReturnRemainder(FreeChunk* chunk,
OrderAccess::storestore(); OrderAccess::storestore();
assert(chunk->is_free() && ffc->is_free(), "Error"); assert(chunk->is_free() && ffc->is_free(), "Error");
_bt.split_block((HeapWord*)chunk, chunk->size(), new_size); _bt.split_block((HeapWord*)chunk, chunk->size(), new_size);
if (rem_size < SmallForDictionary) { if (rem_sz < SmallForDictionary) {
bool is_par = (SharedHeap::heap()->n_par_threads() > 0); bool is_par = (SharedHeap::heap()->n_par_threads() > 0);
if (is_par) _indexedFreeListParLocks[rem_size]->lock(); if (is_par) _indexedFreeListParLocks[rem_sz]->lock();
assert(!is_par || assert(!is_par ||
(SharedHeap::heap()->n_par_threads() == (SharedHeap::heap()->n_par_threads() ==
SharedHeap::heap()->workers()->active_workers()), "Mismatch"); SharedHeap::heap()->workers()->active_workers()), "Mismatch");
returnChunkToFreeList(ffc); returnChunkToFreeList(ffc);
split(size, rem_size); split(size, rem_sz);
if (is_par) _indexedFreeListParLocks[rem_size]->unlock(); if (is_par) _indexedFreeListParLocks[rem_sz]->unlock();
} else { } else {
returnChunkToDictionary(ffc); returnChunkToDictionary(ffc);
split(size ,rem_size); split(size, rem_sz);
} }
chunk->set_size(new_size); chunk->set_size(new_size);
return chunk; return chunk;