Compare commits

..
1 Commits
Author SHA1 Message Date
eyck 8abf90a221 Merge branch 'release/2.19.5' into develop 2026-04-10 09:37:57 +02:00
176 changed files with 1581 additions and 4299 deletions

No files matched your search

-11
View File
@@ -14,15 +14,4 @@
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997756</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
-4
View File
@@ -1,4 +0,0 @@
{
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable",
"java.autobuild.enabled": false
}
-17
View File
@@ -5,24 +5,7 @@
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997726</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
+1 -1
View File
@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
@@ -20,15 +20,4 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997692</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
@@ -10,25 +10,8 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997737</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>1.1.0-SNAPSHOT</version> <version>1.1.0-SNAPSHOT</version>
@@ -10,25 +10,8 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997741</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
@@ -10,25 +10,8 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997745</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
@@ -20,15 +20,4 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997752</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -2,7 +2,7 @@
<feature <feature
id="com.minres.scviewer.feature" id="com.minres.scviewer.feature"
label="%featureName" label="%featureName"
version="2.20.0" version="2.19.5"
provider-name="%providerName"> provider-name="%providerName">
<description> <description>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
</project> </project>
@@ -10,25 +10,8 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature> <nature>org.eclipse.pde.FeatureNature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997772</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>1.1.0-SNAPSHOT</version> <version>1.1.0-SNAPSHOT</version>
@@ -25,26 +25,9 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997695</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -17,7 +17,6 @@ import com.minres.scviewer.database.HierNode;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.LazyValue;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
public class FstSignal<T extends IEvent> extends HierNode implements IWaveform { public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
@@ -32,7 +31,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
private final int width; private final int width;
private final LazyValue<IEventList> values; private final IEventList values;
public FstSignal(FstDbLoader loader, String name) { public FstSignal(FstDbLoader loader, String name) {
this(loader, 0, name, 0, 1); this(loader, 0, name, 0, 1);
@@ -49,7 +48,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
this.id=id; this.id=id;
this.direction = direction; this.direction = direction;
this.width=width; this.width=width;
this.values=new LazyValue<>(); this.values=new EventList();
} }
public FstSignal(FstSignal<T> o, int id, String name) { public FstSignal(FstSignal<T> o, int id, String name) {
@@ -74,11 +73,9 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
@Override @Override
public IEventList getEvents() { public IEventList getEvents() {
return values.get(() -> { if(values.size()==0)
EventList loaded = new EventList(); loader.getEvents(id, width, values);
loader.getEvents(id, width, loaded); return values;
return loaded;
});
} }
@Override @Override
@@ -92,7 +89,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
if(e==null) if(e==null)
return new IEvent[] {}; return new IEvent[] {};
else else
return e.events; return getEvents().floorEntry(time).events;
} }
@Override @Override
@@ -36,15 +36,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997699</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -16,4 +16,3 @@ Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Automatic-Module-Name: com.minres.scviewer.database.ftr Automatic-Module-Name: com.minres.scviewer.database.ftr
Bundle-ClassPath: . Bundle-ClassPath: .
Export-Package: com.minres.scviewer.database.ftr;x-friends:="com.minres.scviewer.database.test"
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -10,12 +10,9 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.ftr; package com.minres.scviewer.database.ftr;
import java.util.ArrayList;
import java.util.HashMap;
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;
@@ -23,27 +20,13 @@ import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.TxRowAllocator; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent; import com.minres.scviewer.database.tx.ITxEvent;
/** /**
* The Class AbstractTxStream. * The Class AbstractTxStream.
*/ */
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider { abstract class AbstractTxStream extends HierNode implements IWaveform {
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;
@@ -55,7 +38,6 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
/** The events. */ /** The events. */
protected IEventList events = new EventList(); protected IEventList events = new EventList();
private EventList.Builder eventBuilder = new EventList.Builder();
/** The max concurrency. */ /** The max concurrency. */
private int rowCount = -1; private int rowCount = -1;
@@ -89,14 +71,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
* @param evt the evt * @param evt the evt
*/ */
public void addEvent(ITxEvent evt) { public void addEvent(ITxEvent evt) {
eventBuilder.add(evt.getTime(), evt); events.put(evt.getTime(), evt);
}
void finishEvents() {
if (eventBuilder != null) {
events = eventBuilder.build();
eventBuilder = null;
}
} }
/** /**
@@ -107,7 +82,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
*/ */
@Override @Override
public IEvent[] getEventsAtTime(long time) { public IEvent[] getEventsAtTime(long time) {
return getEvents().get(time); return events.get(time);
} }
/** /**
@@ -118,11 +93,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
*/ */
@Override @Override
public IEvent[] getEventsBeforeTime(long time) { public IEvent[] getEventsBeforeTime(long time) {
EventEntry e = getEvents().floorEntry(time); EventEntry e = events.floorEntry(time);
if (e == null) if (e == null)
return new IEvent[] {}; return new IEvent[] {};
else else
return e.events; return events.floorEntry(time).events;
} }
/** /**
@@ -132,7 +107,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
*/ */
@Override @Override
public WaveformType getType() { public WaveformType getType() {
return WaveformType.STREAM; return WaveformType.TRANSACTION;
} }
/** /**
@@ -151,7 +126,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
* @return the width * @return the width
*/ */
@Override @Override
public synchronized int getRowCount() { public int getRowCount() {
if (rowCount<0) if (rowCount<0)
calculateConcurrency(); calculateConcurrency();
return rowCount; return rowCount;
@@ -165,16 +140,46 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
/** /**
* Calculate concurrency. * Calculate concurrency.
*/ */
synchronized void calculateConcurrency() { void calculateConcurrency() {
if (rowCount >= 0) return; if (rowCount>=0)
int count = TxRowAllocator.assign(getEvents(), (event, row) -> { return;
((TxEvent) event).setConcurrencyIndex(row); ArrayList<Long> rowEndTime = new ArrayList<>();
Tx tx = (Tx) event.getTransaction(); HashMap<Long, Integer> rowByTxId = new HashMap<>();
if (this instanceof TxGenerator) tx.setConcurrencyIdxInGen(row); for(EventEntry entry: getEvents()) {
else tx.setConcurrencyIndxInStream(row); for(IEvent evt:entry.events) {
}); TxEvent txEvt = (TxEvent) evt;
for (com.minres.scviewer.database.IHierNode child : getChildNodes()) ITx tx = txEvt.getTransaction();
((TxGenerator) child).calculateConcurrency(); int rowIdx = 0;
rowCount = count; switch(evt.getKind()) {
case END: //TODO: might throw NPE in concurrent execution
Long txId = txEvt.getTransaction().getId();
Integer row = rowByTxId.get(txId);
if(row!=null) {
txEvt.setConcurrencyIndex(row);
rowByTxId.remove(txId);
}
break;
case SINGLE:
for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
if (rowEndTime.size() <= rowIdx)
rowEndTime.add(tx.getEndTime());
else
rowEndTime.set(rowIdx, tx.getEndTime());
((TxEvent) evt).setConcurrencyIndex(rowIdx);
break;
case BEGIN:
for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
if (rowEndTime.size() <= rowIdx)
rowEndTime.add(tx.getEndTime());
else
rowEndTime.set(rowIdx, tx.getEndTime());
((TxEvent) evt).setConcurrencyIndex(rowIdx);
rowByTxId.put(tx.getId(), rowIdx);
break;
}
}
}
rowCount=rowEndTime.size()>0?rowEndTime.size():1;
getChildNodes().parallelStream().forEach(c -> ((TxGenerator)c).calculateConcurrency());
} }
} }
@@ -76,8 +76,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
final Map<Long, FtrTx> transactions = UnifiedMap.newMap(); final Map<Long, FtrTx> transactions = UnifiedMap.newMap();
/** The attribute types. */ /** The attribute types. */
private record AttributeKey(String name, DataType type, AssociationType association) { } final Map<String, TxAttributeType> attributeTypes = UnifiedMap.newMap();
final Map<AttributeKey, TxAttributeType> attributeTypes = UnifiedMap.newMap();
/** The relations in. */ /** The relations in. */
final HashMultimap<Long, FtrRelation> relationsIn = HashMultimap.create(); final HashMultimap<Long, FtrRelation> relationsIn = HashMultimap.create();
@@ -178,17 +177,19 @@ public class FtrDbLoader implements IWaveformDbLoader {
* @throws InputFormatException the input format exception * @throws InputFormatException the input format exception
*/ */
@Override @Override
public synchronized void load(File file) throws InputFormatException { public void load(File file) throws InputFormatException {
dispose(); this.file=file;
this.file = file;
try { try {
fis = new FileInputStream(file); fis = new FileInputStream(file);
FileChannel channel = fis.getChannel(); FileChannel channel = fis.getChannel();
lock = channel.lock(0, Long.MAX_VALUE, true); lock=channel.lock(0, Long.MAX_VALUE, true);
parseInput(new CborDecoder(fis), channel); parseInput(new CborDecoder(fis), channel);
} catch (IOException e) {
LOG.warn("Problem parsing file "+file.getName()+": " , e);
} catch (Exception e) { } catch (Exception e) {
dispose(); LOG.error("Error parsing file "+file.getName()+ ": ", e);
throw new InputFormatException("Cannot parse " + file.getName(), e); transactions.clear();
throw new InputFormatException(e.toString());
} }
} }
@@ -211,7 +212,8 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
} catch (Exception e) { } catch (Exception e) {
LOG.error("Error parsing file "+file.getName(), e); LOG.error("Error parsing file "+file.getName(), e);
throw new InputFormatException("Cannot read FTR chunks", e); transactions.clear();
throw new InputFormatException(e.toString());
} }
return ret; return ret;
} }
@@ -219,7 +221,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException { void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException {
CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk)); CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk));
long size = cborDecoder.readArrayLength(); long size = cborDecoder.readArrayLength();
if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1"); assert(size==-1);
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long blockOffset = cborDecoder.getPos(); long blockOffset = cborDecoder.getPos();
@@ -231,7 +233,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
switch((int)tag) { switch((int)tag) {
case 6: // id/generator/start/end case 6: // id/generator/start/end
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); assert(len==4);
txId = cborDecoder.readInt(); txId = cborDecoder.readInt();
genId = cborDecoder.readInt(); genId = cborDecoder.readInt();
long startTime = cborDecoder.readInt()*time_scale_factor; long startTime = cborDecoder.readInt()*time_scale_factor;
@@ -243,18 +245,18 @@ public class FtrDbLoader implements IWaveformDbLoader {
FtrTx scvTx = new FtrTx(txId, stream.getId(), genId, startTime, endTime, blockId, blockOffset); FtrTx scvTx = new FtrTx(txId, stream.getId(), genId, startTime, endTime, blockId, blockOffset);
updateTransactions(txId, scvTx); updateTransactions(txId, scvTx);
if (scvTx.beginTime == scvTx.endTime) { if (scvTx.beginTime == scvTx.endTime) {
stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime, stream.getType())); stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime, gen.getType())); gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
} else { } else {
stream.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime, stream.getType())); stream.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime));
gen.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime, gen.getType())); gen.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime));
stream.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime, stream.getType())); stream.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime));
gen.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime, gen.getType())); gen.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime));
} }
break; break;
default: { // skip over 7:begin attr, 8:record attr, 9:end attr default: { // skip over 7:begin attr, 8:record attr, 9:end attr
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3"); assert(sz==3);
cborDecoder.readInt(); cborDecoder.readInt();
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
switch(DataType.values()[(int)type_id]) { switch(DataType.values()[(int)type_id]) {
@@ -296,7 +298,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
switch((int)tag) { switch((int)tag) {
case 6: // id/generator/start/end case 6: // id/generator/start/end
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); assert(len==4);
cborDecoder.readInt(); //txid cborDecoder.readInt(); //txid
cborDecoder.readInt(); // genId cborDecoder.readInt(); // genId
cborDecoder.readInt(); // startTime cborDecoder.readInt(); // startTime
@@ -304,7 +306,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
break; break;
default: { // skip over 7:begin attr, 8:record attr, 9:end attr default: { // skip over 7:begin attr, 8:record attr, 9:end attr
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3"); assert(sz==3);
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
DataType type = DataType.values()[(int)type_id]; DataType type = DataType.values()[(int)type_id];
@@ -342,41 +344,37 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
} }
} catch (IOException e) { } catch (IOException e) {
throw new IllegalStateException("Cannot parse attributes in " + file.getName(), e); LOG.error("Error parsing file "+file.getName(), e);
} }
return ret; return ret;
} }
private synchronized TxAttributeType getOrAddAttributeType(long tag, DataType type, String attrName) { private synchronized TxAttributeType getOrAddAttributeType(long tag, DataType type, String attrName) {
AssociationType association = AssociationType.values()[(int) tag - 7]; if(!attributeTypes.containsKey(attrName)) {
AttributeKey key = new AttributeKey(attrName, type, association); attributeTypes.put(attrName, new TxAttributeType(attrName, type, AssociationType.values()[(int)tag-7]));
return attributeTypes.computeIfAbsent(key, k -> new TxAttributeType(k.name(), k.type(), k.association())); }
TxAttributeType attrType = attributeTypes.get(attrName);
return attrType;
} }
/** /**
* Dispose. * Dispose.
*/ */
@Override @Override
public synchronized void dispose() { public void dispose() {
try { if (lock != null) lock.close(); } try {
catch (IOException e) { LOG.warn("Cannot release FTR lock", e); } if(lock!=null) lock.close();
finally { lock = null; } lock=null;
try { if (fis != null) fis.close(); } if(fis!=null) fis.close();
catch (IOException e) { LOG.warn("Cannot close FTR file", e); } fis=null;
finally { fis = null; } } catch (IOException e) { }
attrValues.clear(); attrValues.clear();
relationTypes.clear(); relationTypes.clear();
txStreams.clear(); txStreams.clear();
txGenerators.clear(); txGenerators.clear();
transactions.clear(); transactions.clear();
txCache.clear();
strDict.clear();
attributeTypes.clear(); attributeTypes.clear();
relationsIn.clear(); relationsIn.clear();
relationsOut.clear(); relationsOut.clear();
threads.clear();
maxTime = 0;
time_scale_factor = 1000L;
file = null;
} }
static long calculateTimescaleMultipierPower(long power){ static long calculateTimescaleMultipierPower(long power){
@@ -390,11 +388,12 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
} }
public void parseInput(CborDecoder cborDecoder, FileChannel channel) throws IOException { public void parseInput(CborDecoder cborDecoder, FileChannel channel) {
try {
long cbor_tag = cborDecoder.readTag(); long cbor_tag = cborDecoder.readTag();
if (!(cbor_tag == 55799)) throw new IOException("Invalid FTR structure: cbor_tag == 55799"); assert(cbor_tag == 55799);
long array_len = cborDecoder.readArrayLength(); long array_len = cborDecoder.readArrayLength();
if (!(array_len==-1)) throw new IOException("Invalid FTR structure: array_len==-1"); assert(array_len==-1);
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long tag = cborDecoder.readTag(); long tag = cborDecoder.readTag();
@@ -402,12 +401,12 @@ public class FtrDbLoader implements IWaveformDbLoader {
case 6: { // info case 6: { // info
CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString())); CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString()));
long sz = cbd.readArrayLength(); long sz = cbd.readArrayLength();
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); assert(sz==2);
long time_scale=cbd.readInt(); long time_scale=cbd.readInt();
long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale; long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale;
time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale); time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale);
long epoch_tag = cbd.readTag(); long epoch_tag = cbd.readTag();
if (!(epoch_tag==1)) throw new IOException("Invalid FTR structure: epoch_tag==1"); assert(epoch_tag==1);
cbd.readInt(); // epoch cbd.readInt(); // epoch
break; break;
} }
@@ -417,7 +416,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 9: { // dictionary compressed case 9: { // dictionary compressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); assert(sz==2);
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
@@ -428,14 +427,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 11: { // directory compressed case 11: { // directory compressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); assert(sz==2);
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
} }
case 12: { //tx chunk uncompressed case 12: { //tx chunk uncompressed
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); assert(len==4);
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
cborDecoder.readInt(); // start time of block cborDecoder.readInt(); // start time of block
long end_time = cborDecoder.readInt()*time_scale_factor; long end_time = cborDecoder.readInt()*time_scale_factor;
@@ -446,7 +445,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 13: { //tx chunk compressed case 13: { //tx chunk compressed
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==5)) throw new IOException("Invalid FTR structure: len==5"); assert(len==5);
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
cborDecoder.readInt(); // start time of block cborDecoder.readInt(); // start time of block
long end_time = cborDecoder.readInt()*time_scale_factor; long end_time = cborDecoder.readInt()*time_scale_factor;
@@ -462,7 +461,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 15: { // relations uncompressed case 15: { // relations uncompressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); assert(sz==2);
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
@@ -470,6 +469,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
next = cborDecoder.peekType(); next = cborDecoder.peekType();
} }
} catch(IOException e) {
long pos = 0;
try {pos=channel.position(); } catch (Exception ee) {}
LOG.error("Error parsing file input stream at position" + pos, e);
}
} }
private void parseDict(CborDecoder cborDecoder) throws IOException { private void parseDict(CborDecoder cborDecoder) throws IOException {
@@ -477,7 +481,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
ArrayList<String> lst = new ArrayList<>((int)size); ArrayList<String> lst = new ArrayList<>((int)size);
for(long i = 0; i<size; ++i) { for(long i = 0; i<size; ++i) {
long idx = cborDecoder.readInt(); long idx = cborDecoder.readInt();
if (!(idx==strDict.size()+lst.size())) throw new IOException("Invalid FTR structure: idx==strDict.size()+lst.size()"); assert(idx==strDict.size()+lst.size());
lst.add(cborDecoder.readTextString()); lst.add(cborDecoder.readTextString());
} }
strDict.addAll(lst); strDict.addAll(lst);
@@ -501,14 +505,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
long id = cborDecoder.readTag(); long id = cborDecoder.readTag();
if(id==16) { // a stream if(id==16) { // a stream
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==3)) throw new IOException("Invalid FTR structure: len==3"); assert(len==3);
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long kind_id = cborDecoder.readInt(); long kind_id = cborDecoder.readInt();
add(stream_id, new TxStream(this, stream_id, strDict.get((int)name_id), strDict.get((int)kind_id))); add(stream_id, new TxStream(this, stream_id, strDict.get((int)name_id), strDict.get((int)kind_id)));
} else if(id==17) { // a generator } else if(id==17) { // a generator
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
if (!(len==3)) throw new IOException("Invalid FTR structure: len==3"); assert(len==3);
long gen_id = cborDecoder.readInt(); long gen_id = cborDecoder.readInt();
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
@@ -521,18 +525,18 @@ public class FtrDbLoader implements IWaveformDbLoader {
private void parseRel(CborDecoder cborDecoder) throws IOException { private void parseRel(CborDecoder cborDecoder) throws IOException {
long size = cborDecoder.readArrayLength(); long size = cborDecoder.readArrayLength();
if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1"); assert(size==-1);
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
if (!(sz==5 || sz==3)) throw new IOException("Invalid FTR structure: sz==5 || sz==3"); assert(sz==5 || sz==3);
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
long from_id = cborDecoder.readInt(); long from_id = cborDecoder.readInt();
long to_id = cborDecoder.readInt(); long to_id = cborDecoder.readInt();
long from_fiber = sz>3?cborDecoder.readInt():-1; long from_fiber = sz>3?cborDecoder.readInt():-1;
long to_fiber = sz>3?cborDecoder.readInt():-1; long to_fiber = sz>3?cborDecoder.readInt():-1;
String rel_name = strDict.get((int)type_id); String rel_name = strDict.get((int)type_id);
FtrRelation ftrRel = new FtrRelation(relationTypes.computeIfAbsent(rel_name, RelationTypeFactory::create), from_id, to_id, from_fiber, to_fiber); FtrRelation ftrRel = new FtrRelation(relationTypes.getOrDefault(rel_name, RelationTypeFactory.create(rel_name)), from_id, to_id, from_fiber, to_fiber);
relationsOut.put(from_id, ftrRel); relationsOut.put(from_id, ftrRel);
relationsIn.put(to_id, ftrRel); relationsIn.put(to_id, ftrRel);
next = cborDecoder.peekType(); next = cborDecoder.peekType();
@@ -11,10 +11,10 @@
package com.minres.scviewer.database.ftr; package com.minres.scviewer.database.ftr;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.InputFormatException; import com.minres.scviewer.database.InputFormatException;
import com.minres.scviewer.database.LazyValue;
import com.minres.scviewer.database.tx.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
/** /**
@@ -41,7 +41,7 @@ class FtrTx implements Serializable {
long endTime; long endTime;
/** The attributes. */ /** The attributes. */
private final LazyValue<List<ITxAttribute>> attributes = new LazyValue<>(); final List<ITxAttribute> attributes = new ArrayList<>();
final long blockId; final long blockId;
@@ -75,14 +75,15 @@ class FtrTx implements Serializable {
} }
public List<ITxAttribute> getAttributes(FtrDbLoader loader) { public List<ITxAttribute> getAttributes(FtrDbLoader loader) {
return attributes.get(() -> { if(attributes.size()==0)
try { try {
TxStream stream = loader.txStreams.get(streamId); final TxStream stream = loader.txStreams.get(streamId);
byte[] chunk = stream.getChunks().get((int) blockId); final byte[] chunk = stream.getChunks().get((int)blockId);
return List.copyOf(loader.parseAtrributes(chunk, blockOffset)); attributes.addAll(loader.parseAtrributes(chunk, blockOffset));
} catch (InputFormatException e) { } catch (InputFormatException e) {
throw new IllegalStateException("Cannot read attributes for transaction " + id, e); // TODO Auto-generated catch block
e.printStackTrace();
} }
}); return attributes;
} }
} }
@@ -38,9 +38,6 @@ class Tx implements ITx {
private final long streamId; private final long streamId;
private volatile int concurrencyIndxInStream = -1;
private volatile int concurrencyIdxInGen = -1;
/** The begin time. */ /** The begin time. */
long beginTime = -1; long beginTime = -1;
@@ -178,26 +175,6 @@ class Tx implements ITx {
return loader.txGenerators.get(generatorId); return loader.txGenerators.get(generatorId);
} }
@Override
public int getConcurrencyIndxInStream() {
if (concurrencyIndxInStream < 0) getStream().getRowCount();
return concurrencyIndxInStream;
}
@Override
public int getConcurrencyIdxInGen() {
if (concurrencyIdxInGen < 0) getGenerator().getRowCount();
return concurrencyIdxInGen;
}
void setConcurrencyIndxInStream(int index) {
concurrencyIndxInStream = index;
}
void setConcurrencyIdxInGen(int index) {
concurrencyIdxInGen = index;
}
/** /**
* Gets the begin time. * Gets the begin time.
* *
@@ -26,8 +26,6 @@ class TxEvent implements ITxEvent {
/** The kind. */ /** The kind. */
final EventKind kind; final EventKind kind;
private final WaveformType waveformType;
/** The transaction. */ /** The transaction. */
final long transaction; final long transaction;
@@ -42,14 +40,12 @@ class TxEvent implements ITxEvent {
* @param kind the kind * @param kind the kind
* @param transaction the transaction * @param transaction the transaction
* @param time the time * @param time the time
* @param waveformType the type of the owning waveform
*/ */
TxEvent(FtrDbLoader loader, EventKind kind, Long transaction, Long time, WaveformType waveformType) { TxEvent(FtrDbLoader loader, EventKind kind, Long transaction, Long time) {
this.loader = loader; this.loader = loader;
this.kind = kind; this.kind = kind;
this.transaction = transaction; this.transaction = transaction;
this.time = time; this.time = time;
this.waveformType = waveformType;
} }
/** /**
@@ -60,7 +56,7 @@ class TxEvent implements ITxEvent {
*/ */
@Override @Override
public ITxEvent duplicate() throws CloneNotSupportedException { public ITxEvent duplicate() throws CloneNotSupportedException {
return new TxEvent(loader, kind, transaction, time, waveformType); return new TxEvent(loader, kind, transaction, time);
} }
/** /**
@@ -73,6 +69,16 @@ class TxEvent implements ITxEvent {
return kind.toString() + "@" + time + " of tx #" + transaction; return kind.toString() + "@" + time + " of tx #" + transaction;
} }
/**
* Gets the type.
*
* @return the type
*/
@Override
public WaveformType getType() {
return WaveformType.TRANSACTION;
}
/** /**
* Gets the kind. * Gets the kind.
* *
@@ -10,13 +10,14 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.ftr; package com.minres.scviewer.database.ftr;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.InputFormatException;
/** /**
* The Class TxGenerator. * The Class TxGenerator.
@@ -46,11 +47,6 @@ class TxGenerator extends AbstractTxStream {
stream.addChild(this); stream.addChild(this);
} }
@Override
public WaveformType getType() {
return WaveformType.GENERATOR;
}
/** /**
* Checks if is same. * Checks if is same.
* *
@@ -69,7 +65,21 @@ class TxGenerator extends AbstractTxStream {
*/ */
@Override @Override
public IEventList getEvents() { public IEventList getEvents() {
stream.loadStream(); if(stream.events.size()==0) {
try {
List<byte[]> 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();
}
}
return events; return events;
} }
/** /**
@@ -10,11 +10,11 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.ftr; package com.minres.scviewer.database.ftr;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.LazyValue;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
@@ -82,29 +82,7 @@ class TxRelation implements ITxRelation {
final long txId; final long txId;
private final LazyValue<ITx> resolved = new LazyValue<>(); ITx tx = null;
private ITx resolve() {
return resolved.get(() -> {
ITx transaction = loader.getTransaction(txId);
if (transaction != null) return transaction;
TxStream stream = loader.txStreams.get(fiberId);
if (stream != null) {
stream.loadStream();
transaction = loader.getTransaction(txId);
} else if (fiberId < 0) {
// Older FTR relations do not record the endpoint stream.
for (TxStream candidate : loader.txStreams.values()) {
candidate.loadStream();
transaction = loader.getTransaction(txId);
if (transaction != null) break;
}
}
if (transaction == null)
throw new IllegalStateException("Missing related transaction " + txId + " in stream " + fiberId);
return transaction;
});
}
public TxFacade(long fiberId, long txId) { public TxFacade(long fiberId, long txId) {
this.fiberId = fiberId; this.fiberId = fiberId;
@@ -113,9 +91,7 @@ class TxRelation implements ITxRelation {
@Override @Override
public int compareTo(ITx o) { public int compareTo(ITx o) {
if (this == o) return 0; return tx==null?-1:tx.compareTo(o);
int cmp = Long.compare(getBeginTime(), o.getBeginTime());
return cmp != 0 ? cmp : Long.compare(getId(), o.getId());
} }
@Override @Override
@@ -125,52 +101,52 @@ class TxRelation implements ITxRelation {
@Override @Override
public IWaveform getStream() { public IWaveform getStream() {
return resolve().getStream(); if(tx==null) {
TxStream fiber = loader.txStreams.get(fiberId);
fiber.loadStream();
tx = loader.getTransaction(txId);
return fiber;
} else
return tx.getStream();
} }
@Override @Override
public IWaveform getGenerator() { public IWaveform getGenerator() {
return resolve().getGenerator(); if(tx==null) {
loader.txStreams.get(fiberId).loadStream();
tx = loader.getTransaction(txId);
} }
return tx!=null?tx.getGenerator():null;
@Override
public int getConcurrencyIndxInStream() {
return resolve().getConcurrencyIndxInStream();
}
@Override
public int getConcurrencyIdxInGen() {
return resolve().getConcurrencyIdxInGen();
} }
@Override @Override
public long getBeginTime() { public long getBeginTime() {
return resolve().getBeginTime(); return tx==null?-1:tx.getBeginTime();
} }
@Override @Override
public long getEndTime() { public long getEndTime() {
return resolve().getEndTime(); return tx==null?-1:tx.getBeginTime();
} }
@Override @Override
public List<ITxAttribute> getAttributes() { public List<ITxAttribute> getAttributes() {
return resolve().getAttributes(); return tx==null?new ArrayList<>():tx.getAttributes();
} }
@Override @Override
public Collection<ITxRelation> getIncomingRelations() { public Collection<ITxRelation> getIncomingRelations() {
return resolve().getIncomingRelations(); return tx==null?new ArrayList<>():tx.getIncomingRelations();
} }
@Override @Override
public Collection<ITxRelation> getOutgoingRelations() { public Collection<ITxRelation> getOutgoingRelations() {
return resolve().getOutgoingRelations(); return tx==null?new ArrayList<>():tx.getOutgoingRelations();
} }
@Override @Override
public String toString() { public String toString() {
return "tx#" + txId + "[related transaction]"; return tx==null?("tx#" + getId() + "[not available]"):tx.toString();
} }
} }
} }
@@ -17,7 +17,6 @@ import java.util.List;
import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.LazyValue;
import com.minres.scviewer.database.InputFormatException; import com.minres.scviewer.database.InputFormatException;
/** /**
@@ -30,8 +29,7 @@ class TxStream extends AbstractTxStream {
final ArrayList<Long> fileOffsets = new ArrayList<>(); final ArrayList<Long> fileOffsets = new ArrayList<>();
private final LazyValue<List<byte[]>> chunks = new LazyValue<>(); final ArrayList<byte[]> chunks = new ArrayList<>();
private final LazyValue<Boolean> parsed = new LazyValue<>();
/** /**
* Instantiates a new tx stream. * Instantiates a new tx stream.
@@ -68,33 +66,35 @@ class TxStream extends AbstractTxStream {
} }
public List<byte[]> getChunks() throws InputFormatException { public List<byte[]> getChunks() throws InputFormatException {
return chunks.get(() -> { if(chunks.size()==0) {
try { chunks.addAll(loader.getChunksAtOffsets(fileOffsets));
return List.copyOf(loader.getChunksAtOffsets(fileOffsets));
} catch (InputFormatException e) {
throw new IllegalStateException("Cannot read stream " + getFullName(), e);
} }
}); return chunks;
} }
public void loadStream() { public void loadStream() {
parsed.get(() -> { if(chunks.size()>0) return;
try { try {
int blockId = 0; List<byte[]> chunks = getChunks();
for (byte[] chunk : getChunks()) loader.parseTx(this, blockId++, chunk); int blockid = 0;
finishEvents(); for (byte[] bs : chunks) {
for (com.minres.scviewer.database.IHierNode child : getChildNodes()) loader.parseTx(this, blockid, bs);
((TxGenerator) child).finishEvents(); blockid++;
return Boolean.TRUE;
} catch (InputFormatException | IOException e) {
throw new IllegalStateException("Cannot parse stream " + getFullName(), e);
} }
}); } catch (InputFormatException e) {
} catch (IOException e) {
} }
}
/**
* Gets the events.
*
* @return the events
*/
@Override @Override
public IEventList getEvents() { public IEventList getEvents() {
if(events.size()==0) {
loadStream(); loadStream();
}
return events; return events;
} }
@@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@@ -36,15 +36,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997703</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -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=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.compliance=11
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=17 org.eclipse.jdt.core.compiler.source=11
@@ -13,6 +13,3 @@ Embed-Dependency: sqlite-jdbc
Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial"; Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial";
a="sqlite-jdbc";v="3.8.7" a="sqlite-jdbc";v="3.8.7"
Automatic-Module-Name: com.minres.scviewer.database.sqlite Automatic-Module-Name: com.minres.scviewer.database.sqlite
Export-Package: com.minres.scviewer.database.sqlite;x-friends:="com.minres.scviewer.database.test",
com.minres.scviewer.database.sqlite.db;x-friends:="com.minres.scviewer.database.test",
com.minres.scviewer.database.sqlite.tables;x-friends:="com.minres.scviewer.database.test"
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -10,12 +10,10 @@
*******************************************************************************/ *******************************************************************************/
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;
import java.util.Map.Entry;
import com.minres.scviewer.database.EventEntry; import com.minres.scviewer.database.EventEntry;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
@@ -29,21 +27,8 @@ import com.minres.scviewer.database.RelationTypeFactory;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.sqlite.db.IDatabase; 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;
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider { abstract class AbstractTxStream extends HierNode implements IWaveform {
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;
@@ -62,11 +47,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
} }
@Override @Override
public synchronized int getRowCount() { public int getRowCount() {
if (this instanceof TxGenerator) {
getEvents();
return maxConcurrency;
}
if(maxConcurrency==null){ if(maxConcurrency==null){
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream="); sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
@@ -96,29 +77,21 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
} }
@Override @Override
public synchronized IEventList getEvents() { public IEventList getEvents(){
if (events == null) { if(events==null){
EventList.Builder builder = new EventList.Builder(); events=new EventList();
for (ITx tx : getTransactions().values()) { for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
if (tx.getBeginTime() == tx.getEndTime()) { putEvent(new TxEvent(EventKind.BEGIN, entry.getValue()));
TxEvent single = new TxEvent(EventKind.SINGLE, tx, this instanceof TxGenerator); putEvent(new TxEvent(EventKind.END, entry.getValue()));
builder.add(single.getTime(), single);
} else {
TxEvent begin = new TxEvent(EventKind.BEGIN, tx, this instanceof TxGenerator);
TxEvent end = new TxEvent(EventKind.END, tx, this instanceof TxGenerator);
builder.add(begin.getTime(), begin);
builder.add(end.getTime(), end);
} }
} }
IEventList loaded = builder.build();
if (this instanceof TxGenerator)
maxConcurrency = TxRowAllocator.assign(loaded,
(event, row) -> ((Tx) event.getTransaction()).setConcurrencyIdxInGen(row));
events = loaded;
}
return events; return events;
} }
private void putEvent(TxEvent ev){
events.put(ev.getTime(), ev);
}
protected abstract Map<Integer, ITx> getTransactions(); protected abstract Map<Integer, ITx> getTransactions();
@Override @Override
@@ -138,16 +111,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
@Override @Override
public IEvent[] getEventsBeforeTime(long time) { public IEvent[] getEventsBeforeTime(long time) {
EventEntry e = getEvents().floorEntry(time); EventEntry e = events.floorEntry(time);
if(e==null) if(e==null)
return new IEvent[]{}; return new IEvent[]{};
else else
return e.events; return events.floorEntry(time).events;
} }
@Override @Override
public WaveformType getType() { public WaveformType getType() {
return WaveformType.STREAM; return WaveformType.TRANSACTION;
} }
/** /**
@@ -17,12 +17,14 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.sqlite.db.IDatabase; import com.minres.scviewer.database.sqlite.db.IDatabase;
import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler; import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
import com.minres.scviewer.database.sqlite.tables.ScvStream; import com.minres.scviewer.database.sqlite.tables.ScvStream;
import com.minres.scviewer.database.sqlite.tables.ScvTx; import com.minres.scviewer.database.sqlite.tables.ScvTx;
import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute; import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute;
import com.minres.scviewer.database.sqlite.tables.ScvTxEvent;
import com.minres.scviewer.database.sqlite.tables.ScvTxRelation; import com.minres.scviewer.database.sqlite.tables.ScvTxRelation;
import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
@@ -34,10 +36,9 @@ public class Tx implements ITx {
private TxStream trStream; private TxStream trStream;
private TxGenerator trGenerator; private TxGenerator trGenerator;
private ScvTx scvTx; private ScvTx scvTx;
private volatile int concurrencyIdxInGen = -1;
private List<ITxAttribute> attributes; private List<ITxAttribute> attributes;
private final long begin; private long begin=-1;
private final long end; private long end=-1;
private List<ITxRelation> incoming; private List<ITxRelation> incoming;
private List<ITxRelation> outgoing; private List<ITxRelation> outgoing;
@@ -46,9 +47,6 @@ public class Tx implements ITx {
this.trStream=trStream; this.trStream=trStream;
this.trGenerator=trGenerator; this.trGenerator=trGenerator;
this.scvTx=scvTx; this.scvTx=scvTx;
long[] times = trStream.getTransactionTimes(scvTx.getId());
begin = times[0];
end = times[1];
} }
@Override @Override
@@ -66,29 +64,44 @@ public class Tx implements ITx {
return trGenerator; return trGenerator;
} }
@Override int getConcurrencyIndex() {
public int getConcurrencyIndxInStream() {
return scvTx.getConcurrencyLevel(); return scvTx.getConcurrencyLevel();
} }
@Override @Override
public int getConcurrencyIdxInGen() { public long getBeginTime() {
if (concurrencyIdxInGen < 0) trGenerator.getRowCount(); if(begin<0){
return concurrencyIdxInGen; SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
database, "tx="+scvTx.getId()+" AND type="+ AssociationType.BEGIN.ordinal());
try {
for(ScvTxEvent scvEvent:handler.selectObjects()){
begin= scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION");
} }
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
void setConcurrencyIdxInGen(int index) { | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
concurrencyIdxInGen = index; }
}
return begin;
} }
@Override @Override
public long getBeginTime() { return begin; } public long getEndTime() {
if(end<0){
SQLiteDatabaseSelectHandler<ScvTxEvent> handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class,
database, "tx="+scvTx.getId()+" AND type="+ AssociationType.END.ordinal());
try {
for(ScvTxEvent scvEvent:handler.selectObjects()){
end = scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION");
}
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
}
}
return end;
}
@Override @Override
public long getEndTime() { return end; } public List<ITxAttribute> getAttributes() {
@Override
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());
@@ -19,17 +19,12 @@ import com.minres.scviewer.database.tx.ITxEvent;
public class TxEvent implements ITxEvent { public class TxEvent implements ITxEvent {
private final EventKind type; private final EventKind type;
private final boolean inGenerator;
private ITx tx; private ITx tx;
public TxEvent(EventKind type, ITx tx) { public TxEvent(EventKind type, ITx tx) {
this(type, tx, false); super();
}
TxEvent(EventKind type, ITx tx, boolean inGenerator) {
this.type = type; this.type = type;
this.tx = tx; this.tx = tx;
this.inGenerator = inGenerator;
} }
@Override @Override
@@ -39,7 +34,7 @@ public class TxEvent implements ITxEvent {
@Override @Override
public IEvent duplicate() throws CloneNotSupportedException { public IEvent duplicate() throws CloneNotSupportedException {
return new TxEvent(type, tx, inGenerator); return new TxEvent(type, tx);
} }
@Override @Override
@@ -57,9 +52,14 @@ public class TxEvent implements ITxEvent {
return type.toString()+"@"+getTime()+" of tx #"+tx.getId(); return type.toString()+"@"+getTime()+" of tx #"+tx.getId();
} }
@Override
public WaveformType getType() {
return WaveformType.TRANSACTION;
}
@Override @Override
public int getRowIndex() { public int getRowIndex() {
return inGenerator ? tx.getConcurrencyIdxInGen() : tx.getConcurrencyIndxInStream(); return ((Tx)tx).getConcurrencyIndex();
} }
} }
@@ -18,7 +18,6 @@ import java.util.TreeMap;
import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.sqlite.db.IDatabase; import com.minres.scviewer.database.sqlite.db.IDatabase;
import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler; import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
import com.minres.scviewer.database.sqlite.tables.ScvGenerator; import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
@@ -40,11 +39,6 @@ public class TxGenerator extends AbstractTxStream {
stream.addChild(this); stream.addChild(this);
} }
@Override
public WaveformType getType() {
return WaveformType.GENERATOR;
}
@Override @Override
public long getId() { public long getId() {
return (long) scvGenerator.getId(); return (long) scvGenerator.getId();
@@ -66,12 +60,19 @@ public class TxGenerator extends AbstractTxStream {
} }
@Override @Override
protected synchronized Map<Integer, ITx> getTransactions() { protected Map<Integer, ITx> getTransactions() {
if (transactions == null) { if(transactions==null){
TreeMap<Integer, ITx> loaded = new TreeMap<>(); transactions = new TreeMap<>();
for (Map.Entry<Integer, ITx> entry : stream.getTransactions().entrySet()) SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database,
if (entry.getValue().getGenerator() == this) loaded.put(entry.getKey(), entry.getValue()); "stream="+stream.getId()+" and generator="+scvGenerator.getId());
transactions = loaded; try {
for(ScvTx scvTx:handler.selectObjects()){
transactions.put(scvTx.getId(), new Tx(database, (TxStream) stream, this, scvTx));
}
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
e.printStackTrace();
}
} }
return transactions; return transactions;
} }
@@ -17,12 +17,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.HashMap;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.LazyValue;
import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
@@ -42,39 +36,7 @@ public class TxStream extends AbstractTxStream {
private TreeMap<Integer, TxGenerator> generators; private TreeMap<Integer, TxGenerator> generators;
private final LazyValue<Map<Integer, ITx>> transactions = new LazyValue<>(); private TreeMap<Integer, ITx> transactions;
private final LazyValue<Map<Integer, long[]>> transactionTimes = new LazyValue<>();
long[] getTransactionTimes(int id) {
Map<Integer, long[]> times = transactionTimes.get(() -> {
String sql = "SELECT e.tx, MIN(CASE WHEN e.type=? THEN e.time END) AS beginTime, "
+ "MAX(CASE WHEN e.type=? THEN e.time END) AS endTime "
+ "FROM ScvTxEvent e JOIN ScvTx t ON t.id=e.tx WHERE t.stream=? GROUP BY e.tx";
Map<Integer, long[]> loaded = new HashMap<>();
long scale = ((Number) database.getData("TIMERESOLUTION")).longValue();
try (Connection connection = database.createConnection();
PreparedStatement statement = connection.prepareStatement(sql)) {
statement.setInt(1, AssociationType.BEGIN.ordinal());
statement.setInt(2, AssociationType.END.ordinal());
statement.setLong(3, getId());
try (ResultSet rows = statement.executeQuery()) {
while (rows.next()) {
if (rows.getObject("beginTime") == null || rows.getObject("endTime") == null)
throw new SQLException("Missing timestamps for transaction " + rows.getInt("tx"));
loaded.put(rows.getInt("tx"), new long[] {
Math.multiplyExact(rows.getLong("beginTime"), scale),
Math.multiplyExact(rows.getLong("endTime"), scale)});
}
}
} catch (SQLException e) {
throw new IllegalStateException("Cannot load timestamps for stream " + getFullName(), e);
}
return loaded;
});
long[] result = times.get(id);
if (result == null) throw new IllegalStateException("Missing timestamps for transaction " + id);
return result;
}
public TxStream(IDatabase database, ScvStream scvStream) { public TxStream(IDatabase database, ScvStream scvStream) {
super(database, scvStream.getName(), scvStream.getId()); super(database, scvStream.getName(), scvStream.getId());
@@ -92,38 +54,39 @@ public class TxStream extends AbstractTxStream {
return (long) scvStream.getId(); return (long) scvStream.getId();
} }
public synchronized List<IWaveform> getGenerators() { public List<IWaveform> getGenerators() {
if(generators==null){ if(generators==null){
SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>( SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>(
ScvGenerator.class, database, "stream="+scvStream.getId()); ScvGenerator.class, database, "stream="+scvStream.getId());
TreeMap<Integer, TxGenerator> loaded = new TreeMap<>(); generators=new TreeMap<>();
try { try {
for(ScvGenerator scvGenerator:handler.selectObjects()){ for(ScvGenerator scvGenerator:handler.selectObjects()){
loaded.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator)); generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
} }
generators = loaded;
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
throw new IllegalStateException("Cannot load generators for " + getFullName(), e); e.printStackTrace();
} }
} }
return new ArrayList<>(generators.values()); return new ArrayList<>(generators.values());
} }
protected synchronized Map<Integer, ITx> getTransactions() { protected Map<Integer, ITx> getTransactions() {
return transactions.get(() -> { if(transactions==null){
if (generators == null) getGenerators(); if(generators==null) getGenerators();
TreeMap<Integer, ITx> loaded = new TreeMap<>(); transactions = new TreeMap<>();
SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database,
database, "stream=" + scvStream.getId()); "stream="+scvStream.getId());
try { try {
for (ScvTx row : handler.selectObjects()) for(ScvTx scvTx:handler.selectObjects()){
loaded.put(row.getId(), new Tx(database, this, generators.get(row.getGenerator()), row)); transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx));
} catch (ReflectiveOperationException | SQLException | IntrospectionException e) {
throw new IllegalStateException("Cannot load transactions for " + getFullName(), e);
} }
return loaded; } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
}); | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
e.printStackTrace();
}
}
return transactions;
} }
@Override @Override
@@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@@ -36,15 +36,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997711</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -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=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.compliance=11
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=warning
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=17 org.eclipse.jdt.core.compiler.source=11
@@ -19,4 +19,3 @@ Bundle-ClassPath: .,
lib/kotlin-stdlib-1.2.42.jar, lib/kotlin-stdlib-1.2.42.jar,
lib/lz4-1.3.0.jar, lib/lz4-1.3.0.jar,
lib/elsa-3.0.0-M5.jar lib/elsa-3.0.0-M5.jar
Export-Package: com.minres.scviewer.database.text;x-friends:="com.minres.scviewer.database.test"
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -11,12 +11,9 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.text; package com.minres.scviewer.database.text;
import java.util.ArrayList;
import java.util.HashMap;
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,28 +21,13 @@ import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.TxRowAllocator; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent; import com.minres.scviewer.database.tx.ITxEvent;
/** /**
* The Class AbstractTxStream. * The Class AbstractTxStream.
*/ */
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider { abstract class AbstractTxStream extends HierNode implements IWaveform {
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;
@@ -57,7 +39,6 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
/** The events. */ /** The events. */
IEventList events = new EventList(); IEventList events = new EventList();
private EventList.Builder eventBuilder = new EventList.Builder();
/** The max concurrency. */ /** The max concurrency. */
private int rowCount = -1; private int rowCount = -1;
@@ -91,14 +72,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
* @param evt the evt * @param evt the evt
*/ */
public void addEvent(ITxEvent evt) { public void addEvent(ITxEvent evt) {
eventBuilder.add(evt.getTime(), evt); events.put(evt.getTime(), evt);
}
void finishEvents() {
if (eventBuilder != null) {
events = eventBuilder.build();
eventBuilder = null;
}
} }
/** /**
@@ -144,7 +118,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
*/ */
@Override @Override
public WaveformType getType() { public WaveformType getType() {
return WaveformType.STREAM; return WaveformType.TRANSACTION;
} }
/** /**
@@ -163,7 +137,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
* @return the width * @return the width
*/ */
@Override @Override
public synchronized int getRowCount() { public int getRowCount() {
if (rowCount<0) if (rowCount<0)
calculateConcurrency(); calculateConcurrency();
return rowCount; return rowCount;
@@ -176,16 +150,44 @@ abstract class AbstractTxStream extends HierNode implements IWaveform, ITransact
/** /**
* Calculate concurrency. * Calculate concurrency.
*/ */
synchronized void calculateConcurrency() { void calculateConcurrency() {
if (rowCount >= 0) return; if (rowCount>=0)
int count = TxRowAllocator.assign(getEvents(), (event, row) -> { return;
((TxEvent) event).setConcurrencyIndex(row); ArrayList<Long> rowEndTime = new ArrayList<>();
Tx tx = (Tx) event.getTransaction(); HashMap<Long, Integer> rowByTxId = new HashMap<>();
if (this instanceof TxGenerator) tx.setConcurrencyIdxInGen(row); for(EventEntry entry: events) {
else tx.setConcurrencyIndxInStream(row); for(IEvent evt:entry.events) {
}); TxEvent txEvt = (TxEvent) evt;
for (com.minres.scviewer.database.IHierNode child : getChildNodes()) ITx tx = txEvt.getTransaction();
((TxGenerator) child).calculateConcurrency(); int rowIdx = 0;
rowCount = count; switch(evt.getKind()) {
case END:
Long txId = txEvt.getTransaction().getId();
txEvt.setConcurrencyIndex(rowByTxId.get(txId));
rowByTxId.remove(txId);
break;
case SINGLE:
for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
if (rowEndTime.size() <= rowIdx)
rowEndTime.add(tx.getEndTime());
else
rowEndTime.set(rowIdx, tx.getEndTime());
((TxEvent) evt).setConcurrencyIndex(rowIdx);
break;
case BEGIN:
for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
if (rowEndTime.size() <= rowIdx)
rowEndTime.add(tx.getEndTime());
else
rowEndTime.set(rowIdx, tx.getEndTime());
((TxEvent) evt).setConcurrencyIndex(rowIdx);
rowByTxId.put(tx.getId(), rowIdx);
break;
}
}
}
rowCount=rowEndTime.size()>0?rowEndTime.size():1;
//getChildNodes().parallelStream().forEach(c -> ((TxGenerator)c).calculateConcurrency());
getChildNodes().stream().forEach(c -> ((TxGenerator)c).calculateConcurrency());
} }
} }
@@ -144,7 +144,7 @@ public class TextDbLoader implements IWaveformDbLoader {
* @param txId the tx id * @param txId the tx id
* @return the transaction * @return the transaction
*/ */
public synchronized ITx getTransaction(long txId) { public ITx getTransaction(long txId) {
if (txCache.containsKey(txId)) if (txCache.containsKey(txId))
return txCache.get(txId); return txCache.get(txId);
if(transactions.containsKey(txId)) { if(transactions.containsKey(txId)) {
@@ -252,8 +252,6 @@ public class TextDbLoader implements IWaveformDbLoader {
} finally { } finally {
transactions = parser.txSink; transactions = parser.txSink;
} }
txStreams.values().forEach(TxStream::finishEvents);
txGenerators.values().forEach(TxGenerator::finishEvents);
txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency); txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency);
} }
@@ -267,7 +265,6 @@ public class TextDbLoader implements IWaveformDbLoader {
txStreams.clear(); txStreams.clear();
txGenerators.clear(); txGenerators.clear();
transactions = null; transactions = null;
txCache.clear();
attributeTypes.clear(); attributeTypes.clear();
relationsIn.clear(); relationsIn.clear();
relationsOut.clear(); relationsOut.clear();
@@ -421,13 +418,13 @@ public class TextDbLoader implements IWaveformDbLoader {
TxGenerator gen = loader.txGenerators.get(scvTx.generatorId); TxGenerator gen = loader.txGenerators.get(scvTx.generatorId);
TxStream stream = loader.txStreams.get(gen.stream.getId()); TxStream stream = loader.txStreams.get(gen.stream.getId());
if (scvTx.beginTime == scvTx.endTime) { if (scvTx.beginTime == scvTx.endTime) {
stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime, stream.getType())); stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
gen.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime, gen.getType())); gen.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
} else { } else {
stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime, stream.getType())); stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
gen.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime, gen.getType())); gen.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime, stream.getType())); stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
gen.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime, gen.getType())); gen.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
} }
if (nextLine != null && nextLine.charAt(0) == 'a') { if (nextLine != null && nextLine.charAt(0) == 'a') {
int idx = 0; int idx = 0;
@@ -38,9 +38,6 @@ class Tx implements ITx {
private final long streamId; private final long streamId;
private volatile int concurrencyIndxInStream = -1;
private volatile int concurrencyIdxInGen = -1;
/** The begin time. */ /** The begin time. */
long beginTime = -1; long beginTime = -1;
@@ -177,26 +174,6 @@ class Tx implements ITx {
return loader.txGenerators.get(generatorId); return loader.txGenerators.get(generatorId);
} }
@Override
public int getConcurrencyIndxInStream() {
if (concurrencyIndxInStream < 0) getStream().getRowCount();
return concurrencyIndxInStream;
}
@Override
public int getConcurrencyIdxInGen() {
if (concurrencyIdxInGen < 0) getGenerator().getRowCount();
return concurrencyIdxInGen;
}
void setConcurrencyIndxInStream(int index) {
concurrencyIndxInStream = index;
}
void setConcurrencyIdxInGen(int index) {
concurrencyIdxInGen = index;
}
/** /**
* Gets the begin time. * Gets the begin time.
* *
@@ -26,8 +26,6 @@ class TxEvent implements ITxEvent {
/** The kind. */ /** The kind. */
final EventKind kind; final EventKind kind;
private final WaveformType waveformType;
/** The transaction. */ /** The transaction. */
final long transaction; final long transaction;
@@ -42,14 +40,12 @@ class TxEvent implements ITxEvent {
* @param kind the kind * @param kind the kind
* @param transaction the transaction * @param transaction the transaction
* @param time the time * @param time the time
* @param waveformType the type of the owning waveform
*/ */
TxEvent(TextDbLoader loader, EventKind kind, Long transaction, Long time, WaveformType waveformType) { TxEvent(TextDbLoader loader, EventKind kind, Long transaction, Long time) {
this.loader = loader; this.loader = loader;
this.kind = kind; this.kind = kind;
this.transaction = transaction; this.transaction = transaction;
this.time = time; this.time = time;
this.waveformType = waveformType;
} }
/** /**
@@ -60,7 +56,7 @@ class TxEvent implements ITxEvent {
*/ */
@Override @Override
public ITxEvent duplicate() throws CloneNotSupportedException { public ITxEvent duplicate() throws CloneNotSupportedException {
return new TxEvent(loader, kind, transaction, time, waveformType); return new TxEvent(loader, kind, transaction, time);
} }
/** /**
@@ -73,6 +69,16 @@ class TxEvent implements ITxEvent {
return kind.toString() + "@" + time + " of tx #" + transaction; return kind.toString() + "@" + time + " of tx #" + transaction;
} }
/**
* Gets the type.
*
* @return the type
*/
@Override
public WaveformType getType() {
return WaveformType.TRANSACTION;
}
/** /**
* Gets the kind. * Gets the kind.
* *
@@ -16,7 +16,6 @@ import java.util.List;
import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.DirectionType;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType;
/** /**
* The Class TxGenerator. * The Class TxGenerator.
@@ -46,11 +45,6 @@ class TxGenerator extends AbstractTxStream {
stream.addChild(this); stream.addChild(this);
} }
@Override
public WaveformType getType() {
return WaveformType.GENERATOR;
}
/** /**
* Checks if is same. * Checks if is same.
* *
@@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@@ -31,15 +31,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997716</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -29,7 +29,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
@@ -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=17 org.eclipse.jdt.core.compiler.source=11
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<version>4.0.0-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
@@ -1,47 +0,0 @@
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();
}
}
@@ -41,9 +41,9 @@ public class ArrowPainter implements IPainter {
private ITx tx; private ITx tx;
private List<LinkEntry> iRect = new LinkedList<>(); private List<LinkEntry> iRect;
private List<LinkEntry> oRect = new LinkedList<>(); private List<LinkEntry> oRect;
private Rectangle txRectangle; private Rectangle txRectangle;
@@ -56,7 +56,7 @@ public class ArrowPainter implements IPainter {
public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) { public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) {
this.waveCanvas = waveCanvas; this.waveCanvas = waveCanvas;
highlightType=relationType; highlightType=relationType;
updateSelection(); setTx(null);
} }
public RelationType getHighlightType() { public RelationType getHighlightType() {
@@ -71,8 +71,10 @@ public class ArrowPainter implements IPainter {
return tx; return tx;
} }
public void updateSelection() { public void setTx(ITx newTx) {
tx = waveCanvas.currentSelectedTx; this.tx = newTx;
iRect = new LinkedList<>();
oRect = new LinkedList<>();
scaleFactor = waveCanvas.getScale(); scaleFactor = waveCanvas.getScale();
if (tx != null) { if (tx != null) {
calculateGeometries(); calculateGeometries();
@@ -81,40 +83,29 @@ public class ArrowPainter implements IPainter {
private int getConcurrencyIndex(ITx tx) { private int getConcurrencyIndex(ITx tx) {
IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime()); IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime());
Optional<Integer> res = Arrays.stream(eventList).filter(e -> ((ITxEvent)e).getTransaction()== tx).map(e -> ((ITxEvent)e).getRowIndex()).findFirst(); Optional<Integer> res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
if(res.isPresent() && res.get()>0) { if(res.isPresent() && res.get()>0) {
return res.get(); return res.get();
} else } else
return 0; return 0;
} }
private Rectangle getBoundingBox(IWaveformPainter painter, ITx itx, IWaveform stream) {
int laneHeight = painter.getHeight() / stream.getRowCount();
//TODO: it needs to take the concurrency index within the current waveform (stream or generator) into account
int concIdx=getConcurrencyIndex(itx);
int laneOffset = laneHeight * (concIdx>=stream.getRowCount()?stream.getRowCount()-1:concIdx);
int rulerHeight = waveCanvas.rulerHeight;
Rectangle bb = new Rectangle((int) (itx.getBeginTime() / scaleFactor),
rulerHeight + painter.getVerticalOffset() + laneOffset,
(int) ((itx.getEndTime() - itx.getBeginTime()) / scaleFactor), laneHeight);
return bb;
}
protected boolean calculateGeometries() { protected boolean calculateGeometries() {
iRect.clear(); iRect.clear();
oRect.clear(); oRect.clear();
IWaveformPainter painter = null; IWaveformPainter painter = waveCanvas.wave2painterMap.get(tx.getStream());
if(waveCanvas.currentSelectedTrack != null)
painter = waveCanvas.trackAreaPainter.getPainterFor(waveCanvas.currentSelectedTrack);
if(painter == null) if(painter == null)
painter = waveCanvas.wave2painterMap.get(tx.getGenerator()); painter = waveCanvas.wave2painterMap.get(tx.getGenerator());
if(painter==null) if (painter == null) { // stream has been added but painter not yet
painter = waveCanvas.wave2painterMap.get(tx.getStream()); // created
if (painter == null) { // stream has been added but painter not yet created
return true; return true;
} }
Rectangle bb = getBoundingBox(painter, tx, painter instanceof StreamPainter? ((StreamPainter)painter).getStream() : tx.getStream()); int laneHeight = painter.getHeight() / tx.getStream().getRowCount();
txRectangle = bb; int laneOffset = laneHeight * getConcurrencyIndex(tx);
int rulerHeight = waveCanvas.rulerHeight;
txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor),
rulerHeight + painter.getVerticalOffset() + laneOffset,
(int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight);
deriveGeom(tx.getIncomingRelations(), iRect, false); deriveGeom(tx.getIncomingRelations(), iRect, false);
deriveGeom(tx.getOutgoingRelations(), oRect, true); deriveGeom(tx.getOutgoingRelations(), oRect, true);
return false; return false;
@@ -123,14 +114,18 @@ public class ArrowPainter implements IPainter {
protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) { protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) {
for (ITxRelation iTxRelation : relations) { for (ITxRelation iTxRelation : relations) {
ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource(); ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource();
if (otherTx != null && otherTx.getBeginTime() >= 0) if(otherTx!=null && otherTx.getBeginTime()>=0)
for (IWaveform iWaveform : new IWaveform[] { otherTx.getStream(), otherTx.getGenerator() }) { for(IWaveform iWaveform: new IWaveform[]{otherTx.getStream(), otherTx.getGenerator()}) {
if (waveCanvas.wave2painterMap.containsKey(iWaveform)) { if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform); IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform);
if (painter != null) { if(painter!=null) {
Rectangle bb = getBoundingBox(painter, otherTx, int laneHeight = waveCanvas.styleProvider.getTrackHeight();
painter instanceof StreamPainter ? ((StreamPainter) painter).getStream() int laneOffset = laneHeight * getConcurrencyIndex(tx);
: otherTx.getStream()); Rectangle bb = new Rectangle(
(int) (otherTx.getBeginTime() / scaleFactor),
waveCanvas.rulerHeight + painter.getVerticalOffset() + laneOffset,
(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
laneHeight);
res.add(new LinkEntry(bb, iTxRelation.getRelationType())); res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
} }
} }
@@ -165,36 +160,28 @@ public class ArrowPainter implements IPainter {
protected void drawArrow(Projection proj, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) { protected void drawArrow(Projection proj, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) {
Point point1 = proj.project(new Point(srcRectangle.x, srcRectangle.y + srcRectangle.height / 2)); Point point1 = proj.project(new Point(srcRectangle.x, srcRectangle.y + srcRectangle.height / 2));
Point point2 = proj.project(new Point(tgtRectangle.x, tgtRectangle.y + tgtRectangle.height / 2)); Point point2 = proj.project(new Point(tgtRectangle.x, tgtRectangle.y + tgtRectangle.height / 2));
int arrowTipOffset=yCtrlOffset/2;
if (point2.x > point1.x + srcRectangle.width) if (point2.x > point1.x + srcRectangle.width)
point1.x += srcRectangle.width; point1.x += srcRectangle.width;
if (point1.x > point2.x + tgtRectangle.width) if (point1.x > point2.x + tgtRectangle.width)
point2.x += tgtRectangle.width; point2.x += tgtRectangle.width;
Point endPoint = new Point(point2.x-arrowTipOffset, point2.y);
Path path = new Path(Display.getCurrent()); Path path = new Path(Display.getCurrent());
path.moveTo(point1.x, point1.y); path.moveTo(point1.x, point1.y);
if (point1.y == point2.y) { if (point1.y == point2.y) {
Point center = new Point((point1.x + endPoint.x) / 2, point1.y - yCtrlOffset); Point center = new Point((point1.x + point2.x) / 2, point1.y - yCtrlOffset);
path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, center.x - X_CTRL_OFFSET, center.y, center.x, center.y); path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, center.x - X_CTRL_OFFSET, center.y, center.x, center.y);
path.cubicTo(center.x + X_CTRL_OFFSET, center.y, endPoint.x - X_CTRL_OFFSET, endPoint.y, endPoint.x, endPoint.y); path.cubicTo(center.x + X_CTRL_OFFSET, center.y, point2.x - X_CTRL_OFFSET, point2.y, point2.x, point2.y);
} else } else
path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, endPoint.x - X_CTRL_OFFSET, endPoint.y, endPoint.x, endPoint.y); path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, point2.x - X_CTRL_OFFSET, point2.y, point2.x, point2.y);
path.lineTo(point2.x, point2.y);
proj.setAntialias(SWT.ON); proj.setAntialias(SWT.ON);
proj.setForeground(fgColor); proj.setForeground(fgColor);
proj.getGC().drawPath(path); proj.getGC().drawPath(path);
path.dispose(); path.dispose();
// now draw the arrow head // now draw the arrow head
Color background = proj.getGC().getBackground(); proj.getGC().drawLine(point2.x - 8, point2.y - 5, point2.x, point2.y);
proj.setBackground(fgColor); proj.getGC().drawLine(point2.x - 8, point2.y + 5, point2.x, point2.y);
proj.getGC().fillPolygon(new int[] {
point2.x, point2.y,
point2.x - arrowTipOffset, point2.y - 3*arrowTipOffset/5,
point2.x - 3*arrowTipOffset/5, point2.y,
point2.x - arrowTipOffset, point2.y + 3*arrowTipOffset/5 });
proj.setBackground(background);
} }
@@ -106,13 +106,11 @@ public class SignalPainter extends TrackPainter {
EventEntry first = signal.getEvents().floorEntry(beginTime); EventEntry first = signal.getEvents().floorEntry(beginTime);
if (first == null) if (first == null)
first = signal.getEvents().firstEntry(); first = signal.getEvents().firstEntry();
if (first == null || Long.compareUnsigned(first.timestamp, endTime) > 0) return;
beginTime = first.timestamp; beginTime = first.timestamp;
proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE)); proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
proj.setLineStyle(SWT.LINE_SOLID); proj.setLineStyle(SWT.LINE_SOLID);
proj.setLineWidth(1); proj.setLineWidth(1);
IEventList entries = signal.getEvents().subMap(beginTime, true, endTime); IEventList entries = signal.getEvents().subMap(beginTime, true, endTime);
if (entries.isEmpty()) return;
SignalChange left = new SignalChange(entries.firstEntry()); SignalChange left = new SignalChange(entries.firstEntry());
SignalChange right = new SignalChange(entries.size() > 1 ? entries.higherEntry(left.time) : entries.firstEntry()); SignalChange right = new SignalChange(entries.size() > 1 ? entries.higherEntry(left.time) : entries.firstEntry());
maxPosX = area.x + area.width; maxPosX = area.x + area.width;
@@ -10,19 +10,20 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.ui.swt.internal; package com.minres.scviewer.database.ui.swt.internal;
import java.util.TreeMap;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Rectangle;
import com.minres.scviewer.database.EventEntry;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IEventList;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
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.tx.ITxEvent;
import com.minres.scviewer.database.tx.TxIntervalIndex;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.database.ui.WaveformColors; import com.minres.scviewer.database.ui.WaveformColors;
@@ -35,14 +36,14 @@ public class StreamPainter extends TrackPainter{
private IWaveform stream; private IWaveform stream;
private int txBase; private int txBase;
private int txHeight; private int txHeight;
private TxIntervalIndex intervalIndex; // TODO: remove TreeMap usage
private IEventList indexedEvents; private TreeMap<ITx, ITxEvent> seenTx;
private int indexedSize = -1;
public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) { public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) {
super(trackEntry, even); super(trackEntry, even);
this.waveCanvas = waveCanvas; this.waveCanvas = waveCanvas;
this.stream=trackEntry.waveform; this.stream=trackEntry.waveform;
this.seenTx=new TreeMap<>();
} }
public void paintArea(Projection proj, Rectangle area) { public void paintArea(Projection proj, Rectangle area) {
@@ -71,6 +72,11 @@ public class StreamPainter extends TrackPainter{
long beginTime = beginPos*scaleFactor; long beginTime = beginPos*scaleFactor;
long endTime = beginTime + area.width*scaleFactor; long endTime = beginTime + area.width*scaleFactor;
IEventList events = stream.getEvents();
EventEntry firstTx = events.floorEntry(beginTime);
EventEntry lastTx = events.ceilingEntry(endTime);
if(firstTx==null) firstTx = events.firstEntry();
if(lastTx==null) lastTx = events.lastEntry();
proj.setFillRule(SWT.FILL_EVEN_ODD); proj.setFillRule(SWT.FILL_EVEN_ODD);
proj.setLineStyle(SWT.LINE_SOLID); proj.setLineStyle(SWT.LINE_SOLID);
proj.setLineWidth(1); proj.setLineWidth(1);
@@ -78,28 +84,42 @@ public class StreamPainter extends TrackPainter{
for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight) for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
proj.drawLine(area.x, y1, area.x+area.width, y1); proj.drawLine(area.x, y1, area.x+area.width, y1);
ITxEvent highlighted = null; if(firstTx==lastTx) {
for (ITxEvent event : getIntervalIndex().overlapping(beginTime, endTime)) { for(IEvent txEvent: firstTx.events)
ITx tx = event.getTransaction(); drawTx(proj, area, ((ITxEvent)txEvent).getTransaction(), ((ITxEvent)txEvent).getRowIndex(), false);
drawTx(proj, area, tx, event.getRowIndex(), false); }else{
if (waveCanvas.currentSelectedTx != null && waveCanvas.currentSelectedTx.getId() == tx.getId()) seenTx.clear();
highlighted = event; ITxEvent highlighed=null;
} proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
if (highlighted != null) { long selectedId=waveCanvas.currentSelection!=null? waveCanvas.currentSelection.getId():-1;
proj.setForeground(waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE)); for(EventEntry entry: events.subMap(firstTx.timestamp, true, lastTx.timestamp))
drawTx(proj, area, highlighted.getTransaction(), highlighted.getRowIndex(), true); for(IEvent e:entry.events){
ITxEvent evt = (ITxEvent) e;
ITx tx = evt.getTransaction();
if(selectedId==tx.getId())
highlighed=evt;
switch(evt.getKind()) {
case BEGIN:
seenTx.put(tx, evt);
break;
case END:
drawTx(proj, area, tx, evt.getRowIndex(), false);
seenTx.remove(tx);
break;
case SINGLE:
drawTx(proj, area, tx, evt.getRowIndex(), false);
break;
} }
} }
seenTx.entrySet().stream().forEach(e -> {
drawTx(proj, area, e.getKey(), e.getValue().getRowIndex(), false);
});
private TxIntervalIndex getIntervalIndex() { if(highlighed!=null){
stream.getRowCount(); proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE));
IEventList events = stream.getEvents(); drawTx(proj, area, highlighed.getTransaction(), highlighed.getRowIndex(), true);
if (intervalIndex == null || indexedEvents != events || indexedSize != events.size()) { }
intervalIndex = new TxIntervalIndex(events);
indexedEvents = events;
indexedSize = events.size();
} }
return intervalIndex;
} }
protected void drawTx(Projection proj, Rectangle area, ITx tx, int concurrencyIndex, boolean highlighted ) { protected void drawTx(Projection proj, Rectangle area, ITx tx, int concurrencyIndex, boolean highlighted ) {
@@ -136,15 +156,13 @@ public class StreamPainter extends TrackPainter{
public ITx getClicked(Point point) { public ITx getClicked(Point point) {
int lane=point.y/waveCanvas.styleProvider.getTrackHeight(); int lane=point.y/waveCanvas.styleProvider.getTrackHeight();
long scale = waveCanvas.getScale(); EventEntry firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScale());
long time = (long) point.x * scale; if(firstTx!=null){
long low = Math.max(0L, (long) point.x - 5) * scale; do {
long high = ((long) point.x + 5) * scale; ITx tx = getTxFromEntry(lane, point.x, firstTx.events);
for (ITxEvent event : getIntervalIndex().overlapping(low, high)) { if(tx!=null) return tx;
if (event.getRowIndex() != lane) continue; firstTx=stream.getEvents().lowerEntry(firstTx.timestamp);
ITx tx = event.getTransaction(); }while(firstTx!=null);
if (event.getKind() == EventKind.SINGLE ||
(tx.getBeginTime() <= time && tx.getEndTime() >= time)) return tx;
} }
return null; return null;
} }
@@ -155,8 +173,6 @@ public class StreamPainter extends TrackPainter{
public void setStream(IWaveform stream) { public void setStream(IWaveform stream) {
this.stream = stream; this.stream = stream;
intervalIndex = null;
indexedEvents = null;
} }
protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) { protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) {
@@ -10,14 +10,12 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.ui.swt.internal; package com.minres.scviewer.database.ui.swt.internal;
import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Rectangle;
import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.database.ui.WaveformColors; import com.minres.scviewer.database.ui.WaveformColors;
public class TrackAreaPainter implements IPainter { public class TrackAreaPainter implements IPainter {
@@ -62,14 +60,6 @@ public class TrackAreaPainter implements IPainter {
} }
} }
public IWaveformPainter getPainterFor(TrackEntry e) {
for (Entry<Integer,IWaveformPainter> entry : trackVerticalOffset.entrySet()) {
if(entry.getValue().getTrackEntry() == e)
return entry.getValue();
}
return null;
}
public void addTrackPainter(IWaveformPainter trackPainter){ public void addTrackPainter(IWaveformPainter trackPainter){
trackVerticalOffset.put(trackPainter.getVerticalOffset()+waveCanvas.rulerHeight, trackPainter); trackVerticalOffset.put(trackPainter.getVerticalOffset()+waveCanvas.rulerHeight, trackPainter);
@@ -18,7 +18,6 @@ import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Optional; import java.util.Optional;
import org.eclipse.jface.viewers.ISelection;
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;
@@ -45,7 +44,6 @@ 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;
@@ -74,15 +72,13 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
protected List<IPainter> painterList; protected List<IPainter> painterList;
ITx currentSelectedTx; ITx currentSelection;
TrackEntry currentSelectedTrack;
private List<SelectionAdapter> selectionListeners; private List<SelectionAdapter> selectionListeners;
private RulerPainter rulerPainter; private RulerPainter rulerPainter;
TrackAreaPainter trackAreaPainter; private TrackAreaPainter trackAreaPainter;
private ArrowPainter arrowPainter; private ArrowPainter arrowPainter;
@@ -218,9 +214,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
factor=maxFactor; factor=maxFactor;
if(factor!=getScale() || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) { if(factor!=getScale() || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) {
updateScaleFactor(factor); updateScaleFactor(factor);
ITx tx = currentSelectedTx; ITx tx = arrowPainter.getTx();
currentSelectedTx=null; arrowPainter.setTx(null);
arrowPainter.updateSelection();
/* /*
* xc = tc/oldScaleFactor * xc = tc/oldScaleFactor
* xoffs = xc+origin.x * xoffs = xc+origin.x
@@ -236,8 +231,7 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
origin.x=0; origin.x=0;
} }
syncSb(); syncSb();
currentSelectedTx=tx; arrowPainter.setTx(tx);
arrowPainter.updateSelection();
redraw(); redraw();
} }
} }
@@ -457,13 +451,12 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
return result; return result;
} }
public void setSelected(ISelection selection) { public void setSelected(ITx currentSelection) {
WaveformSelection selected = WaveformSelection.from(selection); this.currentSelection = currentSelection;
currentSelectedTrack = selected.track(); if (currentSelection != null)
currentSelectedTx = selected.transaction(); reveal(currentSelection);
if (currentSelectedTx != null) reveal(currentSelectedTx); arrowPainter.setTx(currentSelection);
arrowPainter.updateSelection(); redraw();
if (!isDisposed()) redraw();
} }
public void reveal(ITx tx) { public void reveal(ITx tx) {
@@ -477,21 +470,9 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
} else if (higher > (size.x - origin.x)) { } else if (higher > (size.x - origin.x)) {
setOrigin(size.x - higher, origin.y); setOrigin(size.x - higher, origin.y);
} }
if(currentSelectedTrack != null) {
EventEntry entry = currentSelectedTrack.waveform.getEvents().floorEntry(tx.getBeginTime());
IWaveformPainter painter = trackAreaPainter.getPainterFor(currentSelectedTrack);
if (painter != null && painter instanceof StreamPainter)
reveal(tx, size, painter, entry);
} else
for (IWaveformPainter painter : wave2painterMap.values()) { for (IWaveformPainter painter : wave2painterMap.values()) {
if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) { if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) {
EventEntry entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime()); EventEntry entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime());
reveal(tx, size, painter, entry);
}
}
}
private void reveal(ITx tx, Point size, IWaveformPainter painter, EventEntry entry) {
Optional<IEvent> res = Arrays.stream(entry.events).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst(); Optional<IEvent> res = Arrays.stream(entry.events).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst();
if(res.isPresent()) { if(res.isPresent()) {
int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex(); int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex();
@@ -503,6 +484,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
} }
} }
} }
}
}
public void reveal(IWaveform waveform) { public void reveal(IWaveform waveform) {
for (IWaveformPainter painter : wave2painterMap.values()) { for (IWaveformPainter painter : wave2painterMap.values()) {
@@ -618,7 +601,6 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
public void setStyleProvider(IWaveformStyleProvider styleProvider) { public void setStyleProvider(IWaveformStyleProvider styleProvider) {
this.styleProvider=styleProvider; this.styleProvider=styleProvider;
if(!isDisposed())
redraw(); redraw();
} }
@@ -91,7 +91,6 @@ 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;
@@ -532,16 +531,6 @@ public class WaveformView implements IWaveformView {
} }
} }
}); });
getControl().addListener(SWT.Resize, (evt) -> {
int y = waveformCanvas.getVerticalBar().getSelection();
nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y);
valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y);
});
getControl().addListener(SWT.Move, (evt) -> {
int y = waveformCanvas.getVerticalBar().getSelection();
nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y);
valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y);
});
} }
private Control createFill(Composite pane) { private Control createFill(Composite pane) {
@@ -634,7 +623,7 @@ public class WaveformView implements IWaveformView {
private void addPainter(boolean even, TrackEntry streamEntry) { private void addPainter(boolean even, TrackEntry streamEntry) {
streamEntry.height = styleProvider.getTrackHeight(); streamEntry.height = styleProvider.getTrackHeight();
streamEntry.vOffset = tracksVerticalHeight; streamEntry.vOffset = tracksVerticalHeight;
if (streamEntry.waveform.getType().isTransaction()) { if (streamEntry.waveform.getType() == WaveformType.TRANSACTION) {
streamEntry.currentValue = ""; streamEntry.currentValue = "";
streamEntry.height *= streamEntry.waveform.getRowCount(); streamEntry.height *= streamEntry.waveform.getRowCount();
IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry); IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry);
@@ -691,7 +680,7 @@ public class WaveformView implements IWaveformView {
else else
entry.currentValue = Double.toString(val); entry.currentValue = Double.toString(val);
} }
} else if (entry.waveform.getType().isTransaction()) { } else if (entry.waveform.getType() == WaveformType.TRANSACTION) {
ITx[] resultsList = new ITx[entry.waveform.getRowCount()]; ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
EventEntry firstTx = entry.waveform.getEvents().floorEntry(time); EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
if (firstTx != null) { if (firstTx != null) {
@@ -807,7 +796,12 @@ public class WaveformView implements IWaveformView {
*/ */
@Override @Override
public ISelection getSelection() { public ISelection getSelection() {
return new WaveformSelection(currentTxSelection, currentWaveformSelection).toSelection(); ArrayList<Object> sel = new ArrayList<>();
if (currentTxSelection != null) {
sel.add(currentTxSelection);
}
sel.addAll(currentWaveformSelection);
return new StructuredSelection(sel.toArray());
} }
/* /*
@@ -847,39 +841,63 @@ public class WaveformView implements IWaveformView {
} }
public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) { public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
WaveformSelection requested = WaveformSelection.from(selection); boolean selectionChanged = false;
currentWaveformSelection.forEach(e -> e.selected = false); currentWaveformSelection.forEach(e -> {if(e!=null) e.selected = false;});
if (!add || (requested.transaction() == null && requested.tracks().isEmpty())) { if (selection instanceof IStructuredSelection) {
currentWaveformSelection.clear(); IStructuredSelection sel = (IStructuredSelection) selection;
if (sel.size() == 0) {
selectionChanged = currentTxSelection != null || currentWaveformSelection != null;
currentTxSelection = null; currentTxSelection = null;
}
if (requested.transaction() != null) {
ITx transaction = requested.transaction();
TrackEntry track = requested.track();
if (track == null) track = getEntryFor(transaction);
if (track == null && addIfNeeded) {
track = getEntryFor(transaction.getStream());
if (track == null) {
track = new TrackEntry(transaction.getStream(), styleProvider);
streams.add(track);
}
}
currentWaveformSelection.clear(); currentWaveformSelection.clear();
if (track != null) currentWaveformSelection.add(track);
currentTxSelection = track == null ? null : transaction;
} else { } else {
for (TrackEntry track : requested.tracks()) if (!add)
if (!currentWaveformSelection.contains(track)) currentWaveformSelection.add(track); currentWaveformSelection.clear();
List<?> selList = sel.toList();
for(Object o: selList) {
if (o instanceof ITx) {
ITx txSel = (ITx) o;
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);
} }
currentWaveformSelection.forEach(e -> { }
e.selected = true; }
waveformCanvas.reveal(e.waveform); currentTxSelection = txSel;
}); currentWaveformSelection.clear();
waveformCanvas.setSelected(getSelection()); 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.forEach(e -> {if(e!=null)e.selected = true;});
if (selectionChanged) {
currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform));
waveformCanvas.setSelected(currentTxSelection);
valueList.redraw(); valueList.redraw();
nameList.redraw(); nameList.redraw();
fireSelectionChanged(); fireSelectionChanged();
} }
}
protected void fireSelectionChanged() { protected void fireSelectionChanged() {
if (currentWaveformSelection == null) if (currentWaveformSelection == null)
@@ -928,7 +946,7 @@ public class WaveformView implements IWaveformView {
return; return;
TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0) TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0)
: getEntryFor(currentTxSelection); : getEntryFor(currentTxSelection);
if (selectedWaveform.waveform.getType().isTransaction() && currentTxSelection != null) { if (selectedWaveform.waveform.getType() == WaveformType.TRANSACTION && currentTxSelection != null) {
if (relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)) { if (relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)) {
ITx transaction = null; ITx transaction = null;
if (direction == GotoDirection.NEXT) { if (direction == GotoDirection.NEXT) {
@@ -1050,7 +1068,7 @@ public class WaveformView implements IWaveformView {
TrackEntry sel = currentWaveformSelection.get(0); TrackEntry sel = currentWaveformSelection.get(0);
long time = getCursorTime(); long time = getCursorTime();
IEventList map = null; IEventList map = null;
if (sel.waveform.getType().isTransaction() || sel.waveform.getType() == WaveformType.SIGNAL) { if (sel.waveform.getType() == WaveformType.TRANSACTION || sel.waveform.getType() == WaveformType.SIGNAL) {
map = sel.waveform.getEvents(); map = sel.waveform.getEvents();
} }
if (map != null) { if (map != null) {
@@ -1606,7 +1624,7 @@ public class WaveformView implements IWaveformView {
} }
public boolean waveformsContainsTx() { public boolean waveformsContainsTx() {
return streams.stream().filter(e -> e.waveform.getType().isTransaction()).findFirst().isPresent(); return streams.stream().filter(e -> e.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent();
} }
@Override @Override
@@ -21,7 +21,7 @@ enum Direction {
} }
private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) { private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) {
return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width ); return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width );
} }
private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) { private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) {
@@ -61,7 +61,7 @@ enum Direction {
@Override @Override
protected void expand( Control control, int maxExpansion ) { protected void expand( Control control, int maxExpansion ) {
Rectangle bounds = control.getBounds(); Rectangle bounds = control.getBounds();
int expand = super.expand( bounds.height, maxExpansion ); int expand = expand( bounds.height, maxExpansion );
control.setBounds( bounds.x, bounds.y - expand, bounds.width, bounds.height + expand ); control.setBounds( bounds.x, bounds.y - expand, bounds.width, bounds.height + expand );
} }
}, },
@@ -75,7 +75,7 @@ enum Direction {
} }
private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) { private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) {
return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height ); return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height );
} }
private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) { private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) {
@@ -115,7 +115,7 @@ enum Direction {
@Override @Override
protected void expand( Control control, int maxExpansion ) { protected void expand( Control control, int maxExpansion ) {
Rectangle bounds = control.getBounds(); Rectangle bounds = control.getBounds();
int expand = super.expand( bounds.width, maxExpansion ); int expand = expand( bounds.width, maxExpansion );
control.setBounds( bounds.x - expand, bounds.y, bounds.width + expand, bounds.height ); control.setBounds( bounds.x - expand, bounds.y, bounds.width + expand, bounds.height );
} }
}; };
@@ -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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@@ -36,15 +36,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997720</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -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=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.compliance=11
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=17 org.eclipse.jdt.core.compiler.source=11
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -36,15 +36,4 @@
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997684</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -10,7 +10,7 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
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=warning
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=17 org.eclipse.jdt.core.compiler.source=17
@@ -6,8 +6,7 @@ Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: com.minres.scviewer.database, Export-Package: com.minres.scviewer.database,
com.minres.scviewer.database.tx, com.minres.scviewer.database.tx
com.minres.scviewer.database.internal;x-friends:="com.minres.scviewer.database.test"
Import-Package: org.slf4j Import-Package: org.slf4j
Require-Bundle: javax.inject;bundle-version="1.0.0" Require-Bundle: javax.inject;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
@@ -238,6 +238,16 @@ public class BitVector implements IEvent {
return EventKind.SINGLE; return EventKind.SINGLE;
} }
/**
* Gets the type.
*
* @return the type
*/
@Override
public WaveformType getType() {
return WaveformType.SIGNAL;
}
/** /**
* Duplicate. * Duplicate.
* *
@@ -37,6 +37,16 @@ public class DoubleVal implements IEvent {
return EventKind.SINGLE; return EventKind.SINGLE;
} }
/**
* Gets the type.
*
* @return the type
*/
@Override
public WaveformType getType() {
return WaveformType.SIGNAL;
}
/** /**
* Duplicate. * Duplicate.
* *
@@ -3,142 +3,193 @@ package com.minres.scviewer.database;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.NoSuchElementException;
/** Sorted timestamp buckets. Range views are read-only and bounded by their parent. */
public class EventList implements IEventList { 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<TimedEvent> pending = new ArrayList<>();
private boolean built;
public void add(long time, IEvent event) { ArrayList<EventEntry> store = new ArrayList<>();
if (built) throw new IllegalStateException("Event list has already been built"); int start = 0;
pending.add(new TimedEvent(time, event)); int end = store.size();
boolean unmodifiable = false;
public class Iterator implements java.util.Iterator<EventEntry> {
EventList list;
private int pos;
public Iterator(EventList list) {
this.list=list;
this.pos=-1;
} }
public EventList build() { @Override
if (built) throw new IllegalStateException("Event list has already been built"); public boolean hasNext() {
pending.sort((a, b) -> Long.compareUnsigned(a.time(), b.time())); return pos<(list.end-1);
ArrayList<EventEntry> 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<EventEntry> store; @Override
private final int start; public EventEntry next() {
private int end; if(hasNext()) {
private final boolean unmodifiable; pos++;
return list.store.get(pos);
} else
return null;
}
@Override
public void remove() {
list.store.remove(pos);
}
}
public EventList() { public EventList() {
this(new ArrayList<>(), 0, 0, false);
} }
private EventList(ArrayList<EventEntry> store, int start, int end, boolean unmodifiable) { private EventList(ArrayList<EventEntry> store , int start, int end) {
this.store = store; this.store=store;
this.start = start; this.start=start;
this.end = end; this.end=end;
this.unmodifiable = unmodifiable; this.unmodifiable=true;
}
/** Index of the first timestamp >= key (or > key when exclusive). */
private int bound(long key, boolean exclusive) {
int low = start, high = end;
while (low < high) {
int mid = (low + high) >>> 1;
int cmp = Long.compareUnsigned(store.get(mid).timestamp, key);
if (cmp < 0 || (exclusive && cmp == 0)) low = mid + 1;
else high = mid;
}
return low;
}
private EventEntry entry(int index) {
return index < start || index >= end ? null : store.get(index);
} }
@Override @Override
public IEventList subMap(long from, boolean includeFrom, long to) { public IEventList subMap(long from, boolean includeFrom, long to) {
if (Long.compareUnsigned(from, to) > 0) throw new IllegalArgumentException("Reversed time range"); //the index of the first element greater than the key, or list.size()
int first = bound(from, !includeFrom); int beginIndex = Collections.binarySearch(store, new EventEntry(from));
return new EventList(store, first, Math.max(first, bound(to, true)), true); int startIndex = beginIndex < 0? -(beginIndex + 1): beginIndex;
int endIndex = Collections.binarySearch(store, new EventEntry(to));
endIndex = endIndex < 0? -(endIndex + 1): endIndex+1;
if(beginIndex>0 && !includeFrom)
return new EventList(store, startIndex+1, endIndex);
else
return new EventList(store, startIndex, endIndex);
} }
@Override @Override
public int size() { return end - start; } public int size() {
return end-start;
}
@Override @Override
public boolean containsKey(long key) { public boolean containsKey(long key) {
EventEntry e = entry(bound(key, false)); int index = Collections.binarySearch(store, new EventEntry(key));
return e != null && e.timestamp == key; return index>=0 && index>=start && index<end;
} }
@Override @Override
public IEvent[] get(long key) { public IEvent[] get(long key) {
EventEntry e = entry(bound(key, false)); int index = Collections.binarySearch(store, new EventEntry(key));
return e != null && e.timestamp == key ? e.events : null; if(index<0) return null;
return index>=start && index<end? store.get(index).events: null;
} }
@Override @Override
public void put(long key, IEvent value) { public void put(long key, IEvent value) {
if (unmodifiable) throw new UnsupportedOperationException(); if(unmodifiable) throw new UnsupportedOperationException();
int index = store.isEmpty() || Long.compareUnsigned(store.get(end - 1).timestamp, key) < 0 if(store.size()==0 || store.get(store.size()-1).timestamp < key) {
? end : bound(key, false); store.add(new EventEntry(key, new IEvent[] {value}));
if (index < end && store.get(index).timestamp == key) store.get(index).append(value); } else {
else store.add(index, new EventEntry(key, new IEvent[] {value})); int index = Collections.binarySearch(store, new EventEntry(key));
end = store.size(); // < 0 if element is not in the list, see Collections.binarySearch
if (index < 0) {
EventEntry e = new EventEntry(key, new IEvent[] {value});
index = -(index + 1);
store.add(index, e);
} else {
// Insertion index is index of existing element, to add new element behind it increase index
store.get(index).append(value);
}
}
end=store.size();
} }
@Override @Override
public Collection<EventEntry> entrySet() { public Collection<EventEntry> entrySet() {
if(start != 0 || end != store.size())
return Collections.unmodifiableList(store.subList(start, end)); return Collections.unmodifiableList(store.subList(start, end));
else
return Collections.unmodifiableList(store);
} }
@Override @Override
public boolean isEmpty() { return start == end; } public boolean isEmpty() {
return start==end || store.isEmpty();
}
@Override @Override
public long firstKey() { public long firstKey() {
if (isEmpty()) throw new NoSuchElementException();
return store.get(start).timestamp; return store.get(start).timestamp;
} }
@Override @Override
public long lastKey() { public long lastKey() {
if (isEmpty()) throw new NoSuchElementException(); return store.get(end-1).timestamp;
return store.get(end - 1).timestamp; }
// Navigable map functions
@Override
public EventEntry firstEntry() {
return store.get(start);
} }
@Override @Override
public EventEntry firstEntry() { return entry(start); } public EventEntry lastEntry() {
return store.get(end-1);
}
@Override @Override
public EventEntry lastEntry() { return entry(end - 1); } public EventEntry floorEntry(long key) {
int index = Collections.binarySearch(store, new EventEntry(key));
if(index==-1) return null;
// < 0 if element is not in the list, see Collections.binarySearch
if (index < 0) {
index = -(index + 2);
}
if(index>=end)
return store.get(end-1);
return index<start? null: store.get(index);
}
@Override @Override
public EventEntry floorEntry(long key) { return entry(bound(key, true) - 1); } public EventEntry ceilingEntry(long key) {
int index = Collections.binarySearch(store, new EventEntry(key));
// < 0 if element is not in the list, see Collections.binarySearch
if (index < 0)
index = -(index + 1);
if(index<start)
return store.get(start);
return index>=end? null: store.get(index);
}
@Override @Override
public EventEntry ceilingEntry(long key) { return entry(bound(key, false)); } public EventEntry lowerEntry(long key) {
int index = Collections.binarySearch(store, new EventEntry(key));
// < 0 if element is not in the list, see Collections.binarySearch
if (index < 0)
index = -(index + 1);
index--;
if(index>=end)
return store.get(end-1);
return index>=end || index<start ?null:store.get(index);
}
@Override @Override
public EventEntry lowerEntry(long key) { return entry(bound(key, false) - 1); } public EventEntry higherEntry(long key) {
int index = Collections.binarySearch(store, new EventEntry(key));
// < 0 if element is not in the list, see Collections.binarySearch
if (index < 0)
index = -(index + 1);
else
index++;
if(index<start)
return store.get(start);
return index>=end || index<start ?null:store.get(index);
}
@Override @Override
public EventEntry higherEntry(long key) { return entry(bound(key, true)); } public java.util.Iterator<EventEntry> iterator() {
return new Iterator(this);
}
@Override
public java.util.Iterator<EventEntry> iterator() { return entrySet().iterator(); }
} }
@@ -30,4 +30,11 @@ public interface IEvent {
*/ */
public EventKind getKind(); public EventKind getKind();
/**
* Gets the type.
*
* @return the type
*/
public WaveformType getType();
} }
@@ -70,9 +70,9 @@ public interface IEventList extends Iterable<EventEntry> {
* {@code fromKey} to {@code toKey}. If {@code fromKey} and * {@code fromKey} to {@code toKey}. If {@code fromKey} and
* {@code toKey} are equal, the returned map is empty unless * {@code toKey} are equal, the returned map is empty unless
* {@code fromInclusive} is true. The * {@code fromInclusive} is true. The
* returned view is read-only. Do not structurally modify a mutable source * returned map is backed by this map, so changes in the returned map are
* while a view is in use. EventList.Builder produces frozen sources suitable * reflected in this map, and vice-versa. The returned map supports all
* for sharing range views. * optional map operations that this map supports.
* *
* @param fromKey low endpoint of the keys in the returned map * @param fromKey low endpoint of the keys in the returned map
* @param fromInclusive {@code true} if the low endpoint * @param fromInclusive {@code true} if the low endpoint
@@ -24,15 +24,9 @@ public class InputFormatException extends Exception {
* @param string the string * @param string the string
*/ */
public InputFormatException(String string) { public InputFormatException(String string) {
super(string);
message=string; message=string;
} }
public InputFormatException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
/** The Constant serialVersionUID. */ /** The Constant serialVersionUID. */
private static final long serialVersionUID = 8676129878197783368L; private static final long serialVersionUID = 8676129878197783368L;
@@ -1,31 +0,0 @@
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<T> {
private enum State { UNLOADED, LOADING, LOADED, FAILED }
private State state = State.UNLOADED;
private T value;
private Throwable failure;
public synchronized T get(Supplier<T> 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;
}
}
}
@@ -17,17 +17,10 @@ public enum WaveformType {
/** The signal. */ /** The signal. */
SIGNAL, SIGNAL,
/** The transaction stream. */ /** The transaction. */
STREAM, TRANSACTION,
/** The transaction generator. */
GENERATOR,
/** The filter. */ /** The filter. */
FILTER, FILTER,
/** The blank line. */ /** The blank line. */
EMPTY; EMPTY
/** Whether this waveform contains transactions, in a stream or a generator. */
public boolean isTransaction() {
return this == STREAM || this == GENERATOR;
}
} }
@@ -16,7 +16,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -37,11 +37,11 @@ import com.minres.scviewer.database.RelationType;
public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener { public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener {
/** The loaders. */ /** The loaders. */
private static final CopyOnWriteArrayList<IWaveformDbLoaderFactory> loaderFactories = new CopyOnWriteArrayList<>(); private static List<IWaveformDbLoaderFactory> loaderFactories = new LinkedList<>();
private List<IWaveformDbLoader> activeLoader = new ArrayList<>(); private List<IWaveformDbLoader> activeLoader = new ArrayList<>();
/** The loaded. */ /** The loaded. */
private volatile boolean loaded; private boolean loaded;
/** The relation types. */ /** The relation types. */
private List<RelationType> relationTypes = new ArrayList<>();; private List<RelationType> relationTypes = new ArrayList<>();;
@@ -50,7 +50,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
private Map<String, IWaveform> waveforms = Collections.synchronizedMap(new HashMap<>()) ;; private Map<String, IWaveform> waveforms = Collections.synchronizedMap(new HashMap<>()) ;;
/** The max time. */ /** The max time. */
private volatile long maxTime = 0L; private long maxTime = 0L;
private static final Logger LOG = LoggerFactory.getLogger(WaveformDb.class); private static final Logger LOG = LoggerFactory.getLogger(WaveformDb.class);
@@ -60,7 +60,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @param loader the loader * @param loader the loader
*/ */
public synchronized void bind(IWaveformDbLoaderFactory loader) { public synchronized void bind(IWaveformDbLoaderFactory loader) {
loaderFactories.addIfAbsent(loader); loaderFactories.add(loader);
} }
/** /**
@@ -78,7 +78,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @return the loaders * @return the loaders
*/ */
public static List<IWaveformDbLoaderFactory> getLoaders() { public static List<IWaveformDbLoaderFactory> getLoaders() {
return List.copyOf(loaderFactories); return Collections.unmodifiableList(loaderFactories);
} }
/** /**
@@ -109,7 +109,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
*/ */
@Override @Override
public List<IWaveform> getAllWaves() { public List<IWaveform> getAllWaves() {
synchronized (waveforms) { return new ArrayList<>(waveforms.values()); } return new ArrayList<>(waveforms.values());
} }
/** /**
@@ -120,70 +120,42 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
*/ */
@Override @Override
public boolean load(File inp) { public boolean load(File inp) {
List<PropertyChangeEvent> notifications = new ArrayList<>(); boolean retval = true;
boolean result; for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) {
synchronized (this) { if (loaderFactory.canLoad(inp)) {
result = loadLocked(inp, notifications); IWaveformDbLoader loader = loaderFactory.getLoader();
} loader.addPropertyChangeListener(this);
// A listener may wait for the UI, which in turn may need close().
// Never invoke external listeners while holding the database lock.
notifications.forEach(pcs::firePropertyChange);
return result;
}
private boolean loadLocked(File inp, List<PropertyChangeEvent> notifications) {
for (IWaveformDbLoaderFactory factory : getLoaders()) {
if (!factory.canLoad(inp)) continue;
IWaveformDbLoader loader = factory.getLoader();
List<PropertyChangeEvent> pending = Collections.synchronizedList(new ArrayList<>());
PropertyChangeListener collector = pending::add;
long endTime;
List<RelationType> types;
loader.addPropertyChangeListener(collector);
try { try {
loader.load(inp); loader.load(inp);
endTime = loader.getMaxTime();
types = new ArrayList<>(loader.getAllRelationTypes());
} catch (Exception e) {
LOG.error("Error loading file " + inp.getName(), e);
try { loader.dispose(); }
catch (RuntimeException cleanup) { LOG.warn("Cannot dispose failed loader", cleanup); }
continue;
} finally {
loader.removePropertyChangeListener(collector);
}
// Commit only completed loads; failed loaders never publish partial hierarchies.
activeLoader.add(loader); activeLoader.add(loader);
maxTime = Math.max(maxTime, endTime); } catch (Exception e) {
if (name == null) name = getFileBasename(inp.getName()); LOG.error("error loading file "+inp.getName(), e);
for (RelationType type : types) if (!relationTypes.contains(type)) relationTypes.add(type); retval=false;
synchronized (pending) {
for (PropertyChangeEvent event : pending) applyWaveform(event);
if (!pending.isEmpty()) addWaveformNotifications(notifications);
} }
loader.removePropertyChangeListener(this);
// for (IWaveform w : loader.getAllWaves()) {
// waveforms.put(w.getFullName(), w);
// }
if (loader.getMaxTime() > maxTime) {
maxTime = loader.getMaxTime();
}
if (name == null)
name = getFileBasename(inp.getName());
//buildHierarchyNodes();
relationTypes.addAll(loader.getAllRelationTypes());
}
}
pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null);
loaded = true; loaded = true;
notifications.add(new PropertyChangeEvent(this, IHierNode.LOADING_FINISHED, null, Boolean.TRUE)); return retval;
return true;
}
notifications.add(new PropertyChangeEvent(this, IHierNode.LOADING_FINISHED, null, Boolean.FALSE));
return false;
} }
@Override @Override
public synchronized void close() { public void close() {
for (IWaveformDbLoader loader : activeLoader) { for (IWaveformDbLoader entry : activeLoader) {
try { loader.dispose(); } entry.dispose();
catch (RuntimeException e) { LOG.warn("Cannot dispose database loader", e); }
} }
activeLoader.clear();
waveforms.clear();
childNodes.clear();
relationTypes.clear();
maxTime = 0;
loaded = false;
name = null;
} }
/** /**
* Gets the file basename. * Gets the file basename.
* *
@@ -191,7 +163,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @return the file basename * @return the file basename
*/ */
protected static String getFileBasename(String f) { protected static String getFileBasename(String f) {
String ext = f; String ext = "";
int i = f.lastIndexOf('.'); int i = f.lastIndexOf('.');
if (i > 0 && i < f.length() - 1) { if (i > 0 && i < f.length() - 1) {
ext = f.substring(0, i); ext = f.substring(0, i);
@@ -210,27 +182,33 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
@Override @Override
public void propertyChange(PropertyChangeEvent evt) { public void propertyChange(PropertyChangeEvent evt) {
List<PropertyChangeEvent> notifications = new ArrayList<>(); if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
synchronized (this) { || IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
if (applyWaveform(evt)) addWaveformNotifications(notifications);
}
notifications.forEach(pcs::firePropertyChange);
}
private boolean applyWaveform(PropertyChangeEvent evt) {
String property = evt.getPropertyName();
if (!IWaveformDbLoader.SIGNAL_ADDED.equals(property)
&& !IWaveformDbLoader.STREAM_ADDED.equals(property)
&& !IWaveformDbLoader.GENERATOR_ADDED.equals(property)) return false;
IWaveform waveform = (IWaveform) evt.getNewValue(); IWaveform waveform = (IWaveform) evt.getNewValue();
waveforms.put(waveform.getFullName(), waveform); waveforms.put(waveform.getFullName(), waveform);
if (!IWaveformDbLoader.GENERATOR_ADDED.equals(property)) putInHierarchy(waveform); putInHierarchy(waveform);
return true; pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
} else if (IWaveformDbLoader.GENERATOR_ADDED.equals(evt.getPropertyName())) {
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
}
} }
private void addWaveformNotifications(List<PropertyChangeEvent> notifications) { /**
notifications.add(new PropertyChangeEvent(this, IHierNode.WAVEFORMS, null, new HashMap<>(waveforms))); * Builds the hierarchy nodes.
notifications.add(new PropertyChangeEvent(this, IHierNode.CHILDS, null, new ArrayList<>(childNodes))); */
private synchronized void buildHierarchyNodes() {
boolean needsSorting = false;
for (IWaveform stream : getAllWaves()) {
if (stream.getParent() == null) {
putInHierarchy(stream);
needsSorting = true;
}
}
if (needsSorting) {
pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
}
} }
private synchronized void putInHierarchy(IWaveform waveform) { private synchronized void putInHierarchy(IWaveform waveform) {
@@ -1,12 +0,0 @@
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);
}
@@ -41,22 +41,6 @@ public interface ITx extends Comparable<ITx> {
*/ */
public IWaveform getGenerator(); public IWaveform getGenerator();
/**
* Gets the zero-based row index within the transaction's stream.
* The stream layout is calculated on demand.
*
* @return the concurrency index in the stream
*/
public int getConcurrencyIndxInStream();
/**
* Gets the zero-based row index within the transaction's generator.
* The generator layout is calculated on demand, independently of the stream layout.
*
* @return the concurrency index in the generator
*/
public int getConcurrencyIdxInGen();
/** /**
* Gets the begin time. * Gets the begin time.
* *
@@ -1,36 +0,0 @@
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);
}
}
@@ -1,60 +0,0 @@
package com.minres.scviewer.database.tx;
import java.util.ArrayList;
import java.util.List;
import com.minres.scviewer.database.EventEntry;
import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList;
/** Immutable balanced interval index; each transaction is represented by its start event. */
public final class TxIntervalIndex {
private static final class Node {
final ITxEvent event;
final long begin, end, maxEnd;
final Node left, right;
Node(List<ITxEvent> events, int from, int to) {
int mid = (from + to) >>> 1;
event = events.get(mid);
ITx tx = event.getTransaction();
begin = tx.getBeginTime();
end = tx.getEndTime();
left = from < mid ? new Node(events, from, mid) : null;
right = mid + 1 < to ? new Node(events, mid + 1, to) : null;
long max = end;
if (left != null && Long.compareUnsigned(left.maxEnd, max) > 0) max = left.maxEnd;
if (right != null && Long.compareUnsigned(right.maxEnd, max) > 0) max = right.maxEnd;
maxEnd = max;
}
void overlapping(long from, long to, List<ITxEvent> result) {
if (Long.compareUnsigned(maxEnd, from) < 0) return;
if (left != null) left.overlapping(from, to, result);
if (Long.compareUnsigned(begin, to) > 0) return;
if (Long.compareUnsigned(end, from) >= 0) result.add(event);
if (right != null) right.overlapping(from, to, result);
}
}
private final Node root;
public TxIntervalIndex(IEventList events) {
List<ITxEvent> starts = new ArrayList<>();
for (EventEntry entry : events)
for (IEvent event : entry.events)
if (event instanceof ITxEvent && event.getKind() != EventKind.END)
starts.add((ITxEvent) event);
// EventList already orders buckets by timestamp, including same-time starts.
root = starts.isEmpty() ? null : new Node(starts, 0, starts.size());
}
/** Inclusive boundaries also include zero-duration transactions. */
public List<ITxEvent> overlapping(long from, long to) {
if (Long.compareUnsigned(from, to) > 0) throw new IllegalArgumentException("Reversed time range");
List<ITxEvent> result = new ArrayList<>();
if (root != null) root.overlapping(from, to, result);
return result;
}
}
@@ -1,51 +0,0 @@
package com.minres.scviewer.database.tx;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.PriorityQueue;
import java.util.function.ObjIntConsumer;
import com.minres.scviewer.database.EventEntry;
import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.IEventList;
/** Assigns the lowest available row in O(N log C), where C is peak concurrency. */
public final class TxRowAllocator {
private record Active(long end, int row) { }
private TxRowAllocator() { }
public static int assign(IEventList events, ObjIntConsumer<ITxEvent> setRow) {
PriorityQueue<Active> active = new PriorityQueue<>((a, b) -> {
int cmp = Long.compareUnsigned(a.end(), b.end());
return cmp != 0 ? cmp : Integer.compare(a.row(), b.row());
});
PriorityQueue<Integer> free = new PriorityQueue<>();
Map<Long, Integer> rowByTx = new HashMap<>();
Map<ITxEvent, Integer> assignments = new IdentityHashMap<>();
int count = 0;
for (EventEntry entry : events) {
for (IEvent raw : entry.events) {
ITxEvent event = (ITxEvent) raw;
ITx tx = event.getTransaction();
if (tx == null) throw new IllegalStateException("Missing transaction for " + event);
if (event.getKind() == EventKind.END) {
Integer row = rowByTx.remove(tx.getId());
if (row == null) throw new IllegalStateException("End without begin for transaction " + tx.getId());
assignments.put(event, row);
continue;
}
while (!active.isEmpty() && Long.compareUnsigned(active.peek().end(), tx.getBeginTime()) <= 0)
free.add(active.remove().row());
int row = free.isEmpty() ? count++ : free.remove();
active.add(new Active(tx.getEndTime(), row));
assignments.put(event, row);
if (event.getKind() == EventKind.BEGIN) rowByTx.put(tx.getId(), row);
}
}
// Validate the whole layout before changing any event indexes.
assignments.forEach((event, row) -> setRow.accept(event, row));
return Math.max(1, count);
}
}
@@ -20,26 +20,9 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
<filteredResources>
<filter>
<id>1793520997733</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription> </projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -1,9 +1,9 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.compliance=11
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=17 org.eclipse.jdt.core.compiler.source=11
@@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: SCViewer Help Bundle-Name: SCViewer Help
Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
Bundle-Version: 2.20.0 Bundle-Version: 2.19.5
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Automatic-Module-Name: com.minres.scviewer.e4.application.help Automatic-Module-Name: com.minres.scviewer.e4.application.help
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.minres.scviewer</groupId> <groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId> <artifactId>com.minres.scviewer.parent</artifactId>
<version>2.20.0</version> <version>2.19.5</version>
<relativePath>../..</relativePath> <relativePath>../..</relativePath>
</parent> </parent>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
Loaded 100 of 176 files, more files were not shown because too many files have changed in this diff. Show more