From fb2e4b48c961fe084971804f2ee6f0ceba3baffc Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Thu, 27 Jun 2024 11:23:40 -0400 Subject: [PATCH] common: use trace-event-logger instead of build in tracer This aims to use the provided external infrastructure. Tracing trace compass should be simpler now as only trace events will be loggeed with the external logger. Change-Id: I8f2529dda20694408a85863d4a66e5ed7dcd55d9 Signed-off-by: Matthew Khouzam --- .../META-INF/MANIFEST.MF | 3 +- .../common/core/log/TraceCompassLogUtils.java | 388 ++---------------- .../tracecompass-e4.20.target | 12 +- .../tracecompass-e4.21.target | 10 + .../tracecompass-e4.22.target | 10 + .../tracecompass-e4.23.target | 10 + .../tracecompass-e4.24.target | 10 + .../tracecompass-e4.25.target | 10 + .../tracecompass-e4.26.target | 10 + .../tracecompass-e4.27.target | 10 + .../tracecompass-e4.28.target | 10 + .../tracecompass-e4.29.target | 10 + .../tracecompass-e4.30.target | 10 + .../tracecompass-e4.31.target | 10 + .../tracecompass-e4.32.target | 12 +- .../tracecompass-eStaging.target | 14 +- 16 files changed, 186 insertions(+), 353 deletions(-) diff --git a/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF b/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF index 77c67d1a3f..2535179643 100644 --- a/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF +++ b/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.2.0.qualifier +Bundle-Version: 5.3.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tracecompass.common.core;singleton:=true Bundle-Activator: org.eclipse.tracecompass.internal.common.core.Activator @@ -10,6 +10,7 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, + wrapped.org.eclipse.tracecompass.trace-event-logger, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Export-Package: org.eclipse.tracecompass.common.core, org.eclipse.tracecompass.common.core.collect, diff --git a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/log/TraceCompassLogUtils.java b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/log/TraceCompassLogUtils.java index 66055ef09c..14e18976f8 100644 --- a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/log/TraceCompassLogUtils.java +++ b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/log/TraceCompassLogUtils.java @@ -11,20 +11,12 @@ package org.eclipse.tracecompass.common.core.log; -import java.text.DecimalFormat; -import java.text.Format; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; import org.eclipse.jdt.annotation.Nullable; +import org.eclipse.tracecompass.trace_event_logger.LogUtils; /** * Logger helper @@ -105,23 +97,6 @@ */ public final class TraceCompassLogUtils { - private static final Format FORMAT = new DecimalFormat("#.###"); //$NON-NLS-1$ - - /* - * Field names - */ - private static final String ARGS = "args"; //$NON-NLS-1$ - private static final String NAME = "name"; //$NON-NLS-1$ - private static final String CATEGORY = "cat"; //$NON-NLS-1$ - private static final String ID = "id"; //$NON-NLS-1$ - private static final String TID = "tid"; //$NON-NLS-1$ - private static final String PID = "pid"; //$NON-NLS-1$ - private static final String TIMESTAMP = "ts"; //$NON-NLS-1$ - private static final String PHASE = "ph"; //$NON-NLS-1$ - - private static final String ARGS_ERROR_MESSAGE = "Data should be in the form of key, value, key1, value1, ... TraceCompassScopeLog was supplied "; //$NON-NLS-1$ - private static final AtomicInteger ID_GENERATOR = new AtomicInteger(0); - private TraceCompassLogUtils() { // do nothing } @@ -153,12 +128,9 @@ private TraceCompassLogUtils() { */ public static class ScopeLog implements AutoCloseable { - private final long fTime; - private final long fThreadId; - private final Logger fLogger; - private final Level fLevel; - private final String fLabel; - private final Map fData = new HashMap<>(); + private org.eclipse.tracecompass.trace_event_logger.LogUtils.ScopeLog fsl; + private long fTime; + private String fLabel; /** * Scope logger constructor @@ -176,20 +148,10 @@ public static class ScopeLog implements AutoCloseable { * beginning of the scope */ public ScopeLog(Logger log, Level level, String label, Object... args) { + fsl = new org.eclipse.tracecompass.trace_event_logger.LogUtils.ScopeLog(log, level, label, args); fTime = System.nanoTime(); - fLogger = log; - fLevel = level; - fThreadId = Thread.currentThread().getId(); fLabel = label; - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'B', fTime, fThreadId); - appendName(sb, fLabel); - appendArgs(sb, args); - sb.append('}'); - return sb.toString(); - })); + } /** @@ -207,19 +169,13 @@ public ScopeLog(Logger log, Level level, String label, Object... args) { * The value of the field. */ public void addData(String name, Object value) { - fData.put(name, value); + fsl.addData(name, value); } @Override public void close() { - long time = System.nanoTime(); - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'E', time, fThreadId); - return appendArgs(sb, fData).append('}').toString(); - })); - TraceCompassMonitorManager.getInstance().update(fLabel, time - fTime); + fsl.close(); + TraceCompassMonitorManager.getInstance().update(fLabel, System.nanoTime() - fTime); } } @@ -232,14 +188,8 @@ public void close() { */ public static class FlowScopeLogBuilder { - private final Logger fLogger; - private final Level fLevel; - private final String fLabel; - private final Object[] fArgs; - private int fId = Integer.MIN_VALUE; - private @Nullable String fCategory = null; - private @Nullable FlowScopeLog fParent = null; - private boolean fHasParent = false; + private org.eclipse.tracecompass.trace_event_logger.LogUtils.FlowScopeLogBuilder fFslb; + private String fLabel; /** * Flow scope log builder constructor @@ -255,10 +205,8 @@ public static class FlowScopeLogBuilder { * value2.... typically arguments */ public FlowScopeLogBuilder(Logger logger, Level level, String label, Object... args) { - fLogger = logger; - fLevel = level; fLabel = label; - fArgs = args; + fFslb=new org.eclipse.tracecompass.trace_event_logger.LogUtils.FlowScopeLogBuilder(logger, level, label, args); } /** @@ -274,10 +222,7 @@ public FlowScopeLogBuilder(Logger logger, Level level, String label, Object... a * @return This builder */ public FlowScopeLogBuilder setCategory(String category) { - if (fParent != null) { - throw new IllegalStateException("FlowScopeLogBuilder: Cannot set a category if a parent has already been set"); //$NON-NLS-1$ - } - fCategory = category; + fFslb.setCategory(category); return this; } @@ -295,14 +240,7 @@ public FlowScopeLogBuilder setCategory(String category) { * @return This builder */ public FlowScopeLogBuilder setCategoryAndId(String category, int id) { - if (fParent != null) { - throw new IllegalStateException("FlowScopeLogBuilder: Cannot set a category if a parent has already been set"); //$NON-NLS-1$ - } - fCategory = category; - fId = id; - // Id is already set, so assume this scope has a parent, even if the - // parent object is not available - fHasParent = true; + fFslb.setCategoryAndId(category, id); return this; } @@ -318,11 +256,9 @@ public FlowScopeLogBuilder setCategoryAndId(String category, int id) { * The parent scope * @return This builder */ + @SuppressWarnings("resource") public FlowScopeLogBuilder setParentScope(FlowScopeLog parent) { - if (fCategory != null) { - throw new IllegalStateException("FlowScopeLogBuilder: Cannot set a parent scope if a category has already been set"); //$NON-NLS-1$ - } - fParent = parent; + fFslb.setParentScope(parent.getInner()); return this; } @@ -332,12 +268,7 @@ public FlowScopeLogBuilder setParentScope(FlowScopeLog parent) { * @return The flow scope log */ public FlowScopeLog build() { - FlowScopeLog parent = fParent; - if (parent != null) { - // Has a parent scope, so step in flow - return new FlowScopeLog(fLogger, fLevel, fLabel, parent.fCategory, parent.fId, false, fArgs); - } - return new FlowScopeLog(fLogger, fLevel, fLabel, String.valueOf(fCategory), (fId == Integer.MIN_VALUE ? ID_GENERATOR.incrementAndGet() : fId), !fHasParent, fArgs); + return new FlowScopeLog(fFslb, fLabel); } } @@ -378,12 +309,7 @@ public FlowScopeLog build() { */ public static class FlowScopeLog implements AutoCloseable { - private final long fThreadId; - private final Logger fLogger; - private final Level fLevel; - private final int fId; - private final String fCategory; - private final Map fData = new HashMap<>(); + private final org.eclipse.tracecompass.trace_event_logger.LogUtils.FlowScopeLog fFsl; private final String fLabel; private final long fTime; @@ -407,35 +333,16 @@ public static class FlowScopeLog implements AutoCloseable { * the messages to pass, should be in pairs key, value, key2, * value2.... typically arguments */ - private FlowScopeLog(Logger log, Level level, String label, String category, int id, boolean startFlow, Object... args) { + @SuppressWarnings("resource") + private FlowScopeLog(org.eclipse.tracecompass.trace_event_logger.LogUtils.FlowScopeLogBuilder fslb, String label) { fTime = System.nanoTime(); - fId = id; - fLogger = log; - fLevel = level; - fCategory = category; + fFsl = Objects.requireNonNull(fslb.build()); fLabel = label; - fThreadId = Thread.currentThread().getId(); - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'B', fTime, fThreadId); - appendName(sb, label); - appendArgs(sb, args); - sb.append('}'); - return sb.toString(); - })); - // Add a flow event, either start or step in enclosing scope - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, startFlow ? 's' : 't', fTime, fThreadId); - appendName(sb, label); - appendCategory(sb, category); - appendId(sb, fId); - appendArgs(sb, args); - sb.append('}'); - return sb.toString(); - })); + + } + + private LogUtils.FlowScopeLog getInner() { + return fFsl; } /** @@ -447,18 +354,7 @@ private FlowScopeLog(Logger log, Level level, String label, String category, int * the arguments to log */ public void step(String label, Object... args) { - long time = System.nanoTime(); - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 't', time, fThreadId); - appendName(sb, label); - appendCategory(sb, fCategory); - appendId(sb, fId); - appendArgs(sb, args); - sb.append('}'); - return sb.toString(); - })); + fFsl.step(label, args); } /** @@ -476,7 +372,7 @@ public void step(String label, Object... args) { * The value of the field. */ public void addData(String name, Object value) { - fData.put(name, value); + fFsl.addData(name, value); } /** @@ -486,20 +382,13 @@ public void addData(String name, Object value) { * @return The ID of this scope */ public int getId() { - return fId; + return fFsl.getId(); } @Override public void close() { long time = System.nanoTime(); - fLogger.log(fLevel, (() -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'E', time, fThreadId); - appendArgs(sb, fData); - sb.append('}'); - return sb.toString(); - })); + fFsl.close(); TraceCompassMonitorManager.getInstance().update(fLabel, time - fTime); } } @@ -523,18 +412,7 @@ public void close() { * @return The unique ID of this object (there may be collisions) */ public static int traceObjectCreation(Logger logger, Level level, Object item) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - int identityHashCode = System.identityHashCode(item); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'N', time, threadId); - appendName(sb, item.getClass().getSimpleName()); - appendId(sb, identityHashCode); - return sb.append('}').toString(); - }); - return identityHashCode; + return org.eclipse.tracecompass.trace_event_logger.LogUtils.traceObjectCreation(logger, level, item); } /** @@ -552,16 +430,7 @@ public static int traceObjectCreation(Logger logger, Level level, Object item) { * the Object to trace */ public static void traceObjectDestruction(Logger logger, Level level, Object item) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'D', time, threadId); - appendName(sb, item.getClass().getSimpleName()); - appendId(sb, System.identityHashCode(item)); - return sb.append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceObjectDestruction(logger, level, item); } /** @@ -580,16 +449,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite * The unique ID */ public static void traceObjectDestruction(Logger logger, Level level, Object item, int uniqueId) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'D', time, threadId); - appendName(sb, item.getClass().getSimpleName()); - appendId(sb, uniqueId); - return sb.append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceObjectDestruction(logger, level, item, uniqueId); } /** @@ -611,17 +471,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite * Additional arguments to log */ public static void traceAsyncStart(Logger logger, Level level, @Nullable String name, @Nullable String category, int id, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'b', time, threadId); - appendName(sb, name); - appendCategory(sb, category); - appendId(sb, id); - return appendArgs(sb, args).append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceAsyncStart(logger, level, name, category, id, args); } /** @@ -643,17 +493,7 @@ public static void traceAsyncStart(Logger logger, Level level, @Nullable String * Additional arguments to log */ public static void traceAsyncNested(Logger logger, Level level, @Nullable String name, @Nullable String category, int id, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'n', time, threadId); - appendName(sb, name); - appendCategory(sb, category); - appendId(sb, id); - return appendArgs(sb, args).append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceAsyncNested(logger, level, name, category, id, args); } /** @@ -675,17 +515,7 @@ public static void traceAsyncNested(Logger logger, Level level, @Nullable String * Additional arguments to log */ public static void traceAsyncEnd(Logger logger, Level level, @Nullable String name, @Nullable String category, int id, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'e', time, threadId); - appendName(sb, name); - appendCategory(sb, category); - appendId(sb, id); - return appendArgs(sb, args).append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceAsyncEnd(logger, level, name, category, id, args); } /** @@ -706,15 +536,7 @@ public static void traceAsyncEnd(Logger logger, Level level, @Nullable String na * Additional arguments to log */ public static void traceInstant(Logger logger, Level level, String name, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'i', time, threadId); - appendName(sb, name); - return appendArgs(sb, args).append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceInstant(logger, level, name, args); } /** @@ -731,15 +553,7 @@ public static void traceInstant(Logger logger, Level level, String name, Object. * The counters to log in the format : "title", value */ public static void traceCounter(Logger logger, Level level, @Nullable String name, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'C', time, threadId); - appendName(sb, name); - return appendArgs(sb, args).append('}').toString(); - }); + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceCounter(logger, level, name, args); } /** @@ -760,128 +574,6 @@ public static void traceCounter(Logger logger, Level level, @Nullable String nam * "color" and an rbga will be used */ public static void traceMarker(Logger logger, Level level, @Nullable String name, long duration, Object... args) { - long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); - logger.log(level, () -> { - StringBuilder sb = new StringBuilder(); - sb.append('{'); - appendCommon(sb, 'R', time, threadId); - appendName(sb, name); - sb.append(','); - writeObject(sb, "dur", duration); //$NON-NLS-1$ - return appendArgs(sb, args).append('}').toString(); - }); - } - - // ------------------------------------------------------------------------- - // Helpers - // ------------------------------------------------------------------------- - - /* - * USE ME FIRST - */ - private static StringBuilder appendCommon(StringBuilder appendTo, char phase, long time, long threadId) { - writeObject(appendTo, TIMESTAMP, FORMAT.format((double) time / 1000)).append(','); // $NON-NLS-1$ - writeObject(appendTo, PHASE, phase).append(','); - writeObject(appendTo, TID, threadId).append(','); - return writeObject(appendTo, PID, threadId); // $NON-NLS-1$ - } - - private static StringBuilder appendName(StringBuilder sb, @Nullable String name) { - if (name != null) { - sb.append(','); - writeObject(sb, NAME, name); - } - return sb; - } - - private static StringBuilder appendCategory(StringBuilder sb, @Nullable String category) { - if (category != null) { - sb.append(','); - writeObject(sb, CATEGORY, category); - } - return sb; - } - - private static StringBuilder appendId(StringBuilder sb, int id) { - return sb.append(',') - .append('"') - .append(ID) - .append("\":\"0x") //$NON-NLS-1$ - .append(Integer.toHexString(id)) - .append('"'); - } - - private static StringBuilder appendArgs(StringBuilder sb, Map args) { - if (!args.isEmpty()) { - sb.append(',') - .append('"') - .append(ARGS) - .append('"') - .append(':'); - Object[] argsArray = new Object[2 * args.size()]; - Iterator> entryIter = args.entrySet().iterator(); - for (int i = 0; i < args.size(); i++) { - Entry entry = entryIter.next(); - argsArray[i] = entry.getKey(); - argsArray[i + 1] = entry.getValue(); - } - getArgs(sb, argsArray); - } - return sb; - } - - private static StringBuilder appendArgs(StringBuilder sb, Object... args) { - if (args.length > 0) { - sb.append(',') - .append('"') - .append(ARGS) - .append('"') - .append(':'); - getArgs(sb, args); - } - return sb; - } - - private static StringBuilder getArgs(StringBuilder appendTo, Object[] data) { - if (data.length == 0) { - return appendTo; - } - Set tester = new HashSet<>(); - appendTo.append('{'); - if (data.length == 1) { - // not in contract, but let's assume here that people are still new - // at this - appendTo.append("\"msg\":\"").append(data[0]).append('"'); //$NON-NLS-1$ - } else { - if (data.length % 2 != 0) { - throw new IllegalArgumentException( - ARGS_ERROR_MESSAGE + "an odd number of messages" + Arrays.asList(data).toString()); //$NON-NLS-1$ - } - for (int i = 0; i < data.length - 1; i += 2) { - Object value = data[i + 1]; - String keyVal = String.valueOf(data[i]); - if (tester.contains(keyVal)) { - throw new IllegalArgumentException(ARGS_ERROR_MESSAGE + "an duplicate field names : " + keyVal); //$NON-NLS-1$ - } - tester.add(keyVal); - if (i > 0) { - appendTo.append(','); - } - writeObject(appendTo, keyVal, value); - } - } - - return appendTo.append('}'); - } - - private static StringBuilder writeObject(StringBuilder appendTo, Object key, @Nullable Object value) { - appendTo.append('"').append(key).append('"').append(':'); - if (value instanceof Number) { - appendTo.append(value); - } else { - appendTo.append('"').append(String.valueOf(value)).append('"'); - } - return appendTo; + org.eclipse.tracecompass.trace_event_logger.LogUtils.traceMarker(logger, level, name, duration, args); } } diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target index ccb7525027..9933ba47b4 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.20.target @@ -1,4 +1,4 @@ - + @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target index 6396f61140..fffef6a3ec 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.21.target @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target index b17bed9191..f661432dd4 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.22.target @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target index f2eb2211e5..b920e96104 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.23.target @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target index 61d8493bdc..a22bee92b7 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.24.target @@ -90,6 +90,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target index 10b11742f1..431a32a760 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.25.target @@ -90,6 +90,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target index 126fbbe855..493c5abc54 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.26.target @@ -92,6 +92,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target index 0841dd904a..6d1f00bdd9 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.27.target @@ -86,6 +86,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target index 8d4dda68ef..b918279baa 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.28.target @@ -83,6 +83,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target index fda7ac2432..cdc43b2e71 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.29.target @@ -81,6 +81,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target index 8d4418819b..b04323ce95 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.30.target @@ -87,6 +87,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target index 0dca1940cb..824d239441 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.31.target @@ -90,6 +90,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target index 7ea32cfdb6..fa31b9491b 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.32.target @@ -1,4 +1,4 @@ - + @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target index 40af2e856d..ec63a44dfa 100644 --- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target +++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target @@ -1,4 +1,4 @@ - + @@ -89,6 +89,16 @@ + + + +org.eclipse.tracecompass +trace-event-logger +0.0.4 +jar + + + @@ -96,4 +106,4 @@ -Xmx512M -consolelog - + \ No newline at end of file