Skip to content

Commit c8509f5

Browse files
Rezix93arfio
authored andcommitted
Change LttngUstTrace to validate as a CTFValidationStatus
This passes the declared event types and environment to children traces. Signed-off-by: Reza Rouhghalandari <reza.rouhghalandari@ericsson.com>
1 parent 51bd764 commit c8509f5

File tree

1 file changed

+4
-4
lines changed
  • lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace

1 file changed

+4
-4
lines changed

lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/trace/LttngUstTrace.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect;
4444
import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
4545
import org.eclipse.tracecompass.tmf.core.trace.TmfEventTypeCollectionHelper;
46-
import org.eclipse.tracecompass.tmf.core.trace.TraceValidationStatus;
4746
import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEventFactory;
4847
import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
4948
import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTraceValidationStatus;
@@ -187,13 +186,14 @@ public Iterable<ITmfEventAspect<?>> getEventAspects() {
187186
public IStatus validate(final IProject project, final String path) {
188187
IStatus status = super.validate(project, path);
189188
if (status instanceof CtfTraceValidationStatus) {
190-
Map<String, String> environment = ((CtfTraceValidationStatus) status).getEnvironment();
189+
CtfTraceValidationStatus ctfTraceValidationStatus = (CtfTraceValidationStatus) status;
190+
Map<String, String> environment = ctfTraceValidationStatus.getEnvironment();
191191
/* Make sure the domain is "ust" in the trace's env vars */
192192
String domain = environment.get("domain"); //$NON-NLS-1$
193193
if (domain == null || !domain.equals("\"ust\"")) { //$NON-NLS-1$
194-
return new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.LttngUstTrace_DomainError);
194+
return Status.error(Messages.LttngUstTrace_DomainError);
195195
}
196-
return new TraceValidationStatus(CONFIDENCE, Activator.PLUGIN_ID);
196+
return new CtfTraceValidationStatus(CONFIDENCE, Activator.PLUGIN_ID, environment, ctfTraceValidationStatus.getEventNames() );
197197
}
198198
return status;
199199
}

0 commit comments

Comments
 (0)