Skip to content

Commit 5adce9c

Browse files
j-bahrj-bahr
authored
Ensure FullZGCCycle has all delegate methods (#423)
FullZGCCycle delegates it's accessors to underlying ZGCCycle class. The FullZGCCycle was missing some delegate accessor methods missed during a previous refactor. This change ensures that all "getter" methods are exposed from the FullZGCCycle. These were regenerated automatically by intellij hence the reformatting and reordering of methods.
1 parent 20da31f commit 5adce9c

4 files changed

Lines changed: 129 additions & 123 deletions

File tree

‎api/src/main/java/com/microsoft/gctoolkit/event/zgc/FullZGCCycle.java‎

Lines changed: 120 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -10,238 +10,245 @@
1010
public class FullZGCCycle extends GCEvent {
1111
private ZGCCycle delegate;
1212

13-
public FullZGCCycle(DateTimeStamp timeStamp, GarbageCollectionTypes gcType, GCCause cause, double duration) {
13+
public FullZGCCycle(DateTimeStamp timeStamp, GarbageCollectionTypes gcType, GCCause cause, double duration, ZGCCycle delegate) {
1414
super(timeStamp, gcType, cause, duration);
15+
this.delegate = delegate;
1516
}
1617

17-
public FullZGCCycle(DateTimeStamp timeStamp, double duration) {
18-
super(timeStamp, duration);
18+
public void setZGCCycle(ZGCCycle zgcCycle) {
19+
this.delegate = zgcCycle;
1920
}
2021

21-
public FullZGCCycle(DateTimeStamp timeStamp, GCCause cause, double duration) {
22-
super(timeStamp, cause, duration);
22+
public ZGCReferenceSummary getSoftRefSummary() {
23+
return delegate.getSoftRefSummary();
2324
}
2425

25-
public FullZGCCycle(DateTimeStamp timeStamp, GarbageCollectionTypes gcType, double duration) {
26-
super(timeStamp, gcType, duration);
26+
public ZGCReferenceSummary getFinalRefSummary() {
27+
return delegate.getFinalRefSummary();
2728
}
2829

29-
public void setZGCCycle(ZGCCycle zgcCycle) {
30-
this.delegate = zgcCycle;
30+
public ZGCMemoryPoolSummary getMarkEnd() {
31+
return delegate.getMarkEnd();
3132
}
3233

33-
public ZGCMarkSummary getMarkSummary() {
34-
return delegate.getMarkSummary();
34+
public DateTimeStamp getConcurrentRemapRootsStart() {
35+
return delegate.getConcurrentRemapRootsStart();
3536
}
3637

37-
public DateTimeStamp getPauseMarkStartTimeStamp() {
38-
return delegate.getPauseMarkStartTimeStamp();
38+
public DateTimeStamp getRemapRememberedStart() {
39+
return delegate.getRemapRememberedStart();
3940
}
4041

41-
public double getPauseMarkStartDuration() {
42-
return delegate.getPauseMarkStartDuration();
42+
public ZGCPromotedSummary getPromotedSummary() {
43+
return delegate.getPromotedSummary();
4344
}
4445

45-
public long getGcId() {
46-
return delegate.getGcId();
46+
public ZGCMetaspaceSummary getMetaspaceSummary() {
47+
return delegate.getMetaspaceSummary();
4748
}
4849

50+
public ZGCReferenceSummary getWeakRefSummary() {
51+
return delegate.getWeakRefSummary();
52+
}
4953

50-
public DateTimeStamp getConcurrentMarkTimeStamp() {
51-
return delegate.getConcurrentMarkTimeStamp();
54+
public DateTimeStamp getConcurrentSelectRelocationSetTimeStamp() {
55+
return delegate.getConcurrentSelectRelocationSetTimeStamp();
5256
}
5357

54-
public double getConcurrentMarkDuration() {
55-
return delegate.getConcurrentMarkDuration();
58+
public DateTimeStamp getRemapRootColoredStart() {
59+
return delegate.getRemapRootColoredStart();
5660
}
5761

58-
public DateTimeStamp getConcurrentMarkFreeTimeStamp() {
59-
return delegate.getConcurrentMarkFreeTimeStamp();
62+
public ZGCPhase getPhase() {
63+
return delegate.getPhase();
6064
}
6165

62-
public double getConcurrentMarkFreeDuration() {
63-
return delegate.getConcurrentMarkFreeDuration();
66+
public double getRemapRootsColoredDuration() {
67+
return delegate.getRemapRootsColoredDuration();
6468
}
6569

66-
public DateTimeStamp getPauseMarkEndTimeStamp() {
67-
return delegate.getPauseMarkEndTimeStamp();
70+
public double getConcurrentMarkContinueDuration() {
71+
return delegate.getConcurrentMarkContinueDuration();
6872
}
6973

70-
public double getPauseMarkEndDuration() {
71-
return delegate.getPauseMarkEndDuration();
74+
public double getConcurrentRemapRootsDuration() {
75+
return delegate.getConcurrentRemapRootsDuration();
7276
}
7377

78+
public double getPauseMarkRelocateDuration() {
79+
return delegate.getPauseMarkRelocateDuration();
80+
}
7481

75-
public DateTimeStamp getConcurrentProcessNonStrongReferencesTimeStamp() {
76-
return delegate.getConcurrentProcessNonStrongReferencesTimeStamp();
82+
public ZGCAllocatedSummary getAllocatedSummary() {
83+
return delegate.getAllocatedSummary();
7784
}
7885

79-
public double getConcurrentProcessNonStrongReferencesDuration() {
80-
return delegate.getConcurrentProcessNonStrongReferencesDuration();
86+
public ZGCReferenceSummary getPhantomRefSummary() {
87+
return delegate.getPhantomRefSummary();
8188
}
8289

83-
public DateTimeStamp getConcurrentResetRelocationSetTimeStamp() {
84-
return delegate.getConcurrentResetRelocationSetTimeStamp();
90+
public ZGCMarkSummary getMarkSummary() {
91+
return delegate.getMarkSummary();
8592
}
8693

87-
public double getConcurrentResetRelocationSetDuration() {
88-
return delegate.getConcurrentResetRelocationSetDuration();
94+
public double getRemapRememberedDuration() {
95+
return delegate.getRemapRememberedDuration();
8996
}
9097

91-
public DateTimeStamp getConcurrentSelectRelocationSetTimeStamp() {
92-
return delegate.getConcurrentSelectRelocationSetTimeStamp();
98+
public ZGCGarbageSummary getGarbageSummary() {
99+
return delegate.getGarbageSummary();
93100
}
94101

95-
public double getConcurrentSelectRelocationSetDuration() {
96-
return delegate.getConcurrentSelectRelocationSetDuration();
102+
public DateTimeStamp getConcurrentResetRelocationSetTimeStamp() {
103+
return delegate.getConcurrentResetRelocationSetTimeStamp();
97104
}
98105

99-
public DateTimeStamp getPauseRelocateStartTimeStamp() {
100-
return delegate.getPauseRelocateStartTimeStamp();
106+
public double getConcurrentMarkFreeDuration() {
107+
return delegate.getConcurrentMarkFreeDuration();
101108
}
102109

103-
public double getPauseRelocateStartDuration() {
104-
return delegate.getPauseRelocateStartDuration();
110+
public ZGCMemoryPoolSummary getMarkStart() {
111+
return delegate.getMarkStart();
105112
}
106113

107-
public DateTimeStamp getConcurrentRelocateTimeStamp() {
108-
return delegate.getConcurrentRelocateTimeStamp();
114+
public ZGCLiveSummary getLiveSummary() {
115+
return delegate.getLiveSummary();
109116
}
110117

111-
public double getConcurrentRelocateDuration() {
112-
return delegate.getConcurrentRelocateDuration();
118+
public DateTimeStamp getConcurrentProcessNonStrongReferencesTimeStamp() {
119+
return delegate.getConcurrentProcessNonStrongReferencesTimeStamp();
113120
}
114121

115-
public ZGCMemoryPoolSummary getMarkStart() {
116-
return delegate.getMarkStart();
122+
public DateTimeStamp getConcurrentMarkContinueTimeStamp() {
123+
return delegate.getConcurrentMarkContinueTimeStamp();
117124
}
118125

119-
public ZGCMemoryPoolSummary getMarkEnd() {
120-
return delegate.getMarkEnd();
126+
public ZGCCollectionType getType() {
127+
return delegate.getType();
121128
}
122129

123130
public ZGCMemoryPoolSummary getRelocateStart() {
124131
return delegate.getRelocateStart();
125132
}
126133

127-
public ZGCMemoryPoolSummary getRelocateEnd() {
128-
return delegate.getRelocateEnd();
134+
public DateTimeStamp getMarkFollowStart() {
135+
return delegate.getMarkFollowStart();
129136
}
130137

131-
public ZGCLiveSummary getLive() {
132-
return delegate.getLiveSummary();
138+
public double getPauseMarkEndDuration() {
139+
return delegate.getPauseMarkEndDuration();
133140
}
134141

135-
public ZGCAllocatedSummary getAllocated() {
136-
return delegate.getAllocatedSummary();
142+
public double getConcurrentSelectRelocationSetDuration() {
143+
return delegate.getConcurrentSelectRelocationSetDuration();
137144
}
138145

139-
public ZGCGarbageSummary getGarbage() {
140-
return delegate.getGarbageSummary();
146+
public double getMarkRootsDuration() {
147+
return delegate.getMarkRootsDuration();
141148
}
142149

143-
public ZGCReclaimSummary getReclaimed() {
144-
return delegate.getReclaimSummary();
150+
public double[] getMmu() {
151+
return delegate.getMmu();
145152
}
146153

147-
public ZGCMemorySummary getMemorySummary() {
148-
return delegate.getMemorySummary();
154+
public double getConcurrentProcessNonStrongReferencesDuration() {
155+
return delegate.getConcurrentProcessNonStrongReferencesDuration();
149156
}
150157

151-
public ZGCMetaspaceSummary getMetaspace() {
152-
return delegate.getMetaspaceSummary();
158+
public DateTimeStamp getConcurrentRelocateTimeStamp() {
159+
return delegate.getConcurrentRelocateTimeStamp();
153160
}
154161

155-
public double getLoadAverageAt(int time) {
156-
return delegate.getLoadAverageAt(time);
162+
public DateTimeStamp getPauseMarkStartTimeStamp() {
163+
return delegate.getPauseMarkStartTimeStamp();
157164
}
158165

159-
public double getMMU(int percentage) {
160-
return delegate.getMMU(percentage);
166+
public double getPauseMarkStartDuration() {
167+
return delegate.getPauseMarkStartDuration();
161168
}
162169

163-
public ZGCPromotedSummary getPromotedSummary() {
164-
return delegate.getPromotedSummary();
170+
public OccupancySummary getUsedOccupancySummary() {
171+
return delegate.getUsedOccupancySummary();
165172
}
166173

167-
public ZGCCompactedSummary getCompactedSummary() {
168-
return delegate.getCompactedSummary();
174+
public DateTimeStamp getConcurrentMarkTimeStamp() {
175+
return delegate.getConcurrentMarkTimeStamp();
169176
}
170177

171-
public OccupancySummary getUsedOccupancySummary() {
172-
return delegate.getUsedOccupancySummary();
178+
public double getMMU(int percentage) {
179+
return delegate.getMMU(percentage);
173180
}
174181

175-
public ZGCCollectionType getType() {
176-
return delegate.getType();
182+
public ZGCMemorySummary getMemorySummary() {
183+
return delegate.getMemorySummary();
177184
}
178185

179-
public DateTimeStamp getMarkRootsStart() {
180-
return delegate.getMarkRootsStart();
186+
public ZGCCompactedSummary getCompactedSummary() {
187+
return delegate.getCompactedSummary();
181188
}
182189

183-
public double getMarkRootsDuration() {
184-
return delegate.getMarkRootsDuration();
190+
public long getGcId() {
191+
return delegate.getGcId();
185192
}
186193

187-
public DateTimeStamp getMarkFollowStart() {
188-
return delegate.getMarkFollowStart();
194+
public double getConcurrentResetRelocationSetDuration() {
195+
return delegate.getConcurrentResetRelocationSetDuration();
189196
}
190197

191-
public double getMarkFollowDuration() {
192-
return delegate.getMarkFollowDuration();
198+
public DateTimeStamp getConcurrentMarkFreeTimeStamp() {
199+
return delegate.getConcurrentMarkFreeTimeStamp();
193200
}
194201

195-
public DateTimeStamp getRemapRootColoredStart() {
196-
return delegate.getRemapRootColoredStart();
202+
public DateTimeStamp getPauseMarkEndTimeStamp() {
203+
return delegate.getPauseMarkEndTimeStamp();
197204
}
198205

199-
public double getRemapRootsColoredDuration() {
200-
return delegate.getRemapRootsColoredDuration();
206+
public double getConcurrentRelocateDuration() {
207+
return delegate.getConcurrentRelocateDuration();
201208
}
202209

203-
public DateTimeStamp getRemapRootsUncoloredStart() {
204-
return delegate.getRemapRootsUncoloredStart();
210+
public double getLoadAverageAt(int time) {
211+
return delegate.getLoadAverageAt(time);
205212
}
206213

207-
public double getRemapRootsUncoloredDuration() {
208-
return delegate.getRemapRootsUncoloredDuration();
214+
public DateTimeStamp getPauseRelocateStartTimeStamp() {
215+
return delegate.getPauseRelocateStartTimeStamp();
209216
}
210217

211-
public DateTimeStamp getRemapRememberedStart() {
212-
return delegate.getRemapRememberedStart();
218+
public double[] getLoad() {
219+
return delegate.getLoad();
213220
}
214221

215-
public double getRemapRememberedDuration() {
216-
return delegate.getRemapRememberedDuration();
222+
public double getPauseRelocateStartDuration() {
223+
return delegate.getPauseRelocateStartDuration();
217224
}
218225

219-
public double getPauseMarkRelocateDuration() {
220-
return delegate.getPauseMarkRelocateDuration();
226+
public DateTimeStamp getRemapRootsUncoloredStart() {
227+
return delegate.getRemapRootsUncoloredStart();
221228
}
222229

223-
public DateTimeStamp getConcurrentMarkContinueTimeStamp() {
224-
return delegate.getConcurrentMarkContinueTimeStamp();
230+
public DateTimeStamp getMarkRootsStart() {
231+
return delegate.getMarkRootsStart();
225232
}
226233

227-
public double getConcurrentMarkContinueDuration() {
228-
return delegate.getConcurrentMarkContinueDuration();
234+
public double getRemapRootsUncoloredDuration() {
235+
return delegate.getRemapRootsUncoloredDuration();
229236
}
230237

231-
public DateTimeStamp getRemapRootsStart() {
232-
return delegate.getConcurrentRemapRootsStart();
238+
public double getConcurrentMarkDuration() {
239+
return delegate.getConcurrentMarkDuration();
233240
}
234241

235-
public double getRemapRootsDuration() {
236-
return delegate.getConcurrentRemapRootsDuration();
242+
public ZGCReclaimSummary getReclaimSummary() {
243+
return delegate.getReclaimSummary();
237244
}
238245

239-
public double[] getLoad() {
240-
return delegate.getLoad();
246+
public double getMarkFollowDuration() {
247+
return delegate.getMarkFollowDuration();
241248
}
242249

243-
public double[] getMmu() {
244-
return delegate.getMmu();
250+
public ZGCMemoryPoolSummary getRelocateEnd() {
251+
return delegate.getRelocateEnd();
245252
}
246253
}
247254

‎parser/src/main/java/com/microsoft/gctoolkit/parser/ZGCParser.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,14 +718,13 @@ public GCEvent getGCEVent(DateTimeStamp endTime) {
718718

719719
// Duration recorded by GC
720720
FullZGCCycle fullZGCCycle;
721+
ZGCCycle delegate = getZGCCycle(endTime);
721722
if (gcDuration != null){
722-
fullZGCCycle = new FullZGCCycle(startTimeStamp, gcType, gcCause, gcDuration);
723+
fullZGCCycle = new FullZGCCycle(startTimeStamp, gcType, gcCause, gcDuration, delegate);
723724
} else {
724-
fullZGCCycle = new FullZGCCycle(startTimeStamp, gcType, gcCause, endTime.minus(startTimeStamp));
725+
fullZGCCycle = new FullZGCCycle(startTimeStamp, gcType, gcCause, endTime.minus(startTimeStamp), delegate);
725726
}
726727

727-
fullZGCCycle.setZGCCycle(getZGCCycle(endTime));
728-
729728
return fullZGCCycle;
730729
}
731730

‎parser/src/test/java/com/microsoft/gctoolkit/parser/ZGCParserTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ public void infoLevelZGCCycle() {
109109
assertTrue(checkZGCMemoryPoolSummary(zgc.getRelocateStart(),1837056, 28823552, 550912));
110110
assertTrue(checkZGCMemoryPoolSummary(zgc.getRelocateEnd(), 1837056, 29245440, 129024));
111111

112-
assertTrue(checkZGCMetaSpaceSummary(zgc.getMetaspace(),61440, 61440, 1105920));
112+
assertTrue(checkZGCMetaSpaceSummary(zgc.getMetaspaceSummary(),61440, 61440, 1105920));
113113

114-
assertTrue(checkLiveSummary(zgc.getLive(), 72704, 72704, 72704));
115-
assertTrue(checkAllocatedSummary(zgc.getAllocated(), 18432, 20480, 18432));
116-
assertTrue(checkGarbageSummary(zgc.getGarbage(), 497664, 456704, 35840));
114+
assertTrue(checkLiveSummary(zgc.getLiveSummary(), 72704, 72704, 72704));
115+
assertTrue(checkAllocatedSummary(zgc.getAllocatedSummary(), 18432, 20480, 18432));
116+
assertTrue(checkGarbageSummary(zgc.getGarbageSummary(), 497664, 456704, 35840));
117117

118-
assertTrue(checkReclaimSummary(zgc.getReclaimed(), 40960, 460800));
118+
assertTrue(checkReclaimSummary(zgc.getReclaimSummary(), 40960, 460800));
119119
assertTrue(checkMemorySummary(zgc.getMemorySummary(), 571392, 129024));
120120

121121
assertEquals(7.28, zgc.getLoadAverageAt(1));

0 commit comments

Comments
 (0)