changeset 14301:ceddae1a16c9

Merge
author zgu
date Tue, 28 Jan 2014 06:26:36 -0800
parents d5b8799dfbd7 (diff) dbcbdca5dc04 (current diff)
children 1fb56cbac3a1 c888354aaa35
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jan 28 11:42:30 2014 +0000
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Tue Jan 28 06:26:36 2014 -0800
@@ -49,6 +49,7 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
@@ -906,6 +907,9 @@
   if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
     return; // No matter, we tried, best effort.
   }
+
+  MemTracker::record_virtual_memory_type((address)codebuf, mtInternal);
+
   if (PrintMiscellaneous && (Verbose || WizardMode)) {
      tty->print_cr("[CS limit NX emulation work-around, exec code at: %p]", codebuf);
   }