archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Coleen Phillimore 2012-07-02 13:11:28 -04:00
commit 135f315eaa
315 changed files with 7243 additions and 1475 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/compiler/abstractCompiler.hpp
View file

@ -29,7 +29,7 @@
typedef void (*initializer)(void);
class AbstractCompiler : public CHeapObj {
class AbstractCompiler : public CHeapObj<mtCompiler> {
private:
bool _is_initialized; // Mark whether compiler object is initialized

6
hotspot/src/share/vm/compiler/compileBroker.cpp
View file

@ -951,7 +951,7 @@ void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler
int compiler_count = c1_compiler_count + c2_compiler_count;
_method_threads =
new (ResourceObj::C_HEAP) GrowableArray<CompilerThread*>(compiler_count, true);
new (ResourceObj::C_HEAP, mtCompiler) GrowableArray<CompilerThread*>(compiler_count, true);
char name_buffer[256];
for (int i = 0; i < c2_compiler_count; i++) {
@ -1627,7 +1627,7 @@ void CompileBroker::init_compiler_thread_log() {
}
fp = fopen(fileBuf, "at");
if (fp != NULL) {
file = NEW_C_HEAP_ARRAY(char, strlen(fileBuf)+1);
file = NEW_C_HEAP_ARRAY(char, strlen(fileBuf)+1, mtCompiler);
strcpy(file, fileBuf);
break;
}
@ -1637,7 +1637,7 @@ void CompileBroker::init_compiler_thread_log() {
} else {
if (LogCompilation && Verbose)
tty->print_cr("Opening compilation log %s", file);
CompileLog* log = new(ResourceObj::C_HEAP) CompileLog(file, fp, thread_id);
CompileLog* log = new(ResourceObj::C_HEAP, mtCompiler) CompileLog(file, fp, thread_id);
thread->init_log(log);
if (xtty != NULL) {

6
hotspot/src/share/vm/compiler/compileBroker.hpp
View file

@ -36,7 +36,7 @@ class nmethodLocker;
//
// An entry in the compile queue. It represents a pending or current
// compilation.
class CompileTask : public CHeapObj {
class CompileTask : public CHeapObj<mtCompiler> {
friend class VMStructs;
private:
@ -131,7 +131,7 @@ public:
//
// Per Compiler Performance Counters.
//
class CompilerCounters : public CHeapObj {
class CompilerCounters : public CHeapObj<mtCompiler> {
public:
enum {
@ -175,7 +175,7 @@ class CompilerCounters : public CHeapObj {
// CompileQueue
//
// A list of CompileTasks.
class CompileQueue : public CHeapObj {
class CompileQueue : public CHeapObj<mtCompiler> {
private:
const char* _name;
Monitor* _lock;

8
hotspot/src/share/vm/compiler/compileLog.cpp
View file

@ -37,14 +37,14 @@ CompileLog* CompileLog::_first = NULL;
CompileLog::CompileLog(const char* file, FILE* fp, intx thread_id)
: _context(_context_buffer, sizeof(_context_buffer))
{
initialize(new(ResourceObj::C_HEAP) fileStream(fp));
initialize(new(ResourceObj::C_HEAP, mtCompiler) fileStream(fp));
_file = file;
_file_end = 0;
_thread_id = thread_id;
_identities_limit = 0;
_identities_capacity = 400;
_identities = NEW_C_HEAP_ARRAY(char, _identities_capacity);
_identities = NEW_C_HEAP_ARRAY(char, _identities_capacity, mtCompiler);
// link into the global list
{ MutexLocker locker(CompileTaskAlloc_lock);
@ -56,7 +56,7 @@ CompileLog::CompileLog(const char* file, FILE* fp, intx thread_id)
CompileLog::~CompileLog() {
delete _out;
_out = NULL;
FREE_C_HEAP_ARRAY(char, _identities);
FREE_C_HEAP_ARRAY(char, _identities, mtCompiler);
}
@ -109,7 +109,7 @@ int CompileLog::identify(ciObject* obj) {
if (id >= _identities_capacity) {
int new_cap = _identities_capacity * 2;
if (new_cap <= id) new_cap = id + 100;
_identities = REALLOC_C_HEAP_ARRAY(char, _identities, new_cap);
_identities = REALLOC_C_HEAP_ARRAY(char, _identities, new_cap, mtCompiler);
_identities_capacity = new_cap;
}
while (id >= _identities_limit) {

2
hotspot/src/share/vm/compiler/compilerOracle.cpp
View file

@ -34,7 +34,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/jniHandles.hpp"
class MethodMatcher : public CHeapObj {
class MethodMatcher : public CHeapObj<mtCompiler> {
public:
enum Mode {
Exact,

4
hotspot/src/share/vm/compiler/oopMap.cpp
View file

@ -599,7 +599,7 @@ void OopMapSet::print_on(outputStream* st) const {
#ifdef COMPILER2
class DerivedPointerEntry : public CHeapObj {
class DerivedPointerEntry : public CHeapObj<mtCompiler> {
private:
oop* _location; // Location of derived pointer (also pointing to the base)
intptr_t _offset; // Offset from base pointer
@ -621,7 +621,7 @@ void DerivedPointerTable::clear() {
assert (!_active, "should not be active");
assert(_list == NULL || _list->length() == 0, "table not empty");
if (_list == NULL) {
_list = new (ResourceObj::C_HEAP) GrowableArray<DerivedPointerEntry*>(10, true); // Allocated on C heap
_list = new (ResourceObj::C_HEAP, mtCompiler) GrowableArray<DerivedPointerEntry*>(10, true); // Allocated on C heap
}
_active = true;
}