Refactor viewer sessions and selections and optimize transaction queries
This commit is contained in:
1 parent
4824d48828
commit
589762b220
42 files changed
+1118
-720
No files matched your search
+20
-1
@@ -11,6 +11,11 @@
|
|||||||
package com.minres.scviewer.database.ftr;
|
package com.minres.scviewer.database.ftr;
|
||||||
|
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import com.minres.scviewer.database.LazyValue;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.tx.TransactionLists;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
import com.minres.scviewer.database.EventEntry;
|
import com.minres.scviewer.database.EventEntry;
|
||||||
import com.minres.scviewer.database.EventList;
|
import com.minres.scviewer.database.EventList;
|
||||||
import com.minres.scviewer.database.HierNode;
|
import com.minres.scviewer.database.HierNode;
|
||||||
@@ -24,7 +29,21 @@ import com.minres.scviewer.database.tx.ITxEvent;
|
|||||||
/**
|
/**
|
||||||
* The Class AbstractTxStream.
|
* The Class AbstractTxStream.
|
||||||
*/
|
*/
|
||||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||||
|
|
||||||
|
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ITx> getTransactionList() {
|
||||||
|
return transactionList.get(() -> TransactionLists.fromEvents(getEvents(), () -> false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ITx getTransaction(long id) {
|
||||||
|
getEvents(); // FTR parses the owning stream on demand.
|
||||||
|
ITx transaction = loader.getTransaction(id);
|
||||||
|
return transaction != null && (transaction.getStream() == this || transaction.getGenerator() == this) ? transaction : null;
|
||||||
|
}
|
||||||
|
|
||||||
private final String fullName;
|
private final String fullName;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+16
-1
@@ -10,6 +10,9 @@
|
|||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package com.minres.scviewer.database.sqlite;
|
package com.minres.scviewer.database.sqlite;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.LazyValue;
|
||||||
|
import com.minres.scviewer.database.tx.TransactionLists;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -28,7 +31,19 @@ import com.minres.scviewer.database.sqlite.db.IDatabase;
|
|||||||
import com.minres.scviewer.database.tx.ITx;
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
import com.minres.scviewer.database.tx.TxRowAllocator;
|
import com.minres.scviewer.database.tx.TxRowAllocator;
|
||||||
|
|
||||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||||
|
|
||||||
|
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ITx> getTransactionList() {
|
||||||
|
return transactionList.get(() -> TransactionLists.sorted(getTransactions().values()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ITx getTransaction(long id) {
|
||||||
|
return id < Integer.MIN_VALUE || id > Integer.MAX_VALUE ? null : getTransactions().get((int) id);
|
||||||
|
}
|
||||||
|
|
||||||
protected IDatabase database;
|
protected IDatabase database;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -88,7 +88,7 @@ public class Tx implements ITx {
|
|||||||
public long getEndTime() { return end; }
|
public long getEndTime() { return end; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ITxAttribute> getAttributes() {
|
public synchronized List<ITxAttribute> getAttributes() {
|
||||||
if(attributes==null){
|
if(attributes==null){
|
||||||
SQLiteDatabaseSelectHandler<ScvTxAttribute> handler = new SQLiteDatabaseSelectHandler<>(
|
SQLiteDatabaseSelectHandler<ScvTxAttribute> handler = new SQLiteDatabaseSelectHandler<>(
|
||||||
ScvTxAttribute.class, database, "tx="+scvTx.getId());
|
ScvTxAttribute.class, database, "tx="+scvTx.getId());
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+21
-1
@@ -12,6 +12,11 @@
|
|||||||
package com.minres.scviewer.database.text;
|
package com.minres.scviewer.database.text;
|
||||||
|
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import com.minres.scviewer.database.LazyValue;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.tx.TransactionLists;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
import com.minres.scviewer.database.EventEntry;
|
import com.minres.scviewer.database.EventEntry;
|
||||||
import com.minres.scviewer.database.EventList;
|
import com.minres.scviewer.database.EventList;
|
||||||
import com.minres.scviewer.database.HierNode;
|
import com.minres.scviewer.database.HierNode;
|
||||||
@@ -25,7 +30,22 @@ import com.minres.scviewer.database.tx.ITxEvent;
|
|||||||
/**
|
/**
|
||||||
* The Class AbstractTxStream.
|
* The Class AbstractTxStream.
|
||||||
*/
|
*/
|
||||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||||
|
|
||||||
|
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ITx> getTransactionList() {
|
||||||
|
return transactionList.get(() -> TransactionLists.fromEvents(getEvents(), () -> false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ITx getTransaction(long id) {
|
||||||
|
ITx transaction;
|
||||||
|
try { transaction = loader.getTransaction(id); }
|
||||||
|
catch (IllegalArgumentException missing) { return null; }
|
||||||
|
return transaction != null && (transaction.getStream() == this || transaction.getGenerator() == this) ? transaction : null;
|
||||||
|
}
|
||||||
|
|
||||||
private final String fullName;
|
private final String fullName;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -101,4 +101,4 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
|
|||||||
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
|
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
|
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+47
@@ -0,0 +1,47 @@
|
|||||||
|
package com.minres.scviewer.database.ui;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.eclipse.jface.viewers.ISelection;
|
||||||
|
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||||
|
import org.eclipse.jface.viewers.StructuredSelection;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
|
||||||
|
/** The selected transaction and tracks, with JFace conversion at the UI boundary. */
|
||||||
|
public record WaveformSelection(ITx transaction, List<TrackEntry> tracks) {
|
||||||
|
public WaveformSelection {
|
||||||
|
tracks = tracks.stream().filter(java.util.Objects::nonNull).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static WaveformSelection from(ISelection selection) {
|
||||||
|
if (!(selection instanceof IStructuredSelection structured)) return new WaveformSelection(null, List.of());
|
||||||
|
ITx transaction = null;
|
||||||
|
List<TrackEntry> tracks = new ArrayList<>();
|
||||||
|
for (Object element : structured.toArray()) {
|
||||||
|
if (element instanceof ITx tx && transaction == null) transaction = tx;
|
||||||
|
if (element instanceof TrackEntry track) tracks.add(track);
|
||||||
|
}
|
||||||
|
return new WaveformSelection(transaction, tracks);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TrackEntry track() {
|
||||||
|
if (transaction == null) return tracks.isEmpty() ? null : tracks.get(0);
|
||||||
|
return tracks.stream().filter(t -> t.waveform == transaction.getStream()
|
||||||
|
|| t.waveform == transaction.getGenerator()).findFirst().orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IStructuredSelection toSelection() {
|
||||||
|
List<Object> elements = new ArrayList<>();
|
||||||
|
if (transaction != null) elements.add(transaction);
|
||||||
|
TrackEntry primary = track();
|
||||||
|
if (primary != null) elements.add(primary);
|
||||||
|
for (TrackEntry track : tracks) if (track != primary) elements.add(track);
|
||||||
|
return new StructuredSelection(elements);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IStructuredSelection of(ITx transaction, TrackEntry track) {
|
||||||
|
return new WaveformSelection(transaction, track == null ? List.of() : List.of(track)).toSelection();
|
||||||
|
}
|
||||||
|
}
|
||||||
+7
-12
@@ -19,7 +19,6 @@ import java.util.Map.Entry;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.eclipse.jface.viewers.ISelection;
|
import org.eclipse.jface.viewers.ISelection;
|
||||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.events.ControlAdapter;
|
import org.eclipse.swt.events.ControlAdapter;
|
||||||
import org.eclipse.swt.events.ControlEvent;
|
import org.eclipse.swt.events.ControlEvent;
|
||||||
@@ -46,6 +45,7 @@ import com.minres.scviewer.database.ui.IWaveformStyleProvider;
|
|||||||
import com.minres.scviewer.database.ui.IWaveformView;
|
import com.minres.scviewer.database.ui.IWaveformView;
|
||||||
import com.minres.scviewer.database.ui.IWaveformZoom;
|
import com.minres.scviewer.database.ui.IWaveformZoom;
|
||||||
import com.minres.scviewer.database.ui.TrackEntry;
|
import com.minres.scviewer.database.ui.TrackEntry;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.database.ui.ZoomKind;
|
import com.minres.scviewer.database.ui.ZoomKind;
|
||||||
import com.minres.scviewer.database.ui.swt.Constants;
|
import com.minres.scviewer.database.ui.swt.Constants;
|
||||||
import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar;
|
import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar;
|
||||||
@@ -458,17 +458,12 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setSelected(ISelection selection) {
|
public void setSelected(ISelection selection) {
|
||||||
if(selection instanceof IStructuredSelection) {
|
WaveformSelection selected = WaveformSelection.from(selection);
|
||||||
IStructuredSelection structuredSelection = (IStructuredSelection)selection;
|
currentSelectedTrack = selected.track();
|
||||||
Object[] selList = structuredSelection.toArray();
|
currentSelectedTx = selected.transaction();
|
||||||
currentSelectedTrack = (selList.length> 1 && selList[1] instanceof TrackEntry) ? (TrackEntry) selList[1] : null;
|
if (currentSelectedTx != null) reveal(currentSelectedTx);
|
||||||
currentSelectedTx = (selList.length> 0 && selList[0] instanceof ITx)? (ITx) selList[0] : null;
|
arrowPainter.updateSelection();
|
||||||
if(currentSelectedTx != null)
|
if (!isDisposed()) redraw();
|
||||||
reveal(currentSelectedTx);
|
|
||||||
arrowPainter.updateSelection();
|
|
||||||
if(!isDisposed())
|
|
||||||
redraw();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reveal(ITx tx) {
|
public void reveal(ITx tx) {
|
||||||
|
|||||||
+30
-58
@@ -91,6 +91,7 @@ import com.minres.scviewer.database.ui.IWaveformView;
|
|||||||
import com.minres.scviewer.database.ui.IWaveformZoom;
|
import com.minres.scviewer.database.ui.IWaveformZoom;
|
||||||
import com.minres.scviewer.database.ui.IWaveformviewEventListener;
|
import com.minres.scviewer.database.ui.IWaveformviewEventListener;
|
||||||
import com.minres.scviewer.database.ui.TrackEntry;
|
import com.minres.scviewer.database.ui.TrackEntry;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.database.ui.TrackEntry.HierState;
|
import com.minres.scviewer.database.ui.TrackEntry.HierState;
|
||||||
import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar;
|
import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar;
|
||||||
|
|
||||||
@@ -806,12 +807,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public ISelection getSelection() {
|
public ISelection getSelection() {
|
||||||
ArrayList<Object> sel = new ArrayList<>();
|
return new WaveformSelection(currentTxSelection, currentWaveformSelection).toSelection();
|
||||||
if (currentTxSelection != null) {
|
|
||||||
sel.add(currentTxSelection);
|
|
||||||
}
|
|
||||||
sel.addAll(currentWaveformSelection);
|
|
||||||
return new StructuredSelection(sel.toArray());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -851,62 +847,38 @@ public class WaveformView implements IWaveformView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
|
public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
|
||||||
boolean selectionChanged = false;
|
WaveformSelection requested = WaveformSelection.from(selection);
|
||||||
currentWaveformSelection.forEach(e -> {if(e!=null) e.selected = false;});
|
currentWaveformSelection.forEach(e -> e.selected = false);
|
||||||
if (selection instanceof IStructuredSelection) {
|
if (!add || (requested.transaction() == null && requested.tracks().isEmpty())) {
|
||||||
IStructuredSelection sel = (IStructuredSelection) selection;
|
currentWaveformSelection.clear();
|
||||||
if (sel.size() == 0) {
|
currentTxSelection = null;
|
||||||
selectionChanged = currentTxSelection != null || currentWaveformSelection != null;
|
}
|
||||||
currentTxSelection = null;
|
if (requested.transaction() != null) {
|
||||||
currentWaveformSelection.clear();
|
ITx transaction = requested.transaction();
|
||||||
} else {
|
TrackEntry track = requested.track();
|
||||||
if (!add)
|
if (track == null) track = getEntryFor(transaction);
|
||||||
currentWaveformSelection.clear();
|
if (track == null && addIfNeeded) {
|
||||||
List<?> selList = sel.toList();
|
track = getEntryFor(transaction.getStream());
|
||||||
for(Object o: selList) {
|
if (track == null) {
|
||||||
if (o instanceof ITx) {
|
track = new TrackEntry(transaction.getStream(), styleProvider);
|
||||||
ITx txSel = (ITx) o;
|
streams.add(track);
|
||||||
TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry
|
|
||||||
? (TrackEntry) selList.get(1)
|
|
||||||
: null;
|
|
||||||
if (trackEntry == null) {
|
|
||||||
trackEntry = getEntryFor(txSel);
|
|
||||||
if (trackEntry == null && addIfNeeded) {
|
|
||||||
IWaveform stream = txSel.getStream();
|
|
||||||
Optional<TrackEntry> te = streams.stream().filter(e -> stream.equals(e.waveform)).findFirst();
|
|
||||||
if (te.isEmpty()) { // add stream only if really needed
|
|
||||||
trackEntry = new TrackEntry(txSel.getStream(), styleProvider);
|
|
||||||
streams.add(trackEntry);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
currentTxSelection = txSel;
|
|
||||||
currentWaveformSelection.clear();
|
|
||||||
currentWaveformSelection.add(trackEntry);
|
|
||||||
selectionChanged = true;
|
|
||||||
} else if (o instanceof TrackEntry) {
|
|
||||||
TrackEntry e = (TrackEntry)o;
|
|
||||||
if(!currentWaveformSelection.contains(e))
|
|
||||||
currentWaveformSelection.add(e);
|
|
||||||
selectionChanged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if (currentTxSelection != null || !currentWaveformSelection.isEmpty())
|
|
||||||
selectionChanged = true;
|
|
||||||
currentTxSelection = null;
|
|
||||||
currentWaveformSelection.clear();
|
currentWaveformSelection.clear();
|
||||||
|
if (track != null) currentWaveformSelection.add(track);
|
||||||
|
currentTxSelection = track == null ? null : transaction;
|
||||||
|
} else {
|
||||||
|
for (TrackEntry track : requested.tracks())
|
||||||
|
if (!currentWaveformSelection.contains(track)) currentWaveformSelection.add(track);
|
||||||
}
|
}
|
||||||
currentWaveformSelection.forEach(e -> {if(e!=null)e.selected = true;});
|
currentWaveformSelection.forEach(e -> {
|
||||||
if (selectionChanged) {
|
e.selected = true;
|
||||||
currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform));
|
waveformCanvas.reveal(e.waveform);
|
||||||
waveformCanvas.setSelected(getSelection());
|
});
|
||||||
valueList.redraw();
|
waveformCanvas.setSelected(getSelection());
|
||||||
nameList.redraw();
|
valueList.redraw();
|
||||||
fireSelectionChanged();
|
nameList.redraw();
|
||||||
}
|
fireSelectionChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void fireSelectionChanged() {
|
protected void fireSelectionChanged() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
package com.minres.scviewer.database.tx;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/** Optional indexed access scoped to one transaction stream or generator. */
|
||||||
|
public interface ITransactionProvider {
|
||||||
|
/** Immutable list ordered by begin time and transaction ID; does not load attributes. */
|
||||||
|
List<ITx> getTransactionList();
|
||||||
|
|
||||||
|
/** Returns null when the ID does not belong to this stream or generator. */
|
||||||
|
ITx getTransaction(long id);
|
||||||
|
}
|
||||||
+36
@@ -0,0 +1,36 @@
|
|||||||
|
package com.minres.scviewer.database.tx;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.EventEntry;
|
||||||
|
import com.minres.scviewer.database.EventKind;
|
||||||
|
import com.minres.scviewer.database.IEvent;
|
||||||
|
import com.minres.scviewer.database.IEventList;
|
||||||
|
|
||||||
|
public final class TransactionLists {
|
||||||
|
private TransactionLists() {}
|
||||||
|
|
||||||
|
/** Compatibility path for event-backed waveforms; callers can cache the completed result. */
|
||||||
|
public static List<ITx> fromEvents(IEventList events, BooleanSupplier cancelled) {
|
||||||
|
List<ITx> transactions = new ArrayList<>();
|
||||||
|
for (EventEntry entry : events.entrySet()) {
|
||||||
|
if (cancelled.getAsBoolean()) throw new java.util.concurrent.CancellationException();
|
||||||
|
if (entry.events == null) continue;
|
||||||
|
for (IEvent event : entry.events) {
|
||||||
|
if (cancelled.getAsBoolean()) throw new java.util.concurrent.CancellationException();
|
||||||
|
if (event instanceof ITxEvent tx && (event.getKind() == EventKind.BEGIN || event.getKind() == EventKind.SINGLE))
|
||||||
|
transactions.add(tx.getTransaction());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sorted(transactions);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<ITx> sorted(java.util.Collection<ITx> transactions) {
|
||||||
|
List<ITx> sorted = new ArrayList<>(transactions);
|
||||||
|
sorted.sort(Comparator.comparingLong(ITx::getBeginTime).thenComparingLong(ITx::getId));
|
||||||
|
return List.copyOf(sorted);
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
|||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+6
-9
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
|
|||||||
|
|
||||||
import com.minres.scviewer.database.RelationType;
|
import com.minres.scviewer.database.RelationType;
|
||||||
import com.minres.scviewer.database.RelationTypeFactory;
|
import com.minres.scviewer.database.RelationTypeFactory;
|
||||||
import com.minres.scviewer.database.tx.ITx;
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.e4.application.Messages;
|
import com.minres.scviewer.e4.application.Messages;
|
||||||
import com.minres.scviewer.e4.application.parts.PartListener;
|
import com.minres.scviewer.e4.application.parts.PartListener;
|
||||||
import com.minres.scviewer.e4.application.parts.WaveformViewer;
|
import com.minres.scviewer.e4.application.parts.WaveformViewer;
|
||||||
@@ -130,14 +130,11 @@ public class RelationTypeToolControl extends PartListener implements ISelectionC
|
|||||||
*/
|
*/
|
||||||
protected void checkSelection(ISelection selection) {
|
protected void checkSelection(ISelection selection) {
|
||||||
if (disposed || comboViewer == null || comboViewer.getCombo().isDisposed()) return;
|
if (disposed || comboViewer == null || comboViewer.getCombo().isDisposed()) return;
|
||||||
if( selection instanceof IStructuredSelection) {
|
if (WaveformSelection.from(selection).transaction() != null && waveformViewerPart != null) {
|
||||||
Object object= ((IStructuredSelection)selection).getFirstElement();
|
comboViewer.getCombo().setEnabled(true);
|
||||||
if(object instanceof ITx && waveformViewerPart!=null){
|
comboViewer.setInput(waveformViewerPart.getSelectionRelationTypes());
|
||||||
comboViewer.getCombo().setEnabled(true);
|
comboViewer.setSelection(new StructuredSelection(waveformViewerPart.getRelationTypeFilter()));
|
||||||
comboViewer.setInput(waveformViewerPart.getSelectionRelationTypes());//getAllRelationTypes());
|
return;
|
||||||
comboViewer.setSelection(new StructuredSelection(waveformViewerPart.getRelationTypeFilter()));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(comboViewer!=null && !comboViewer.getCombo().isDisposed()) comboViewer.getCombo().setEnabled(false);
|
if(comboViewer!=null && !comboViewer.getCombo().isDisposed()) comboViewer.getCombo().setEnabled(false);
|
||||||
}
|
}
|
||||||
|
|||||||
+115
@@ -0,0 +1,115 @@
|
|||||||
|
package com.minres.scviewer.e4.application.internal.util;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
import org.eclipse.core.runtime.IStatus;
|
||||||
|
import org.eclipse.core.runtime.jobs.Job;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.IWaveformDb;
|
||||||
|
import com.minres.scviewer.database.IWaveformDbFactory;
|
||||||
|
|
||||||
|
/** Owns session replacement, callback validity, and reload monitoring, without SWT. */
|
||||||
|
public final class DatabaseSessionManager implements AutoCloseable {
|
||||||
|
private final IWaveformDbFactory factory;
|
||||||
|
private final Consumer<Runnable> dispatch;
|
||||||
|
private final Consumer<IWaveformDb> updated;
|
||||||
|
private final Consumer<IWaveformDb> filesChanged;
|
||||||
|
private final FileMonitor monitor;
|
||||||
|
private final long checkInterval;
|
||||||
|
private IWaveformDb database;
|
||||||
|
private DatabaseLoadSession session;
|
||||||
|
private List<File> files = List.of();
|
||||||
|
private IFileChangeListener watcher;
|
||||||
|
private IModificationChecker checker;
|
||||||
|
private long watchGeneration;
|
||||||
|
private boolean loading;
|
||||||
|
private boolean reloadEnabled;
|
||||||
|
private boolean closed;
|
||||||
|
|
||||||
|
public DatabaseSessionManager(IWaveformDbFactory factory, Consumer<Runnable> dispatch,
|
||||||
|
Consumer<IWaveformDb> updated, Consumer<IWaveformDb> filesChanged, long checkInterval) {
|
||||||
|
this.factory = factory;
|
||||||
|
this.dispatch = dispatch;
|
||||||
|
this.updated = updated;
|
||||||
|
this.filesChanged = filesChanged;
|
||||||
|
this.checkInterval = checkInterval;
|
||||||
|
this.monitor = new FileMonitor();
|
||||||
|
database = factory.getDatabase();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Controller methods and dispatched callbacks run on the owning thread. */
|
||||||
|
public IWaveformDb load(List<File> input, long delay, Consumer<IStatus> completion) {
|
||||||
|
if (closed) throw new IllegalStateException("Database sessions are closed");
|
||||||
|
stopWatching();
|
||||||
|
if (session != null) {
|
||||||
|
session.close();
|
||||||
|
database = factory.getDatabase();
|
||||||
|
}
|
||||||
|
files = List.copyOf(input);
|
||||||
|
IWaveformDb requested = database;
|
||||||
|
requested.setName(files.stream().map(File::getName).collect(java.util.stream.Collectors.joining(",")));
|
||||||
|
loading = true;
|
||||||
|
session = new DatabaseLoadSession(requested, files, event -> dispatch.accept(() -> {
|
||||||
|
if (isCurrent(requested)) updated.accept(requested);
|
||||||
|
}), status -> dispatch.accept(() -> {
|
||||||
|
if (!isCurrent(requested)) return;
|
||||||
|
loading = false;
|
||||||
|
completion.accept(status);
|
||||||
|
if (isCurrent(requested) && status.isOK()) startWatching();
|
||||||
|
}));
|
||||||
|
session.schedule(delay);
|
||||||
|
return requested;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IWaveformDb database() { return database; }
|
||||||
|
|
||||||
|
public boolean isCurrent(IWaveformDb requested) { return !closed && database == requested; }
|
||||||
|
|
||||||
|
public void setReloadEnabled(boolean enabled) {
|
||||||
|
reloadEnabled = enabled;
|
||||||
|
startWatching();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void checkFiles() {
|
||||||
|
if (checker != null) checker.check();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void stopWatching() {
|
||||||
|
++watchGeneration;
|
||||||
|
if (watcher != null) monitor.removeFileChangeListener(watcher);
|
||||||
|
watcher = null;
|
||||||
|
checker = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startWatching() {
|
||||||
|
stopWatching();
|
||||||
|
if (closed || loading || !reloadEnabled || session == null || !database.isLoaded()) return;
|
||||||
|
long generation = watchGeneration;
|
||||||
|
IWaveformDb requested = database;
|
||||||
|
watcher = changed -> dispatch.accept(() -> {
|
||||||
|
if (!isCurrent(requested) || !reloadEnabled || generation != watchGeneration) return;
|
||||||
|
stopWatching();
|
||||||
|
try { filesChanged.accept(requested); }
|
||||||
|
finally {
|
||||||
|
// Declining a reload acknowledges the current timestamps and resumes polling.
|
||||||
|
if (isCurrent(requested)) startWatching();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
checker = monitor.addFileChangeListener(watcher, files, checkInterval);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void close() {
|
||||||
|
if (closed) return;
|
||||||
|
closed = true;
|
||||||
|
stopWatching();
|
||||||
|
monitor.dispose();
|
||||||
|
if (session != null) session.close();
|
||||||
|
else Job.create("Close Database", progress -> {
|
||||||
|
database.close();
|
||||||
|
return org.eclipse.core.runtime.Status.OK_STATUS;
|
||||||
|
}).schedule();
|
||||||
|
}
|
||||||
|
}
|
||||||
+72
@@ -0,0 +1,72 @@
|
|||||||
|
package com.minres.scviewer.e4.application.internal.util;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
|
import org.eclipse.core.runtime.OperationCanceledException;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.DataType;
|
||||||
|
import com.minres.scviewer.database.IWaveform;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
|
import com.minres.scviewer.database.tx.TransactionLists;
|
||||||
|
|
||||||
|
/** Cached transaction headers; attribute values are visited only on explicit request. */
|
||||||
|
public final class TransactionQuery {
|
||||||
|
public record Attribute(String name, DataType type) {}
|
||||||
|
private final IWaveform waveform;
|
||||||
|
private volatile List<ITx> transactions;
|
||||||
|
private List<Attribute> attributes;
|
||||||
|
|
||||||
|
public TransactionQuery(IWaveform waveform) { this.waveform = waveform; }
|
||||||
|
|
||||||
|
public List<ITx> transactions(BooleanSupplier cancelled) {
|
||||||
|
check(cancelled);
|
||||||
|
List<ITx> result = transactions;
|
||||||
|
if (result == null) {
|
||||||
|
synchronized (this) {
|
||||||
|
result = transactions;
|
||||||
|
if (result == null) {
|
||||||
|
try {
|
||||||
|
result = waveform instanceof ITransactionProvider indexed ? indexed.getTransactionList()
|
||||||
|
: TransactionLists.fromEvents(waveform.getEvents(), cancelled);
|
||||||
|
} catch (java.util.concurrent.CancellationException e) { throw new OperationCanceledException(); }
|
||||||
|
check(cancelled);
|
||||||
|
transactions = result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
check(cancelled);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ITx> filter(Predicate<ITx> predicate, BooleanSupplier cancelled) {
|
||||||
|
List<ITx> result = new ArrayList<>();
|
||||||
|
for (ITx transaction : transactions(cancelled)) {
|
||||||
|
check(cancelled);
|
||||||
|
if (predicate.test(transaction)) result.add(transaction);
|
||||||
|
}
|
||||||
|
return List.copyOf(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized List<Attribute> discoverAttributes(BooleanSupplier cancelled) {
|
||||||
|
check(cancelled);
|
||||||
|
if (attributes != null) return attributes;
|
||||||
|
Map<String, DataType> types = new TreeMap<>();
|
||||||
|
for (ITx transaction : transactions(cancelled)) {
|
||||||
|
check(cancelled);
|
||||||
|
transaction.getAttributes().forEach(attribute -> types.putIfAbsent(attribute.getName(), attribute.getDataType()));
|
||||||
|
}
|
||||||
|
check(cancelled);
|
||||||
|
attributes = types.entrySet().stream().map(e -> new Attribute(e.getKey(), e.getValue())).toList();
|
||||||
|
return attributes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void check(BooleanSupplier cancelled) {
|
||||||
|
if (cancelled.getAsBoolean()) throw new OperationCanceledException();
|
||||||
|
}
|
||||||
|
}
|
||||||
+84
-11
@@ -1,8 +1,12 @@
|
|||||||
package com.minres.scviewer.e4.application.parts;
|
package com.minres.scviewer.e4.application.internal.util;
|
||||||
|
|
||||||
import static com.minres.scviewer.e4.application.parts.WaveformViewer.*;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.util.Properties;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -18,17 +22,84 @@ import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay;
|
|||||||
import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay;
|
import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay;
|
||||||
|
|
||||||
/** Validates the existing properties format before any viewer state is changed. */
|
/** Validates the existing properties format before any viewer state is changed. */
|
||||||
record ViewerSettings(List<Track> tracks, List<Long> cursors, Long scale, Long baseline,
|
public record ViewerSettings(List<Track> tracks, List<Long> cursors, Long scale, Long baseline,
|
||||||
Long transactionId, String transactionTrack, Boolean detailsShown) {
|
Long transactionId, String transactionTrack, Boolean detailsShown, List<File> files) {
|
||||||
record Track(String name, WaveformType type, ValueDisplay valueDisplay, WaveDisplay waveDisplay, boolean selected) {}
|
public static final String DATABASE_FILE = "DATABASE_FILE";
|
||||||
|
public static final String SHOWN_WAVEFORM = "SHOWN_WAVEFORM";
|
||||||
|
public static final String WAVEFORM_TYPE = ".WAVEFORM_TYPE";
|
||||||
|
public static final String VALUE_DISPLAY = ".VALUE_DISPLAY";
|
||||||
|
public static final String WAVE_DISPLAY = ".WAVE_DISPLAY";
|
||||||
|
public static final String SHOWN_CURSOR = "SHOWN_CURSOR";
|
||||||
|
public static final String SCALING_FACTOR = "SCALING_FACTOR";
|
||||||
|
public static final String BASE_LINE_TIME = "BASE_LINE_TIME";
|
||||||
|
public static final String SELECTED_TX_ID = "SELECTED_TX_ID";
|
||||||
|
public static final String SELECTED_TRACKENTRY_NAME = "SELECTED_TRACKENTRY_NAME";
|
||||||
|
public static final String WAVEFORM_SELECTED = ".WAVEFORM_SELECTED";
|
||||||
|
public static final String TX_DETAILS_SHOWN = "TX_DETAILS_SHOWN";
|
||||||
|
|
||||||
static ViewerSettings parse(Map<String, String> state) {
|
public record Track(String name, WaveformType type, ValueDisplay valueDisplay, WaveDisplay waveDisplay, boolean selected) {}
|
||||||
|
|
||||||
|
public ViewerSettings {
|
||||||
|
tracks = List.copyOf(tracks);
|
||||||
|
cursors = List.copyOf(cursors);
|
||||||
|
files = List.copyOf(files);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ViewerSettings read(Path path) throws IOException {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
try (java.io.InputStream input = Files.newInputStream(path)) { properties.load(input); }
|
||||||
|
Map<String, String> state = new HashMap<>();
|
||||||
|
properties.stringPropertyNames().forEach(key -> state.put(key, properties.getProperty(key)));
|
||||||
|
return parse(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void write(Path path) throws IOException {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
properties.putAll(toMap());
|
||||||
|
try (java.io.OutputStream output = Files.newOutputStream(path)) { properties.store(output, "Written by SCViewer"); }
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, String> toMap() {
|
||||||
|
Map<String, String> state = new HashMap<>();
|
||||||
|
state.put(DATABASE_FILE + "S", Integer.toString(files.size()));
|
||||||
|
for (int i = 0; i < files.size(); i++) state.put(DATABASE_FILE + i, files.get(i).getAbsolutePath());
|
||||||
|
state.put(SHOWN_WAVEFORM + "S", Integer.toString(tracks.size()));
|
||||||
|
for (int i = 0; i < tracks.size(); i++) {
|
||||||
|
Track track = tracks.get(i);
|
||||||
|
String key = SHOWN_WAVEFORM + i;
|
||||||
|
state.put(key, track.name());
|
||||||
|
if (track.type() != null) state.put(key + WAVEFORM_TYPE, track.type().name());
|
||||||
|
state.put(key + WAVEFORM_SELECTED, Boolean.toString(track.selected()));
|
||||||
|
state.put(key + VALUE_DISPLAY, track.valueDisplay().name());
|
||||||
|
state.put(key + WAVE_DISPLAY, track.waveDisplay().name());
|
||||||
|
}
|
||||||
|
state.put(SHOWN_CURSOR + "S", Integer.toString(cursors.size()));
|
||||||
|
for (int i = 0; i < cursors.size(); i++) state.put(SHOWN_CURSOR + i, cursors.get(i).toString());
|
||||||
|
if (scale != null) state.put(SCALING_FACTOR, scale.toString());
|
||||||
|
if (baseline != null) state.put(BASE_LINE_TIME, baseline.toString());
|
||||||
|
if (transactionId != null && transactionTrack != null) {
|
||||||
|
state.put(SELECTED_TX_ID, transactionId.toString());
|
||||||
|
state.put(SELECTED_TRACKENTRY_NAME, transactionTrack);
|
||||||
|
}
|
||||||
|
if (detailsShown != null) state.put(TX_DETAILS_SHOWN, detailsShown.toString());
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void replaceState(Map<String, String> state) {
|
||||||
|
state.keySet().removeIf(key -> key.startsWith(DATABASE_FILE) || key.startsWith(SHOWN_WAVEFORM)
|
||||||
|
|| key.startsWith(SHOWN_CURSOR) || key.equals(SCALING_FACTOR) || key.equals(BASE_LINE_TIME)
|
||||||
|
|| key.equals(SELECTED_TX_ID) || key.equals(SELECTED_TRACKENTRY_NAME) || key.equals(TX_DETAILS_SHOWN));
|
||||||
|
state.putAll(toMap());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ViewerSettings parse(Map<String, String> state) {
|
||||||
List<Track> tracks = new ArrayList<>();
|
List<Track> tracks = new ArrayList<>();
|
||||||
int count = count(state, SHOWN_WAVEFORM + "S");
|
int count = count(state, SHOWN_WAVEFORM + "S");
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
String key = SHOWN_WAVEFORM + i;
|
String key = SHOWN_WAVEFORM + i;
|
||||||
String name = required(state, key);
|
String name = required(state, key);
|
||||||
WaveformType type = enumeration(state, key + WAVEFORM_TYPE, WaveformType.class, null);
|
WaveformType type = "TRANSACTION".equals(state.get(key + WAVEFORM_TYPE)) ? WaveformType.STREAM
|
||||||
|
: enumeration(state, key + WAVEFORM_TYPE, WaveformType.class, null);
|
||||||
tracks.add(new Track(name, type,
|
tracks.add(new Track(name, type,
|
||||||
enumeration(state, key + VALUE_DISPLAY, ValueDisplay.class, ValueDisplay.DEFAULT),
|
enumeration(state, key + VALUE_DISPLAY, ValueDisplay.class, ValueDisplay.DEFAULT),
|
||||||
enumeration(state, key + WAVE_DISPLAY, WaveDisplay.class, WaveDisplay.DEFAULT),
|
enumeration(state, key + WAVE_DISPLAY, WaveDisplay.class, WaveDisplay.DEFAULT),
|
||||||
@@ -47,17 +118,17 @@ record ViewerSettings(List<Track> tracks, List<Long> cursors, Long scale, Long b
|
|||||||
String track = state.get(SELECTED_TRACKENTRY_NAME);
|
String track = state.get(SELECTED_TRACKENTRY_NAME);
|
||||||
if (tx != null) required(state, SELECTED_TRACKENTRY_NAME);
|
if (tx != null) required(state, SELECTED_TRACKENTRY_NAME);
|
||||||
return new ViewerSettings(List.copyOf(tracks), List.copyOf(cursors), scale, baseline,
|
return new ViewerSettings(List.copyOf(tracks), List.copyOf(cursors), scale, baseline,
|
||||||
tx, track, bool(state, TX_DETAILS_SHOWN));
|
tx, track, bool(state, TX_DETAILS_SHOWN), List.copyOf(databaseFiles(state)));
|
||||||
}
|
}
|
||||||
|
|
||||||
static List<File> databaseFiles(Map<String, String> state) {
|
public static List<File> databaseFiles(Map<String, String> state) {
|
||||||
List<File> files = new ArrayList<>();
|
List<File> files = new ArrayList<>();
|
||||||
for (int i = 0, n = count(state, DATABASE_FILE + "S"); i < n; i++)
|
for (int i = 0, n = count(state, DATABASE_FILE + "S"); i < n; i++)
|
||||||
files.add(new File(required(state, DATABASE_FILE + i)));
|
files.add(new File(required(state, DATABASE_FILE + i)));
|
||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
||||||
static IWaveform resolveWaveform(IWaveformDb database, String name) {
|
public static IWaveform resolveWaveform(IWaveformDb database, String name) {
|
||||||
IWaveform waveform = database.getStreamByName(name);
|
IWaveform waveform = database.getStreamByName(name);
|
||||||
if (waveform != null) return waveform;
|
if (waveform != null) return waveform;
|
||||||
int separator = name.lastIndexOf('.');
|
int separator = name.lastIndexOf('.');
|
||||||
@@ -68,7 +139,9 @@ record ViewerSettings(List<Track> tracks, List<Long> cursors, Long scale, Long b
|
|||||||
.filter(child -> name.substring(separator + 1).equals(child.getName())).findFirst().orElse(null);
|
.filter(child -> name.substring(separator + 1).equals(child.getName())).findFirst().orElse(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ITx findTransaction(IWaveform waveform, long id) {
|
public static ITx findTransaction(IWaveform waveform, long id) {
|
||||||
|
if (waveform instanceof com.minres.scviewer.database.tx.ITransactionProvider indexed)
|
||||||
|
return indexed.getTransaction(id);
|
||||||
for (EventEntry entry : waveform.getEvents().entrySet()) {
|
for (EventEntry entry : waveform.getEvents().entrySet()) {
|
||||||
if (entry.events == null) continue;
|
if (entry.events == null) continue;
|
||||||
for (IEvent event : entry.events)
|
for (IEvent event : entry.events)
|
||||||
+3
-4
@@ -54,6 +54,7 @@ import org.eclipse.swt.widgets.Tree;
|
|||||||
import org.eclipse.swt.widgets.TreeItem;
|
import org.eclipse.swt.widgets.TreeItem;
|
||||||
|
|
||||||
import com.minres.scviewer.database.tx.ITx;
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.database.tx.ITxAttribute;
|
import com.minres.scviewer.database.tx.ITxAttribute;
|
||||||
import com.minres.scviewer.e4.application.Messages;
|
import com.minres.scviewer.e4.application.Messages;
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
|
import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
|
||||||
@@ -393,10 +394,8 @@ public class TransactionDetails {
|
|||||||
MPart part = partService.getActivePart();
|
MPart part = partService.getActivePart();
|
||||||
if( part == null || ! (part.getObject() instanceof WaveformViewer ) || part.getObject() != waveformViewerPart)
|
if( part == null || ! (part.getObject() instanceof WaveformViewer ) || part.getObject() != waveformViewerPart)
|
||||||
return;
|
return;
|
||||||
if(treeViewer!=null && selection!=null && !treeViewer.getTree().isDisposed() &&
|
if (treeViewer != null && !treeViewer.getTree().isDisposed())
|
||||||
selection instanceof IStructuredSelection && !selection.isEmpty()) {
|
setInput(WaveformSelection.from(selection).transaction());
|
||||||
setInput(selection.getFirstElement());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+198
-277
@@ -1,316 +1,237 @@
|
|||||||
package com.minres.scviewer.e4.application.parts;
|
package com.minres.scviewer.e4.application.parts;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import org.eclipse.core.runtime.OperationCanceledException;
|
import org.eclipse.jface.viewers.ArrayContentProvider;
|
||||||
import org.eclipse.core.databinding.observable.list.ObservableList;
|
|
||||||
import org.eclipse.core.databinding.observable.list.WritableList;
|
|
||||||
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
|
|
||||||
import org.eclipse.jface.viewers.ComboViewer;
|
import org.eclipse.jface.viewers.ComboViewer;
|
||||||
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
|
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
|
||||||
import org.eclipse.jface.viewers.ISelection;
|
import org.eclipse.jface.viewers.ILazyContentProvider;
|
||||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||||
import org.eclipse.jface.viewers.LabelProvider;
|
import org.eclipse.jface.viewers.LabelProvider;
|
||||||
import org.eclipse.jface.viewers.StructuredSelection;
|
import org.eclipse.jface.viewers.StructuredSelection;
|
||||||
import org.eclipse.jface.viewers.TableViewer;
|
import org.eclipse.jface.viewers.TableViewer;
|
||||||
import org.eclipse.jface.viewers.TableViewerColumn;
|
import org.eclipse.jface.viewers.TableViewerColumn;
|
||||||
|
import org.eclipse.jface.viewers.Viewer;
|
||||||
|
import org.eclipse.jface.dialogs.MessageDialog;
|
||||||
|
import org.eclipse.core.runtime.OperationCanceledException;
|
||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.widgets.Display;
|
|
||||||
import org.eclipse.swt.events.SelectionEvent;
|
|
||||||
import org.eclipse.swt.events.SelectionListener;
|
|
||||||
import org.eclipse.swt.layout.FillLayout;
|
|
||||||
import org.eclipse.swt.layout.GridData;
|
import org.eclipse.swt.layout.GridData;
|
||||||
import org.eclipse.swt.layout.GridLayout;
|
import org.eclipse.swt.layout.GridLayout;
|
||||||
import org.eclipse.swt.widgets.Combo;
|
import org.eclipse.swt.layout.FillLayout;
|
||||||
|
import org.eclipse.swt.widgets.Button;
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
|
import org.eclipse.swt.widgets.Display;
|
||||||
import org.eclipse.swt.widgets.Label;
|
import org.eclipse.swt.widgets.Label;
|
||||||
import org.eclipse.swt.widgets.Table;
|
|
||||||
import org.eclipse.swt.widgets.TableColumn;
|
|
||||||
import org.eclipse.swt.widgets.Text;
|
import org.eclipse.swt.widgets.Text;
|
||||||
|
|
||||||
import com.minres.scviewer.database.DataType;
|
import com.minres.scviewer.database.DataType;
|
||||||
import com.minres.scviewer.database.EventEntry;
|
|
||||||
import com.minres.scviewer.database.EventKind;
|
|
||||||
import com.minres.scviewer.database.IWaveform;
|
import com.minres.scviewer.database.IWaveform;
|
||||||
import com.minres.scviewer.database.IEvent;
|
|
||||||
import com.minres.scviewer.database.tx.ITx;
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
import com.minres.scviewer.database.tx.ITxEvent;
|
|
||||||
import com.minres.scviewer.database.ui.TrackEntry;
|
import com.minres.scviewer.database.ui.TrackEntry;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.e4.application.internal.util.LatestJob;
|
import com.minres.scviewer.e4.application.internal.util.LatestJob;
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
|
import com.minres.scviewer.e4.application.internal.util.TransactionQuery;
|
||||||
|
import com.minres.scviewer.e4.application.internal.util.TransactionQuery.Attribute;
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;
|
import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.TransactionTreeNode;
|
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.TransactionTreeNodeType;
|
|
||||||
import com.minres.scviewer.e4.application.parts.txTableTree.TxFilter;
|
import com.minres.scviewer.e4.application.parts.txTableTree.TxFilter;
|
||||||
|
|
||||||
public class TransactionList extends Composite {
|
public class TransactionList extends Composite {
|
||||||
public class AttributeNameBean {
|
private final ComboViewer searchProperty;
|
||||||
public String getName() {
|
private final ComboViewer viewProperty;
|
||||||
return name;
|
private final Text searchValue;
|
||||||
}
|
private final TableViewer tableViewer;
|
||||||
public void setName(String name) {
|
private final Button loadProperties;
|
||||||
this.name = name;
|
private final AttributeLabelProvider valueProvider;
|
||||||
}
|
private final LatestJob<List<ITx>> rowsJob;
|
||||||
public DataType getType() {
|
private record PropertyDiscovery(List<Attribute> attributes, RuntimeException error) {}
|
||||||
return type;
|
private final LatestJob<PropertyDiscovery> attributesJob;
|
||||||
}
|
private final TxFilter filter = new TxFilter();
|
||||||
public void setType(DataType type) {
|
private final Runnable applyFilter = this::refreshTransactions;
|
||||||
this.type = type;
|
private List<ITx> rows = List.of();
|
||||||
}
|
private List<Attribute> attributes = List.of();
|
||||||
public AttributeNameBean(String name, DataType type) {
|
private IWaveform stream;
|
||||||
super();
|
private TrackEntry track;
|
||||||
this.name = name;
|
private TransactionQuery query;
|
||||||
this.type = type;
|
|
||||||
}
|
|
||||||
String name;
|
|
||||||
DataType type;
|
|
||||||
|
|
||||||
}
|
public TransactionList(Composite parent, int style, WaveformViewer waveformViewer) {
|
||||||
|
super(parent, style);
|
||||||
|
parent.setLayout(new FillLayout());
|
||||||
|
setLayout(new GridLayout(6, false));
|
||||||
|
label("Property to match:");
|
||||||
|
searchProperty = propertiesCombo();
|
||||||
|
searchValue = new Text(this, SWT.BORDER);
|
||||||
|
searchValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
|
||||||
|
label("Property to show:");
|
||||||
|
viewProperty = propertiesCombo();
|
||||||
|
loadProperties = new Button(this, SWT.PUSH);
|
||||||
|
loadProperties.setText("Load properties");
|
||||||
|
loadProperties.setToolTipText("Discover property names in this track; values are otherwise loaded only when needed.");
|
||||||
|
loadProperties.setEnabled(false);
|
||||||
|
|
||||||
private ComboViewer searchPropComboViewer = null;
|
tableViewer = new TableViewer(this, SWT.VIRTUAL | SWT.FULL_SELECTION | SWT.BORDER);
|
||||||
|
tableViewer.setUseHashlookup(true);
|
||||||
|
tableViewer.getTable().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 6, 1));
|
||||||
|
tableViewer.getTable().setHeaderVisible(true);
|
||||||
|
tableViewer.getTable().setLinesVisible(true);
|
||||||
|
tableViewer.setContentProvider(new ILazyContentProvider() {
|
||||||
|
@Override public void updateElement(int index) {
|
||||||
|
if (index < rows.size()) tableViewer.replace(rows.get(index), index);
|
||||||
|
}
|
||||||
|
@Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
|
||||||
|
@Override public void dispose() {}
|
||||||
|
});
|
||||||
|
column("Tx ID", 160, new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.NAME));
|
||||||
|
column("Start time", 150, new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.TX_TIME));
|
||||||
|
valueProvider = new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.VALUE);
|
||||||
|
column("Property Value", 180, valueProvider);
|
||||||
|
|
||||||
private ComboViewer viewPropComboViewer = null;
|
Display display = getDisplay();
|
||||||
|
rowsJob = new LatestJob<>(task -> { if (!display.isDisposed()) display.asyncExec(task); }, result -> {
|
||||||
|
if (isDisposed()) return;
|
||||||
|
rows = result;
|
||||||
|
tableViewer.setInput(rows);
|
||||||
|
tableViewer.setItemCount(rows.size());
|
||||||
|
});
|
||||||
|
attributesJob = new LatestJob<>(task -> { if (!display.isDisposed()) display.asyncExec(task); }, result -> {
|
||||||
|
if (isDisposed()) return;
|
||||||
|
loadProperties.setEnabled(query != null);
|
||||||
|
loadProperties.setText("Load properties");
|
||||||
|
if (result.error() != null) {
|
||||||
|
MessageDialog.openError(getShell(), "Cannot load properties", result.error().toString());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Object selected = ((IStructuredSelection) searchProperty.getSelection()).getFirstElement();
|
||||||
|
String displayedProperty = valueProvider.getShowProp();
|
||||||
|
attributes = result.attributes();
|
||||||
|
searchProperty.setInput(attributes);
|
||||||
|
viewProperty.setInput(attributes);
|
||||||
|
if (attributes.contains(selected)) searchProperty.setSelection(new StructuredSelection(selected));
|
||||||
|
else if (!attributes.isEmpty()) searchProperty.setSelection(new StructuredSelection(attributes.get(0)));
|
||||||
|
attributes.stream().filter(attribute -> attribute.name().equals(displayedProperty)).findFirst()
|
||||||
|
.ifPresent(attribute -> viewProperty.setSelection(new StructuredSelection(attribute)));
|
||||||
|
loadProperties.setEnabled(query != null);
|
||||||
|
});
|
||||||
|
addListener(SWT.Show, event -> {
|
||||||
|
getDisplay().timerExec(-1, applyFilter);
|
||||||
|
refreshTransactions();
|
||||||
|
});
|
||||||
|
searchValue.addModifyListener(event -> requestFilter(200));
|
||||||
|
searchProperty.addSelectionChangedListener(event -> {
|
||||||
|
if (event.getSelection() instanceof IStructuredSelection selected && selected.getFirstElement() instanceof Attribute attribute) {
|
||||||
|
filter.setSearchProp(attribute.name(), attribute.type());
|
||||||
|
requestFilter(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
viewProperty.addSelectionChangedListener(event -> {
|
||||||
|
if (event.getSelection() instanceof IStructuredSelection selected && selected.getFirstElement() instanceof Attribute attribute) {
|
||||||
|
valueProvider.setShowProp(attribute.name());
|
||||||
|
tableViewer.refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
loadProperties.addListener(SWT.Selection, event -> {
|
||||||
|
TransactionQuery requested = query;
|
||||||
|
if (requested == null) return;
|
||||||
|
loadProperties.setEnabled(false);
|
||||||
|
loadProperties.setText("Loading properties…");
|
||||||
|
attributesJob.schedule("Discover transaction properties", monitor -> {
|
||||||
|
try { return new PropertyDiscovery(requested.discoverAttributes(monitor::isCanceled), null); }
|
||||||
|
catch (OperationCanceledException e) { throw e; }
|
||||||
|
catch (RuntimeException e) { return new PropertyDiscovery(List.of(), e); }
|
||||||
|
});
|
||||||
|
});
|
||||||
|
tableViewer.addSelectionChangedListener(event -> {
|
||||||
|
if (event.getSelection() instanceof IStructuredSelection selected && selected.getFirstElement() instanceof ITx tx)
|
||||||
|
waveformViewer.setSelection(WaveformSelection.of(tx, track));
|
||||||
|
});
|
||||||
|
addDisposeListener(event -> {
|
||||||
|
display.timerExec(-1, applyFilter);
|
||||||
|
rowsJob.close();
|
||||||
|
attributesJob.close();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
private Text searchPropValue;
|
private void label(String text) { new Label(this, SWT.NONE).setText(text); }
|
||||||
|
|
||||||
private TableViewer tableViewer = null;
|
private ComboViewer propertiesCombo() {
|
||||||
|
ComboViewer combo = new ComboViewer(this, SWT.READ_ONLY);
|
||||||
|
combo.setContentProvider(ArrayContentProvider.getInstance());
|
||||||
|
combo.setLabelProvider(new LabelProvider() {
|
||||||
|
@Override public String getText(Object element) {
|
||||||
|
Attribute attribute = (Attribute) element;
|
||||||
|
return attribute.name() + " [" + attribute.type() + "]";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
GridData layout = new GridData(SWT.FILL, SWT.CENTER, false, false);
|
||||||
|
layout.widthHint = 140;
|
||||||
|
combo.getCombo().setLayoutData(layout);
|
||||||
|
return combo;
|
||||||
|
}
|
||||||
|
|
||||||
private LatestJob<TransactionData> updateJob;
|
private void column(String name, int width, AttributeLabelProvider provider) {
|
||||||
|
TableViewerColumn column = new TableViewerColumn(tableViewer, SWT.NONE);
|
||||||
|
column.getColumn().setText(name);
|
||||||
|
column.getColumn().setWidth(width);
|
||||||
|
column.setLabelProvider(new DelegatingStyledCellLabelProvider(provider));
|
||||||
|
}
|
||||||
|
|
||||||
private record TransactionData(List<ITx> transactions, List<AttributeNameBean> attributes) {}
|
public void setInput(TrackEntry requestedTrack) {
|
||||||
|
track = requestedTrack;
|
||||||
|
IWaveform requestedStream = track != null && track.waveform.getType().isTransaction() ? track.waveform : null;
|
||||||
|
if (requestedStream != null && stream == requestedStream) return;
|
||||||
|
getDisplay().timerExec(-1, applyFilter);
|
||||||
|
rowsJob.cancel();
|
||||||
|
attributesJob.cancel();
|
||||||
|
stream = requestedStream;
|
||||||
|
query = stream == null ? null : new TransactionQuery(stream);
|
||||||
|
rows = List.of();
|
||||||
|
attributes = List.of();
|
||||||
|
searchProperty.setInput(attributes);
|
||||||
|
viewProperty.setInput(attributes);
|
||||||
|
valueProvider.setShowProp(null);
|
||||||
|
filter.setSearchProp(null, null);
|
||||||
|
tableViewer.setInput(rows);
|
||||||
|
tableViewer.setItemCount(0);
|
||||||
|
loadProperties.setEnabled(query != null);
|
||||||
|
loadProperties.setText("Load properties");
|
||||||
|
requestFilter(0);
|
||||||
|
}
|
||||||
|
|
||||||
private TableColumn valueColumn = null;
|
private void requestFilter(int delay) {
|
||||||
|
rowsJob.cancel();
|
||||||
|
getDisplay().timerExec(-1, applyFilter);
|
||||||
|
if (!getVisible()) return;
|
||||||
|
if (delay == 0) refreshTransactions();
|
||||||
|
else getDisplay().timerExec(delay, applyFilter);
|
||||||
|
}
|
||||||
|
|
||||||
private AttributeLabelProvider valueLabelProvider = null;
|
private void refreshTransactions() {
|
||||||
|
if (isDisposed() || query == null) return;
|
||||||
|
TransactionQuery requested = query;
|
||||||
|
filter.setSearchValue(searchValue.getText());
|
||||||
|
java.util.function.Predicate<ITx> predicate = filter.snapshot();
|
||||||
|
boolean unfiltered = searchValue.getText().isEmpty();
|
||||||
|
rowsJob.schedule("Read transactions", monitor -> unfiltered ? requested.transactions(monitor::isCanceled)
|
||||||
|
: requested.filter(predicate, monitor::isCanceled));
|
||||||
|
}
|
||||||
|
|
||||||
private IWaveform stream;
|
public void focusSearch() {
|
||||||
|
if (isDisposed()) return;
|
||||||
private ObservableList<AttributeNameBean> attrNames = new WritableList<>();
|
searchValue.setFocus();
|
||||||
|
searchValue.selectAll();
|
||||||
private List<ITx> emptyList = new ArrayList<>();
|
}
|
||||||
|
|
||||||
TxFilter txFilter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create the composite.
|
|
||||||
* @param parent
|
|
||||||
* @param style
|
|
||||||
*/
|
|
||||||
public TransactionList(Composite parent, int style, WaveformViewer waveformViewer) {
|
|
||||||
super(parent, style);
|
|
||||||
parent.setLayout(new FillLayout());
|
|
||||||
|
|
||||||
setLayout(new GridLayout(5, false));
|
|
||||||
txFilter = new TxFilter();
|
|
||||||
|
|
||||||
Label lbl1 = new Label(this, SWT.NONE);
|
|
||||||
lbl1.setAlignment(SWT.RIGHT);
|
|
||||||
lbl1.setText("Property to match:");
|
|
||||||
lbl1.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
|
|
||||||
|
|
||||||
searchPropComboViewer = new ComboViewer(this, SWT.NONE);
|
|
||||||
searchPropComboViewer.setLabelProvider(new LabelProvider() {
|
|
||||||
@Override
|
|
||||||
public String getText(Object element) {
|
|
||||||
AttributeNameBean entry = (AttributeNameBean) element;
|
|
||||||
return entry.getName()+" ["+entry.getType().toString()+"]";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
searchPropComboViewer.setContentProvider(new ObservableListContentProvider<AttributeNameBean>());
|
|
||||||
searchPropComboViewer.setInput(attrNames);
|
|
||||||
Combo searchPropCombo = searchPropComboViewer.getCombo();
|
|
||||||
GridData gdSearchProp = new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1);
|
|
||||||
gdSearchProp.widthHint=100;
|
|
||||||
searchPropCombo.setLayoutData(gdSearchProp);
|
|
||||||
searchPropCombo.addSelectionListener(new SelectionListener() {
|
|
||||||
@Override
|
|
||||||
public void widgetSelected(SelectionEvent e) {
|
|
||||||
extracted(searchPropCombo);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void widgetDefaultSelected(SelectionEvent e) {
|
|
||||||
extracted(searchPropCombo);
|
|
||||||
}
|
|
||||||
private void extracted(Combo searchPropCombo) {
|
|
||||||
int idx = searchPropCombo.getSelectionIndex();
|
|
||||||
if(idx<0) return;
|
|
||||||
AttributeNameBean sel = attrNames.get(idx);
|
|
||||||
txFilter.setSearchProp(sel.getName(), sel.getType());
|
|
||||||
tableViewer.refresh();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
searchPropValue = new Text(this, SWT.BORDER);
|
|
||||||
GridData gdSearchPropValue = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
|
|
||||||
gdSearchPropValue.minimumWidth = 50;
|
|
||||||
searchPropValue.setLayoutData(gdSearchPropValue);
|
|
||||||
searchPropValue.addModifyListener(e -> {
|
|
||||||
txFilter.setSearchValue(((Text) e.widget).getText());
|
|
||||||
tableViewer.refresh();
|
|
||||||
});
|
|
||||||
|
|
||||||
Label lbl2 = new Label(this, SWT.NONE);
|
|
||||||
lbl2.setAlignment(SWT.RIGHT);
|
|
||||||
lbl2.setText("Property to show:");
|
|
||||||
lbl2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
|
|
||||||
|
|
||||||
viewPropComboViewer = new ComboViewer(this, SWT.NONE);
|
|
||||||
viewPropComboViewer.setLabelProvider(new LabelProvider() {
|
|
||||||
@Override
|
|
||||||
public String getText(Object element) {
|
|
||||||
AttributeNameBean entry = (AttributeNameBean) element;
|
|
||||||
return entry.getName()+" ["+entry.getType().toString()+"]";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
viewPropComboViewer.setContentProvider(new ObservableListContentProvider<AttributeNameBean>());
|
|
||||||
viewPropComboViewer.setInput(attrNames);
|
|
||||||
Combo viewPropCombo = viewPropComboViewer.getCombo();
|
|
||||||
GridData gdviewProp = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
|
|
||||||
gdviewProp.widthHint=100;
|
|
||||||
viewPropCombo.setLayoutData(gdviewProp);
|
|
||||||
viewPropCombo.addSelectionListener(new SelectionListener() {
|
|
||||||
@Override
|
|
||||||
public void widgetSelected(SelectionEvent e) {
|
|
||||||
int idx = viewPropCombo.getSelectionIndex();
|
|
||||||
if(idx<0) return;
|
|
||||||
valueLabelProvider.setShowProp(attrNames.get(idx).getName());
|
|
||||||
tableViewer.refresh(true);
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void widgetDefaultSelected(SelectionEvent e) { /* do nothing */ }
|
|
||||||
});
|
|
||||||
|
|
||||||
tableViewer = new TableViewer(this);
|
|
||||||
tableViewer.setContentProvider(new AbstractTransactionTreeContentProvider(waveformViewer) {
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
|
||||||
public Object[] getElements(Object inputElement) {
|
|
||||||
if (inputElement instanceof List<?>) {
|
|
||||||
return ((List<ITx>) inputElement).stream().map(tx-> new TransactionTreeNode(tx, TransactionTreeNodeType.TX)).collect(Collectors.toList()).toArray();
|
|
||||||
}
|
|
||||||
return new Object[0];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
tableViewer.addFilter(txFilter);
|
|
||||||
tableViewer.addSelectionChangedListener(event -> {
|
|
||||||
ISelection treeSelection = event.getSelection();
|
|
||||||
if(treeSelection instanceof IStructuredSelection) {
|
|
||||||
Object selected = ((IStructuredSelection)treeSelection).getFirstElement();
|
|
||||||
if(selected instanceof ITx){
|
|
||||||
waveformViewer.setSelection(new StructuredSelection(selected));
|
|
||||||
} else if(selected instanceof TransactionTreeNode && ((TransactionTreeNode)selected).type == TransactionTreeNodeType.TX) {
|
|
||||||
waveformViewer.setSelection(new StructuredSelection(((TransactionTreeNode)selected).element));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Table table = tableViewer.getTable();
|
|
||||||
table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1));
|
|
||||||
|
|
||||||
TableViewerColumn nameColumnViewer = new TableViewerColumn(tableViewer, SWT.NONE);
|
|
||||||
TableColumn nameColumn = nameColumnViewer.getColumn();
|
|
||||||
nameColumn.setWidth(200);
|
|
||||||
nameColumn.setText("Tx ID");
|
|
||||||
nameColumn.setResizable(true);
|
|
||||||
nameColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.NAME)));
|
|
||||||
|
|
||||||
TableViewerColumn timeColumnViewer = new TableViewerColumn(tableViewer, SWT.NONE);
|
|
||||||
TableColumn timeColumn = timeColumnViewer.getColumn();
|
|
||||||
timeColumn.setAlignment(SWT.RIGHT);
|
|
||||||
timeColumn.setWidth(150);
|
|
||||||
timeColumn.setText("Start time");
|
|
||||||
timeColumn.setResizable(true);
|
|
||||||
timeColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.TX_TIME)));
|
|
||||||
|
|
||||||
TableViewerColumn valueColumnViewer = new TableViewerColumn(tableViewer, SWT.NONE);
|
|
||||||
valueColumn = valueColumnViewer.getColumn();
|
|
||||||
valueColumn.setWidth(150);
|
|
||||||
valueColumn.setText("Property Value");
|
|
||||||
valueColumn.setResizable(true);
|
|
||||||
valueLabelProvider= new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.VALUE);
|
|
||||||
valueColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(valueLabelProvider));
|
|
||||||
|
|
||||||
// Turn on the header and the lines
|
|
||||||
table.setHeaderVisible(true);
|
|
||||||
table.setLinesVisible(true);
|
|
||||||
final Display display = getDisplay();
|
|
||||||
updateJob = new LatestJob<>(task -> {
|
|
||||||
if (!display.isDisposed()) display.asyncExec(task);
|
|
||||||
}, data -> {
|
|
||||||
if (isDisposed()) return;
|
|
||||||
attrNames.addAll(data.attributes());
|
|
||||||
if (!attrNames.isEmpty()) {
|
|
||||||
txFilter.setSearchProp(attrNames.get(0).getName(), attrNames.get(0).getType());
|
|
||||||
txFilter.setSearchValue(searchPropValue.getText());
|
|
||||||
}
|
|
||||||
tableViewer.setInput(data.transactions());
|
|
||||||
searchPropComboViewer.refresh();
|
|
||||||
viewPropComboViewer.refresh();
|
|
||||||
});
|
|
||||||
addDisposeListener(event -> {
|
|
||||||
updateJob.close();
|
|
||||||
attrNames.dispose();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setInput(TrackEntry trackEntry) {
|
|
||||||
final IWaveform requestedStream = trackEntry != null && trackEntry.waveform.getType().isTransaction()
|
|
||||||
? trackEntry.waveform : null;
|
|
||||||
if (requestedStream != null && stream == requestedStream) return;
|
|
||||||
updateJob.cancel();
|
|
||||||
stream = requestedStream;
|
|
||||||
attrNames.clear();
|
|
||||||
tableViewer.setInput(emptyList);
|
|
||||||
if (requestedStream == null) return;
|
|
||||||
|
|
||||||
updateJob.schedule("Read transactions", monitor -> {
|
|
||||||
final Map<String, DataType> propNames = new HashMap<>();
|
|
||||||
final List<ITx> txList = new ArrayList<>();
|
|
||||||
if (monitor.isCanceled()) throw new OperationCanceledException();
|
|
||||||
for (EventEntry entry : requestedStream.getEvents().entrySet()) {
|
|
||||||
if (monitor.isCanceled()) throw new OperationCanceledException();
|
|
||||||
if (entry.events == null) continue;
|
|
||||||
for (IEvent event : entry.events) {
|
|
||||||
if (monitor.isCanceled()) throw new OperationCanceledException();
|
|
||||||
if (event.getKind() == EventKind.BEGIN || event.getKind() == EventKind.SINGLE) {
|
|
||||||
ITx tx = ((ITxEvent) event).getTransaction();
|
|
||||||
tx.getAttributes().forEach(attr -> propNames.put(attr.getName(), attr.getDataType()));
|
|
||||||
txList.add(tx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (monitor.isCanceled()) throw new OperationCanceledException();
|
|
||||||
txList.sort((t1, t2) -> Long.compare(t1.getBeginTime(), t2.getBeginTime()));
|
|
||||||
final List<AttributeNameBean> newAttrNames = propNames.entrySet().stream()
|
|
||||||
.sorted(Map.Entry.comparingByKey())
|
|
||||||
.map(e -> new AttributeNameBean(e.getKey(), e.getValue()))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
return new TransactionData(txList, newAttrNames);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void focusSearch() {
|
|
||||||
if (isDisposed()) return;
|
|
||||||
searchPropValue.setFocus();
|
|
||||||
searchPropValue.selectAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSearchProps(String propName, DataType type, String propValue) {
|
|
||||||
for (int i = 0; i < attrNames.size(); i++) {
|
|
||||||
if (propName.equals(attrNames.get(i).getName())) {
|
|
||||||
searchPropComboViewer.setSelection(new StructuredSelection(attrNames.get(i)));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
txFilter.setSearchProp(propName, type);
|
|
||||||
txFilter.setSearchValue(propValue);
|
|
||||||
searchPropValue.setText(propValue);
|
|
||||||
tableViewer.refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
public void setSearchProps(String name, DataType type, String value) {
|
||||||
|
Attribute property = new Attribute(name, type);
|
||||||
|
if (!attributes.contains(property)) {
|
||||||
|
java.util.ArrayList<Attribute> known = new java.util.ArrayList<>(attributes);
|
||||||
|
known.add(property);
|
||||||
|
attributes = List.copyOf(known);
|
||||||
|
searchProperty.setInput(attributes);
|
||||||
|
viewProperty.setInput(attributes);
|
||||||
|
}
|
||||||
|
searchProperty.setSelection(new StructuredSelection(property));
|
||||||
|
filter.setSearchProp(name, type);
|
||||||
|
searchValue.setText(value);
|
||||||
|
requestFilter(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+2
-15
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
|
|||||||
import org.eclipse.swt.SWT;
|
import org.eclipse.swt.SWT;
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
|
|
||||||
import com.minres.scviewer.database.ui.TrackEntry;
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
|
|
||||||
public class TransactionListView {
|
public class TransactionListView {
|
||||||
private WaveformViewer waveformViewer;
|
private WaveformViewer waveformViewer;
|
||||||
@@ -60,20 +60,7 @@ public class TransactionListView {
|
|||||||
MPart part = partService.getActivePart();
|
MPart part = partService.getActivePart();
|
||||||
if( part == null || ! (part.getObject() instanceof WaveformViewer ) || part.getObject() != waveformViewer)
|
if( part == null || ! (part.getObject() instanceof WaveformViewer ) || part.getObject() != waveformViewer)
|
||||||
return;
|
return;
|
||||||
if(selection==null || selection.isEmpty())
|
transactionList.setInput(WaveformSelection.from(selection).track());
|
||||||
transactionList.setInput(null);
|
|
||||||
else if(selection instanceof IStructuredSelection) {
|
|
||||||
TrackEntry e = findTrackEntry(selection.toArray());
|
|
||||||
if(e!=null)
|
|
||||||
transactionList.setInput(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private TrackEntry findTrackEntry(Object[] elems) {
|
|
||||||
for(Object o: elems)
|
|
||||||
if(o instanceof TrackEntry)
|
|
||||||
return (TrackEntry)o;
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public TransactionList getControl() {
|
public TransactionList getControl() {
|
||||||
|
|||||||
+57
-241
@@ -11,16 +11,12 @@
|
|||||||
package com.minres.scviewer.e4.application.parts;
|
package com.minres.scviewer.e4.application.parts;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.nio.file.Path;
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
@@ -76,7 +72,6 @@ import org.osgi.service.prefs.BackingStoreException;
|
|||||||
|
|
||||||
import com.minres.scviewer.database.DataType;
|
import com.minres.scviewer.database.DataType;
|
||||||
import com.minres.scviewer.database.EmptyWaveform;
|
import com.minres.scviewer.database.EmptyWaveform;
|
||||||
import com.minres.scviewer.database.IHierNode;
|
|
||||||
import com.minres.scviewer.database.IWaveform;
|
import com.minres.scviewer.database.IWaveform;
|
||||||
import com.minres.scviewer.database.IWaveformDb;
|
import com.minres.scviewer.database.IWaveformDb;
|
||||||
import com.minres.scviewer.database.IWaveformDbFactory;
|
import com.minres.scviewer.database.IWaveformDbFactory;
|
||||||
@@ -91,18 +86,17 @@ import com.minres.scviewer.database.ui.ICursor;
|
|||||||
import com.minres.scviewer.database.ui.IWaveformView;
|
import com.minres.scviewer.database.ui.IWaveformView;
|
||||||
import com.minres.scviewer.database.ui.IWaveformviewEventListener;
|
import com.minres.scviewer.database.ui.IWaveformviewEventListener;
|
||||||
import com.minres.scviewer.database.ui.TrackEntry;
|
import com.minres.scviewer.database.ui.TrackEntry;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
import com.minres.scviewer.database.ui.ZoomKind;
|
import com.minres.scviewer.database.ui.ZoomKind;
|
||||||
import com.minres.scviewer.database.ui.swt.Constants;
|
import com.minres.scviewer.database.ui.swt.Constants;
|
||||||
import com.minres.scviewer.database.ui.swt.IToolTipContentProvider;
|
import com.minres.scviewer.database.ui.swt.IToolTipContentProvider;
|
||||||
import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider;
|
import com.minres.scviewer.database.ui.swt.IToolTipHelpTextProvider;
|
||||||
import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
|
import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
|
||||||
import com.minres.scviewer.e4.application.AppModelId;
|
import com.minres.scviewer.e4.application.AppModelId;
|
||||||
|
import com.minres.scviewer.e4.application.internal.util.ViewerSettings;
|
||||||
|
import com.minres.scviewer.e4.application.internal.util.DatabaseSessionManager;
|
||||||
import com.minres.scviewer.e4.application.Messages;
|
import com.minres.scviewer.e4.application.Messages;
|
||||||
import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
|
import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
|
||||||
import com.minres.scviewer.e4.application.internal.util.DatabaseLoadSession;
|
|
||||||
import com.minres.scviewer.e4.application.internal.util.FileMonitor;
|
|
||||||
import com.minres.scviewer.e4.application.internal.util.IFileChangeListener;
|
|
||||||
import com.minres.scviewer.e4.application.internal.util.IModificationChecker;
|
|
||||||
import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
|
import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -116,42 +110,6 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
/** The Constant ADD_WAVEFORM. */
|
/** The Constant ADD_WAVEFORM. */
|
||||||
public static final String ADD_WAVEFORM = "AddWaveform"; //$NON-NLS-1$
|
public static final String ADD_WAVEFORM = "AddWaveform"; //$NON-NLS-1$
|
||||||
|
|
||||||
/** The Constant DATABASE_FILE. */
|
|
||||||
protected static final String DATABASE_FILE = "DATABASE_FILE"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant SHOWN_WAVEFORM. */
|
|
||||||
protected static final String SHOWN_WAVEFORM = "SHOWN_WAVEFORM"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
protected static final String WAVEFORM_TYPE = ".WAVEFORM_TYPE"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
protected static final String VALUE_DISPLAY = ".VALUE_DISPLAY"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
protected static final String WAVE_DISPLAY = ".WAVE_DISPLAY"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant SHOWN_CURSOR. */
|
|
||||||
protected static final String SHOWN_CURSOR = "SHOWN_CURSOR"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant ZOOM_LEVEL. */
|
|
||||||
protected static final String SCALING_FACTOR = "SCALING_FACTOR"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant BASE_LINE_TIME. */
|
|
||||||
protected static final String BASE_LINE_TIME = "BASE_LINE_TIME"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant SELECTED_TX_ID. */
|
|
||||||
protected static final String SELECTED_TX_ID = "SELECTED_TX_ID"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant SELECTED_TRACKENTRY_NAME. */
|
|
||||||
protected static final String SELECTED_TRACKENTRY_NAME = "SELECTED_TRACKENTRY_NAME"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant WAVEFORM_SELECTED. */
|
|
||||||
protected static final String WAVEFORM_SELECTED = ".WAVEFORM_SELECTED"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant FILE_CHECK_INTERVAL. */
|
|
||||||
protected static final long FILE_CHECK_INTERVAL = 60000;
|
|
||||||
|
|
||||||
/** The Constant TX_DETAILS_SHOWN. */
|
|
||||||
protected static final String TX_DETAILS_SHOWN = "TX_DETAILS_SHOWN"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/** The Constant ID. */
|
/** The Constant ID. */
|
||||||
public static final String ID = "com.minres.scviewer.ui.TxEditorPart"; //$NON-NLS-1$
|
public static final String ID = "com.minres.scviewer.ui.TxEditorPart"; //$NON-NLS-1$
|
||||||
|
|
||||||
@@ -198,26 +156,16 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
|
|
||||||
IEclipsePreferences store = null;
|
IEclipsePreferences store = null;
|
||||||
|
|
||||||
/** The database. */
|
private DatabaseSessionManager sessions;
|
||||||
private IWaveformDb database;
|
|
||||||
|
|
||||||
private volatile DatabaseLoadSession loadSession;
|
|
||||||
|
|
||||||
private volatile boolean disposed;
|
private volatile boolean disposed;
|
||||||
|
|
||||||
private boolean loadingDatabase;
|
private boolean checkForUpdates;
|
||||||
|
|
||||||
/** The check for updates. */
|
|
||||||
private volatile boolean checkForUpdates;
|
|
||||||
|
|
||||||
private IEclipsePreferences observedPreferences;
|
private IEclipsePreferences observedPreferences;
|
||||||
|
|
||||||
private PartListener partListener;
|
private PartListener partListener;
|
||||||
|
|
||||||
private IFileChangeListener fileChangeListener;
|
|
||||||
|
|
||||||
private long fileWatchGeneration;
|
|
||||||
|
|
||||||
/** The my part. */
|
/** The my part. */
|
||||||
@Inject private MPart myPart;
|
@Inject private MPart myPart;
|
||||||
|
|
||||||
@@ -241,11 +189,6 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
/** The navigation relation type. */
|
/** The navigation relation type. */
|
||||||
private RelationType navigationRelationType=IWaveformView.NEXT_PREV_IN_STREAM ;
|
private RelationType navigationRelationType=IWaveformView.NEXT_PREV_IN_STREAM ;
|
||||||
|
|
||||||
/** The file monitor. */
|
|
||||||
FileMonitor fileMonitor = new FileMonitor();
|
|
||||||
|
|
||||||
/** The file checker. */
|
|
||||||
IModificationChecker fileChecker;
|
|
||||||
|
|
||||||
@Inject IWaveformDbFactory dbFactory;
|
@Inject IWaveformDbFactory dbFactory;
|
||||||
|
|
||||||
@@ -276,12 +219,14 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
myParent = parent;
|
myParent = parent;
|
||||||
store=prefs;
|
store=prefs;
|
||||||
showHover=hover;
|
showHover=hover;
|
||||||
database = dbFactory.getDatabase();
|
sessions = new DatabaseSessionManager(dbFactory, task -> sync.asyncExec(task),
|
||||||
|
db -> { if (!isViewerDisposed()) waveformPane.setMaxTime(db.getMaxTime()); },
|
||||||
|
db -> { if (!isViewerDisposed() && confirmReload()) reloadDatabase(); }, 60000);
|
||||||
parent.setLayout(new FillLayout(SWT.HORIZONTAL));
|
parent.setLayout(new FillLayout(SWT.HORIZONTAL));
|
||||||
|
|
||||||
IEclipseContext ctx = myPart.getContext();
|
IEclipseContext ctx = myPart.getContext();
|
||||||
ctx.set(WaveformViewer.class, this);
|
ctx.set(WaveformViewer.class, this);
|
||||||
ctx.set(IWaveformDb.class, database);
|
ctx.set(IWaveformDb.class, getDatabase());
|
||||||
|
|
||||||
topSash = new SashForm(parent, SWT.BORDER | SWT.SMOOTH | SWT.HORIZONTAL);
|
topSash = new SashForm(parent, SWT.BORDER | SWT.SMOOTH | SWT.HORIZONTAL);
|
||||||
Composite left = new Composite(topSash, SWT.NONE);
|
Composite left = new Composite(topSash, SWT.NONE);
|
||||||
@@ -390,6 +335,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
});
|
});
|
||||||
|
|
||||||
checkForUpdates = store.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
|
checkForUpdates = store.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
|
||||||
|
sessions.setReloadEnabled(checkForUpdates);
|
||||||
filesToLoad = new ArrayList<>();
|
filesToLoad = new ArrayList<>();
|
||||||
persistedState = part.getPersistedState();
|
persistedState = part.getPersistedState();
|
||||||
try {
|
try {
|
||||||
@@ -406,8 +352,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
@Override
|
@Override
|
||||||
public void partActivated(MPart part) {
|
public void partActivated(MPart part) {
|
||||||
if (part == myPart && !disposed) {
|
if (part == myPart && !disposed) {
|
||||||
if (fileChecker != null)
|
sessions.checkFiles();
|
||||||
fileChecker.check();
|
|
||||||
updateAll();
|
updateAll();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -515,8 +460,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
public void closeDatabase() {
|
public void closeDatabase() {
|
||||||
if (disposed) return;
|
if (disposed) return;
|
||||||
disposed = true;
|
disposed = true;
|
||||||
stopFileMonitoring();
|
if (sessions != null) sessions.close();
|
||||||
fileMonitor.dispose();
|
|
||||||
if (observedPreferences != null) {
|
if (observedPreferences != null) {
|
||||||
observedPreferences.removePreferenceChangeListener(this);
|
observedPreferences.removePreferenceChangeListener(this);
|
||||||
observedPreferences = null;
|
observedPreferences = null;
|
||||||
@@ -525,8 +469,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
ePartService.removePartListener(partListener);
|
ePartService.removePartListener(partListener);
|
||||||
partListener = null;
|
partListener = null;
|
||||||
}
|
}
|
||||||
fileChecker = null;
|
|
||||||
if (loadSession != null) loadSession.close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@@ -555,7 +498,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
@Optional
|
@Optional
|
||||||
public void reactOnReloadDatabaseChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.DATABASE_RELOAD) Boolean enabled) {
|
public void reactOnReloadDatabaseChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.DATABASE_RELOAD) Boolean enabled) {
|
||||||
checkForUpdates = Boolean.TRUE.equals(enabled);
|
checkForUpdates = Boolean.TRUE.equals(enabled);
|
||||||
if (!disposed && waveformPane != null) sync.asyncExec(this::startFileMonitoring);
|
if (!disposed && sessions != null) sync.asyncExec(() -> sessions.setReloadEnabled(checkForUpdates));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean isViewerDisposed() {
|
protected boolean isViewerDisposed() {
|
||||||
@@ -566,34 +509,6 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
return MessageDialog.openQuestion(myParent.getShell(), Messages.WaveformViewer_17, Messages.WaveformViewer_18);
|
return MessageDialog.openQuestion(myParent.getShell(), Messages.WaveformViewer_17, Messages.WaveformViewer_18);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void stopFileMonitoring() {
|
|
||||||
++fileWatchGeneration;
|
|
||||||
if (fileChangeListener != null) fileMonitor.removeFileChangeListener(fileChangeListener);
|
|
||||||
fileChangeListener = null;
|
|
||||||
fileChecker = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void startFileMonitoring() {
|
|
||||||
stopFileMonitoring();
|
|
||||||
if (disposed || loadingDatabase || !checkForUpdates || database == null || !database.isLoaded()
|
|
||||||
|| loadSession == null || loadSession.isCancelled()) return;
|
|
||||||
final long generation = fileWatchGeneration;
|
|
||||||
final DatabaseLoadSession requestedSession = loadSession;
|
|
||||||
fileChangeListener = files -> sync.asyncExec(() -> {
|
|
||||||
if (isViewerDisposed() || !checkForUpdates
|
|
||||||
|| loadSession != requestedSession || generation != fileWatchGeneration) return;
|
|
||||||
stopFileMonitoring();
|
|
||||||
boolean reload = false;
|
|
||||||
try {
|
|
||||||
reload = confirmReload();
|
|
||||||
} finally {
|
|
||||||
if (!reload && loadSession == requestedSession) startFileMonitoring();
|
|
||||||
}
|
|
||||||
if (reload && !disposed && loadSession == requestedSession) reloadDatabase();
|
|
||||||
});
|
|
||||||
fileChecker = fileMonitor.addFileChangeListener(fileChangeListener, List.copyOf(filesToLoad), FILE_CHECK_INTERVAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
|
* @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
|
||||||
*/
|
*/
|
||||||
@@ -613,53 +528,28 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
|
|
||||||
protected void loadDatabase(final Map<String, String> state, long delay) {
|
protected void loadDatabase(final Map<String, String> state, long delay) {
|
||||||
if (disposed) return;
|
if (disposed) return;
|
||||||
stopFileMonitoring();
|
setSelection(null);
|
||||||
if (loadSession != null) {
|
waveformPane.getStreamList().clear();
|
||||||
setSelection(null);
|
waveformPane.update();
|
||||||
loadSession.close();
|
|
||||||
waveformPane.getStreamList().clear();
|
|
||||||
waveformPane.update();
|
|
||||||
database = dbFactory.getDatabase();
|
|
||||||
}
|
|
||||||
loadingDatabase = true;
|
|
||||||
final IWaveformDb requestedDatabase = database;
|
|
||||||
final List<File> requestedFiles = List.copyOf(filesToLoad);
|
|
||||||
final Map<String, String> requestedState = state == null ? Map.of() : new HashMap<>(state);
|
final Map<String, String> requestedState = state == null ? Map.of() : new HashMap<>(state);
|
||||||
final String requestedConfig = partConfig;
|
final String requestedConfig = partConfig;
|
||||||
// An input configuration applies once; reloads preserve the current layout.
|
|
||||||
partConfig = "";
|
partConfig = "";
|
||||||
requestedDatabase.setName(requestedFiles.stream().map(File::getName).collect(java.util.stream.Collectors.joining(",")));
|
IWaveformDb requested = sessions.load(filesToLoad, delay, result -> {
|
||||||
myPart.getContext().set(IWaveformDb.class, requestedDatabase);
|
IWaveformDb current = sessions.database();
|
||||||
loadSession = new DatabaseLoadSession(requestedDatabase, requestedFiles, event -> {
|
if (isViewerDisposed()) return;
|
||||||
if (IHierNode.WAVEFORMS.equals(event.getPropertyName())
|
|
||||||
|| IHierNode.LOADING_FINISHED.equals(event.getPropertyName())) {
|
|
||||||
sync.asyncExec(() -> {
|
|
||||||
if (isCurrentDatabase(requestedDatabase))
|
|
||||||
waveformPane.setMaxTime(requestedDatabase.getMaxTime());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, result -> sync.asyncExec(() -> {
|
|
||||||
if (!isCurrentDatabase(requestedDatabase)) return;
|
|
||||||
loadingDatabase = false;
|
|
||||||
if (!result.isOK()) {
|
if (!result.isOK()) {
|
||||||
MessageDialog.openWarning(myParent.getShell(), "Error loading database", result.getMessage());
|
MessageDialog.openWarning(myParent.getShell(), "Error loading database", result.getMessage());
|
||||||
ePartService.hidePart(myPart, true);
|
ePartService.hidePart(myPart, true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
waveformPane.setMaxTime(requestedDatabase.getMaxTime());
|
waveformPane.setMaxTime(current.getMaxTime());
|
||||||
if (!requestedState.isEmpty()) restoreWaveformViewerState(requestedState);
|
if (!requestedState.isEmpty()) restoreWaveformViewerState(requestedState);
|
||||||
if (!isCurrentDatabase(requestedDatabase)) return;
|
if (isViewerDisposed() || !sessions.isCurrent(current)) return;
|
||||||
if (requestedConfig != null && !requestedConfig.isEmpty()) loadState(requestedConfig);
|
if (requestedConfig != null && !requestedConfig.isEmpty()) loadState(requestedConfig);
|
||||||
if (!isCurrentDatabase(requestedDatabase)) return;
|
if (isViewerDisposed() || !sessions.isCurrent(current)) return;
|
||||||
if (designBrowser != null) designBrowser.setWaveformDb(requestedDatabase);
|
if (designBrowser != null) designBrowser.setWaveformDb(current);
|
||||||
startFileMonitoring();
|
});
|
||||||
}));
|
myPart.getContext().set(IWaveformDb.class, requested);
|
||||||
loadSession.schedule(delay);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isCurrentDatabase(IWaveformDb requestedDatabase) {
|
|
||||||
return !disposed && !myParent.isDisposed() && database == requestedDatabase
|
|
||||||
&& loadSession != null && !loadSession.isCancelled();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void reloadDatabase() {
|
public void reloadDatabase() {
|
||||||
@@ -704,44 +594,19 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
*/
|
*/
|
||||||
@PersistState
|
@PersistState
|
||||||
public void saveState(MPart part) {
|
public void saveState(MPart part) {
|
||||||
// save changes
|
captureSettings().replaceState(part.getPersistedState());
|
||||||
Map<String, String> persistingState = part.getPersistedState();
|
|
||||||
persistingState.put(DATABASE_FILE + "S", Integer.toString(filesToLoad.size())); //$NON-NLS-1$
|
|
||||||
Integer index = 0;
|
|
||||||
for (File file : filesToLoad) {
|
|
||||||
persistingState.put(DATABASE_FILE + index, file.getAbsolutePath());
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
saveWaveformViewerState(persistingState);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void saveState(String fileName){
|
public void saveState(String fileName) {
|
||||||
Map<String, String> persistingState = new HashMap<>();
|
try { captureSettings().write(Path.of(fileName)); }
|
||||||
persistingState.put(DATABASE_FILE + "S", Integer.toString(filesToLoad.size())); //$NON-NLS-1$
|
catch (IOException | IllegalArgumentException e) {
|
||||||
Integer index = 0;
|
|
||||||
for (File file : filesToLoad) {
|
|
||||||
persistingState.put(DATABASE_FILE + index, file.getAbsolutePath());
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
saveWaveformViewerState(persistingState);
|
|
||||||
Properties props = new Properties();
|
|
||||||
props.putAll(persistingState);
|
|
||||||
|
|
||||||
try (FileOutputStream out = new FileOutputStream(fileName)) {
|
|
||||||
props.store(out, "Written by SCViewer"); //$NON-NLS-1$
|
|
||||||
} catch (IOException e) {
|
|
||||||
reportSettingsError("Cannot save settings", fileName + ": " + e.getMessage());
|
reportSettingsError("Cannot save settings", fileName + ": " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void loadState(String fileName) {
|
public void loadState(String fileName) {
|
||||||
try (FileInputStream in = new FileInputStream(fileName)) {
|
try { applySettings(ViewerSettings.read(Path.of(fileName))); }
|
||||||
Properties props = new Properties();
|
catch (IOException | IllegalArgumentException e) {
|
||||||
props.load(in);
|
|
||||||
Map<String, String> state = new HashMap<>();
|
|
||||||
for (String key : props.stringPropertyNames()) state.put(key, props.getProperty(key));
|
|
||||||
applySettings(ViewerSettings.parse(state));
|
|
||||||
} catch (IOException | IllegalArgumentException e) {
|
|
||||||
reportSettingsError("Cannot load settings", fileName + ": " + e.getMessage());
|
reportSettingsError("Cannot load settings", fileName + ": " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -757,63 +622,22 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
*
|
*
|
||||||
* @param persistingState the persisted state
|
* @param persistingState the persisted state
|
||||||
*/
|
*/
|
||||||
protected void saveWaveformViewerState(Map<String, String> persistingState) {
|
protected void saveWaveformViewerState(Map<String, String> state) {
|
||||||
persistingState.put(SHOWN_WAVEFORM + "S", Integer.toString(waveformPane.getStreamList().size())); //$NON-NLS-1$
|
captureSettings().replaceState(state);
|
||||||
Integer index = 0;
|
|
||||||
for (TrackEntry trackEntry : waveformPane.getStreamList()) {
|
|
||||||
persistingState.put(SHOWN_WAVEFORM + index, trackEntry.waveform.getFullName());
|
|
||||||
persistingState.put(SHOWN_WAVEFORM + index + WAVEFORM_TYPE, trackEntry.waveform.getType().toString());
|
|
||||||
persistingState.put(SHOWN_WAVEFORM + index + WAVEFORM_SELECTED, String.valueOf(trackEntry.selected).toUpperCase());
|
|
||||||
if (trackEntry.waveform.getType()!=WaveformType.EMPTY) {
|
|
||||||
persistingState.put(SHOWN_WAVEFORM + index + VALUE_DISPLAY, trackEntry.valueDisplay.toString());
|
|
||||||
persistingState.put(SHOWN_WAVEFORM + index + WAVE_DISPLAY, trackEntry.waveDisplay.toString());
|
|
||||||
}
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
List<ICursor> cursors = waveformPane.getCursorList();
|
|
||||||
persistingState.put(SHOWN_CURSOR + "S", Integer.toString(cursors.size())); //$NON-NLS-1$
|
|
||||||
index = 0;
|
|
||||||
for (ICursor cursor : cursors) {
|
|
||||||
persistingState.put(SHOWN_CURSOR + index, Long.toString(cursor.getTime()));
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
persistingState.put(SCALING_FACTOR, Long.toString(waveformPane.getWaveformZoom().getScale()));
|
|
||||||
persistingState.put(BASE_LINE_TIME, Long.toString(waveformPane.getWaveformZoom().getMinVisibleTime()));
|
|
||||||
|
|
||||||
persistingState.remove(SELECTED_TX_ID);
|
|
||||||
persistingState.remove(SELECTED_TRACKENTRY_NAME);
|
|
||||||
// get selected transaction of a stream
|
|
||||||
ISelection selection = waveformPane.getSelection();
|
|
||||||
if (!selection.isEmpty()) {
|
|
||||||
List<Object> sel = getISelection(selection);
|
|
||||||
if(sel.size()>1 && sel.get(0) instanceof ITx && sel.get(1) instanceof TrackEntry) {
|
|
||||||
ITx tx = (ITx) sel.get(0);
|
|
||||||
TrackEntry te = (TrackEntry) sel.get(1);
|
|
||||||
// get transaction id
|
|
||||||
persistingState.put(SELECTED_TX_ID, Long.toString(tx.getId()));
|
|
||||||
//get TrackEntry name
|
|
||||||
String name = te.waveform.getFullName();
|
|
||||||
persistingState.put(SELECTED_TRACKENTRY_NAME, name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
persistingState.put(TX_DETAILS_SHOWN, Boolean.toString(store.getBoolean(PreferenceConstants.SHOW_TX_DETAILS, false)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected List<Object> getISelection(ISelection selection){
|
private ViewerSettings captureSettings() {
|
||||||
List<Object> result = new LinkedList<> ();
|
List<ViewerSettings.Track> tracks = waveformPane.getStreamList().stream()
|
||||||
|
.map(t -> new ViewerSettings.Track(t.waveform.getFullName(), t.waveform.getType(),
|
||||||
if ( selection instanceof IStructuredSelection ) {
|
t.valueDisplay, t.waveDisplay, t.selected)).toList();
|
||||||
Iterator<?> i = ((IStructuredSelection)selection).iterator();
|
WaveformSelection selection = WaveformSelection.from(waveformPane.getSelection());
|
||||||
while (i.hasNext()){
|
boolean selectedTransaction = selection.transaction() != null && selection.track() != null;
|
||||||
Object o = i.next ();
|
return new ViewerSettings(tracks, waveformPane.getCursorList().stream().map(ICursor::getTime).toList(),
|
||||||
if (o == null) {
|
waveformPane.getWaveformZoom().getScale(), waveformPane.getWaveformZoom().getMinVisibleTime(),
|
||||||
continue;
|
selectedTransaction ? selection.transaction().getId() : null,
|
||||||
}
|
selectedTransaction ? selection.track().waveform.getFullName() : null,
|
||||||
result.add(o);
|
store.getBoolean(PreferenceConstants.SHOW_TX_DETAILS, false), List.copyOf(filesToLoad));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Restore waveform viewer state.
|
* Restore waveform viewer state.
|
||||||
@@ -838,7 +662,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
IWaveform selectedWaveform = null;
|
IWaveform selectedWaveform = null;
|
||||||
for (ViewerSettings.Track track : settings.tracks()) {
|
for (ViewerSettings.Track track : settings.tracks()) {
|
||||||
IWaveform waveform = track.type() == WaveformType.EMPTY ? new EmptyWaveform(track.name())
|
IWaveform waveform = track.type() == WaveformType.EMPTY ? new EmptyWaveform(track.name())
|
||||||
: ViewerSettings.resolveWaveform(database, track.name());
|
: ViewerSettings.resolveWaveform(getDatabase(), track.name());
|
||||||
if (waveform == null) {
|
if (waveform == null) {
|
||||||
missing.add(track.name());
|
missing.add(track.name());
|
||||||
continue;
|
continue;
|
||||||
@@ -870,7 +694,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
if (settings.detailsShown() != null) showTxDetails(settings.detailsShown());
|
if (settings.detailsShown() != null) showTxDetails(settings.detailsShown());
|
||||||
waveformPane.update();
|
waveformPane.update();
|
||||||
if (selectedTransaction != null && transactionTrack != null)
|
if (selectedTransaction != null && transactionTrack != null)
|
||||||
waveformPane.setSelection(new StructuredSelection(new Object[] {selectedTransaction, transactionTrack}));
|
waveformPane.setSelection(WaveformSelection.of(selectedTransaction, transactionTrack));
|
||||||
else waveformPane.setSelection(new StructuredSelection(selectedTracks));
|
else waveformPane.setSelection(new StructuredSelection(selectedTracks));
|
||||||
updateAll();
|
updateAll();
|
||||||
if (!missing.isEmpty() && !disposed && !myParent.isDisposed())
|
if (!missing.isEmpty() && !disposed && !myParent.isDisposed())
|
||||||
@@ -957,7 +781,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
* @return the database
|
* @return the database
|
||||||
*/
|
*/
|
||||||
public IWaveformDb getDatabase() {
|
public IWaveformDb getDatabase() {
|
||||||
return database;
|
return sessions == null ? null : sessions.database();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1149,7 +973,7 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
public List<RelationType> getAllRelationTypes() {
|
public List<RelationType> getAllRelationTypes() {
|
||||||
List<RelationType> res =new ArrayList<>();
|
List<RelationType> res =new ArrayList<>();
|
||||||
res.add(IWaveformView.NEXT_PREV_IN_STREAM);
|
res.add(IWaveformView.NEXT_PREV_IN_STREAM);
|
||||||
res.addAll(database.getAllRelationTypes());
|
res.addAll(getDatabase().getAllRelationTypes());
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1161,20 +985,12 @@ public class WaveformViewer implements IPreferenceChangeListener, DisposeListene
|
|||||||
public List<RelationType> getSelectionRelationTypes() {
|
public List<RelationType> getSelectionRelationTypes() {
|
||||||
List<RelationType> res =new ArrayList<>();
|
List<RelationType> res =new ArrayList<>();
|
||||||
res.add(IWaveformView.NEXT_PREV_IN_STREAM);
|
res.add(IWaveformView.NEXT_PREV_IN_STREAM);
|
||||||
ISelection selection = waveformPane.getSelection();
|
ITx transaction = WaveformSelection.from(waveformPane.getSelection()).transaction();
|
||||||
if(selection instanceof IStructuredSelection && !selection.isEmpty()){
|
if (transaction != null) {
|
||||||
IStructuredSelection sel=(IStructuredSelection) selection;
|
for (ITxRelation relation : transaction.getIncomingRelations())
|
||||||
if(sel.getFirstElement() instanceof ITx){
|
if (!res.contains(relation.getRelationType())) res.add(relation.getRelationType());
|
||||||
ITx tx = (ITx) sel.getFirstElement();
|
for (ITxRelation relation : transaction.getOutgoingRelations())
|
||||||
for(ITxRelation rel:tx.getIncomingRelations()){
|
if (!res.contains(relation.getRelationType())) res.add(relation.getRelationType());
|
||||||
if(!res.contains(rel.getRelationType()))
|
|
||||||
res.add(rel.getRelationType());
|
|
||||||
}
|
|
||||||
for(ITxRelation rel:tx.getOutgoingRelations()){
|
|
||||||
if(!res.contains(rel.getRelationType()))
|
|
||||||
res.add(rel.getRelationType());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -57,6 +57,14 @@ public class TxFilter extends ViewerFilter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A worker receives an independent filter, never mutable UI state. */
|
||||||
|
public java.util.function.Predicate<ITx> snapshot() {
|
||||||
|
TxFilter copy = new TxFilter();
|
||||||
|
copy.setSearchProp(searchProp, searchType);
|
||||||
|
copy.setSearchValue(searchValue);
|
||||||
|
return transaction -> copy.select(null, null, transaction);
|
||||||
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
* @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
|
* @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
|
||||||
*/
|
*/
|
||||||
@@ -70,6 +78,7 @@ public class TxFilter extends ViewerFilter {
|
|||||||
else if(element instanceof TransactionTreeNode && ((TransactionTreeNode)element).type == TransactionTreeNodeType.TX)
|
else if(element instanceof TransactionTreeNode && ((TransactionTreeNode)element).type == TransactionTreeNodeType.TX)
|
||||||
iTx = ((TransactionTreeNode)element).element;
|
iTx = ((TransactionTreeNode)element).element;
|
||||||
if(iTx==null) return true;
|
if(iTx==null) return true;
|
||||||
|
if (searchProp == null || searchType == null) return true;
|
||||||
List<ITxAttribute> res = iTx.getAttributes().stream().filter(a -> searchProp.equals(a.getName())).collect(Collectors.toList());
|
List<ITxAttribute> res = iTx.getAttributes().stream().filter(a -> searchProp.equals(a.getName())).collect(Collectors.toList());
|
||||||
if(res.size()==1) {
|
if(res.size()==1) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
|||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
org.eclipse.jdt.core.compiler.compliance=11
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
||||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=11
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+19
@@ -20,6 +20,25 @@ public class SQLiteBatchTest {
|
|||||||
@Override public Connection createConnection() throws SQLException { connections++;return super.createConnection(); }
|
@Override public Connection createConnection() throws SQLException { connections++;return super.createConnection(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void concurrentAttributeReadersShareOneCompletedLoad() throws Exception {
|
||||||
|
Database database = new Database();
|
||||||
|
ScvStream row = new ScvStream(); row.setId(1); row.setName("test"); row.setKind("test");
|
||||||
|
TxStream stream = new TxStream(database, row);
|
||||||
|
ITx transaction = stream.getTransactionList().get(0);
|
||||||
|
int before = database.connections;
|
||||||
|
java.util.concurrent.ExecutorService workers = java.util.concurrent.Executors.newFixedThreadPool(8);
|
||||||
|
java.util.concurrent.CountDownLatch start = new java.util.concurrent.CountDownLatch(1);
|
||||||
|
try {
|
||||||
|
java.util.List<java.util.concurrent.Future<java.util.List<com.minres.scviewer.database.tx.ITxAttribute>>> results = new java.util.ArrayList<>();
|
||||||
|
for (int i = 0; i < 8; i++) results.add(workers.submit(() -> { start.await(); return transaction.getAttributes(); }));
|
||||||
|
start.countDown();
|
||||||
|
java.util.List<com.minres.scviewer.database.tx.ITxAttribute> attributes = results.get(0).get(5, java.util.concurrent.TimeUnit.SECONDS);
|
||||||
|
for (java.util.concurrent.Future<?> result : results) assertSame(attributes, result.get(5, java.util.concurrent.TimeUnit.SECONDS));
|
||||||
|
assertEquals(before + 1, database.connections);
|
||||||
|
} finally { workers.shutdownNow(); }
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void loadsAllTimesInOneQueryAndSharesGeneratorTransactions() {
|
public void loadsAllTimesInOneQueryAndSharesGeneratorTransactions() {
|
||||||
Database database = new Database();
|
Database database = new Database();
|
||||||
|
|||||||
+53
@@ -0,0 +1,53 @@
|
|||||||
|
package com.minres.scviewer.database.test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.IWaveform;
|
||||||
|
import com.minres.scviewer.database.IWaveformDbLoader;
|
||||||
|
import com.minres.scviewer.database.ftr.FtrDbLoader;
|
||||||
|
import com.minres.scviewer.database.text.TextDbLoader;
|
||||||
|
import com.minres.scviewer.database.sqlite.SQLiteDbLoader;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
|
|
||||||
|
public class TransactionIndexTest {
|
||||||
|
@Test
|
||||||
|
public void transactionListsAreCachedAndLookupsRespectGeneratorMembership() throws Exception {
|
||||||
|
IWaveformDbLoader[] loaders = {new FtrDbLoader(), new TextDbLoader(), new SQLiteDbLoader()};
|
||||||
|
String[] inputs = {"my_db.ftr", "my_db.txlog", "my_sqldb.txdb"};
|
||||||
|
for (int i = 0; i < loaders.length; i++) {
|
||||||
|
IWaveformDbLoader loader = loaders[i];
|
||||||
|
try {
|
||||||
|
loader.load(TxTestSupport.input(inputs[i]));
|
||||||
|
for (IWaveform wave : loader.getAllWaves()) {
|
||||||
|
if (!wave.getType().isTransaction()) continue;
|
||||||
|
assertTrue(wave instanceof ITransactionProvider);
|
||||||
|
check((ITransactionProvider) wave);
|
||||||
|
for (com.minres.scviewer.database.IHierNode child : wave.getChildNodes()) {
|
||||||
|
if (!(child instanceof ITransactionProvider generator)) continue;
|
||||||
|
check(generator);
|
||||||
|
for (ITx transaction : ((ITransactionProvider) wave).getTransactionList())
|
||||||
|
if (transaction.getGenerator() != child) assertNull(generator.getTransaction(transaction.getId()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally { loader.dispose(); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void check(ITransactionProvider provider) {
|
||||||
|
List<ITx> transactions = provider.getTransactionList();
|
||||||
|
assertSame(transactions, provider.getTransactionList());
|
||||||
|
for (int i = 0; i < transactions.size(); i++) {
|
||||||
|
ITx transaction = transactions.get(i);
|
||||||
|
assertSame(transaction, provider.getTransaction(transaction.getId()));
|
||||||
|
if (i > 0) assertTrue(transactions.get(i - 1).compareTo(transaction) <= 0);
|
||||||
|
}
|
||||||
|
assertNull(provider.getTransaction(Long.MAX_VALUE));
|
||||||
|
try { transactions.clear(); fail("Index list must be immutable"); }
|
||||||
|
catch (UnsupportedOperationException expected) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||||
|
org.eclipse.jdt.core.compiler.compliance=17
|
||||||
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
|
org.eclipse.jdt.core.compiler.source=17
|
||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
package com.minres.scviewer.e4.application.internal.util;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.attribute.FileTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.BlockingQueue;
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.HierNode;
|
||||||
|
import com.minres.scviewer.database.IHierNode;
|
||||||
|
import com.minres.scviewer.database.IWaveform;
|
||||||
|
import com.minres.scviewer.database.IWaveformDb;
|
||||||
|
import com.minres.scviewer.database.RelationType;
|
||||||
|
|
||||||
|
public class DatabaseSessionManagerTest {
|
||||||
|
private static class Database extends HierNode implements IWaveformDb {
|
||||||
|
boolean loaded;
|
||||||
|
final CountDownLatch closed = new CountDownLatch(1);
|
||||||
|
@Override public boolean load(File file) { loaded = true; pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, true); return true; }
|
||||||
|
@Override public void close() { closed.countDown(); }
|
||||||
|
@Override public boolean isLoaded() { return loaded; }
|
||||||
|
@Override public long getMaxTime() { return 0; }
|
||||||
|
@Override public IWaveform getStreamByName(String name) { return null; }
|
||||||
|
@Override public List<IWaveform> getAllWaves() { return List.of(); }
|
||||||
|
@Override public List<RelationType> getAllRelationTypes() { return List.of(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void runUntil(BlockingQueue<Runnable> queue, BooleanSupplier finished) throws Exception {
|
||||||
|
long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5);
|
||||||
|
while (!finished.getAsBoolean()) {
|
||||||
|
Runnable task = queue.poll(Math.max(1, deadline - System.nanoTime()), TimeUnit.NANOSECONDS);
|
||||||
|
assertNotNull("Controller callback did not arrive", task);
|
||||||
|
task.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void declinedChangesResumeMonitoringAndDisabledQueuedChangesAreIgnored() throws Exception {
|
||||||
|
Path file = Files.createTempFile("session-watch", ".tmp");
|
||||||
|
BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
|
||||||
|
AtomicInteger completions = new AtomicInteger(), prompts = new AtomicInteger();
|
||||||
|
Database database = new Database();
|
||||||
|
try (DatabaseSessionManager sessions = new DatabaseSessionManager(() -> database, queue::add,
|
||||||
|
db -> {}, db -> prompts.incrementAndGet(), 60000)) {
|
||||||
|
sessions.setReloadEnabled(true);
|
||||||
|
sessions.load(List.of(file.toFile()), 0, result -> completions.incrementAndGet());
|
||||||
|
runUntil(queue, () -> completions.get() == 1);
|
||||||
|
change(file); sessions.checkFiles();
|
||||||
|
runUntil(queue, () -> prompts.get() == 1);
|
||||||
|
sessions.checkFiles();
|
||||||
|
assertTrue("Declined change should be acknowledged", queue.isEmpty());
|
||||||
|
change(file); sessions.checkFiles();
|
||||||
|
runUntil(queue, () -> prompts.get() == 2);
|
||||||
|
change(file); sessions.checkFiles();
|
||||||
|
sessions.setReloadEnabled(false);
|
||||||
|
Runnable pending = queue.poll(5, TimeUnit.SECONDS);
|
||||||
|
assertNotNull(pending); pending.run();
|
||||||
|
assertEquals(2, prompts.get());
|
||||||
|
sessions.setReloadEnabled(true);
|
||||||
|
change(file); sessions.checkFiles();
|
||||||
|
runUntil(queue, () -> prompts.get() == 3);
|
||||||
|
} finally { Files.deleteIfExists(file); }
|
||||||
|
assertTrue(database.closed.await(5, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void replacementRejectsQueuedResultsFromOldDatabase() throws Exception {
|
||||||
|
BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
|
||||||
|
Database first = new Database(), second = new Database();
|
||||||
|
AtomicInteger created = new AtomicInteger(), oldCompleted = new AtomicInteger(), newCompleted = new AtomicInteger();
|
||||||
|
List<IWaveformDb> updates = new java.util.ArrayList<>();
|
||||||
|
try (DatabaseSessionManager sessions = new DatabaseSessionManager(
|
||||||
|
() -> created.getAndIncrement() == 0 ? first : second, queue::add, updates::add, db -> {}, 60000)) {
|
||||||
|
sessions.load(List.of(new File("first")), 0, result -> oldCompleted.incrementAndGet());
|
||||||
|
Runnable oldUpdate = queue.poll(5, TimeUnit.SECONDS);
|
||||||
|
assertNotNull(oldUpdate);
|
||||||
|
sessions.load(List.of(new File("second")), 0, result -> newCompleted.incrementAndGet());
|
||||||
|
oldUpdate.run();
|
||||||
|
runUntil(queue, () -> newCompleted.get() == 1);
|
||||||
|
assertEquals(0, oldCompleted.get());
|
||||||
|
assertFalse(sessions.isCurrent(first));
|
||||||
|
assertTrue(sessions.isCurrent(second));
|
||||||
|
assertTrue(updates.stream().allMatch(db -> db == second));
|
||||||
|
}
|
||||||
|
assertTrue(first.closed.await(5, TimeUnit.SECONDS));
|
||||||
|
assertTrue(second.closed.await(5, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void change(Path file) throws Exception {
|
||||||
|
Files.setLastModifiedTime(file, FileTime.fromMillis(Files.getLastModifiedTime(file).toMillis() + 10000));
|
||||||
|
}
|
||||||
|
}
|
||||||
+94
@@ -0,0 +1,94 @@
|
|||||||
|
package com.minres.scviewer.e4.application.internal.util;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.lang.reflect.Proxy;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
import org.eclipse.core.runtime.OperationCanceledException;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.DataType;
|
||||||
|
import com.minres.scviewer.database.EmptyWaveform;
|
||||||
|
import com.minres.scviewer.database.IEventList;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.tx.ITxAttribute;
|
||||||
|
import com.minres.scviewer.database.tx.ITransactionProvider;
|
||||||
|
|
||||||
|
public class TransactionQueryTest {
|
||||||
|
private static class Waveform extends EmptyWaveform implements ITransactionProvider {
|
||||||
|
List<ITx> transactions;
|
||||||
|
int requests;
|
||||||
|
@Override public List<ITx> getTransactionList() { requests++; return transactions; }
|
||||||
|
@Override public ITx getTransaction(long id) { return transactions.stream().filter(tx -> tx.getId() == id).findFirst().orElse(null); }
|
||||||
|
@Override public IEventList getEvents() { throw new AssertionError("Indexed access must not enumerate waveform events"); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private ITx transaction(long id, AtomicInteger attributeReads) {
|
||||||
|
ITxAttribute attribute = (ITxAttribute) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{ITxAttribute.class},
|
||||||
|
(p, m, a) -> switch (m.getName()) { case "getName" -> "field"; case "getDataType" -> DataType.STRING; default -> "value"; });
|
||||||
|
return (ITx) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{ITx.class}, (p, m, a) -> {
|
||||||
|
if (m.getName().equals("getAttributes")) { attributeReads.incrementAndGet(); return List.of(attribute); }
|
||||||
|
return id;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void headerQueriesAndIndexedRestorationNeverReadAttributesOrEvents() {
|
||||||
|
AtomicInteger reads = new AtomicInteger();
|
||||||
|
Waveform wave = new Waveform();
|
||||||
|
ITx first = transaction(1, reads), second = transaction(2, reads);
|
||||||
|
wave.transactions = List.of(first, second);
|
||||||
|
TransactionQuery query = new TransactionQuery(wave);
|
||||||
|
assertSame(wave.transactions, query.transactions(() -> false));
|
||||||
|
assertSame(wave.transactions, query.transactions(() -> false));
|
||||||
|
assertEquals(1, wave.requests);
|
||||||
|
assertSame(second, ViewerSettings.findTransaction(wave, 2));
|
||||||
|
assertNull(ViewerSettings.findTransaction(wave, 3));
|
||||||
|
assertEquals(0, reads.get());
|
||||||
|
assertEquals(1, query.filter(tx -> tx.getId() == 2, () -> false).size());
|
||||||
|
assertEquals(0, reads.get());
|
||||||
|
assertEquals(List.of(new TransactionQuery.Attribute("field", DataType.STRING)), query.discoverAttributes(() -> false));
|
||||||
|
assertEquals(2, reads.get());
|
||||||
|
query.discoverAttributes(() -> false);
|
||||||
|
assertEquals("Property discovery is cached for this track", 2, reads.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void cancelledFallbackBuildCanBeRetriedForTheSameTrack() {
|
||||||
|
AtomicInteger reads = new AtomicInteger();
|
||||||
|
ITx tx = transaction(1, reads);
|
||||||
|
com.minres.scviewer.database.tx.ITxEvent event = (com.minres.scviewer.database.tx.ITxEvent) Proxy.newProxyInstance(
|
||||||
|
getClass().getClassLoader(), new Class<?>[]{com.minres.scviewer.database.tx.ITxEvent.class},
|
||||||
|
(p, m, a) -> switch (m.getName()) {
|
||||||
|
case "getTransaction" -> tx;
|
||||||
|
case "getKind" -> com.minres.scviewer.database.EventKind.SINGLE;
|
||||||
|
default -> 1L;
|
||||||
|
});
|
||||||
|
com.minres.scviewer.database.EventList.Builder builder = new com.minres.scviewer.database.EventList.Builder();
|
||||||
|
builder.add(1, event);
|
||||||
|
IEventList events = builder.build();
|
||||||
|
EmptyWaveform waveform = new EmptyWaveform() {
|
||||||
|
@Override public IEventList getEvents() { return events; }
|
||||||
|
};
|
||||||
|
TransactionQuery query = new TransactionQuery(waveform);
|
||||||
|
AtomicInteger checks = new AtomicInteger();
|
||||||
|
try { query.transactions(() -> checks.incrementAndGet() >= 2); fail("Expected cancellation"); }
|
||||||
|
catch (OperationCanceledException expected) {}
|
||||||
|
assertEquals(1, query.transactions(() -> false).size());
|
||||||
|
assertEquals(0, reads.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void cancelledQueriesStopBeforeLoadingAttributeValues() {
|
||||||
|
Waveform wave = new Waveform();
|
||||||
|
AtomicInteger reads = new AtomicInteger();
|
||||||
|
wave.transactions = List.of(transaction(1, reads));
|
||||||
|
TransactionQuery query = new TransactionQuery(wave);
|
||||||
|
try { query.discoverAttributes(() -> true); fail("Cancelled query ran"); }
|
||||||
|
catch (OperationCanceledException expected) {}
|
||||||
|
assertEquals(0, reads.get());
|
||||||
|
assertEquals(0, wave.requests);
|
||||||
|
}
|
||||||
|
}
|
||||||
-60
@@ -3,22 +3,13 @@ package com.minres.scviewer.e4.application.parts;
|
|||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
import java.lang.reflect.Proxy;
|
import java.lang.reflect.Proxy;
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.attribute.FileTime;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
|
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
|
||||||
import org.eclipse.e4.ui.di.UISynchronize;
|
|
||||||
import org.eclipse.e4.ui.workbench.modeling.EPartService;
|
import org.eclipse.e4.ui.workbench.modeling.EPartService;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import com.minres.scviewer.database.IWaveformDb;
|
|
||||||
import com.minres.scviewer.database.ui.IWaveformView;
|
|
||||||
import com.minres.scviewer.e4.application.elements.RelationTypeToolControl;
|
import com.minres.scviewer.e4.application.elements.RelationTypeToolControl;
|
||||||
import com.minres.scviewer.e4.application.internal.util.DatabaseLoadSession;
|
|
||||||
import com.minres.scviewer.e4.application.internal.util.IModificationChecker;
|
|
||||||
|
|
||||||
public class ViewerLifecycleTest {
|
public class ViewerLifecycleTest {
|
||||||
private void set(WaveformViewer viewer, String name, Object value) throws Exception {
|
private void set(WaveformViewer viewer, String name, Object value) throws Exception {
|
||||||
@@ -71,55 +62,4 @@ public class ViewerLifecycleTest {
|
|||||||
assertEquals(1, added.get()); assertEquals(1, removed.get());
|
assertEquals(1, added.get()); assertEquals(1, removed.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void decliningReloadResumesMonitoringAndPreferenceChangesTakeEffect() throws Exception {
|
|
||||||
class Viewer extends WaveformViewer {
|
|
||||||
boolean closed;
|
|
||||||
int prompts;
|
|
||||||
@Override protected boolean isViewerDisposed() { return closed; }
|
|
||||||
@Override protected boolean confirmReload() { prompts++; return false; }
|
|
||||||
@Override public void closeDatabase() { closed = true; super.closeDatabase(); }
|
|
||||||
}
|
|
||||||
Viewer viewer = new Viewer();
|
|
||||||
Path file = Files.createTempFile("scviewer-reload", ".tmp");
|
|
||||||
IWaveformDb database = (IWaveformDb) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{IWaveformDb.class},
|
|
||||||
(proxy, method, args) -> method.getName().equals("isLoaded") ? true : null);
|
|
||||||
DatabaseLoadSession session = new DatabaseLoadSession(database, List.of(file.toFile()), event -> {}, result -> {});
|
|
||||||
try {
|
|
||||||
viewer.sync = new UISynchronize() {
|
|
||||||
@Override public void syncExec(Runnable task) { task.run(); }
|
|
||||||
@Override public void asyncExec(Runnable task) { task.run(); }
|
|
||||||
@Override protected boolean isUIThread(Thread thread) { return true; }
|
|
||||||
@Override protected void showBusyWhile(Runnable task) { task.run(); }
|
|
||||||
@Override protected boolean dispatchEvents() { return false; }
|
|
||||||
};
|
|
||||||
set(viewer, "database", database); set(viewer, "loadSession", session);
|
|
||||||
set(viewer, "waveformPane", Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{IWaveformView.class},
|
|
||||||
(proxy, method, args) -> null));
|
|
||||||
viewer.filesToLoad.add(file.toFile());
|
|
||||||
viewer.reactOnReloadDatabaseChange(true);
|
|
||||||
IModificationChecker first = viewer.fileChecker;
|
|
||||||
assertNotNull(first);
|
|
||||||
change(file); first.check();
|
|
||||||
assertEquals(1, viewer.prompts); assertNotNull(viewer.fileChecker); assertNotSame(first, viewer.fileChecker);
|
|
||||||
viewer.fileChecker.check();
|
|
||||||
assertEquals("Declined change must be acknowledged", 1, viewer.prompts);
|
|
||||||
change(file); viewer.fileChecker.check();
|
|
||||||
assertEquals(2, viewer.prompts);
|
|
||||||
IModificationChecker old = viewer.fileChecker;
|
|
||||||
viewer.reactOnReloadDatabaseChange(false);
|
|
||||||
assertNull(viewer.fileChecker);
|
|
||||||
change(file); old.check();
|
|
||||||
assertEquals(2, viewer.prompts);
|
|
||||||
viewer.reactOnReloadDatabaseChange(true);
|
|
||||||
assertNotNull(viewer.fileChecker);
|
|
||||||
viewer.closeDatabase();
|
|
||||||
viewer.reactOnReloadDatabaseChange(true);
|
|
||||||
assertNull(viewer.fileChecker);
|
|
||||||
} finally { viewer.closeDatabase(); Files.deleteIfExists(file); }
|
|
||||||
}
|
|
||||||
|
|
||||||
private void change(Path file) throws Exception {
|
|
||||||
Files.setLastModifiedTime(file, FileTime.fromMillis(Files.getLastModifiedTime(file).toMillis() + 10000));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+28
@@ -1,6 +1,7 @@
|
|||||||
package com.minres.scviewer.e4.application.parts;
|
package com.minres.scviewer.e4.application.parts;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
import com.minres.scviewer.e4.application.internal.util.ViewerSettings;
|
||||||
|
|
||||||
import java.lang.reflect.Proxy;
|
import java.lang.reflect.Proxy;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
@@ -26,6 +27,16 @@ public class ViewerSettingsTest {
|
|||||||
"SHOWN_WAVEFORM0.WAVEFORM_SELECTED", "TRUE", "SHOWN_CURSORS", "1", "SHOWN_CURSOR0", "123"));
|
"SHOWN_WAVEFORM0.WAVEFORM_SELECTED", "TRUE", "SHOWN_CURSORS", "1", "SHOWN_CURSOR0", "123"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void legacyTransactionTypeIsReadAndSavedAsStream() {
|
||||||
|
Map<String, String> legacy = state();
|
||||||
|
legacy.put("SHOWN_WAVEFORM0.WAVEFORM_TYPE", "TRANSACTION");
|
||||||
|
ViewerSettings settings = ViewerSettings.parse(legacy);
|
||||||
|
assertEquals(WaveformType.STREAM, settings.tracks().get(0).type());
|
||||||
|
assertEquals("STREAM", settings.toMap().get("SHOWN_WAVEFORM0.WAVEFORM_TYPE"));
|
||||||
|
assertEquals("TRANSACTION", legacy.get("SHOWN_WAVEFORM0.WAVEFORM_TYPE"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void readsExistingFormatIncludingOptionalAndUppercaseValues() {
|
public void readsExistingFormatIncludingOptionalAndUppercaseValues() {
|
||||||
ViewerSettings settings = ViewerSettings.parse(state());
|
ViewerSettings settings = ViewerSettings.parse(state());
|
||||||
@@ -37,6 +48,23 @@ public class ViewerSettingsTest {
|
|||||||
assertNull(settings.scale());
|
assertNull(settings.scale());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void settingsRoundTripWithoutWidgetsAndRemoveObsoletePersistedEntries() throws Exception {
|
||||||
|
ViewerSettings original = ViewerSettings.parse(state());
|
||||||
|
Path file = Files.createTempFile("settings-roundtrip", ".properties");
|
||||||
|
try {
|
||||||
|
original.write(file);
|
||||||
|
assertEquals(original, ViewerSettings.read(file));
|
||||||
|
Map<String, String> persisted = new HashMap<>(Map.of("SHOWN_WAVEFORM99", "stale",
|
||||||
|
"SELECTED_TX_ID", "123", "SELECTED_TRACKENTRY_NAME", "stale", "unrelated", "retained"));
|
||||||
|
original.replaceState(persisted);
|
||||||
|
assertFalse(persisted.containsKey("SHOWN_WAVEFORM99"));
|
||||||
|
assertFalse(persisted.containsKey("SELECTED_TX_ID"));
|
||||||
|
assertEquals("retained", persisted.get("unrelated"));
|
||||||
|
assertEquals(original, ViewerSettings.parse(persisted));
|
||||||
|
} finally { Files.deleteIfExists(file); }
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void rejectsMalformedFieldsBeforeApplication() {
|
public void rejectsMalformedFieldsBeforeApplication() {
|
||||||
for (Map.Entry<String, String> entry : Map.of("SHOWN_WAVEFORMS", "-1", "SHOWN_CURSORS", "9999999999",
|
for (Map.Entry<String, String> entry : Map.of("SHOWN_WAVEFORMS", "-1", "SHOWN_CURSORS", "9999999999",
|
||||||
|
|||||||
+41
@@ -0,0 +1,41 @@
|
|||||||
|
package com.minres.scviewer.e4.application.parts;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.lang.reflect.Proxy;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.eclipse.jface.viewers.StructuredSelection;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.minres.scviewer.database.EmptyWaveform;
|
||||||
|
import com.minres.scviewer.database.tx.ITx;
|
||||||
|
import com.minres.scviewer.database.ui.TrackEntry;
|
||||||
|
import com.minres.scviewer.database.ui.WaveformSelection;
|
||||||
|
|
||||||
|
public class WaveformSelectionTest {
|
||||||
|
@Test
|
||||||
|
public void transactionAndGeneratorTrackAreIndependentOfElementOrder() {
|
||||||
|
EmptyWaveform stream = new EmptyWaveform("stream"), generator = new EmptyWaveform("generator");
|
||||||
|
ITx tx = (ITx) Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{ITx.class},
|
||||||
|
(p, m, a) -> m.getName().equals("getStream") ? stream : generator);
|
||||||
|
TrackEntry track = new TrackEntry(generator, null);
|
||||||
|
WaveformSelection selection = WaveformSelection.from(new StructuredSelection(new Object[]{track, tx}));
|
||||||
|
assertSame(tx, selection.transaction());
|
||||||
|
assertSame(track, selection.track());
|
||||||
|
assertSame(tx, selection.toSelection().getFirstElement());
|
||||||
|
assertSame(track, WaveformSelection.from(selection.toSelection()).track());
|
||||||
|
TrackEntry unrelated = new TrackEntry(new EmptyWaveform("other"), null);
|
||||||
|
assertNull(new WaveformSelection(tx, List.of(unrelated)).track());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void emptyAndTrackOnlySelectionsHaveNoStaleTransaction() {
|
||||||
|
assertNull(WaveformSelection.from(null).transaction());
|
||||||
|
assertTrue(WaveformSelection.from(StructuredSelection.EMPTY).toSelection().isEmpty());
|
||||||
|
TrackEntry track = new TrackEntry(new EmptyWaveform("stream"), null);
|
||||||
|
WaveformSelection selection = WaveformSelection.from(new StructuredSelection(track));
|
||||||
|
assertNull(selection.transaction());
|
||||||
|
assertSame(track, selection.track());
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
@@ -33,6 +33,17 @@ public class TxFilterTest {
|
|||||||
assertTrue(filter.select(null, null, transaction("text", "prefix match suffix")));
|
assertTrue(filter.select(null, null, transaction("text", "prefix match suffix")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void backgroundFilterSnapshotIsUnaffectedBySubsequentUiEdits() {
|
||||||
|
TxFilter filter = new TxFilter();
|
||||||
|
filter.setSearchProp("text", DataType.STRING);
|
||||||
|
filter.setSearchValue("old");
|
||||||
|
java.util.function.Predicate<ITx> snapshot = filter.snapshot();
|
||||||
|
filter.setSearchValue("new");
|
||||||
|
assertTrue(snapshot.test(transaction("text", "old")));
|
||||||
|
assertFalse(snapshot.test(transaction("text", "new")));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void booleanValuesCanBeMatchedWithoutAStringCast() {
|
public void booleanValuesCanBeMatchedWithoutAStringCast() {
|
||||||
TxFilter filter = new TxFilter();
|
TxFilter filter = new TxFilter();
|
||||||
|
|||||||
Reference in new issue
Block a user