提交 83b6d2ab 编写于 作者: M maoliang.ml 提交者: mmyxym

[MISC] Fix build issues on Windows/Mac from G1ElasticHeap

Summary: Fix build issues on Windows/Mac from G1ElasticHeap

Test Plan:
test/elastic_heap/

Reviewers:
shiyuexw, sanhong

Issue:
https://github.com/alibaba/dragonwell8/issues/54

CR:
上级 d4a1ec96
...@@ -82,6 +82,15 @@ ...@@ -82,6 +82,15 @@
_JVM_DumpAllStacks _JVM_DumpAllStacks
_JVM_DumpThreads _JVM_DumpThreads
_JVM_EnableCompiler _JVM_EnableCompiler
_JVM_ElasticHeapGetEvaluationMode
_JVM_ElasticHeapSetYoungGenCommitPercent
_JVM_ElasticHeapGetYoungGenCommitPercent
_JVM_ElasticHeapSetUncommitIHOP
_JVM_ElasticHeapGetUncommitIHOP
_JVM_ElasticHeapGetTotalYoungUncommittedBytes
_JVM_ElasticHeapSetSoftmxPercent
_JVM_ElasticHeapGetSoftmxPercent
_JVM_ElasticHeapGetTotalUncommittedBytes
_JVM_Exit _JVM_Exit
_JVM_FillInStackTrace _JVM_FillInStackTrace
_JVM_FindClassFromCaller _JVM_FindClassFromCaller
......
...@@ -82,6 +82,15 @@ ...@@ -82,6 +82,15 @@
_JVM_DumpAllStacks _JVM_DumpAllStacks
_JVM_DumpThreads _JVM_DumpThreads
_JVM_EnableCompiler _JVM_EnableCompiler
_JVM_ElasticHeapGetEvaluationMode
_JVM_ElasticHeapSetYoungGenCommitPercent
_JVM_ElasticHeapGetYoungGenCommitPercent
_JVM_ElasticHeapSetUncommitIHOP
_JVM_ElasticHeapGetUncommitIHOP
_JVM_ElasticHeapGetTotalYoungUncommittedBytes
_JVM_ElasticHeapSetSoftmxPercent
_JVM_ElasticHeapGetSoftmxPercent
_JVM_ElasticHeapGetTotalUncommittedBytes
_JVM_Exit _JVM_Exit
_JVM_FillInStackTrace _JVM_FillInStackTrace
_JVM_FindClassFromCaller _JVM_FindClassFromCaller
......
...@@ -69,15 +69,6 @@ SUNWprivate_1.1 { ...@@ -69,15 +69,6 @@ SUNWprivate_1.1 {
JVM_CurrentClassLoader; JVM_CurrentClassLoader;
JVM_CurrentLoadedClass; JVM_CurrentLoadedClass;
JVM_CurrentThread; JVM_CurrentThread;
JVM_ElasticHeapGetEvaluationMode;
JVM_ElasticHeapSetYoungGenCommitPercent;
JVM_ElasticHeapGetYoungGenCommitPercent;
JVM_ElasticHeapSetUncommitIHOP;
JVM_ElasticHeapGetUncommitIHOP;
JVM_ElasticHeapGetTotalYoungUncommittedBytes;
JVM_ElasticHeapSetSoftmxPercent;
JVM_ElasticHeapGetSoftmxPercent;
JVM_ElasticHeapGetTotalUncommittedBytes;
JVM_CurrentTimeMillis; JVM_CurrentTimeMillis;
JVM_DefineClass; JVM_DefineClass;
JVM_DefineClassWithSource; JVM_DefineClassWithSource;
...@@ -93,6 +84,15 @@ SUNWprivate_1.1 { ...@@ -93,6 +84,15 @@ SUNWprivate_1.1 {
JVM_DumpAllStacks; JVM_DumpAllStacks;
JVM_DumpThreads; JVM_DumpThreads;
JVM_EnableCompiler; JVM_EnableCompiler;
JVM_ElasticHeapGetEvaluationMode;
JVM_ElasticHeapSetYoungGenCommitPercent;
JVM_ElasticHeapGetYoungGenCommitPercent;
JVM_ElasticHeapSetUncommitIHOP;
JVM_ElasticHeapGetUncommitIHOP;
JVM_ElasticHeapGetTotalYoungUncommittedBytes;
JVM_ElasticHeapSetSoftmxPercent;
JVM_ElasticHeapGetSoftmxPercent;
JVM_ElasticHeapGetTotalUncommittedBytes;
JVM_Exit; JVM_Exit;
JVM_FillInStackTrace; JVM_FillInStackTrace;
JVM_FindClassFromCaller; JVM_FindClassFromCaller;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "precompiled.hpp"
#include "gc_implementation/g1/g1CollectedHeap.hpp" #include "gc_implementation/g1/g1CollectedHeap.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp" #include "gc_implementation/g1/g1CollectorPolicy.hpp"
#include "gc_implementation/g1/elasticHeap.hpp" #include "gc_implementation/g1/elasticHeap.hpp"
...@@ -41,6 +42,7 @@ public: ...@@ -41,6 +42,7 @@ public:
} else { } else {
_elastic_heap->uncommit_region_memory(hr); _elastic_heap->uncommit_region_memory(hr);
} }
return false;
} }
}; };
...@@ -502,6 +504,7 @@ ElasticHeap::EvaluationMode ElasticHeapSetting::target_evaluation_mode(uint youn ...@@ -502,6 +504,7 @@ ElasticHeap::EvaluationMode ElasticHeapSetting::target_evaluation_mode(uint youn
return ElasticHeap::SoftmxMode; return ElasticHeap::SoftmxMode;
} else { } else {
ShouldNotReachHere(); ShouldNotReachHere();
return ElasticHeap::InactiveMode;
} }
} }
......
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
virtual void evaluate_old() { ShouldNotReachHere(); } virtual void evaluate_old() { ShouldNotReachHere(); }
virtual void evaluate_old_common(); virtual void evaluate_old_common();
virtual bool ready_to_initial_mark() { ShouldNotReachHere(); } virtual bool ready_to_initial_mark() { ShouldNotReachHere(); return false; }
}; };
class RecoverEvaluator : public ElasticHeapEvaluator { class RecoverEvaluator : public ElasticHeapEvaluator {
...@@ -447,7 +447,7 @@ public: ...@@ -447,7 +447,7 @@ public:
uint young_percent() const { uint young_percent() const {
return _young_percent; return _young_percent;
} }
uint set_young_percent(uint p) { void set_young_percent(uint p) {
_young_percent = p; _young_percent = p;
} }
// Whether a jcmd/mxbean command set the uncommit ihop // Whether a jcmd/mxbean command set the uncommit ihop
......
...@@ -259,7 +259,7 @@ static jint set_bool_flag(const char* name, AttachOperation* op, outputStream* o ...@@ -259,7 +259,7 @@ static jint set_bool_flag(const char* name, AttachOperation* op, outputStream* o
} }
value = (tmp != 0); value = (tmp != 0);
} }
if (strcmp(name, "ElasticHeapPeriodicUncommit") == 0 & value) { if ((strcmp(name, "ElasticHeapPeriodicUncommit") == 0) && value) {
if (G1ElasticHeap && if (G1ElasticHeap &&
!G1CollectedHeap::heap()->elastic_heap()->can_turn_on_periodic_uncommit()) { !G1CollectedHeap::heap()->elastic_heap()->can_turn_on_periodic_uncommit()) {
out->print_cr("cannot be set because of illegal state."); out->print_cr("cannot be set because of illegal state.");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册