--- old/src/share/vm/gc_implementation/shared/gcHeapSummary.hpp	2015-05-12 11:56:50.345793848 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
-
-#include "memory/allocation.hpp"
-#include "memory/metaspaceChunkFreeListSummary.hpp"
-
-class VirtualSpaceSummary : public StackObj {
-  HeapWord* _start;
-  HeapWord* _committed_end;
-  HeapWord* _reserved_end;
-public:
-  VirtualSpaceSummary() :
-      _start(NULL), _committed_end(NULL), _reserved_end(NULL) { }
-  VirtualSpaceSummary(HeapWord* start, HeapWord* committed_end, HeapWord* reserved_end) :
-      _start(start), _committed_end(committed_end), _reserved_end(reserved_end) { }
-
-  HeapWord* start() const { return _start; }
-  HeapWord* committed_end() const { return _committed_end; }
-  HeapWord* reserved_end() const { return _reserved_end; }
-  size_t committed_size() const { return (uintptr_t)_committed_end - (uintptr_t)_start;  }
-  size_t reserved_size() const { return (uintptr_t)_reserved_end - (uintptr_t)_start; }
-};
-
-class SpaceSummary : public StackObj {
-  HeapWord* _start;
-  HeapWord* _end;
-  size_t    _used;
-public:
-  SpaceSummary() :
-      _start(NULL), _end(NULL), _used(0) { }
-  SpaceSummary(HeapWord* start, HeapWord* end, size_t used) :
-      _start(start), _end(end), _used(used) { }
-
-  HeapWord* start() const { return _start; }
-  HeapWord* end() const { return _end; }
-  size_t used() const { return _used; }
-  size_t size() const { return (uintptr_t)_end - (uintptr_t)_start; }
-};
-
-class MetaspaceSizes : public StackObj {
-  size_t _committed;
-  size_t _used;
-  size_t _reserved;
-
- public:
-  MetaspaceSizes() : _committed(0), _used(0), _reserved(0) {}
-  MetaspaceSizes(size_t committed, size_t used, size_t reserved) :
-    _committed(committed), _used(used), _reserved(reserved) {}
-
-  size_t committed() const { return _committed; }
-  size_t used() const { return _used; }
-  size_t reserved() const { return _reserved; }
-};
-
-class GCHeapSummary;
-class PSHeapSummary;
-
-class GCHeapSummaryVisitor {
- public:
-  virtual void visit(const GCHeapSummary* heap_summary) const = 0;
-  virtual void visit(const PSHeapSummary* heap_summary) const {}
-};
-
-class GCHeapSummary : public StackObj {
-  VirtualSpaceSummary _heap;
-  size_t _used;
-
- public:
-   GCHeapSummary() :
-       _heap(), _used(0) { }
-   GCHeapSummary(VirtualSpaceSummary& heap_space, size_t used) :
-       _heap(heap_space), _used(used) { }
-
-  const VirtualSpaceSummary& heap() const { return _heap; }
-  size_t used() const { return _used; }
-
-   virtual void accept(GCHeapSummaryVisitor* visitor) const {
-     visitor->visit(this);
-   }
-};
-
-class PSHeapSummary : public GCHeapSummary {
-  VirtualSpaceSummary  _old;
-  SpaceSummary         _old_space;
-  VirtualSpaceSummary  _young;
-  SpaceSummary         _eden;
-  SpaceSummary         _from;
-  SpaceSummary         _to;
- public:
-   PSHeapSummary(VirtualSpaceSummary& heap_space, size_t heap_used, VirtualSpaceSummary old, SpaceSummary old_space, VirtualSpaceSummary young, SpaceSummary eden, SpaceSummary from, SpaceSummary to) :
-       GCHeapSummary(heap_space, heap_used), _old(old), _old_space(old_space), _young(young), _eden(eden), _from(from), _to(to) { }
-   const VirtualSpaceSummary& old() const { return _old; }
-   const SpaceSummary& old_space() const { return _old_space; }
-   const VirtualSpaceSummary& young() const { return _young; }
-   const SpaceSummary& eden() const { return _eden; }
-   const SpaceSummary& from() const { return _from; }
-   const SpaceSummary& to() const { return _to; }
-
-   virtual void accept(GCHeapSummaryVisitor* visitor) const {
-     visitor->visit(this);
-   }
-};
-
-class MetaspaceSummary : public StackObj {
-  size_t _capacity_until_GC;
-  MetaspaceSizes _meta_space;
-  MetaspaceSizes _data_space;
-  MetaspaceSizes _class_space;
-  MetaspaceChunkFreeListSummary _metaspace_chunk_free_list_summary;
-  MetaspaceChunkFreeListSummary _class_chunk_free_list_summary;
-
- public:
-  MetaspaceSummary() :
-    _capacity_until_GC(0),
-    _meta_space(),
-    _data_space(),
-    _class_space(),
-    _metaspace_chunk_free_list_summary(),
-    _class_chunk_free_list_summary()
-  {}
-  MetaspaceSummary(size_t capacity_until_GC,
-                   const MetaspaceSizes& meta_space,
-                   const MetaspaceSizes& data_space,
-                   const MetaspaceSizes& class_space,
-                   const MetaspaceChunkFreeListSummary& metaspace_chunk_free_list_summary,
-                   const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary) :
-    _capacity_until_GC(capacity_until_GC),
-    _meta_space(meta_space),
-    _data_space(data_space),
-    _class_space(class_space),
-    _metaspace_chunk_free_list_summary(metaspace_chunk_free_list_summary),
-    _class_chunk_free_list_summary(class_chunk_free_list_summary)
-  {}
-
-  size_t capacity_until_GC() const { return _capacity_until_GC; }
-  const MetaspaceSizes& meta_space() const { return _meta_space; }
-  const MetaspaceSizes& data_space() const { return _data_space; }
-  const MetaspaceSizes& class_space() const { return _class_space; }
-
-  const MetaspaceChunkFreeListSummary& metaspace_chunk_free_list_summary() const {
-    return _metaspace_chunk_free_list_summary;
-  }
-
-  const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary() const {
-    return _class_chunk_free_list_summary;
-  }
-
-};
-
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_GCHEAPSUMMARY_HPP
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/src/share/vm/gc/shared/gcHeapSummary.hpp	2015-05-12 11:56:50.091783145 +0200
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#define SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+
+#include "memory/allocation.hpp"
+#include "memory/metaspaceChunkFreeListSummary.hpp"
+
+class VirtualSpaceSummary : public StackObj {
+  HeapWord* _start;
+  HeapWord* _committed_end;
+  HeapWord* _reserved_end;
+public:
+  VirtualSpaceSummary() :
+      _start(NULL), _committed_end(NULL), _reserved_end(NULL) { }
+  VirtualSpaceSummary(HeapWord* start, HeapWord* committed_end, HeapWord* reserved_end) :
+      _start(start), _committed_end(committed_end), _reserved_end(reserved_end) { }
+
+  HeapWord* start() const { return _start; }
+  HeapWord* committed_end() const { return _committed_end; }
+  HeapWord* reserved_end() const { return _reserved_end; }
+  size_t committed_size() const { return (uintptr_t)_committed_end - (uintptr_t)_start;  }
+  size_t reserved_size() const { return (uintptr_t)_reserved_end - (uintptr_t)_start; }
+};
+
+class SpaceSummary : public StackObj {
+  HeapWord* _start;
+  HeapWord* _end;
+  size_t    _used;
+public:
+  SpaceSummary() :
+      _start(NULL), _end(NULL), _used(0) { }
+  SpaceSummary(HeapWord* start, HeapWord* end, size_t used) :
+      _start(start), _end(end), _used(used) { }
+
+  HeapWord* start() const { return _start; }
+  HeapWord* end() const { return _end; }
+  size_t used() const { return _used; }
+  size_t size() const { return (uintptr_t)_end - (uintptr_t)_start; }
+};
+
+class MetaspaceSizes : public StackObj {
+  size_t _committed;
+  size_t _used;
+  size_t _reserved;
+
+ public:
+  MetaspaceSizes() : _committed(0), _used(0), _reserved(0) {}
+  MetaspaceSizes(size_t committed, size_t used, size_t reserved) :
+    _committed(committed), _used(used), _reserved(reserved) {}
+
+  size_t committed() const { return _committed; }
+  size_t used() const { return _used; }
+  size_t reserved() const { return _reserved; }
+};
+
+class GCHeapSummary;
+class PSHeapSummary;
+
+class GCHeapSummaryVisitor {
+ public:
+  virtual void visit(const GCHeapSummary* heap_summary) const = 0;
+  virtual void visit(const PSHeapSummary* heap_summary) const {}
+};
+
+class GCHeapSummary : public StackObj {
+  VirtualSpaceSummary _heap;
+  size_t _used;
+
+ public:
+   GCHeapSummary() :
+       _heap(), _used(0) { }
+   GCHeapSummary(VirtualSpaceSummary& heap_space, size_t used) :
+       _heap(heap_space), _used(used) { }
+
+  const VirtualSpaceSummary& heap() const { return _heap; }
+  size_t used() const { return _used; }
+
+   virtual void accept(GCHeapSummaryVisitor* visitor) const {
+     visitor->visit(this);
+   }
+};
+
+class PSHeapSummary : public GCHeapSummary {
+  VirtualSpaceSummary  _old;
+  SpaceSummary         _old_space;
+  VirtualSpaceSummary  _young;
+  SpaceSummary         _eden;
+  SpaceSummary         _from;
+  SpaceSummary         _to;
+ public:
+   PSHeapSummary(VirtualSpaceSummary& heap_space, size_t heap_used, VirtualSpaceSummary old, SpaceSummary old_space, VirtualSpaceSummary young, SpaceSummary eden, SpaceSummary from, SpaceSummary to) :
+       GCHeapSummary(heap_space, heap_used), _old(old), _old_space(old_space), _young(young), _eden(eden), _from(from), _to(to) { }
+   const VirtualSpaceSummary& old() const { return _old; }
+   const SpaceSummary& old_space() const { return _old_space; }
+   const VirtualSpaceSummary& young() const { return _young; }
+   const SpaceSummary& eden() const { return _eden; }
+   const SpaceSummary& from() const { return _from; }
+   const SpaceSummary& to() const { return _to; }
+
+   virtual void accept(GCHeapSummaryVisitor* visitor) const {
+     visitor->visit(this);
+   }
+};
+
+class MetaspaceSummary : public StackObj {
+  size_t _capacity_until_GC;
+  MetaspaceSizes _meta_space;
+  MetaspaceSizes _data_space;
+  MetaspaceSizes _class_space;
+  MetaspaceChunkFreeListSummary _metaspace_chunk_free_list_summary;
+  MetaspaceChunkFreeListSummary _class_chunk_free_list_summary;
+
+ public:
+  MetaspaceSummary() :
+    _capacity_until_GC(0),
+    _meta_space(),
+    _data_space(),
+    _class_space(),
+    _metaspace_chunk_free_list_summary(),
+    _class_chunk_free_list_summary()
+  {}
+  MetaspaceSummary(size_t capacity_until_GC,
+                   const MetaspaceSizes& meta_space,
+                   const MetaspaceSizes& data_space,
+                   const MetaspaceSizes& class_space,
+                   const MetaspaceChunkFreeListSummary& metaspace_chunk_free_list_summary,
+                   const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary) :
+    _capacity_until_GC(capacity_until_GC),
+    _meta_space(meta_space),
+    _data_space(data_space),
+    _class_space(class_space),
+    _metaspace_chunk_free_list_summary(metaspace_chunk_free_list_summary),
+    _class_chunk_free_list_summary(class_chunk_free_list_summary)
+  {}
+
+  size_t capacity_until_GC() const { return _capacity_until_GC; }
+  const MetaspaceSizes& meta_space() const { return _meta_space; }
+  const MetaspaceSizes& data_space() const { return _data_space; }
+  const MetaspaceSizes& class_space() const { return _class_space; }
+
+  const MetaspaceChunkFreeListSummary& metaspace_chunk_free_list_summary() const {
+    return _metaspace_chunk_free_list_summary;
+  }
+
+  const MetaspaceChunkFreeListSummary& class_chunk_free_list_summary() const {
+    return _class_chunk_free_list_summary;
+  }
+
+};
+
+#endif // SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP