comparison 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
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
265 // was this VM created by the gamma launcher 265 // was this VM created by the gamma launcher
266 static bool _created_by_gamma_launcher; 266 static bool _created_by_gamma_launcher;
267 267
268 // Option flags 268 // Option flags
269 static bool _has_profile; 269 static bool _has_profile;
270 static bool _has_alloc_profile;
271 static const char* _gc_log_filename; 270 static const char* _gc_log_filename;
272 static uintx _min_heap_size; 271 static uintx _min_heap_size;
273 272
274 // -Xrun arguments 273 // -Xrun arguments
275 static AgentLibraryList _libraryList; 274 static AgentLibraryList _libraryList;
318 static void set_ergonomics_flags(); 317 static void set_ergonomics_flags();
319 static void set_shared_spaces_flags(); 318 static void set_shared_spaces_flags();
320 // limits the given memory size by the maximum amount of memory this process is 319 // limits the given memory size by the maximum amount of memory this process is
321 // currently allowed to allocate or reserve. 320 // currently allowed to allocate or reserve.
322 static julong limit_by_allocatable_memory(julong size); 321 static julong limit_by_allocatable_memory(julong size);
322 // Setup HeapBaseMinAddress
323 static void set_heap_base_min_address();
323 // Setup heap size 324 // Setup heap size
324 static void set_heap_size(); 325 static void set_heap_size();
325 // Based on automatic selection criteria, should the 326 // Based on automatic selection criteria, should the
326 // low pause collector be used. 327 // low pause collector be used.
327 static bool should_auto_select_low_pause_collector(); 328 static bool should_auto_select_low_pause_collector();
472 static int sun_java_launcher_pid() { return _sun_java_launcher_pid; } 473 static int sun_java_launcher_pid() { return _sun_java_launcher_pid; }
473 474
474 // -Xloggc:<file>, if not specified will be NULL 475 // -Xloggc:<file>, if not specified will be NULL
475 static const char* gc_log_filename() { return _gc_log_filename; } 476 static const char* gc_log_filename() { return _gc_log_filename; }
476 477
477 // -Xprof/-Xaprof 478 // -Xprof
478 static bool has_profile() { return _has_profile; } 479 static bool has_profile() { return _has_profile; }
479 static bool has_alloc_profile() { return _has_alloc_profile; }
480 480
481 // -Xms, -Xmx 481 // -Xms, -Xmx
482 static uintx min_heap_size() { return _min_heap_size; } 482 static uintx min_heap_size() { return _min_heap_size; }
483 static void set_min_heap_size(uintx v) { _min_heap_size = v; } 483 static void set_min_heap_size(uintx v) { _min_heap_size = v; }
484 484