src/share/vm/runtime/fprofiler.cpp

changeset 6240
9b4ce069642e
parent 5617
491de79915eb
child 6680
78bbf4d43a14
     1.1 --- a/src/share/vm/runtime/fprofiler.cpp	Fri Sep 06 09:55:38 2013 +0100
     1.2 +++ b/src/share/vm/runtime/fprofiler.cpp	Sat Sep 14 20:40:34 2013 +0100
     1.3 @@ -264,7 +264,7 @@
     1.4  
     1.5   public:
     1.6  
     1.7 -  void* operator new(size_t size, ThreadProfiler* tp);
     1.8 +  void* operator new(size_t size, ThreadProfiler* tp) throw();
     1.9    void  operator delete(void* p);
    1.10  
    1.11    ProfilerNode() {
    1.12 @@ -373,7 +373,7 @@
    1.13    }
    1.14  };
    1.15  
    1.16 -void* ProfilerNode::operator new(size_t size, ThreadProfiler* tp){
    1.17 +void* ProfilerNode::operator new(size_t size, ThreadProfiler* tp) throw() {
    1.18    void* result = (void*) tp->area_top;
    1.19    tp->area_top += size;
    1.20  
    1.21 @@ -925,6 +925,8 @@
    1.22        FlatProfiler::interval_print();
    1.23        FlatProfiler::interval_reset();
    1.24      }
    1.25 +
    1.26 +    FREE_C_HEAP_ARRAY(JavaThread *, threadsList, mtInternal);
    1.27    } else {
    1.28      // Couldn't get the threads lock, just record that rather than blocking
    1.29      FlatProfiler::threads_lock_ticks += 1;

mercurial