Skip to content

Commit 5455e45

Browse files
author
Dmitry Tsurko
committed
JE-55778 [java-memory-agent] Add options for GC
1 parent 4d93bfc commit 5455e45

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

scripts/memoryConfig.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grep -qiE 'OpenJ9' <<< "$JAVA_VERSION" && OPEN_J9=true || OPEN_J9=false
3131
function normalize {
3232
var="$(echo ${1} | tr '[A-Z]' '[a-z]')"
3333
prefix="$(echo ${2} | tr '[A-Z]' '[a-z]')"
34-
[[ "${var}" == "${prefix}"* ]] && { echo ${1}; } || { [[ "${var}" == "${prefix:1:100}"* ]] && echo "-"${1} || echo ${2}${1}; }
34+
[[ "${var}" == "${prefix}"* ]] && { echo ${1}; } || { [[ "${var}" == "${prefix:1:100}"* ]] && echo "-"${1} || echo ${2}${1}; }
3535
}
3636

3737
ARGS=("$@")
@@ -98,26 +98,26 @@ then
9898
}
9999
}
100100
}
101-
ARGS=($MAXPERMSIZE "${ARGS[@]}");
101+
ARGS=($MAXPERMSIZE "${ARGS[@]}");
102102
fi
103103

104104
if ! echo ${ARGS[@]} | grep -q "\-XX:+Use.*GC"
105-
then
105+
then
106106
[[ -z "$GC" ]] && {
107107
[[ ! -z $JAVA_VERSION && ${JAVA_VERSION%%[.|u|+]*} -le 7 ]] && {
108108
[[ "$XMX_VALUE" -ge "$G1_J7_MIN_RAM_THRESHOLD" ]] && GC="-XX:+UseG1GC" || GC="-XX:+UseParNewGC";
109109
} || {
110110
GC="-XX:+Use$GC_DEF";
111111
}
112112
}
113-
ARGS=("$GC" "${ARGS[@]}");
113+
ARGS=("$GC" "${ARGS[@]}");
114114
fi
115-
115+
116116
#enabling string deduplication feature https://blogs.oracle.com/java-platform-group/entry/g1_from_garbage_collector_to
117117
if echo ${ARGS[@]} | grep -q "\-XX:+UseG1GC"; then
118118
if ! echo ${ARGS[@]} | grep -q "UseStringDeduplication"; then
119119
ARGS=("-XX:+UseStringDeduplication" "${ARGS[@]}");
120-
fi
120+
fi
121121
fi
122122

123123
[ "$VERT_SCALING" != "false" -a "$VERT_SCALING" != "0" ] && {
@@ -131,7 +131,7 @@ fi
131131
ARGS=("-XX:ZCollectionInterval=$ZCOLLECTION_INTERVAL" "${ARGS[@]}");
132132
fi
133133
fi
134-
if `echo ${ARGS[@]} | grep -q "\-XX:+UseG1GC"`; then
134+
if echo ${ARGS[@]} | grep -q "\-XX:+UseG1GC"; then
135135
if [[ ! -z $JAVA_VERSION && ${JAVA_VERSION%%[.|u|+]*} -ge 12 ]]; then
136136
if ! echo ${ARGS[@]} | grep -q "G1PeriodicGCInterval"; then
137137
ARGS=("-XX:G1PeriodicGCInterval=${G1PERIODIC_GC_INTERVAL}" "${ARGS[@]}");
@@ -168,7 +168,7 @@ fi
168168

169169
if ! echo ${ARGS[@]} | grep -q "\-server"
170170
then
171-
ARGS=("-server" "${ARGS[@]}");
171+
ARGS=("-server" "${ARGS[@]}");
172172
fi
173173

174174
set -- "${ARGS[@]}"

0 commit comments

Comments
 (0)