Skip to content

Commit 70a6954

Browse files
theibhirtheibhir
committed
callStack: add Annotations handlers for instant events
1 parent 7f18609 commit 70a6954

File tree

4 files changed

+117
-5
lines changed

4 files changed

+117
-5
lines changed

‎analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/analysis/profiling/core/callstack/CallStackAnalysis.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ public abstract class CallStackAnalysis extends TmfStateSystemAnalysisModule imp
5454
*/
5555
public static final String CALL_STACK = "CallStack"; //$NON-NLS-1$
5656

57+
/**
58+
* Annotations string state attribute
59+
*
60+
* @since 2.6
61+
*/
62+
public static final String ANNOTATIONS = "Markers"; //$NON-NLS-1$
63+
5764
private static final String[] DEFAULT_PROCESSES_PATTERN = new String[] { CallStackStateProvider.PROCESSES, "*" }; //$NON-NLS-1$
5865

5966
private static final String[] DEFAULT_THREADS_PATTERN = new String[] { "*" }; //$NON-NLS-1$

‎analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/analysis/profiling/core/callstack/CallStackStateProvider.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,15 @@ public void done() {
277277
/* Override to provide a thread name */
278278
return null;
279279
}
280+
281+
/**
282+
* Add an event as a marker to the Annotations attribute
283+
*
284+
* @param event
285+
* The event to add as a marker
286+
* @since 2.6
287+
*/
288+
protected void addMarker(ITmfEvent event) {
289+
// Do nothing, this is a placeholder for overriding.
290+
}
280291
}

‎analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/internal/analysis/profiling/core/instrumented/FlameChartDataProvider.java‎

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.eclipse.tracecompass.analysis.profiling.core.base.FlameWithKernelPalette;
3939
import org.eclipse.tracecompass.analysis.profiling.core.base.ICallStackElement;
4040
import org.eclipse.tracecompass.analysis.profiling.core.callgraph.ICalledFunction;
41+
import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackAnalysis;
4142
import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStack;
4243
import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackDepth;
4344
import org.eclipse.tracecompass.analysis.profiling.core.callstack2.CallStackSeries;
@@ -48,7 +49,10 @@
4849
import org.eclipse.tracecompass.internal.analysis.profiling.core.instrumented.FlameChartEntryModel.EntryType;
4950
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ModelManager;
5051
import org.eclipse.tracecompass.internal.analysis.profiling.core.model.ProcessStatusInterval;
52+
import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
5153
import org.eclipse.tracecompass.segmentstore.core.ISegment;
54+
import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem;
55+
import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException;
5256
import org.eclipse.tracecompass.statesystem.core.exceptions.TimeRangeException;
5357
import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval;
5458
import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
@@ -57,6 +61,13 @@
5761
import org.eclipse.tracecompass.tmf.core.model.IOutputStyleProvider;
5862
import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
5963
import org.eclipse.tracecompass.tmf.core.model.OutputStyleModel;
64+
import org.eclipse.tracecompass.tmf.core.model.StyleProperties;
65+
import org.eclipse.tracecompass.tmf.core.model.StyleProperties.SymbolType;
66+
import org.eclipse.tracecompass.tmf.core.model.annotations.Annotation;
67+
import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationCategoriesModel;
68+
import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationModel;
69+
import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider;
70+
import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter;
6071
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow;
6172
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider;
6273
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphRowModel;
@@ -70,6 +81,7 @@
7081
import org.eclipse.tracecompass.tmf.core.response.ITmfResponse;
7182
import org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status;
7283
import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse;
84+
import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModule;
7385
import org.eclipse.tracecompass.tmf.core.symbols.ISymbolProvider;
7486
import org.eclipse.tracecompass.tmf.core.symbols.SymbolProviderManager;
7587
import org.eclipse.tracecompass.tmf.core.symbols.SymbolProviderUtils;
@@ -84,6 +96,7 @@
8496
import com.google.common.collect.BiMap;
8597
import com.google.common.collect.HashBiMap;
8698
import com.google.common.collect.ImmutableList;
99+
import com.google.common.collect.ImmutableMap;
87100
import com.google.common.collect.ImmutableList.Builder;
88101
import com.google.common.collect.ImmutableMultimap;
89102
import com.google.common.collect.Multimap;
@@ -95,7 +108,7 @@
95108
*
96109
* @author Geneviève Bastien
97110
*/
98-
public class FlameChartDataProvider extends AbstractTmfTraceDataProvider implements ITimeGraphDataProvider<FlameChartEntryModel>, IOutputStyleProvider {
111+
public class FlameChartDataProvider extends AbstractTmfTraceDataProvider implements ITimeGraphDataProvider<FlameChartEntryModel>, IOutputAnnotationProvider, IOutputStyleProvider {
99112

100113
/**
101114
* Provider ID.
@@ -345,7 +358,8 @@ public TmfModelResponse<TmfTreeModel<FlameChartEntryModel>> fetchTree(Map<String
345358
boolean complete = fcProvider.isComplete();
346359
CallStackSeries callstack = fcProvider.getCallStackSeries();
347360
if (callstack == null) {
348-
// Explicitly tell the client that the analysis is completed to prevent further polling
361+
// Explicitly tell the client that the analysis is completed to
362+
// prevent further polling
349363
if (complete) {
350364
return new TmfModelResponse<>(new TmfTreeModel<>(Collections.emptyList(), Collections.emptyList()), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
351365
}
@@ -710,4 +724,79 @@ public TmfModelResponse<OutputStyleModel> fetchStyle(Map<String, Object> fetchPa
710724
Map<String, OutputElementStyle> styles = FlameWithKernelPalette.getInstance().getStyles();
711725
return new TmfModelResponse<>(new OutputStyleModel(styles), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
712726
}
727+
728+
@Override
729+
public TmfModelResponse<AnnotationCategoriesModel> fetchAnnotationCategories(Map<String, Object> fetchParameters, @Nullable IProgressMonitor monitor) {
730+
return new TmfModelResponse<>(new AnnotationCategoriesModel(Collections.singletonList(CallStackAnalysis.ANNOTATIONS)), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
731+
}
732+
733+
@Override
734+
public TmfModelResponse<AnnotationModel> fetchAnnotations(Map<String, Object> fetchParameters, @Nullable IProgressMonitor monitor) {
735+
736+
if (!(fFcProvider instanceof TmfStateSystemAnalysisModule)) {
737+
return new TmfModelResponse<>(null, ITmfResponse.Status.FAILED, CommonStatusMessage.ANALYSIS_INITIALIZATION_FAILED);
738+
}
739+
740+
TmfStateSystemAnalysisModule csa = (TmfStateSystemAnalysisModule) fFcProvider;
741+
ITmfStateSystem ss = csa.getStateSystem();
742+
if (ss == null) {
743+
return new TmfModelResponse<>(null, ITmfResponse.Status.FAILED, CommonStatusMessage.STATE_SYSTEM_FAILED);
744+
}
745+
746+
SelectionTimeQueryFilter filter = FetchParametersUtils.createSelectionTimeQuery(fetchParameters);
747+
if (filter == null) {
748+
return new TmfModelResponse<>(null, ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
749+
}
750+
751+
Map<Long, FlameChartEntryModel> selectedEntries = getSelectedEntries(fetchParameters);
752+
List<Annotation> annotations = new ArrayList<>();
753+
754+
try {
755+
for (Entry<@NonNull Long, @NonNull FlameChartEntryModel> entry : selectedEntries.entrySet()) {
756+
long csId = entry.getValue().getId();
757+
CallStackDepth cs = fIdToCallstack.get(csId);
758+
if (cs == null) {
759+
continue;
760+
}
761+
762+
int parentQuark = ss.getParentAttributeQuark(ss.getParentAttributeQuark(cs.getQuark()));
763+
if (parentQuark < 5) {
764+
new Object();
765+
}
766+
int markersQuark = ss.optQuarkRelative(parentQuark, CallStackAnalysis.ANNOTATIONS);
767+
768+
if (markersQuark != ITmfStateSystem.INVALID_ATTRIBUTE) {
769+
List<Long> times = DataProviderParameterUtils.extractTimeRequested(fetchParameters);
770+
for (ITmfStateInterval markerInterval : ss.query2D(Collections.singleton(markersQuark), times)) {
771+
if (!markerInterval.getStateValue().isNull()) {
772+
long startTime = markerInterval.getStartTime();
773+
// Find callstack depth at marker start time
774+
int depth = 0;
775+
for (int i = 1; i <= ss.getNbAttributes(); i++) {
776+
int depthQuark = ss.optQuarkRelative(cs.getQuark(), String.valueOf(i));
777+
if (depthQuark != ITmfStateSystem.INVALID_ATTRIBUTE) {
778+
ITmfStateInterval depthInterval = ss.querySingleState(startTime, depthQuark);
779+
if (!depthInterval.getStateValue().isNull()) {
780+
depth = i;
781+
}
782+
}
783+
}
784+
785+
long entryId = entry.getKey();
786+
long rowId = (depth > 0) ? entryId + depth : entryId;
787+
OutputElementStyle style = new OutputElementStyle(null, ImmutableMap.of(
788+
StyleProperties.COLOR, "#7D3D31", //$NON-NLS-1$
789+
StyleProperties.HEIGHT, 0.5f,
790+
StyleProperties.SYMBOL_TYPE, SymbolType.DIAMOND));
791+
annotations.add(new Annotation(startTime, 1, rowId,markerInterval.getStateValue().unboxStr(), style));
792+
}
793+
}
794+
}
795+
}
796+
} catch (StateSystemDisposedException e) {
797+
return new TmfModelResponse<>(null, ITmfResponse.Status.FAILED, e.getMessage());
798+
}
799+
800+
return new TmfModelResponse<>(new AnnotationModel(Collections.singletonMap(CallStackAnalysis.ANNOTATIONS, annotations)), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
801+
}
713802
}

‎tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,9 +2361,14 @@ private void oldDrawMarker(IMarkerEvent marker, GC gc, Rectangle rect, int color
23612361
gc.setAlpha(OPAQUE);
23622362
String label = marker.getLabel();
23632363
if (fLabelsVisible && label != null && marker.getEntry() != null) {
2364-
label = label.substring(0, Math.min(label.indexOf('\n') != -1 ? label.indexOf('\n') : label.length(), MAX_LABEL_LENGTH));
2365-
gc.setForeground(color);
2366-
Utils.drawText(gc, label, rect.x - gc.textExtent(label).x, rect.y, true);
2364+
StyleManager styleManager = getStyleManager();
2365+
OutputElementStyle elementStyle = getElementStyle(marker);
2366+
Object symbolType = (elementStyle != null) ? styleManager.getStyle(elementStyle, StyleProperties.SYMBOL_TYPE) : null;
2367+
if (symbolType == null || symbolType == SymbolType.NONE) {
2368+
label = label.substring(0, Math.min(label.indexOf('\n') != -1 ? label.indexOf('\n') : label.length(), MAX_LABEL_LENGTH));
2369+
gc.setForeground(color);
2370+
Utils.drawText(gc, label, rect.x - gc.textExtent(label).x, rect.y, true);
2371+
}
23672372
}
23682373
}
23692374

0 commit comments

Comments
 (0)