changeset 26570:8a96177975bc

Merge
author minqi
date Tue, 09 Sep 2014 18:56:24 +0000
parents 65dbacf42e6d 5fcbc13c071c
children 9d01d41f1aa7 1f181bd352ce
files
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/os/posix/vm/os_posix.cpp	Tue Sep 09 09:48:42 2014 -0700
+++ b/hotspot/src/os/posix/vm/os_posix.cpp	Tue Sep 09 18:56:24 2014 +0000
@@ -215,6 +215,9 @@
   struct utsname name;
   uname(&name);
   st->print("%s ", name.sysname);
+#ifdef ASSERT
+  st->print("%s ", name.nodename);
+#endif
   st->print("%s ", name.release);
   st->print("%s ", name.version);
   st->print("%s", name.machine);
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Tue Sep 09 09:48:42 2014 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Tue Sep 09 18:56:24 2014 +0000
@@ -1588,8 +1588,17 @@
 }
 
 void os::print_os_info(outputStream* st) {
-  st->print("OS:");
-
+#ifdef ASSERT
+  char buffer[1024];
+  DWORD size = sizeof(buffer);
+  st->print(" HostName: ");
+  if (GetComputerNameEx(ComputerNameDnsHostname, buffer, &size)) {
+    st->print("%s", buffer);
+  } else {
+    st->print("N/A");
+  }
+#endif
+  st->print(" OS:");
   os::win32::print_windows_version(st);
 }