changeset 4079:48dbf98e800c

Merge
author collins
date Fri, 30 Nov 2012 11:07:16 -0800
parents 6a93eda4e0f5 d1d909eefb31
children fd3cf9ada039
files
diffstat 4 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 29 12:56:49 2012 -0800
+++ b/.hgtags	Fri Nov 30 11:07:16 2012 -0800
@@ -402,3 +402,6 @@
 b4da4e577c9992d9168d093600aa3c3e3aa5156d hs24-b24
 0601ca30c7b40026d5ac40e8aca39ea71f129f96 jdk7u12-b01
 1e5b6a49c06dd1fac6d2f579c64b7b67a8af0edf hs24-b25
+ce5983a3e0b2937cf9a672e61dbcb234f569b29e jdk7u12-b02
+94984276a8dcba53f63a5de563b14eeb5e336c55 jdk7u12-b03
+b9e0f2c87dd64fad932871fef82ee28ada04d6da hs24-b26
--- a/make/hotspot_version	Thu Nov 29 12:56:49 2012 -0800
+++ b/make/hotspot_version	Fri Nov 30 11:07:16 2012 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=26
+HS_BUILD_NUMBER=27
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/src/share/vm/runtime/vm_version.cpp	Thu Nov 29 12:56:49 2012 -0800
+++ b/src/share/vm/runtime/vm_version.cpp	Fri Nov 30 11:07:16 2012 -0800
@@ -241,19 +241,21 @@
 
   #ifndef FLOAT_ARCH
     #if defined(__SOFTFP__)
-      #define FLOAT_ARCH "-sflt"
+      #define FLOAT_ARCH_STR "-sflt"
     #elif defined(E500V2)
-      #define FLOAT_ARCH "-e500v2"
+      #define FLOAT_ARCH_STR "-e500v2"
     #elif defined(ARM)
-      #define FLOAT_ARCH "-vfp"
+      #define FLOAT_ARCH_STR "-vfp"
     #elif defined(PPC)
-      #define FLOAT_ARCH "-hflt"
+      #define FLOAT_ARCH_STR "-hflt"
     #else
-      #define FLOAT_ARCH ""
+      #define FLOAT_ARCH_STR ""
     #endif
+  #else
+    #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
   #endif
 
-  return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH
+  return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
          " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
          " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
 }
--- a/src/share/vm/services/memTracker.cpp	Thu Nov 29 12:56:49 2012 -0800
+++ b/src/share/vm/services/memTracker.cpp	Fri Nov 30 11:07:16 2012 -0800
@@ -69,10 +69,12 @@
 
 void MemTracker::init_tracking_options(const char* option_line) {
   _tracking_level = NMT_off;
-  if (strncmp(option_line, "=summary", 8) == 0) {
+  if (strcmp(option_line, "=summary") == 0) {
     _tracking_level = NMT_summary;
-  } else if (strncmp(option_line, "=detail", 8) == 0) {
+  } else if (strcmp(option_line, "=detail") == 0) {
     _tracking_level = NMT_detail;
+  } else if (strcmp(option_line, "=off") != 0) {
+    vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
   }
 }