jdk-sandbox: comparison hotspot/src/os/windows/vm/os

equal deleted inserted replaced

-:3e92f211533f
+:fedb7f148e85
 _hToken = NULL;
 }
 static bool numa_interleaving_init() {
 bool success = false;
-bool use_numa_specified = !FLAG_IS_DEFAULT(UseNUMA);
 bool use_numa_interleaving_specified = !FLAG_IS_DEFAULT(UseNUMAInterleaving);
-// print a warning if UseNUMA or UseNUMAInterleaving flag is specified on command line
+// print a warning if UseNUMAInterleaving flag is specified on command line
-bool warn_on_failure =  use_numa_specified || use_numa_interleaving_specified;
+bool warn_on_failure = use_numa_interleaving_specified;
 # define WARN(msg) if (warn_on_failure) { warning(msg); }
 // NUMAInterleaveGranularity cannot be less than vm_allocation_granularity (or _large_page_size if using large pages)
 size_t min_interleave_granularity = UseLargePages ? _large_page_size : os::vm_allocation_granularity();
 NUMAInterleaveGranularity = align_size_up(NUMAInterleaveGranularity, min_interleave_granularity);
 if (os::Kernel32Dll::NumaCallsAvailable()) {
 if (numa_node_list_holder.build()) {
 if (PrintMiscellaneous && Verbose) {
-tty->print("NUMA UsedNodeCount=%d, namely ", os::numa_get_groups_num());
+tty->print("NUMA UsedNodeCount=%d, namely ", numa_node_list_holder.get_count());
 for (int i = 0; i < numa_node_list_holder.get_count(); i++) {
 tty->print("%d ", numa_node_list_holder.get_node_list_entry(i));
 }
 tty->print("\n");
 }
 }
 } else {
 WARN("NUMA Interleaving is not supported by the operating system.");
 }
 if (!success) {
-if (use_numa_specified) WARN("...Ignoring UseNUMA flag.");
 if (use_numa_interleaving_specified) WARN("...Ignoring UseNUMAInterleaving flag.");
 }
 return success;
 #undef WARN
 }
 bytes_to_rq,
 flags,
 prot);
 } else {
 // get the next node to use from the used_node_list
-DWORD node = numa_node_list_holder.get_node_list_entry(count % os::numa_get_groups_num());
+assert(numa_node_list_holder.get_count() > 0, "Multiple NUMA nodes expected");
+DWORD node = numa_node_list_holder.get_node_list_entry(count % numa_node_list_holder.get_count());
 p_new = (char *)os::Kernel32Dll::VirtualAllocExNuma(hProc,
 next_alloc_addr,
 bytes_to_rq,
 flags,
 prot,
 void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
 void os::free_memory(char *addr, size_t bytes)         { }
 void os::numa_make_global(char *addr, size_t bytes)    { }
 void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint)    { }
 bool os::numa_topology_changed()                       { return false; }
-size_t os::numa_get_groups_num()                       { return numa_node_list_holder.get_count(); }
+size_t os::numa_get_groups_num()                       { return MAX2(numa_node_list_holder.get_count(), 1); }
 int os::numa_get_group_id()                            { return 0; }
 size_t os::numa_get_leaf_groups(int *ids, size_t size) {
-// check for size bigger than actual groups_num
+if (numa_node_list_holder.get_count() == 0 && size > 0) {
-size = MIN2(size, numa_get_groups_num());
+// Provide an answer for UMA systems
-for (int i = 0; i < (int)size; i++) {
+ids[0] = 0;
-ids[i] = numa_node_list_holder.get_node_list_entry(i);
+return 1;
-}
+} else {
-return size;
+// check for size bigger than actual groups_num
+size = MIN2(size, numa_get_groups_num());
+for (int i = 0; i < (int)size; i++) {
+ids[i] = numa_node_list_holder.get_node_list_entry(i);
+}
+return size;
+}
 }
 bool os::get_page_info(char *start, page_info* info) {
 return false;
 }
 NOT_PRODUCT(if (PrintMiscellaneous && Verbose) nx_check_protection());
 #endif
 // initialize thread priority policy
 prio_init();
+if (UseNUMA && !ForceNUMA) {
+UseNUMA = false; // We don't fully support this yet
+}
 if (UseNUMAInterleaving) {
 // first check whether this Windows OS supports VirtualAllocExNuma, if not ignore this flag
 bool success = numa_interleaving_init();
 if (!success) UseNUMAInterleaving = false;

changeset 10527	fedb7f148e85
parent 10494	3f347ed8bd3c
child 10536	28111f5acd64