archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8060074: os::free() takes MemoryTrackingLevel but doesn't need it

Browse source 
Cleaned up unused arguments in os::free and it's callers.

Reviewed-by: lfoltan, coleenp, ctornqvi, dholmes
This commit is contained in:
Max Ockner 2014-12-01 12:16:15 -05:00 • committed by Coleen Phillimore
parent 6c1cf6ba45
commit 91dbd4f088
91 changed files with 354 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -171,9 +171,9 @@ void* Thread::allocate(size_t size, bool throw_excpt, MEMFLAGS flags) {
void Thread::operator delete(void* p) {
if (UseBiasedLocking) {
void* real_malloc_addr = ((Thread*) p)->_real_malloc_address;
FreeHeap(real_malloc_addr, mtThread);
FreeHeap(real_malloc_addr);
} else {
FreeHeap(p, mtThread);
FreeHeap(p);
}
}
@ -1146,7 +1146,7 @@ NamedThread::NamedThread() : Thread() {
NamedThread::~NamedThread() {
if (_name != NULL) {
FREE_C_HEAP_ARRAY(char, _name, mtThread);
FREE_C_HEAP_ARRAY(char, _name);
_name = NULL;
}
}
@ -2998,7 +2998,7 @@ WordSize JavaThread::popframe_preserved_args_size_in_words() {
void JavaThread::popframe_free_preserved_args() {
assert(_popframe_preserved_args != NULL, "should not free PopFrame preserved arguments twice");
FREE_C_HEAP_ARRAY(char, (char*) _popframe_preserved_args, mtThread);
FREE_C_HEAP_ARRAY(char, (char*) _popframe_preserved_args);
_popframe_preserved_args = NULL;
_popframe_preserved_args_size = 0;
}
@ -3608,7 +3608,7 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent,
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
// If we can't find the agent, exit.
vm_exit_during_initialization(buf, NULL);
FREE_C_HEAP_ARRAY(char, buf, mtThread);
FREE_C_HEAP_ARRAY(char, buf);
}
} else {
// Try to load the agent from the standard dll directory
@ -3628,7 +3628,7 @@ static OnLoadEntry_t lookup_on_load(AgentLibrary* agent,
jio_snprintf(buf, len, "%s%s%s%s", msg, name, sub_msg, ebuf);
// If we can't find the agent, exit.
vm_exit_during_initialization(buf, NULL);
FREE_C_HEAP_ARRAY(char, buf, mtThread);
FREE_C_HEAP_ARRAY(char, buf);
}
}
}