Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.hpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 6b0fd0964b87 |
children | 58fc8e2b7b6d |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.hpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/share/vm/runtime/arguments.hpp Mon Aug 05 13:20:06 2013 +0200 @@ -267,7 +267,6 @@ // Option flags static bool _has_profile; - static bool _has_alloc_profile; static const char* _gc_log_filename; static uintx _min_heap_size; @@ -320,6 +319,8 @@ // limits the given memory size by the maximum amount of memory this process is // currently allowed to allocate or reserve. static julong limit_by_allocatable_memory(julong size); + // Setup HeapBaseMinAddress + static void set_heap_base_min_address(); // Setup heap size static void set_heap_size(); // Based on automatic selection criteria, should the @@ -474,9 +475,8 @@ // -Xloggc:<file>, if not specified will be NULL static const char* gc_log_filename() { return _gc_log_filename; } - // -Xprof/-Xaprof + // -Xprof static bool has_profile() { return _has_profile; } - static bool has_alloc_profile() { return _has_alloc_profile; } // -Xms, -Xmx static uintx min_heap_size() { return _min_heap_size; }