Skip to content

tmf.core: Add event type children to histogram data provider #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatthewKhouzam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tmf.core: Add event type children to histogram data provider #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...eclipse/tracecompass/tmf/core/tests/histogram/dataprovider/HistogramDataProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.annotation.NonNull;
Expand Down Expand Up @@ -108,7 +109,10 @@ public void testHelloLost() throws TmfAnalysisException {
ITmfResponse.Status.COMPLETED, treeResponse.getStatus());
TmfTreeModel<@NonNull TmfTreeDataModel> treeModel = treeResponse.getModel();
assertNotNull(treeModel);
assertEquals(EXPECTED_FULL_PATHS, getFullPaths(treeModel.getEntries()));
List<String> entries = getFullPaths(treeModel.getEntries());
for (String path : EXPECTED_FULL_PATHS) {
assertTrue(entries.contains(path));
}

for (TmfTreeDataModel entry : treeModel.getEntries()) {
if (!entry.getName().equals(TRACE_NAME)) {
Expand All @@ -124,7 +128,10 @@ public void testHelloLost() throws TmfAnalysisException {
ITmfResponse.Status.COMPLETED, xyResponse.getStatus());
ITmfXyModel xyModel = xyResponse.getModel();
assertNotNull(xyModel);
assertEquals(EXPECTED_YDATA, Maps.uniqueIndex(xyModel.getSeriesData(), ISeriesModel::getId));
Map<Long, @NonNull ISeriesModel> data = Maps.uniqueIndex(xyModel.getSeriesData(), ISeriesModel::getId);
for (Entry<Long, ISeriesModel> yEntry : EXPECTED_YDATA.entrySet()) {
assertEquals(data.get(yEntry.getKey()), yEntry.getValue());
}
} finally {
module.dispose();
CtfTmfTestTraceUtils.dispose(CtfTestTrace.HELLO_LOST);
Expand Down
84 changes: 84 additions & 0 deletions ....core/src/org/eclipse/tracecompass/internal/tmf/core/histogram/HistogramDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -74,6 +75,7 @@ public class HistogramDataProvider extends AbstractTmfTraceDataProvider implemen
private final long fTraceId = TRACE_IDS.getAndIncrement();
private final long fTotalId = TRACE_IDS.getAndIncrement();
private final long fLostId = TRACE_IDS.getAndIncrement();
private final Map<String, Long> fEventTypeIds = new HashMap<>();

/**
* Constructor
Expand Down Expand Up @@ -101,6 +103,21 @@ public TmfModelResponse<TmfTreeModel<TmfTreeDataModel>> fetchTree(Map<String, Ob
if (eventsSs.optQuarkAbsolute(Attributes.LOST_EVENTS) != ITmfStateSystem.INVALID_ATTRIBUTE) {
builder.add(new TmfXyTreeDataModel(fLostId, fTraceId, Collections.singletonList(Objects.requireNonNull(Messages.HistogramDataProvider_Lost)), true, null, true));
}

// Add event type children
int eventTypesQuark = eventsSs.optQuarkAbsolute(Attributes.EVENT_TYPES);
if (eventTypesQuark != ITmfStateSystem.INVALID_ATTRIBUTE) {
List<Integer> eventTypeQuarks = eventsSs.getSubAttributes(eventTypesQuark, false);
for (Integer quark : eventTypeQuarks) {
String eventTypeName = eventsSs.getAttributeName(quark);
if (!"Lost event".equals(eventTypeName)) { //$NON-NLS-1$
long eventTypeId = TRACE_IDS.getAndIncrement();
fEventTypeIds.put(eventTypeName, eventTypeId);
builder.add(new TmfXyTreeDataModel(eventTypeId, fTraceId, Collections.singletonList(eventTypeName), true, null, true));
}
}
}

if (eventsSs.waitUntilBuilt(0)) {
TmfModelResponse<TmfTreeModel<TmfTreeDataModel>> response = new TmfModelResponse<>(new TmfTreeModel<>(Collections.emptyList(), builder.build()), ITmfResponse.Status.COMPLETED, CommonStatusMessage.COMPLETED);
fCached = response;
Expand Down Expand Up @@ -145,6 +162,21 @@ public TmfModelResponse<TmfTreeModel<TmfTreeDataModel>> fetchTree(Map<String, Ob
return TmfXyResponseFactory.createFailedResponse(CommonStatusMessage.STATE_SYSTEM_FAILED);
}
}

// Handle event type requests
if (eventsSs != null) {
for (Map.Entry<String, Long> entry : fEventTypeIds.entrySet()) {
if (selected.contains(entry.getValue())) {
try {
YModel series = getEventTypeHistogram(eventsSs, entry.getKey(), entry.getValue(), xValues);
builder.add(series);
} catch (StateSystemDisposedException e) {
return TmfXyResponseFactory.createFailedResponse(CommonStatusMessage.STATE_SYSTEM_FAILED);
}
}
}
}

boolean completed = eventsSs != null ? eventsSs.waitUntilBuilt(0) || eventsSs.getCurrentEndTime() >= filter.getEnd() : false;

return TmfXyResponseFactory.create(TITLE, xValues, builder.build(), completed);
Expand Down Expand Up @@ -212,6 +244,58 @@ private YModel getLostEvents(ITmfStateSystem ss, long[] times) throws StateSyste
return new YModel(fLostId, lostName, leY);
}

private YModel getEventTypeHistogram(ITmfStateSystem eventsSs, String eventTypeName, long eventTypeId, long[] times) throws StateSystemDisposedException {
int eventTypeQuark = eventsSs.optQuarkAbsolute(Attributes.EVENT_TYPES, eventTypeName);
if (eventTypeQuark == ITmfStateSystem.INVALID_ATTRIBUTE) {
return new YModel(eventTypeId, getTrace().getName() + '/' + eventTypeName, new double[times.length]);
}

List<Long> timesList = new ArrayList<>();
for (long time : times) {
timesList.add(time);
}

List<Long> values = new ArrayList<>();
try {
List<ITmfStateInterval> rawValues = new ArrayList<>();

Iterable<ITmfStateInterval> intervals = eventsSs.query2D(Collections.singletonList(eventTypeQuark), timesList);
for (ITmfStateInterval interval : intervals) {
rawValues.add(interval);
}
rawValues.sort(new Comparator<ITmfStateInterval>() {
@Override
public int compare(ITmfStateInterval arg0, ITmfStateInterval arg1) {
return Long.compare(arg0.getStartTime(), arg1.getStartTime());
}
});
long prevValue = rawValues.get(0).getValueLong();
for (ITmfStateInterval interval : rawValues) {
Object value = interval.getValue();
long currentValue = (value instanceof Number) ? ((Number) value).longValue() : 0;
values.add(currentValue - prevValue);
prevValue = currentValue;
}
} catch (StateSystemDisposedException e) {
// Return empty data if state system is disposed
for (int i = 0; i < times.length; i++) {
values.add(0L);
}
}

// Pad with zeros if needed
while (values.size() < times.length) {
values.add(0L);
}

double[] y = new double[times.length];
for (int i = 0; i < Math.min(times.length, values.size()); i++) {
y[i] = values.get(i).doubleValue();
}

return new YModel(eventTypeId, getTrace().getName() + '/' + eventTypeName, y);
}

private class LostEventInterval {
private final long fStartTime;
private final long fEndTime;
Expand Down
4 changes: 2 additions & 2 deletions ...org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/eventdensity/EventDensityViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ public void testManipulatingTreeViewer() {

// Uncheck a leaf of the tree
totalItem.uncheck();
assertFalse(root.isChecked());
assertTrue(root.isChecked());
assertFalse(totalItem.isChecked());
WaitUtils.waitUntil(c -> c.getSeriesSet().getSeries().length == 0, chart,
WaitUtils.waitUntil(c -> c.getSeriesSet().getSeries().length >= 1, chart,
"A data series has not been removed.");
}

Expand Down
2 changes: 1 addition & 1 deletion ...src/org/eclipse/tracecompass/internal/tmf/ui/viewers/eventdensity/EventDensityViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ public EventDensityViewer(Composite parent, TmfXYChartSettings settings) {

@Override
public @NonNull OutputElementStyle getSeriesStyle(@NonNull Long seriesId) {
return getPresentationProvider().getSeriesStyle(seriesId, StyleProperties.SeriesType.BAR, DEFAULT_SERIES_WIDTH);
return getPresentationProvider().getSeriesStyle(seriesId, StyleProperties.SeriesType.AREA, DEFAULT_SERIES_WIDTH);
}
}
Loading