archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8011064: Some tests have failed with SIGSEGV on arm-hflt on build b82

Browse source 
NMT_detail is only supported when frame pointers are not omitted (-fno-omit-frame-pointer).

Reviewed-by: dholmes, cjplummer
This commit is contained in:
Joseph Provino 2013-05-28 11:32:46 -04:00
parent ddea5b012c
commit 8d4061812f
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hotspot/src/share/vm/services/memTracker.cpp
View file

@ -34,6 +34,7 @@
#include "services/memReporter.hpp" #include "services/memReporter.hpp"
#include "services/memTracker.hpp" #include "services/memTracker.hpp"
#include "utilities/decoder.hpp" #include "utilities/decoder.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/globalDefinitions.hpp" #include "utilities/globalDefinitions.hpp"
bool NMT_track_callsite = false; bool NMT_track_callsite = false;
@ -77,7 +78,15 @@ void MemTracker::init_tracking_options(const char* option_line) {
if (strcmp(option_line, "=summary") == 0) { if (strcmp(option_line, "=summary") == 0) {
_tracking_level = NMT_summary; _tracking_level = NMT_summary;
} else if (strcmp(option_line, "=detail") == 0) { } else if (strcmp(option_line, "=detail") == 0) {
_tracking_level = NMT_detail; // detail relies on a stack-walking ability that may not
// be available depending on platform and/or compiler flags
if (PLATFORM_NMT_DETAIL_SUPPORTED) {
_tracking_level = NMT_detail;
} else {
jio_fprintf(defaultStream::error_stream(),
"NMT detail is not supported on this platform. Using NMT summary instead.");
_tracking_level = NMT_summary;
}
} else if (strcmp(option_line, "=off") != 0) { } else if (strcmp(option_line, "=off") != 0) {
vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL); vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
} }

8
hotspot/src/share/vm/utilities/globalDefinitions.hpp
View file

@ -380,6 +380,14 @@ const uint64_t KlassEncodingMetaspaceMax = (uint64_t(max_juint) + 1) << LogKlass
# include "globalDefinitions_ppc.hpp" # include "globalDefinitions_ppc.hpp"
#endif #endif
/*
* If a platform does not support NMT_detail
* the platform specific globalDefinitions (above)
* can set PLATFORM_NMT_DETAIL_SUPPORTED to false
*/
#ifndef PLATFORM_NMT_DETAIL_SUPPORTED
#define PLATFORM_NMT_DETAIL_SUPPORTED true
#endif
// The byte alignment to be used by Arena::Amalloc. See bugid 4169348. // The byte alignment to be used by Arena::Amalloc. See bugid 4169348.
// Note: this value must be a power of 2 // Note: this value must be a power of 2