Skip to content

tmf: Return one callsite in TmfEventTableDataProvider if not a list #186

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

Merged
bhufmann merged 1 commit into from
Dec 9, 2024
Merged

tmf: Return one callsite in TmfEventTableDataProvider if not a list #186

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
20 changes: 19 additions & 1 deletion ...se/tracecompass/internal/provisional/tmf/core/model/events/TmfEventTableDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
import org.eclipse.tracecompass.tmf.core.event.aspect.MultiAspect;
import org.eclipse.tracecompass.tmf.core.event.aspect.TmfBaseAspects;
import org.eclipse.tracecompass.tmf.core.event.aspect.TmfCallsiteAspect;
import org.eclipse.tracecompass.tmf.core.event.lookup.ITmfCallsite;
import org.eclipse.tracecompass.tmf.core.filter.FilterManager;
import org.eclipse.tracecompass.tmf.core.filter.ITmfFilter;
import org.eclipse.tracecompass.tmf.core.filter.model.ITmfFilterTreeNode;
Expand Down Expand Up @@ -561,7 +563,12 @@ private static EventTableLine buildEventTableLine(Map<Long, ITmfEventAspect<?>>
List<VirtualTableCell> entry = new ArrayList<>(aspects.size());
for (Entry<Long, ITmfEventAspect<?>> aspectEntry : aspects.entrySet()) {
ITmfEventAspect<?> aspect = Objects.requireNonNull(aspectEntry.getValue());
Object aspectResolved = aspect.resolve(event);
Object aspectResolved = null;
if (aspect instanceof TmfCallsiteAspect) {
aspectResolved = toCallsiteString(event, (TmfCallsiteAspect) aspect);
} else {
aspectResolved = aspect.resolve(event);
}
String cellContent = aspectResolved == null ? StringUtils.EMPTY : String.valueOf(aspectResolved);
entry.add(new VirtualTableCell(cellContent));
}
Expand All @@ -570,6 +577,17 @@ private static EventTableLine buildEventTableLine(Map<Long, ITmfEventAspect<?>>
return tableLine;
}

private static @Nullable String toCallsiteString(ITmfEvent event, TmfCallsiteAspect callsiteAspect) {
List<ITmfCallsite> result = callsiteAspect.resolve(event);
if (result != null && !result.isEmpty()) {
if (result.size() == 1) {
return result.get(0).toString();
}
return result.toString();
}
return null;
}

/**
* Apply a filter to this provider that will be used for future request. If
* the current filter is null or not equal to the provided filter, the
Expand Down
Loading