diff --git a/plugins/com.minres.scviewer.database.fst/src/com/minres/scviewer/database/fst/FstSignal.java b/plugins/com.minres.scviewer.database.fst/src/com/minres/scviewer/database/fst/FstSignal.java index 9765844..8f085cf 100644 --- a/plugins/com.minres.scviewer.database.fst/src/com/minres/scviewer/database/fst/FstSignal.java +++ b/plugins/com.minres.scviewer.database.fst/src/com/minres/scviewer/database/fst/FstSignal.java @@ -17,6 +17,7 @@ import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.LazyValue; import com.minres.scviewer.database.WaveformType; public class FstSignal extends HierNode implements IWaveform { @@ -31,7 +32,7 @@ public class FstSignal extends HierNode implements IWaveform { private final int width; - private final IEventList values; + private final LazyValue values; public FstSignal(FstDbLoader loader, String name) { this(loader, 0, name, 0, 1); @@ -48,7 +49,7 @@ public class FstSignal extends HierNode implements IWaveform { this.id=id; this.direction = direction; this.width=width; - this.values=new EventList(); + this.values=new LazyValue<>(); } public FstSignal(FstSignal o, int id, String name) { @@ -73,9 +74,11 @@ public class FstSignal extends HierNode implements IWaveform { @Override public IEventList getEvents() { - if(values.size()==0) - loader.getEvents(id, width, values); - return values; + return values.get(() -> { + EventList loaded = new EventList(); + loader.getEvents(id, width, loaded); + return loaded; + }); } @Override @@ -89,7 +92,7 @@ public class FstSignal extends HierNode implements IWaveform { if(e==null) return new IEvent[] {}; else - return getEvents().floorEntry(time).events; + return e.events; } @Override diff --git a/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF index 8ca4e45..9859d23 100644 --- a/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Service-Component: OSGI-INF/component.xml Bundle-ActivationPolicy: lazy Automatic-Module-Name: com.minres.scviewer.database.ftr Bundle-ClassPath: . +Export-Package: com.minres.scviewer.database.ftr;x-friends:="com.minres.scviewer.database.test" 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 310407b..3e23253 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 @@ -82,7 +82,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { */ @Override public IEvent[] getEventsAtTime(long time) { - return events.get(time); + return getEvents().get(time); } /** @@ -93,11 +93,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { */ @Override public IEvent[] getEventsBeforeTime(long time) { - EventEntry e = events.floorEntry(time); + EventEntry e = getEvents().floorEntry(time); if (e == null) return new IEvent[] {}; else - return events.floorEntry(time).events; + return e.events; } /** diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java index 85ab7c7..41364bd 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java @@ -344,7 +344,7 @@ public class FtrDbLoader implements IWaveformDbLoader { } } } catch (IOException e) { - LOG.error("Error parsing file "+file.getName(), e); + throw new IllegalStateException("Cannot parse attributes in " + file.getName(), e); } return ret; } diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrTx.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrTx.java index c227bd3..8db452d 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrTx.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrTx.java @@ -11,10 +11,10 @@ package com.minres.scviewer.database.ftr; import java.io.Serializable; -import java.util.ArrayList; import java.util.List; import com.minres.scviewer.database.InputFormatException; +import com.minres.scviewer.database.LazyValue; import com.minres.scviewer.database.tx.ITxAttribute; /** @@ -41,7 +41,7 @@ class FtrTx implements Serializable { long endTime; /** The attributes. */ - final List attributes = new ArrayList<>(); + private final LazyValue> attributes = new LazyValue<>(); final long blockId; @@ -75,15 +75,14 @@ class FtrTx implements Serializable { } public List getAttributes(FtrDbLoader loader) { - if(attributes.size()==0) - try { - final TxStream stream = loader.txStreams.get(streamId); - final byte[] chunk = stream.getChunks().get((int)blockId); - attributes.addAll(loader.parseAtrributes(chunk, blockOffset)); - } catch (InputFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return attributes; - } + return attributes.get(() -> { + try { + TxStream stream = loader.txStreams.get(streamId); + byte[] chunk = stream.getChunks().get((int) blockId); + return List.copyOf(loader.parseAtrributes(chunk, blockOffset)); + } catch (InputFormatException e) { + throw new IllegalStateException("Cannot read attributes for transaction " + id, e); + } + }); + } } diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java index d6bf0fe..d8ba9b0 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java @@ -10,14 +10,12 @@ *******************************************************************************/ package com.minres.scviewer.database.ftr; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IWaveform; -import com.minres.scviewer.database.InputFormatException; /** * The Class TxGenerator. @@ -65,21 +63,7 @@ class TxGenerator extends AbstractTxStream { */ @Override public IEventList getEvents() { - if(stream.events.size()==0) { - try { - List chunks = stream.getChunks(); - int blockid = 0; - for (byte[] bs : chunks) { - loader.parseTx(stream, blockid++, bs); - } - } catch (InputFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + stream.loadStream(); return events; } /** 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 5243b40..1c7c4b5 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 @@ -17,6 +17,7 @@ import java.util.List; import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.LazyValue; import com.minres.scviewer.database.InputFormatException; /** @@ -29,7 +30,8 @@ class TxStream extends AbstractTxStream { final ArrayList fileOffsets = new ArrayList<>(); - final ArrayList chunks = new ArrayList<>(); + private final LazyValue> chunks = new LazyValue<>(); + private final LazyValue parsed = new LazyValue<>(); /** * Instantiates a new tx stream. @@ -66,37 +68,32 @@ class TxStream extends AbstractTxStream { } public List getChunks() throws InputFormatException { - if(chunks.size()==0) { - chunks.addAll(loader.getChunksAtOffsets(fileOffsets)); - } - return chunks; - } + return chunks.get(() -> { + try { + return List.copyOf(loader.getChunksAtOffsets(fileOffsets)); + } catch (InputFormatException e) { + throw new IllegalStateException("Cannot read stream " + getFullName(), e); + } + }); + } - public void loadStream() { - if(chunks.size()>0) return; - try { - List chunks = getChunks(); - int blockid = 0; - for (byte[] bs : chunks) { - loader.parseTx(this, blockid, bs); - blockid++; - } - } catch (InputFormatException e) { - } catch (IOException e) { - } - } - /** - * Gets the events. - * - * @return the events - */ - @Override - public IEventList getEvents() { - if(events.size()==0) { - loadStream(); - } - return events; - } + public void loadStream() { + parsed.get(() -> { + try { + int blockId = 0; + for (byte[] chunk : getChunks()) loader.parseTx(this, blockId++, chunk); + return Boolean.TRUE; + } catch (InputFormatException | IOException e) { + throw new IllegalStateException("Cannot parse stream " + getFullName(), e); + } + }); + } + + @Override + public IEventList getEvents() { + loadStream(); + return events; + } @Override public DirectionType getDirection() { diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/LazyValue.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/LazyValue.java new file mode 100644 index 0000000..6f202c6 --- /dev/null +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/LazyValue.java @@ -0,0 +1,31 @@ +package com.minres.scviewer.database; + +import java.util.function.Supplier; + +/** Publishes one complete value, including empty values, and preserves loading failures. */ +public final class LazyValue { + private enum State { UNLOADED, LOADING, LOADED, FAILED } + private State state = State.UNLOADED; + private T value; + private Throwable failure; + + public synchronized T get(Supplier supplier) { + if (state == State.LOADED) return value; + if (state == State.FAILED) { + if (failure instanceof Error) throw (Error) failure; + throw (RuntimeException) failure; + } + if (state == State.LOADING) throw new IllegalStateException("Recursive lazy loading"); + state = State.LOADING; + try { + T loaded = supplier.get(); + value = loaded; + state = State.LOADED; + return loaded; + } catch (RuntimeException | Error e) { + failure = e; + state = State.FAILED; + throw e; + } + } +} diff --git a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF index c3fb9b0..730155f 100644 --- a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF +++ b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF @@ -9,6 +9,7 @@ Require-Bundle: com.minres.scviewer.database, com.minres.scviewer.database.sqlite;bundle-version="1.0.0", com.minres.scviewer.database.text;bundle-version="1.0.0", com.minres.scviewer.database.vcd;bundle-version="1.0.0", + com.minres.scviewer.database.ftr, org.junit Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/FtrLoadingTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/FtrLoadingTest.java new file mode 100644 index 0000000..07a5f33 --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/FtrLoadingTest.java @@ -0,0 +1,33 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import java.lang.reflect.Method; +import org.junit.Test; +import com.minres.scviewer.database.IEventList; +import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.ftr.FtrDbLoader; + +public class FtrLoadingTest { + @Test + public void cachedChunksStillParseEvents() throws Exception { + for (String name : new String[] {"my_db.ftr", "my_db_c.ftr"}) { + FtrDbLoader loader = new FtrDbLoader(); + try { + loader.load(TxTestSupport.input(name)); + IWaveform stream = loader.getAllWaves().stream() + .filter(w -> w.getClass().getSimpleName().equals("TxStream") && w.getId() == 1) + .findFirst().get(); + Method chunks = stream.getClass().getMethod("getChunks"); + chunks.setAccessible(true); + chunks.invoke(stream); + assertNotNull(stream.getEventsAtTime(0)); + IEventList events = stream.getEvents(); + assertEquals(27, events.size()); + assertSame(events, stream.getEvents()); + assertEquals(2, stream.getRowCount()); + for (IWaveform wave : loader.getAllWaves()) wave.getEvents(); + assertEquals(27, stream.getEvents().size()); + } finally { loader.dispose(); } + } + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/LazyValueTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/LazyValueTest.java new file mode 100644 index 0000000..a8a0b9d --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/LazyValueTest.java @@ -0,0 +1,37 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.Test; +import com.minres.scviewer.database.LazyValue; + +public class LazyValueTest { + @Test + public void concurrentEmptyValueLoadsOnce() throws Exception { + LazyValue> lazy = new LazyValue<>(); + AtomicInteger calls = new AtomicInteger(); + ExecutorService executor = Executors.newFixedThreadPool(8); + try { + List>> tasks = new ArrayList<>(); + for (int i = 0; i < 100; ++i) tasks.add(() -> lazy.get(() -> { + calls.incrementAndGet(); + return java.util.Collections.emptyList(); + })); + for (Future> result : executor.invokeAll(tasks)) assertTrue(result.get().isEmpty()); + assertEquals(1, calls.get()); + } finally { executor.shutdownNow(); } + } + + @Test + public void preservesFailureWithoutRetry() { + LazyValue lazy = new LazyValue<>(); + IllegalStateException failure = new IllegalStateException("Invalid input"); + for (int i = 0; i < 2; ++i) { + try { lazy.get(() -> { throw failure; }); fail("Expected failure"); } + catch (IllegalStateException e) { assertSame(failure, e); } + } + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java index 2f247cb..ef152cc 100644 --- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java @@ -13,6 +13,11 @@ import com.minres.scviewer.database.tx.ITxEvent; import com.minres.scviewer.database.tx.ITxRelation; final class TxTestSupport { + static java.io.File input(String name) { + java.io.File local = new java.io.File("inputs/" + name); + return local.exists() ? local : new java.io.File("tests/com.minres.scviewer.database.test/inputs/" + name); + } + static class Tx implements ITx { final long id, begin, end; Tx(long id, long begin, long end) { this.id = id; this.begin = begin; this.end = end; }