Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/os.hpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | b8f261ba79c6 0c039865ef2b |
children | 836a62f43af9 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.hpp Fri Apr 05 18:53:57 2013 +0200 +++ b/src/share/vm/runtime/os.hpp Sat Apr 06 20:04:06 2013 +0200 @@ -180,11 +180,11 @@ // Interface for detecting multiprocessor system static inline bool is_MP() { assert(_processor_count > 0, "invalid processor count"); - return _processor_count > 1; + return _processor_count > 1 || AssumeMP; } static julong available_memory(); static julong physical_memory(); - static julong allocatable_physical_memory(julong size); + static bool has_allocatable_memory_limit(julong* limit); static bool is_server_class_machine(); // number of CPUs