diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java index f7316a5..bb06f3c 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java @@ -36,6 +36,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { /** The events. */ protected IEventList events = new EventList(); + private EventList.Builder eventBuilder = new EventList.Builder(); /** The max concurrency. */ private int rowCount = -1; @@ -69,9 +70,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { * @param evt the evt */ public void addEvent(ITxEvent evt) { - events.put(evt.getTime(), evt); + eventBuilder.add(evt.getTime(), evt); } + void finishEvents() { + if (eventBuilder != null) { + events = eventBuilder.build(); + eventBuilder = null; + } + } + /** * Gets the events at time. * diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxStream.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxStream.java index 1c7c4b5..19eeddd 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxStream.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxStream.java @@ -82,6 +82,9 @@ class TxStream extends AbstractTxStream { try { int blockId = 0; for (byte[] chunk : getChunks()) loader.parseTx(this, blockId++, chunk); + finishEvents(); + for (com.minres.scviewer.database.IHierNode child : getChildNodes()) + ((TxGenerator) child).finishEvents(); return Boolean.TRUE; } catch (InputFormatException | IOException e) { throw new IllegalStateException("Cannot parse stream " + getFullName(), e); diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java index d3df3a4..72a69e8 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java @@ -13,7 +13,6 @@ package com.minres.scviewer.database.sqlite; import java.sql.SQLException; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import com.minres.scviewer.database.EventEntry; import com.minres.scviewer.database.EventKind; @@ -77,20 +76,24 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { } @Override - public IEventList getEvents(){ - if(events==null){ - events=new EventList(); - for(Entry entry:getTransactions().entrySet()){ - putEvent(new TxEvent(EventKind.BEGIN, entry.getValue())); - putEvent(new TxEvent(EventKind.END, entry.getValue())); - } - } - return events; - } - - private void putEvent(TxEvent ev){ - events.put(ev.getTime(), ev); - } + public synchronized IEventList getEvents() { + if (events == null) { + EventList.Builder builder = new EventList.Builder(); + for (ITx tx : getTransactions().values()) { + if (tx.getBeginTime() == tx.getEndTime()) { + TxEvent single = new TxEvent(EventKind.SINGLE, tx); + builder.add(single.getTime(), single); + } else { + TxEvent begin = new TxEvent(EventKind.BEGIN, tx); + TxEvent end = new TxEvent(EventKind.END, tx); + builder.add(begin.getTime(), begin); + builder.add(end.getTime(), end); + } + } + events = builder.build(); + } + return events; + } protected abstract Map getTransactions(); diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java index 2dd1163..c19c815 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java @@ -37,6 +37,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { /** The events. */ IEventList events = new EventList(); + private EventList.Builder eventBuilder = new EventList.Builder(); /** The max concurrency. */ private int rowCount = -1; @@ -70,9 +71,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { * @param evt the evt */ public void addEvent(ITxEvent evt) { - events.put(evt.getTime(), evt); + eventBuilder.add(evt.getTime(), evt); } + void finishEvents() { + if (eventBuilder != null) { + events = eventBuilder.build(); + eventBuilder = null; + } + } + /** * Gets the events. * diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java index 36825f5..a5c3d58 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java @@ -252,7 +252,9 @@ public class TextDbLoader implements IWaveformDbLoader { } finally { transactions = parser.txSink; } - txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency); + txStreams.values().forEach(TxStream::finishEvents); + txGenerators.values().forEach(TxGenerator::finishEvents); + txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency); } /** diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java index 91cbbd8..f18d5e5 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java @@ -106,7 +106,7 @@ public class SignalPainter extends TrackPainter { EventEntry first = signal.getEvents().floorEntry(beginTime); if (first == null) first = signal.getEvents().firstEntry(); - if (first == null) return; + if (first == null || Long.compareUnsigned(first.timestamp, endTime) > 0) return; beginTime = first.timestamp; proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE)); proj.setLineStyle(SWT.LINE_SOLID); diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventList.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventList.java index d5db634..de080c9 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventList.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventList.java @@ -7,6 +7,36 @@ import java.util.NoSuchElementException; /** Sorted timestamp buckets. Range views are read-only and bounded by their parent. */ public class EventList implements IEventList { + /** Accumulates unsorted events and freezes timestamp buckets with one sort and one allocation per bucket. */ + public static final class Builder { + private record TimedEvent(long time, IEvent event) { } + private final ArrayList pending = new ArrayList<>(); + private boolean built; + + public void add(long time, IEvent event) { + if (built) throw new IllegalStateException("Event list has already been built"); + pending.add(new TimedEvent(time, event)); + } + + public EventList build() { + if (built) throw new IllegalStateException("Event list has already been built"); + pending.sort((a, b) -> Long.compareUnsigned(a.time(), b.time())); + ArrayList entries = new ArrayList<>(); + for (int first = 0; first < pending.size();) { + long time = pending.get(first).time(); + int next = first + 1; + while (next < pending.size() && pending.get(next).time() == time) next++; + IEvent[] events = new IEvent[next - first]; + for (int i = first; i < next; ++i) events[i - first] = pending.get(i).event(); + entries.add(new EventEntry(time, events)); + first = next; + } + built = true; + pending.clear(); + return new EventList(entries, 0, entries.size(), true); + } + } + private final ArrayList store; private final int start; private int end; diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEventList.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEventList.java index 7561c16..78f793b 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEventList.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEventList.java @@ -70,9 +70,9 @@ public interface IEventList extends Iterable { * {@code fromKey} to {@code toKey}. If {@code fromKey} and * {@code toKey} are equal, the returned map is empty unless * {@code fromInclusive} is true. The - * returned map is backed by this map, so changes in the returned map are - * reflected in this map, and vice-versa. The returned map supports all - * optional map operations that this map supports. + * returned view is read-only. Do not structurally modify a mutable source + * while a view is in use. EventList.Builder produces frozen sources suitable + * for sharing range views. * * @param fromKey low endpoint of the keys in the returned map * @param fromInclusive {@code true} if the low endpoint diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/EventListBuilderTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/EventListBuilderTest.java new file mode 100644 index 0000000..7b25b2c --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/EventListBuilderTest.java @@ -0,0 +1,32 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import org.junit.Test; +import com.minres.scviewer.database.*; + +public class EventListBuilderTest { + @Test + public void sortsAndPreservesSameTimeInsertionOrder() { + EventList.Builder builder = new EventList.Builder(); + TxTestSupport.Tx tx = new TxTestSupport.Tx(1, 0, 10); + IEvent begin = new TxTestSupport.Event(tx, EventKind.BEGIN); + IEvent end = new TxTestSupport.Event(tx, EventKind.END); + builder.add(10, begin);builder.add(2, end);builder.add(10, end); + builder.add(Long.MIN_VALUE, begin);builder.add(Long.MAX_VALUE, end); + EventList list = builder.build(); + assertEquals(4, list.size()); + assertEquals(2, list.firstKey()); + assertArrayEquals(new IEvent[] {begin, end}, list.get(10)); + assertEquals(Long.MIN_VALUE, list.lastKey()); + try { list.put(5, begin); fail(); } catch (UnsupportedOperationException expected) { } + try { builder.add(5, begin); fail(); } catch (IllegalStateException expected) { } + } + + @Test + public void handlesManyEventsAtOneTimestampAndEmptyInput() { + EventList.Builder builder = new EventList.Builder(); + for (int i = 0; i < 10000; ++i) builder.add(5, null); + assertEquals(10000, builder.build().get(5).length); + assertNull(new EventList.Builder().build().firstEntry()); + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TransactionReaderTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TransactionReaderTest.java new file mode 100644 index 0000000..110f0ea --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TransactionReaderTest.java @@ -0,0 +1,38 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import java.util.HashMap; +import java.util.Map; +import org.junit.Test; +import com.minres.scviewer.database.*; +import com.minres.scviewer.database.text.TextDbLoader; +import com.minres.scviewer.database.tx.ITxEvent; + +public class TransactionReaderTest { + @Test + public void textAndTruncatedRecordingsHaveConsistentRows() throws Exception { + for (String input : new String[] {"my_db.txlog", "my_db_truncated.txlog"}) { + TextDbLoader loader = new TextDbLoader(); + try { + loader.load(TxTestSupport.input(input)); + assertFalse(loader.getAllWaves().isEmpty()); + for (IWaveform wave : loader.getAllWaves()) { + int rows = wave.getRowCount(); + Map begun = new HashMap<>(); + for (EventEntry entry : wave.getEvents()) for (IEvent raw : entry.events) { + ITxEvent event = (ITxEvent) raw; + assertTrue(event.getRowIndex() >= 0 && event.getRowIndex() < rows); + assertTrue(event.getTransaction().getEndTime() >= event.getTransaction().getBeginTime()); + if (event.getKind() == EventKind.BEGIN) + begun.put(event.getTransaction().getId(), event.getRowIndex()); + else if (event.getKind() == EventKind.END) + assertEquals(begun.remove(event.getTransaction().getId()), Integer.valueOf(event.getRowIndex())); + } + assertTrue(begun.isEmpty()); + try { wave.getEvents().put(1, null); fail("Frozen event list"); } + catch (UnsupportedOperationException expected) { } + } + } finally { loader.dispose(); } + } + } +}