Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56ad3026a1 | ||
|
|
3e31fee780 | ||
|
|
589762b220 | ||
|
|
4824d48828 | ||
|
|
7bceaa0635 | ||
|
|
d48fa68280 | ||
|
|
ad313b83f3 | ||
|
|
1eed2c970c | ||
|
|
6668151a53 | ||
|
|
591fe2c4c7 | ||
|
|
1f861cefb8 | ||
|
|
40d402ce8a | ||
|
|
889dee0b87 | ||
|
|
2b913d0e94 | ||
|
|
883aeb600b | ||
|
|
75fa1a4f31 | ||
|
|
e78c65a36c | ||
|
|
8d4ec071e5 | ||
|
|
d31fe15000 | ||
|
|
c85a842dbe | ||
|
|
82c4dcf552 | ||
|
|
182b5bc01e | ||
|
|
de66bb2580 | ||
|
|
f4908e45ba | ||
|
|
51115ff55c | ||
|
|
33c58983e3 | ||
|
|
2ffcbe1fa3 | ||
|
|
360df27a53 | ||
|
|
17015f1bbc | ||
|
|
e4ba753f82 |
No files matched your search
@@ -14,4 +14,15 @@
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
</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>
|
||||
Vendored
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable",
|
||||
"java.autobuild.enabled": false
|
||||
}
|
||||
@@ -5,7 +5,24 @@
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
</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>
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -7,7 +7,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -20,4 +20,15 @@
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
|
||||
@@ -10,8 +10,25 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
@@ -1,2 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding/<project>=UTF-8
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
|
||||
@@ -10,8 +10,25 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding/<project>=UTF-8
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
|
||||
@@ -10,8 +10,25 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding/<project>=UTF-8
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
|
||||
@@ -20,4 +20,15 @@
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="com.minres.scviewer.feature"
|
||||
label="%featureName"
|
||||
version="2.19.4"
|
||||
version="2.20.0"
|
||||
provider-name="%providerName">
|
||||
|
||||
<description>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
</project>
|
||||
@@ -10,8 +10,25 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.FeatureNature</nature>
|
||||
</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>
|
||||
@@ -1,2 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding/<project>=UTF-8
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>1.1.0-SNAPSHOT</version>
|
||||
|
||||
@@ -25,9 +25,26 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
+9
-6
@@ -17,6 +17,7 @@ import com.minres.scviewer.database.HierNode;
|
||||
import com.minres.scviewer.database.IEvent;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.LazyValue;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
|
||||
public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
|
||||
@@ -31,7 +32,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
|
||||
|
||||
private final int width;
|
||||
|
||||
private final IEventList values;
|
||||
private final LazyValue<IEventList> values;
|
||||
|
||||
public FstSignal(FstDbLoader loader, String name) {
|
||||
this(loader, 0, name, 0, 1);
|
||||
@@ -48,7 +49,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
|
||||
this.id=id;
|
||||
this.direction = direction;
|
||||
this.width=width;
|
||||
this.values=new EventList();
|
||||
this.values=new LazyValue<>();
|
||||
}
|
||||
|
||||
public FstSignal(FstSignal<T> o, int id, String name) {
|
||||
@@ -73,9 +74,11 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
|
||||
|
||||
@Override
|
||||
public IEventList getEvents() {
|
||||
if(values.size()==0)
|
||||
loader.getEvents(id, width, values);
|
||||
return values;
|
||||
return values.get(() -> {
|
||||
EventList loaded = new EventList();
|
||||
loader.getEvents(id, width, loaded);
|
||||
return loaded;
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -89,7 +92,7 @@ public class FstSignal<T extends IEvent> extends HierNode implements IWaveform {
|
||||
if(e==null)
|
||||
return new IEvent[] {};
|
||||
else
|
||||
return getEvents().floorEntry(time).events;
|
||||
return e.events;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -36,4 +36,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -16,3 +16,4 @@ Service-Component: OSGI-INF/component.xml
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Automatic-Module-Name: com.minres.scviewer.database.ftr
|
||||
Bundle-ClassPath: .
|
||||
Export-Package: com.minres.scviewer.database.ftr;x-friends:="com.minres.scviewer.database.test"
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
+46
-48
@@ -10,9 +10,12 @@
|
||||
*******************************************************************************/
|
||||
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.EventList;
|
||||
import com.minres.scviewer.database.HierNode;
|
||||
@@ -20,13 +23,27 @@ import com.minres.scviewer.database.IEvent;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.TxRowAllocator;
|
||||
import com.minres.scviewer.database.tx.ITxEvent;
|
||||
|
||||
/**
|
||||
* The Class AbstractTxStream.
|
||||
*/
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||
|
||||
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||
|
||||
@Override
|
||||
public List<ITx> getTransactionList() {
|
||||
return transactionList.get(() -> TransactionLists.fromEvents(getEvents(), () -> false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITx getTransaction(long id) {
|
||||
getEvents(); // FTR parses the owning stream on demand.
|
||||
ITx transaction = loader.getTransaction(id);
|
||||
return transaction != null && (transaction.getStream() == this || transaction.getGenerator() == this) ? transaction : null;
|
||||
}
|
||||
|
||||
private final String fullName;
|
||||
|
||||
@@ -38,6 +55,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
|
||||
/** The events. */
|
||||
protected IEventList events = new EventList();
|
||||
private EventList.Builder eventBuilder = new EventList.Builder();
|
||||
|
||||
/** The max concurrency. */
|
||||
private int rowCount = -1;
|
||||
@@ -71,7 +89,14 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
* @param evt the evt
|
||||
*/
|
||||
public void addEvent(ITxEvent evt) {
|
||||
events.put(evt.getTime(), evt);
|
||||
eventBuilder.add(evt.getTime(), evt);
|
||||
}
|
||||
|
||||
void finishEvents() {
|
||||
if (eventBuilder != null) {
|
||||
events = eventBuilder.build();
|
||||
eventBuilder = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,7 +107,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
*/
|
||||
@Override
|
||||
public IEvent[] getEventsAtTime(long time) {
|
||||
return events.get(time);
|
||||
return getEvents().get(time);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -93,11 +118,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
*/
|
||||
@Override
|
||||
public IEvent[] getEventsBeforeTime(long time) {
|
||||
EventEntry e = events.floorEntry(time);
|
||||
EventEntry e = getEvents().floorEntry(time);
|
||||
if (e == null)
|
||||
return new IEvent[] {};
|
||||
else
|
||||
return events.floorEntry(time).events;
|
||||
return e.events;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -107,7 +132,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
return WaveformType.STREAM;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -126,7 +151,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
* @return the width
|
||||
*/
|
||||
@Override
|
||||
public int getRowCount() {
|
||||
public synchronized int getRowCount() {
|
||||
if (rowCount<0)
|
||||
calculateConcurrency();
|
||||
return rowCount;
|
||||
@@ -140,43 +165,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
/**
|
||||
* Calculate concurrency.
|
||||
*/
|
||||
void calculateConcurrency() {
|
||||
if (rowCount>=0)
|
||||
return;
|
||||
ArrayList<Long> rowEndTime = new ArrayList<>();
|
||||
HashMap<Long, Integer> rowByTxId = new HashMap<>();
|
||||
for(EventEntry entry: getEvents()) {
|
||||
for(IEvent evt:entry.events) {
|
||||
TxEvent txEvt = (TxEvent) evt;
|
||||
ITx tx = txEvt.getTransaction();
|
||||
int rowIdx = 0;
|
||||
switch(evt.getKind()) {
|
||||
case END: //TODO: might throw NPE in concurrent execution
|
||||
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());
|
||||
synchronized void calculateConcurrency() {
|
||||
if (rowCount >= 0) return;
|
||||
int count = TxRowAllocator.assign(getEvents(), (event, row) -> {
|
||||
((TxEvent) event).setConcurrencyIndex(row);
|
||||
Tx tx = (Tx) event.getTransaction();
|
||||
if (this instanceof TxGenerator) tx.setConcurrencyIdxInGen(row);
|
||||
else tx.setConcurrencyIndxInStream(row);
|
||||
});
|
||||
for (com.minres.scviewer.database.IHierNode child : getChildNodes())
|
||||
((TxGenerator) child).calculateConcurrency();
|
||||
rowCount = count;
|
||||
}
|
||||
}
|
||||
+55
-57
@@ -76,7 +76,8 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
final Map<Long, FtrTx> transactions = UnifiedMap.newMap();
|
||||
|
||||
/** The attribute types. */
|
||||
final Map<String, TxAttributeType> attributeTypes = UnifiedMap.newMap();
|
||||
private record AttributeKey(String name, DataType type, AssociationType association) { }
|
||||
final Map<AttributeKey, TxAttributeType> attributeTypes = UnifiedMap.newMap();
|
||||
|
||||
/** The relations in. */
|
||||
final HashMultimap<Long, FtrRelation> relationsIn = HashMultimap.create();
|
||||
@@ -177,19 +178,17 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
* @throws InputFormatException the input format exception
|
||||
*/
|
||||
@Override
|
||||
public void load(File file) throws InputFormatException {
|
||||
this.file=file;
|
||||
public synchronized void load(File file) throws InputFormatException {
|
||||
dispose();
|
||||
this.file = file;
|
||||
try {
|
||||
fis = new FileInputStream(file);
|
||||
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);
|
||||
} catch (IOException e) {
|
||||
LOG.warn("Problem parsing file "+file.getName()+": " , e);
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error parsing file "+file.getName()+ ": ", e);
|
||||
transactions.clear();
|
||||
throw new InputFormatException(e.toString());
|
||||
dispose();
|
||||
throw new InputFormatException("Cannot parse " + file.getName(), e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -212,8 +211,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.error("Error parsing file "+file.getName(), e);
|
||||
transactions.clear();
|
||||
throw new InputFormatException(e.toString());
|
||||
throw new InputFormatException("Cannot read FTR chunks", e);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -221,7 +219,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException {
|
||||
CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk));
|
||||
long size = cborDecoder.readArrayLength();
|
||||
assert(size==-1);
|
||||
if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1");
|
||||
CborType next = cborDecoder.peekType();
|
||||
while(next != null && !break_type.isEqualType(next)) {
|
||||
long blockOffset = cborDecoder.getPos();
|
||||
@@ -233,28 +231,30 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
switch((int)tag) {
|
||||
case 6: // id/generator/start/end
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==4);
|
||||
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
|
||||
txId = cborDecoder.readInt();
|
||||
genId = cborDecoder.readInt();
|
||||
long startTime = cborDecoder.readInt()*time_scale_factor;
|
||||
long endTime = cborDecoder.readInt()*time_scale_factor;
|
||||
if(endTime<startTime) // fix buggy recording, end time needs to be later or equal start time
|
||||
endTime=startTime;
|
||||
TxGenerator gen = txGenerators.get(genId);
|
||||
TxStream stream = gen.stream;
|
||||
FtrTx scvTx = new FtrTx(txId, stream.getId(), genId, startTime, endTime, blockId, blockOffset);
|
||||
updateTransactions(txId, scvTx);
|
||||
if (scvTx.beginTime == scvTx.endTime) {
|
||||
stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
|
||||
gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
|
||||
stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime, gen.getType()));
|
||||
} else {
|
||||
stream.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime));
|
||||
gen.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime));
|
||||
stream.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime));
|
||||
gen.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime));
|
||||
stream.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(this, EventKind.BEGIN, txId, scvTx.beginTime, gen.getType()));
|
||||
stream.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(this, EventKind.END, txId, scvTx.endTime, gen.getType()));
|
||||
}
|
||||
break;
|
||||
default: { // skip over 7:begin attr, 8:record attr, 9:end attr
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==3);
|
||||
if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3");
|
||||
cborDecoder.readInt();
|
||||
long type_id = cborDecoder.readInt();
|
||||
switch(DataType.values()[(int)type_id]) {
|
||||
@@ -296,7 +296,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
switch((int)tag) {
|
||||
case 6: // id/generator/start/end
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==4);
|
||||
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
|
||||
cborDecoder.readInt(); //txid
|
||||
cborDecoder.readInt(); // genId
|
||||
cborDecoder.readInt(); // startTime
|
||||
@@ -304,7 +304,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
break;
|
||||
default: { // skip over 7:begin attr, 8:record attr, 9:end attr
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==3);
|
||||
if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3");
|
||||
long name_id = cborDecoder.readInt();
|
||||
long type_id = cborDecoder.readInt();
|
||||
DataType type = DataType.values()[(int)type_id];
|
||||
@@ -342,37 +342,41 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
LOG.error("Error parsing file "+file.getName(), e);
|
||||
throw new IllegalStateException("Cannot parse attributes in " + file.getName(), e);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
private synchronized TxAttributeType getOrAddAttributeType(long tag, DataType type, String attrName) {
|
||||
if(!attributeTypes.containsKey(attrName)) {
|
||||
attributeTypes.put(attrName, new TxAttributeType(attrName, type, AssociationType.values()[(int)tag-7]));
|
||||
}
|
||||
TxAttributeType attrType = attributeTypes.get(attrName);
|
||||
return attrType;
|
||||
AssociationType association = AssociationType.values()[(int) tag - 7];
|
||||
AttributeKey key = new AttributeKey(attrName, type, association);
|
||||
return attributeTypes.computeIfAbsent(key, k -> new TxAttributeType(k.name(), k.type(), k.association()));
|
||||
}
|
||||
/**
|
||||
* Dispose.
|
||||
*/
|
||||
@Override
|
||||
public void dispose() {
|
||||
try {
|
||||
if(lock!=null) lock.close();
|
||||
lock=null;
|
||||
if(fis!=null) fis.close();
|
||||
fis=null;
|
||||
} catch (IOException e) { }
|
||||
public synchronized void dispose() {
|
||||
try { if (lock != null) lock.close(); }
|
||||
catch (IOException e) { LOG.warn("Cannot release FTR lock", e); }
|
||||
finally { lock = null; }
|
||||
try { if (fis != null) fis.close(); }
|
||||
catch (IOException e) { LOG.warn("Cannot close FTR file", e); }
|
||||
finally { fis = null; }
|
||||
attrValues.clear();
|
||||
relationTypes.clear();
|
||||
txStreams.clear();
|
||||
txGenerators.clear();
|
||||
transactions.clear();
|
||||
txCache.clear();
|
||||
strDict.clear();
|
||||
attributeTypes.clear();
|
||||
relationsIn.clear();
|
||||
relationsOut.clear();
|
||||
threads.clear();
|
||||
maxTime = 0;
|
||||
time_scale_factor = 1000L;
|
||||
file = null;
|
||||
}
|
||||
|
||||
static long calculateTimescaleMultipierPower(long power){
|
||||
@@ -386,12 +390,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
}
|
||||
|
||||
public void parseInput(CborDecoder cborDecoder, FileChannel channel) {
|
||||
try {
|
||||
public void parseInput(CborDecoder cborDecoder, FileChannel channel) throws IOException {
|
||||
long cbor_tag = cborDecoder.readTag();
|
||||
assert(cbor_tag == 55799);
|
||||
if (!(cbor_tag == 55799)) throw new IOException("Invalid FTR structure: cbor_tag == 55799");
|
||||
long array_len = cborDecoder.readArrayLength();
|
||||
assert(array_len==-1);
|
||||
if (!(array_len==-1)) throw new IOException("Invalid FTR structure: array_len==-1");
|
||||
CborType next = cborDecoder.peekType();
|
||||
while(next != null && !break_type.isEqualType(next)) {
|
||||
long tag = cborDecoder.readTag();
|
||||
@@ -399,12 +402,12 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
case 6: { // info
|
||||
CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString()));
|
||||
long sz = cbd.readArrayLength();
|
||||
assert(sz==2);
|
||||
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
|
||||
long time_scale=cbd.readInt();
|
||||
long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale;
|
||||
time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale);
|
||||
long epoch_tag = cbd.readTag();
|
||||
assert(epoch_tag==1);
|
||||
if (!(epoch_tag==1)) throw new IOException("Invalid FTR structure: epoch_tag==1");
|
||||
cbd.readInt(); // epoch
|
||||
break;
|
||||
}
|
||||
@@ -414,7 +417,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
case 9: { // dictionary compressed
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==2);
|
||||
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
|
||||
cborDecoder.readInt(); // uncompressed size
|
||||
parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
|
||||
break;
|
||||
@@ -425,14 +428,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
case 11: { // directory compressed
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==2);
|
||||
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
|
||||
cborDecoder.readInt(); // uncompressed size
|
||||
parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
|
||||
break;
|
||||
}
|
||||
case 12: { //tx chunk uncompressed
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==4);
|
||||
if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
|
||||
long stream_id = cborDecoder.readInt();
|
||||
cborDecoder.readInt(); // start time of block
|
||||
long end_time = cborDecoder.readInt()*time_scale_factor;
|
||||
@@ -443,7 +446,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
case 13: { //tx chunk compressed
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==5);
|
||||
if (!(len==5)) throw new IOException("Invalid FTR structure: len==5");
|
||||
long stream_id = cborDecoder.readInt();
|
||||
cborDecoder.readInt(); // start time of block
|
||||
long end_time = cborDecoder.readInt()*time_scale_factor;
|
||||
@@ -459,7 +462,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
case 15: { // relations uncompressed
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==2);
|
||||
if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
|
||||
cborDecoder.readInt(); // uncompressed size
|
||||
parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
|
||||
break;
|
||||
@@ -467,11 +470,6 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
}
|
||||
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 {
|
||||
@@ -479,7 +477,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
ArrayList<String> lst = new ArrayList<>((int)size);
|
||||
for(long i = 0; i<size; ++i) {
|
||||
long idx = cborDecoder.readInt();
|
||||
assert(idx==strDict.size()+lst.size());
|
||||
if (!(idx==strDict.size()+lst.size())) throw new IOException("Invalid FTR structure: idx==strDict.size()+lst.size()");
|
||||
lst.add(cborDecoder.readTextString());
|
||||
}
|
||||
strDict.addAll(lst);
|
||||
@@ -503,14 +501,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
long id = cborDecoder.readTag();
|
||||
if(id==16) { // a stream
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==3);
|
||||
if (!(len==3)) throw new IOException("Invalid FTR structure: len==3");
|
||||
long stream_id = cborDecoder.readInt();
|
||||
long name_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)));
|
||||
} else if(id==17) { // a generator
|
||||
long len = cborDecoder.readArrayLength();
|
||||
assert(len==3);
|
||||
if (!(len==3)) throw new IOException("Invalid FTR structure: len==3");
|
||||
long gen_id = cborDecoder.readInt();
|
||||
long name_id = cborDecoder.readInt();
|
||||
long stream_id = cborDecoder.readInt();
|
||||
@@ -523,18 +521,18 @@ public class FtrDbLoader implements IWaveformDbLoader {
|
||||
|
||||
private void parseRel(CborDecoder cborDecoder) throws IOException {
|
||||
long size = cborDecoder.readArrayLength();
|
||||
assert(size==-1);
|
||||
if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1");
|
||||
CborType next = cborDecoder.peekType();
|
||||
while(next != null && !break_type.isEqualType(next)) {
|
||||
long sz = cborDecoder.readArrayLength();
|
||||
assert(sz==5 || sz==3);
|
||||
if (!(sz==5 || sz==3)) throw new IOException("Invalid FTR structure: sz==5 || sz==3");
|
||||
long type_id = cborDecoder.readInt();
|
||||
long from_id = cborDecoder.readInt();
|
||||
long to_id = cborDecoder.readInt();
|
||||
long from_fiber = sz>3?cborDecoder.readInt():-1;
|
||||
long to_fiber = sz>3?cborDecoder.readInt():-1;
|
||||
String rel_name = strDict.get((int)type_id);
|
||||
FtrRelation ftrRel = new FtrRelation(relationTypes.getOrDefault(rel_name, RelationTypeFactory.create(rel_name)), from_id, to_id, from_fiber, to_fiber);
|
||||
FtrRelation ftrRel = new FtrRelation(relationTypes.computeIfAbsent(rel_name, RelationTypeFactory::create), from_id, to_id, from_fiber, to_fiber);
|
||||
relationsOut.put(from_id, ftrRel);
|
||||
relationsIn.put(to_id, ftrRel);
|
||||
next = cborDecoder.peekType();
|
||||
|
||||
+8
-9
@@ -11,10 +11,10 @@
|
||||
package com.minres.scviewer.database.ftr;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.minres.scviewer.database.InputFormatException;
|
||||
import com.minres.scviewer.database.LazyValue;
|
||||
import com.minres.scviewer.database.tx.ITxAttribute;
|
||||
|
||||
/**
|
||||
@@ -41,7 +41,7 @@ class FtrTx implements Serializable {
|
||||
long endTime;
|
||||
|
||||
/** The attributes. */
|
||||
final List<ITxAttribute> attributes = new ArrayList<>();
|
||||
private final LazyValue<List<ITxAttribute>> attributes = new LazyValue<>();
|
||||
|
||||
final long blockId;
|
||||
|
||||
@@ -75,15 +75,14 @@ class FtrTx implements Serializable {
|
||||
}
|
||||
|
||||
public List<ITxAttribute> getAttributes(FtrDbLoader loader) {
|
||||
if(attributes.size()==0)
|
||||
return attributes.get(() -> {
|
||||
try {
|
||||
final TxStream stream = loader.txStreams.get(streamId);
|
||||
final byte[] chunk = stream.getChunks().get((int)blockId);
|
||||
attributes.addAll(loader.parseAtrributes(chunk, blockOffset));
|
||||
TxStream stream = loader.txStreams.get(streamId);
|
||||
byte[] chunk = stream.getChunks().get((int) blockId);
|
||||
return List.copyOf(loader.parseAtrributes(chunk, blockOffset));
|
||||
} catch (InputFormatException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
throw new IllegalStateException("Cannot read attributes for transaction " + id, e);
|
||||
}
|
||||
return attributes;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -38,6 +38,9 @@ class Tx implements ITx {
|
||||
|
||||
private final long streamId;
|
||||
|
||||
private volatile int concurrencyIndxInStream = -1;
|
||||
private volatile int concurrencyIdxInGen = -1;
|
||||
|
||||
/** The begin time. */
|
||||
long beginTime = -1;
|
||||
|
||||
@@ -175,6 +178,26 @@ class Tx implements ITx {
|
||||
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.
|
||||
*
|
||||
|
||||
+6
-12
@@ -26,6 +26,8 @@ class TxEvent implements ITxEvent {
|
||||
/** The kind. */
|
||||
final EventKind kind;
|
||||
|
||||
private final WaveformType waveformType;
|
||||
|
||||
/** The transaction. */
|
||||
final long transaction;
|
||||
|
||||
@@ -40,12 +42,14 @@ class TxEvent implements ITxEvent {
|
||||
* @param kind the kind
|
||||
* @param transaction the transaction
|
||||
* @param time the time
|
||||
* @param waveformType the type of the owning waveform
|
||||
*/
|
||||
TxEvent(FtrDbLoader loader, EventKind kind, Long transaction, Long time) {
|
||||
TxEvent(FtrDbLoader loader, EventKind kind, Long transaction, Long time, WaveformType waveformType) {
|
||||
this.loader = loader;
|
||||
this.kind = kind;
|
||||
this.transaction = transaction;
|
||||
this.time = time;
|
||||
this.waveformType = waveformType;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,7 +60,7 @@ class TxEvent implements ITxEvent {
|
||||
*/
|
||||
@Override
|
||||
public ITxEvent duplicate() throws CloneNotSupportedException {
|
||||
return new TxEvent(loader, kind, transaction, time);
|
||||
return new TxEvent(loader, kind, transaction, time, waveformType);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -69,16 +73,6 @@ class TxEvent implements ITxEvent {
|
||||
return kind.toString() + "@" + time + " of tx #" + transaction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the type.
|
||||
*
|
||||
* @return the type
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the kind.
|
||||
*
|
||||
|
||||
+7
-17
@@ -10,14 +10,13 @@
|
||||
*******************************************************************************/
|
||||
package com.minres.scviewer.database.ftr;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.minres.scviewer.database.DirectionType;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.InputFormatException;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
|
||||
/**
|
||||
* The Class TxGenerator.
|
||||
@@ -47,6 +46,11 @@ class TxGenerator extends AbstractTxStream {
|
||||
stream.addChild(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.GENERATOR;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if is same.
|
||||
*
|
||||
@@ -65,21 +69,7 @@ class TxGenerator extends AbstractTxStream {
|
||||
*/
|
||||
@Override
|
||||
public IEventList getEvents() {
|
||||
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();
|
||||
}
|
||||
}
|
||||
stream.loadStream();
|
||||
return events;
|
||||
}
|
||||
/**
|
||||
|
||||
+44
-20
@@ -10,11 +10,11 @@
|
||||
*******************************************************************************/
|
||||
package com.minres.scviewer.database.ftr;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.LazyValue;
|
||||
import com.minres.scviewer.database.RelationType;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.ITxAttribute;
|
||||
@@ -82,7 +82,29 @@ class TxRelation implements ITxRelation {
|
||||
|
||||
final long txId;
|
||||
|
||||
ITx tx = null;
|
||||
private final LazyValue<ITx> resolved = new LazyValue<>();
|
||||
|
||||
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) {
|
||||
this.fiberId = fiberId;
|
||||
@@ -91,7 +113,9 @@ class TxRelation implements ITxRelation {
|
||||
|
||||
@Override
|
||||
public int compareTo(ITx o) {
|
||||
return tx==null?-1:tx.compareTo(o);
|
||||
if (this == o) return 0;
|
||||
int cmp = Long.compare(getBeginTime(), o.getBeginTime());
|
||||
return cmp != 0 ? cmp : Long.compare(getId(), o.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -101,52 +125,52 @@ class TxRelation implements ITxRelation {
|
||||
|
||||
@Override
|
||||
public IWaveform getStream() {
|
||||
if(tx==null) {
|
||||
TxStream fiber = loader.txStreams.get(fiberId);
|
||||
fiber.loadStream();
|
||||
tx = loader.getTransaction(txId);
|
||||
return loader.txStreams.get(fiberId);
|
||||
} else
|
||||
return tx.getStream();
|
||||
return resolve().getStream();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IWaveform getGenerator() {
|
||||
if(tx==null) {
|
||||
loader.txStreams.get(fiberId).loadStream();
|
||||
tx = loader.getTransaction(txId);
|
||||
return resolve().getGenerator();
|
||||
}
|
||||
return tx.getGenerator();
|
||||
|
||||
@Override
|
||||
public int getConcurrencyIndxInStream() {
|
||||
return resolve().getConcurrencyIndxInStream();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getConcurrencyIdxInGen() {
|
||||
return resolve().getConcurrencyIdxInGen();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getBeginTime() {
|
||||
return tx==null?-1:tx.getBeginTime();
|
||||
return resolve().getBeginTime();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getEndTime() {
|
||||
return tx==null?-1:tx.getBeginTime();
|
||||
return resolve().getEndTime();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ITxAttribute> getAttributes() {
|
||||
return tx==null?new ArrayList<>():tx.getAttributes();
|
||||
return resolve().getAttributes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ITxRelation> getIncomingRelations() {
|
||||
return tx==null?new ArrayList<>():tx.getIncomingRelations();
|
||||
return resolve().getIncomingRelations();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ITxRelation> getOutgoingRelations() {
|
||||
return tx==null?new ArrayList<>():tx.getOutgoingRelations();
|
||||
return resolve().getOutgoingRelations();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return tx==null?("tx#" + getId() + "[not available]"):tx.toString();
|
||||
return "tx#" + txId + "[related transaction]";
|
||||
}
|
||||
}
|
||||
}
|
||||
+20
-19
@@ -17,6 +17,7 @@ import java.util.List;
|
||||
import com.minres.scviewer.database.DirectionType;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.LazyValue;
|
||||
import com.minres.scviewer.database.InputFormatException;
|
||||
|
||||
/**
|
||||
@@ -29,7 +30,8 @@ class TxStream extends AbstractTxStream {
|
||||
|
||||
final ArrayList<Long> fileOffsets = new ArrayList<>();
|
||||
|
||||
final ArrayList<byte[]> chunks = new ArrayList<>();
|
||||
private final LazyValue<List<byte[]>> chunks = new LazyValue<>();
|
||||
private final LazyValue<Boolean> parsed = new LazyValue<>();
|
||||
|
||||
/**
|
||||
* Instantiates a new tx stream.
|
||||
@@ -66,34 +68,33 @@ class TxStream extends AbstractTxStream {
|
||||
}
|
||||
|
||||
public List<byte[]> getChunks() throws InputFormatException {
|
||||
if(chunks.size()==0) {
|
||||
chunks.addAll(loader.getChunksAtOffsets(fileOffsets));
|
||||
return chunks.get(() -> {
|
||||
try {
|
||||
return List.copyOf(loader.getChunksAtOffsets(fileOffsets));
|
||||
} catch (InputFormatException e) {
|
||||
throw new IllegalStateException("Cannot read stream " + getFullName(), e);
|
||||
}
|
||||
return chunks;
|
||||
});
|
||||
}
|
||||
|
||||
public void loadStream() {
|
||||
parsed.get(() -> {
|
||||
try {
|
||||
List<byte[]> chunks = getChunks();
|
||||
int blockid = 0;
|
||||
for (byte[] bs : chunks) {
|
||||
loader.parseTx(this, blockid, bs);
|
||||
blockid++;
|
||||
int blockId = 0;
|
||||
for (byte[] chunk : getChunks()) loader.parseTx(this, blockId++, chunk);
|
||||
finishEvents();
|
||||
for (com.minres.scviewer.database.IHierNode child : getChildNodes())
|
||||
((TxGenerator) child).finishEvents();
|
||||
return Boolean.TRUE;
|
||||
} catch (InputFormatException | IOException e) {
|
||||
throw new IllegalStateException("Cannot parse stream " + getFullName(), e);
|
||||
}
|
||||
} catch (InputFormatException e) {
|
||||
} catch (IOException e) {
|
||||
});
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Gets the events.
|
||||
*
|
||||
* @return the events
|
||||
*/
|
||||
|
||||
@Override
|
||||
public IEventList getEvents() {
|
||||
if(events.size()==0) {
|
||||
loadStream();
|
||||
}
|
||||
return events;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
|
||||
@@ -36,4 +36,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -1,10 +1,10 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -13,3 +13,6 @@ Embed-Dependency: sqlite-jdbc
|
||||
Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial";
|
||||
a="sqlite-jdbc";v="3.8.7"
|
||||
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>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
+43
-16
@@ -10,10 +10,12 @@
|
||||
*******************************************************************************/
|
||||
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.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import com.minres.scviewer.database.EventEntry;
|
||||
import com.minres.scviewer.database.EventKind;
|
||||
@@ -27,8 +29,21 @@ import com.minres.scviewer.database.RelationTypeFactory;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
import com.minres.scviewer.database.sqlite.db.IDatabase;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.TxRowAllocator;
|
||||
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||
|
||||
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||
|
||||
@Override
|
||||
public List<ITx> getTransactionList() {
|
||||
return transactionList.get(() -> TransactionLists.sorted(getTransactions().values()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITx getTransaction(long id) {
|
||||
return id < Integer.MIN_VALUE || id > Integer.MAX_VALUE ? null : getTransactions().get((int) id);
|
||||
}
|
||||
|
||||
protected IDatabase database;
|
||||
|
||||
@@ -47,7 +62,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRowCount() {
|
||||
public synchronized int getRowCount() {
|
||||
if (this instanceof TxGenerator) {
|
||||
getEvents();
|
||||
return maxConcurrency;
|
||||
}
|
||||
if(maxConcurrency==null){
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
|
||||
@@ -77,21 +96,29 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IEventList getEvents(){
|
||||
if(events==null){
|
||||
events=new EventList();
|
||||
for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
|
||||
putEvent(new TxEvent(EventKind.BEGIN, entry.getValue()));
|
||||
putEvent(new TxEvent(EventKind.END, entry.getValue()));
|
||||
public synchronized IEventList getEvents() {
|
||||
if (events == null) {
|
||||
EventList.Builder builder = new EventList.Builder();
|
||||
for (ITx tx : getTransactions().values()) {
|
||||
if (tx.getBeginTime() == tx.getEndTime()) {
|
||||
TxEvent single = new TxEvent(EventKind.SINGLE, tx, this instanceof TxGenerator);
|
||||
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;
|
||||
}
|
||||
|
||||
private void putEvent(TxEvent ev){
|
||||
events.put(ev.getTime(), ev);
|
||||
}
|
||||
|
||||
protected abstract Map<Integer, ITx> getTransactions();
|
||||
|
||||
@Override
|
||||
@@ -111,16 +138,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
|
||||
@Override
|
||||
public IEvent[] getEventsBeforeTime(long time) {
|
||||
EventEntry e = events.floorEntry(time);
|
||||
EventEntry e = getEvents().floorEntry(time);
|
||||
if(e==null)
|
||||
return new IEvent[]{};
|
||||
else
|
||||
return events.floorEntry(time).events;
|
||||
return e.events;
|
||||
}
|
||||
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
return WaveformType.STREAM;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+19
-32
@@ -17,14 +17,12 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import com.minres.scviewer.database.AssociationType;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.sqlite.db.IDatabase;
|
||||
import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
|
||||
import com.minres.scviewer.database.sqlite.tables.ScvStream;
|
||||
import com.minres.scviewer.database.sqlite.tables.ScvTx;
|
||||
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.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.ITxAttribute;
|
||||
@@ -36,9 +34,10 @@ public class Tx implements ITx {
|
||||
private TxStream trStream;
|
||||
private TxGenerator trGenerator;
|
||||
private ScvTx scvTx;
|
||||
private volatile int concurrencyIdxInGen = -1;
|
||||
private List<ITxAttribute> attributes;
|
||||
private long begin=-1;
|
||||
private long end=-1;
|
||||
private final long begin;
|
||||
private final long end;
|
||||
private List<ITxRelation> incoming;
|
||||
private List<ITxRelation> outgoing;
|
||||
|
||||
@@ -47,6 +46,9 @@ public class Tx implements ITx {
|
||||
this.trStream=trStream;
|
||||
this.trGenerator=trGenerator;
|
||||
this.scvTx=scvTx;
|
||||
long[] times = trStream.getTransactionTimes(scvTx.getId());
|
||||
begin = times[0];
|
||||
end = times[1];
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -64,44 +66,29 @@ public class Tx implements ITx {
|
||||
return trGenerator;
|
||||
}
|
||||
|
||||
int getConcurrencyIndex() {
|
||||
@Override
|
||||
public int getConcurrencyIndxInStream() {
|
||||
return scvTx.getConcurrencyLevel();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getBeginTime() {
|
||||
if(begin<0){
|
||||
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");
|
||||
public int getConcurrencyIdxInGen() {
|
||||
if (concurrencyIdxInGen < 0) trGenerator.getRowCount();
|
||||
return concurrencyIdxInGen;
|
||||
}
|
||||
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
|
||||
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
|
||||
}
|
||||
}
|
||||
return begin;
|
||||
|
||||
void setConcurrencyIdxInGen(int index) {
|
||||
concurrencyIdxInGen = index;
|
||||
}
|
||||
|
||||
@Override
|
||||
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;
|
||||
}
|
||||
public long getBeginTime() { return begin; }
|
||||
|
||||
@Override
|
||||
public List<ITxAttribute> getAttributes() {
|
||||
public long getEndTime() { return end; }
|
||||
|
||||
@Override
|
||||
public synchronized List<ITxAttribute> getAttributes() {
|
||||
if(attributes==null){
|
||||
SQLiteDatabaseSelectHandler<ScvTxAttribute> handler = new SQLiteDatabaseSelectHandler<>(
|
||||
ScvTxAttribute.class, database, "tx="+scvTx.getId());
|
||||
|
||||
+8
-8
@@ -19,12 +19,17 @@ import com.minres.scviewer.database.tx.ITxEvent;
|
||||
public class TxEvent implements ITxEvent {
|
||||
|
||||
private final EventKind type;
|
||||
private final boolean inGenerator;
|
||||
private ITx tx;
|
||||
|
||||
public TxEvent(EventKind type, ITx tx) {
|
||||
super();
|
||||
this(type, tx, false);
|
||||
}
|
||||
|
||||
TxEvent(EventKind type, ITx tx, boolean inGenerator) {
|
||||
this.type = type;
|
||||
this.tx = tx;
|
||||
this.inGenerator = inGenerator;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -34,7 +39,7 @@ public class TxEvent implements ITxEvent {
|
||||
|
||||
@Override
|
||||
public IEvent duplicate() throws CloneNotSupportedException {
|
||||
return new TxEvent(type, tx);
|
||||
return new TxEvent(type, tx, inGenerator);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -52,14 +57,9 @@ public class TxEvent implements ITxEvent {
|
||||
return type.toString()+"@"+getTime()+" of tx #"+tx.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRowIndex() {
|
||||
return ((Tx)tx).getConcurrencyIndex();
|
||||
return inGenerator ? tx.getConcurrencyIdxInGen() : tx.getConcurrencyIndxInStream();
|
||||
}
|
||||
|
||||
}
|
||||
+12
-13
@@ -18,6 +18,7 @@ import java.util.TreeMap;
|
||||
|
||||
import com.minres.scviewer.database.DirectionType;
|
||||
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.SQLiteDatabaseSelectHandler;
|
||||
import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
|
||||
@@ -39,6 +40,11 @@ public class TxGenerator extends AbstractTxStream {
|
||||
stream.addChild(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.GENERATOR;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getId() {
|
||||
return (long) scvGenerator.getId();
|
||||
@@ -60,19 +66,12 @@ public class TxGenerator extends AbstractTxStream {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Map<Integer, ITx> getTransactions() {
|
||||
if(transactions==null){
|
||||
transactions = new TreeMap<>();
|
||||
SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database,
|
||||
"stream="+stream.getId()+" and generator="+scvGenerator.getId());
|
||||
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();
|
||||
}
|
||||
protected synchronized Map<Integer, ITx> getTransactions() {
|
||||
if (transactions == null) {
|
||||
TreeMap<Integer, ITx> loaded = new TreeMap<>();
|
||||
for (Map.Entry<Integer, ITx> entry : stream.getTransactions().entrySet())
|
||||
if (entry.getValue().getGenerator() == this) loaded.put(entry.getKey(), entry.getValue());
|
||||
transactions = loaded;
|
||||
}
|
||||
return transactions;
|
||||
}
|
||||
|
||||
+56
-19
@@ -17,6 +17,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
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.IEvent;
|
||||
@@ -36,7 +42,39 @@ public class TxStream extends AbstractTxStream {
|
||||
|
||||
private TreeMap<Integer, TxGenerator> generators;
|
||||
|
||||
private TreeMap<Integer, ITx> transactions;
|
||||
private final LazyValue<Map<Integer, ITx>> transactions = new LazyValue<>();
|
||||
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) {
|
||||
super(database, scvStream.getName(), scvStream.getId());
|
||||
@@ -54,39 +92,38 @@ public class TxStream extends AbstractTxStream {
|
||||
return (long) scvStream.getId();
|
||||
}
|
||||
|
||||
public List<IWaveform> getGenerators() {
|
||||
public synchronized List<IWaveform> getGenerators() {
|
||||
if(generators==null){
|
||||
SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>(
|
||||
ScvGenerator.class, database, "stream="+scvStream.getId());
|
||||
generators=new TreeMap<>();
|
||||
TreeMap<Integer, TxGenerator> loaded = new TreeMap<>();
|
||||
try {
|
||||
for(ScvGenerator scvGenerator:handler.selectObjects()){
|
||||
generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
|
||||
loaded.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
|
||||
}
|
||||
generators = loaded;
|
||||
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
|
||||
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
throw new IllegalStateException("Cannot load generators for " + getFullName(), e);
|
||||
}
|
||||
}
|
||||
return new ArrayList<>(generators.values());
|
||||
}
|
||||
|
||||
protected Map<Integer, ITx> getTransactions() {
|
||||
if(transactions==null){
|
||||
if(generators==null) getGenerators();
|
||||
transactions = new TreeMap<>();
|
||||
SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database,
|
||||
"stream="+scvStream.getId());
|
||||
protected synchronized Map<Integer, ITx> getTransactions() {
|
||||
return transactions.get(() -> {
|
||||
if (generators == null) getGenerators();
|
||||
TreeMap<Integer, ITx> loaded = new TreeMap<>();
|
||||
SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class,
|
||||
database, "stream=" + scvStream.getId());
|
||||
try {
|
||||
for(ScvTx scvTx:handler.selectObjects()){
|
||||
transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx));
|
||||
for (ScvTx row : handler.selectObjects())
|
||||
loaded.put(row.getId(), new Tx(database, this, generators.get(row.getGenerator()), row));
|
||||
} catch (ReflectiveOperationException | SQLException | IntrospectionException e) {
|
||||
throw new IllegalStateException("Cannot load transactions for " + getFullName(), e);
|
||||
}
|
||||
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
|
||||
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return transactions;
|
||||
return loaded;
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
|
||||
@@ -36,4 +36,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -1,11 +1,11 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -19,3 +19,4 @@ Bundle-ClassPath: .,
|
||||
lib/kotlin-stdlib-1.2.42.jar,
|
||||
lib/lz4-1.3.0.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>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
+44
-46
@@ -11,9 +11,12 @@
|
||||
*******************************************************************************/
|
||||
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.EventList;
|
||||
import com.minres.scviewer.database.HierNode;
|
||||
@@ -21,13 +24,28 @@ import com.minres.scviewer.database.IEvent;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.TxRowAllocator;
|
||||
import com.minres.scviewer.database.tx.ITxEvent;
|
||||
|
||||
/**
|
||||
* The Class AbstractTxStream.
|
||||
*/
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
abstract class AbstractTxStream extends HierNode implements IWaveform, ITransactionProvider {
|
||||
|
||||
private final LazyValue<List<ITx>> transactionList = new LazyValue<>();
|
||||
|
||||
@Override
|
||||
public List<ITx> getTransactionList() {
|
||||
return transactionList.get(() -> TransactionLists.fromEvents(getEvents(), () -> false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITx getTransaction(long id) {
|
||||
ITx transaction;
|
||||
try { transaction = loader.getTransaction(id); }
|
||||
catch (IllegalArgumentException missing) { return null; }
|
||||
return transaction != null && (transaction.getStream() == this || transaction.getGenerator() == this) ? transaction : null;
|
||||
}
|
||||
|
||||
private final String fullName;
|
||||
|
||||
@@ -39,6 +57,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
|
||||
/** The events. */
|
||||
IEventList events = new EventList();
|
||||
private EventList.Builder eventBuilder = new EventList.Builder();
|
||||
|
||||
/** The max concurrency. */
|
||||
private int rowCount = -1;
|
||||
@@ -72,7 +91,14 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
* @param evt the evt
|
||||
*/
|
||||
public void addEvent(ITxEvent evt) {
|
||||
events.put(evt.getTime(), evt);
|
||||
eventBuilder.add(evt.getTime(), evt);
|
||||
}
|
||||
|
||||
void finishEvents() {
|
||||
if (eventBuilder != null) {
|
||||
events = eventBuilder.build();
|
||||
eventBuilder = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -118,7 +144,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
return WaveformType.STREAM;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -137,7 +163,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
* @return the width
|
||||
*/
|
||||
@Override
|
||||
public int getRowCount() {
|
||||
public synchronized int getRowCount() {
|
||||
if (rowCount<0)
|
||||
calculateConcurrency();
|
||||
return rowCount;
|
||||
@@ -150,44 +176,16 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
||||
/**
|
||||
* Calculate concurrency.
|
||||
*/
|
||||
void calculateConcurrency() {
|
||||
if (rowCount>=0)
|
||||
return;
|
||||
ArrayList<Long> rowEndTime = new ArrayList<>();
|
||||
HashMap<Long, Integer> rowByTxId = new HashMap<>();
|
||||
for(EventEntry entry: events) {
|
||||
for(IEvent evt:entry.events) {
|
||||
TxEvent txEvt = (TxEvent) evt;
|
||||
ITx tx = txEvt.getTransaction();
|
||||
int rowIdx = 0;
|
||||
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());
|
||||
synchronized void calculateConcurrency() {
|
||||
if (rowCount >= 0) return;
|
||||
int count = TxRowAllocator.assign(getEvents(), (event, row) -> {
|
||||
((TxEvent) event).setConcurrencyIndex(row);
|
||||
Tx tx = (Tx) event.getTransaction();
|
||||
if (this instanceof TxGenerator) tx.setConcurrencyIdxInGen(row);
|
||||
else tx.setConcurrencyIndxInStream(row);
|
||||
});
|
||||
for (com.minres.scviewer.database.IHierNode child : getChildNodes())
|
||||
((TxGenerator) child).calculateConcurrency();
|
||||
rowCount = count;
|
||||
}
|
||||
}
|
||||
+10
-7
@@ -144,7 +144,7 @@ public class TextDbLoader implements IWaveformDbLoader {
|
||||
* @param txId the tx id
|
||||
* @return the transaction
|
||||
*/
|
||||
public ITx getTransaction(long txId) {
|
||||
public synchronized ITx getTransaction(long txId) {
|
||||
if (txCache.containsKey(txId))
|
||||
return txCache.get(txId);
|
||||
if(transactions.containsKey(txId)) {
|
||||
@@ -252,6 +252,8 @@ public class TextDbLoader implements IWaveformDbLoader {
|
||||
} finally {
|
||||
transactions = parser.txSink;
|
||||
}
|
||||
txStreams.values().forEach(TxStream::finishEvents);
|
||||
txGenerators.values().forEach(TxGenerator::finishEvents);
|
||||
txStreams.values().parallelStream().forEach(TxStream::calculateConcurrency);
|
||||
}
|
||||
|
||||
@@ -265,6 +267,7 @@ public class TextDbLoader implements IWaveformDbLoader {
|
||||
txStreams.clear();
|
||||
txGenerators.clear();
|
||||
transactions = null;
|
||||
txCache.clear();
|
||||
attributeTypes.clear();
|
||||
relationsIn.clear();
|
||||
relationsOut.clear();
|
||||
@@ -418,13 +421,13 @@ public class TextDbLoader implements IWaveformDbLoader {
|
||||
TxGenerator gen = loader.txGenerators.get(scvTx.generatorId);
|
||||
TxStream stream = loader.txStreams.get(gen.stream.getId());
|
||||
if (scvTx.beginTime == scvTx.endTime) {
|
||||
stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
|
||||
stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime, gen.getType()));
|
||||
} else {
|
||||
stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
|
||||
stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
|
||||
stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime, gen.getType()));
|
||||
stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime, stream.getType()));
|
||||
gen.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime, gen.getType()));
|
||||
}
|
||||
if (nextLine != null && nextLine.charAt(0) == 'a') {
|
||||
int idx = 0;
|
||||
|
||||
+23
@@ -38,6 +38,9 @@ class Tx implements ITx {
|
||||
|
||||
private final long streamId;
|
||||
|
||||
private volatile int concurrencyIndxInStream = -1;
|
||||
private volatile int concurrencyIdxInGen = -1;
|
||||
|
||||
/** The begin time. */
|
||||
long beginTime = -1;
|
||||
|
||||
@@ -174,6 +177,26 @@ class Tx implements ITx {
|
||||
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.
|
||||
*
|
||||
|
||||
+6
-12
@@ -26,6 +26,8 @@ class TxEvent implements ITxEvent {
|
||||
/** The kind. */
|
||||
final EventKind kind;
|
||||
|
||||
private final WaveformType waveformType;
|
||||
|
||||
/** The transaction. */
|
||||
final long transaction;
|
||||
|
||||
@@ -40,12 +42,14 @@ class TxEvent implements ITxEvent {
|
||||
* @param kind the kind
|
||||
* @param transaction the transaction
|
||||
* @param time the time
|
||||
* @param waveformType the type of the owning waveform
|
||||
*/
|
||||
TxEvent(TextDbLoader loader, EventKind kind, Long transaction, Long time) {
|
||||
TxEvent(TextDbLoader loader, EventKind kind, Long transaction, Long time, WaveformType waveformType) {
|
||||
this.loader = loader;
|
||||
this.kind = kind;
|
||||
this.transaction = transaction;
|
||||
this.time = time;
|
||||
this.waveformType = waveformType;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,7 +60,7 @@ class TxEvent implements ITxEvent {
|
||||
*/
|
||||
@Override
|
||||
public ITxEvent duplicate() throws CloneNotSupportedException {
|
||||
return new TxEvent(loader, kind, transaction, time);
|
||||
return new TxEvent(loader, kind, transaction, time, waveformType);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -69,16 +73,6 @@ class TxEvent implements ITxEvent {
|
||||
return kind.toString() + "@" + time + " of tx #" + transaction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the type.
|
||||
*
|
||||
* @return the type
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.TRANSACTION;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the kind.
|
||||
*
|
||||
|
||||
+6
@@ -16,6 +16,7 @@ import java.util.List;
|
||||
|
||||
import com.minres.scviewer.database.DirectionType;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
|
||||
/**
|
||||
* The Class TxGenerator.
|
||||
@@ -45,6 +46,11 @@ class TxGenerator extends AbstractTxStream {
|
||||
stream.addChild(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.GENERATOR;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if is same.
|
||||
*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
|
||||
@@ -31,4 +31,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -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.nullanalysis=disabled
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
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.finalParameterBound=warning
|
||||
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
||||
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
|
||||
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
|
||||
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.varargsArgumentNeedCast=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
package com.minres.scviewer.database.ui;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.jface.viewers.StructuredSelection;
|
||||
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
|
||||
/** The selected transaction and tracks, with JFace conversion at the UI boundary. */
|
||||
public record WaveformSelection(ITx transaction, List<TrackEntry> tracks) {
|
||||
public WaveformSelection {
|
||||
tracks = tracks.stream().filter(java.util.Objects::nonNull).toList();
|
||||
}
|
||||
|
||||
public static WaveformSelection from(ISelection selection) {
|
||||
if (!(selection instanceof IStructuredSelection structured)) return new WaveformSelection(null, List.of());
|
||||
ITx transaction = null;
|
||||
List<TrackEntry> tracks = new ArrayList<>();
|
||||
for (Object element : structured.toArray()) {
|
||||
if (element instanceof ITx tx && transaction == null) transaction = tx;
|
||||
if (element instanceof TrackEntry track) tracks.add(track);
|
||||
}
|
||||
return new WaveformSelection(transaction, tracks);
|
||||
}
|
||||
|
||||
public TrackEntry track() {
|
||||
if (transaction == null) return tracks.isEmpty() ? null : tracks.get(0);
|
||||
return tracks.stream().filter(t -> t.waveform == transaction.getStream()
|
||||
|| t.waveform == transaction.getGenerator()).findFirst().orElse(null);
|
||||
}
|
||||
|
||||
public IStructuredSelection toSelection() {
|
||||
List<Object> elements = new ArrayList<>();
|
||||
if (transaction != null) elements.add(transaction);
|
||||
TrackEntry primary = track();
|
||||
if (primary != null) elements.add(primary);
|
||||
for (TrackEntry track : tracks) if (track != primary) elements.add(track);
|
||||
return new StructuredSelection(elements);
|
||||
}
|
||||
|
||||
public static IStructuredSelection of(ITx transaction, TrackEntry track) {
|
||||
return new WaveformSelection(transaction, track == null ? List.of() : List.of(track)).toSelection();
|
||||
}
|
||||
}
|
||||
+46
-33
@@ -41,9 +41,9 @@ public class ArrowPainter implements IPainter {
|
||||
|
||||
private ITx tx;
|
||||
|
||||
private List<LinkEntry> iRect;
|
||||
private List<LinkEntry> iRect = new LinkedList<>();
|
||||
|
||||
private List<LinkEntry> oRect;
|
||||
private List<LinkEntry> oRect = new LinkedList<>();
|
||||
|
||||
private Rectangle txRectangle;
|
||||
|
||||
@@ -56,7 +56,7 @@ public class ArrowPainter implements IPainter {
|
||||
public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) {
|
||||
this.waveCanvas = waveCanvas;
|
||||
highlightType=relationType;
|
||||
setTx(null);
|
||||
updateSelection();
|
||||
}
|
||||
|
||||
public RelationType getHighlightType() {
|
||||
@@ -71,10 +71,8 @@ public class ArrowPainter implements IPainter {
|
||||
return tx;
|
||||
}
|
||||
|
||||
public void setTx(ITx newTx) {
|
||||
this.tx = newTx;
|
||||
iRect = new LinkedList<>();
|
||||
oRect = new LinkedList<>();
|
||||
public void updateSelection() {
|
||||
tx = waveCanvas.currentSelectedTx;
|
||||
scaleFactor = waveCanvas.getScale();
|
||||
if (tx != null) {
|
||||
calculateGeometries();
|
||||
@@ -83,29 +81,40 @@ public class ArrowPainter implements IPainter {
|
||||
|
||||
private int getConcurrencyIndex(ITx tx) {
|
||||
IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime());
|
||||
Optional<Integer> res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
|
||||
Optional<Integer> res = Arrays.stream(eventList).filter(e -> ((ITxEvent)e).getTransaction()== tx).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
|
||||
if(res.isPresent() && res.get()>0) {
|
||||
return res.get();
|
||||
} else
|
||||
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() {
|
||||
iRect.clear();
|
||||
oRect.clear();
|
||||
IWaveformPainter painter = waveCanvas.wave2painterMap.get(tx.getStream());
|
||||
IWaveformPainter painter = null;
|
||||
if(waveCanvas.currentSelectedTrack != null)
|
||||
painter = waveCanvas.trackAreaPainter.getPainterFor(waveCanvas.currentSelectedTrack);
|
||||
if(painter == null)
|
||||
painter = waveCanvas.wave2painterMap.get(tx.getGenerator());
|
||||
if (painter == null) { // stream has been added but painter not yet
|
||||
// created
|
||||
if(painter==null)
|
||||
painter = waveCanvas.wave2painterMap.get(tx.getStream());
|
||||
if (painter == null) { // stream has been added but painter not yet created
|
||||
return true;
|
||||
}
|
||||
int laneHeight = painter.getHeight() / tx.getStream().getRowCount();
|
||||
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);
|
||||
Rectangle bb = getBoundingBox(painter, tx, painter instanceof StreamPainter? ((StreamPainter)painter).getStream() : tx.getStream());
|
||||
txRectangle = bb;
|
||||
deriveGeom(tx.getIncomingRelations(), iRect, false);
|
||||
deriveGeom(tx.getOutgoingRelations(), oRect, true);
|
||||
return false;
|
||||
@@ -114,18 +123,14 @@ public class ArrowPainter implements IPainter {
|
||||
protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) {
|
||||
for (ITxRelation iTxRelation : relations) {
|
||||
ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource();
|
||||
if(otherTx!=null && otherTx.getBeginTime()>=0)
|
||||
for(IWaveform iWaveform: new IWaveform[]{otherTx.getStream(), otherTx.getGenerator()}) {
|
||||
if (otherTx != null && otherTx.getBeginTime() >= 0)
|
||||
for (IWaveform iWaveform : new IWaveform[] { otherTx.getStream(), otherTx.getGenerator() }) {
|
||||
if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
|
||||
IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform);
|
||||
if(painter!=null) {
|
||||
int laneHeight = waveCanvas.styleProvider.getTrackHeight();
|
||||
int laneOffset = laneHeight * getConcurrencyIndex(tx);
|
||||
Rectangle bb = new Rectangle(
|
||||
(int) (otherTx.getBeginTime() / scaleFactor),
|
||||
waveCanvas.rulerHeight + painter.getVerticalOffset() + laneOffset,
|
||||
(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
|
||||
laneHeight);
|
||||
if (painter != null) {
|
||||
Rectangle bb = getBoundingBox(painter, otherTx,
|
||||
painter instanceof StreamPainter ? ((StreamPainter) painter).getStream()
|
||||
: otherTx.getStream());
|
||||
res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
|
||||
}
|
||||
}
|
||||
@@ -160,28 +165,36 @@ public class ArrowPainter implements IPainter {
|
||||
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 point2 = proj.project(new Point(tgtRectangle.x, tgtRectangle.y + tgtRectangle.height / 2));
|
||||
int arrowTipOffset=yCtrlOffset/2;
|
||||
|
||||
if (point2.x > point1.x + srcRectangle.width)
|
||||
point1.x += srcRectangle.width;
|
||||
if (point1.x > point2.x + tgtRectangle.width)
|
||||
point2.x += tgtRectangle.width;
|
||||
|
||||
Point endPoint = new Point(point2.x-arrowTipOffset, point2.y);
|
||||
Path path = new Path(Display.getCurrent());
|
||||
path.moveTo(point1.x, point1.y);
|
||||
if (point1.y == point2.y) {
|
||||
Point center = new Point((point1.x + point2.x) / 2, point1.y - yCtrlOffset);
|
||||
Point center = new Point((point1.x + endPoint.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(center.x + X_CTRL_OFFSET, center.y, point2.x - X_CTRL_OFFSET, point2.y, point2.x, point2.y);
|
||||
path.cubicTo(center.x + X_CTRL_OFFSET, center.y, endPoint.x - X_CTRL_OFFSET, endPoint.y, endPoint.x, endPoint.y);
|
||||
} else
|
||||
path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, point2.x - X_CTRL_OFFSET, point2.y, point2.x, point2.y);
|
||||
|
||||
path.cubicTo(point1.x + X_CTRL_OFFSET, point1.y, endPoint.x - X_CTRL_OFFSET, endPoint.y, endPoint.x, endPoint.y);
|
||||
path.lineTo(point2.x, point2.y);
|
||||
proj.setAntialias(SWT.ON);
|
||||
proj.setForeground(fgColor);
|
||||
proj.getGC().drawPath(path);
|
||||
path.dispose();
|
||||
// now draw the arrow head
|
||||
proj.getGC().drawLine(point2.x - 8, point2.y - 5, point2.x, point2.y);
|
||||
proj.getGC().drawLine(point2.x - 8, point2.y + 5, point2.x, point2.y);
|
||||
Color background = proj.getGC().getBackground();
|
||||
proj.setBackground(fgColor);
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -106,11 +106,13 @@ public class SignalPainter extends TrackPainter {
|
||||
EventEntry first = signal.getEvents().floorEntry(beginTime);
|
||||
if (first == null)
|
||||
first = signal.getEvents().firstEntry();
|
||||
if (first == null || Long.compareUnsigned(first.timestamp, endTime) > 0) return;
|
||||
beginTime = first.timestamp;
|
||||
proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
|
||||
proj.setLineStyle(SWT.LINE_SOLID);
|
||||
proj.setLineWidth(1);
|
||||
IEventList entries = signal.getEvents().subMap(beginTime, true, endTime);
|
||||
if (entries.isEmpty()) return;
|
||||
SignalChange left = new SignalChange(entries.firstEntry());
|
||||
SignalChange right = new SignalChange(entries.size() > 1 ? entries.higherEntry(left.time) : entries.firstEntry());
|
||||
maxPosX = area.x + area.width;
|
||||
|
||||
+35
-50
@@ -10,20 +10,19 @@
|
||||
*******************************************************************************/
|
||||
package com.minres.scviewer.database.ui.swt.internal;
|
||||
|
||||
import java.util.TreeMap;
|
||||
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.graphics.Rectangle;
|
||||
|
||||
import com.minres.scviewer.database.EventEntry;
|
||||
import com.minres.scviewer.database.EventKind;
|
||||
import com.minres.scviewer.database.IEvent;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
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.WaveformColors;
|
||||
|
||||
@@ -36,14 +35,14 @@ public class StreamPainter extends TrackPainter{
|
||||
private IWaveform stream;
|
||||
private int txBase;
|
||||
private int txHeight;
|
||||
// TODO: remove TreeMap usage
|
||||
private TreeMap<ITx, ITxEvent> seenTx;
|
||||
private TxIntervalIndex intervalIndex;
|
||||
private IEventList indexedEvents;
|
||||
private int indexedSize = -1;
|
||||
|
||||
public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) {
|
||||
super(trackEntry, even);
|
||||
this.waveCanvas = waveCanvas;
|
||||
this.stream=trackEntry.waveform;
|
||||
this.seenTx=new TreeMap<>();
|
||||
}
|
||||
|
||||
public void paintArea(Projection proj, Rectangle area) {
|
||||
@@ -72,11 +71,6 @@ public class StreamPainter extends TrackPainter{
|
||||
long beginTime = beginPos*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.setLineStyle(SWT.LINE_SOLID);
|
||||
proj.setLineWidth(1);
|
||||
@@ -84,47 +78,34 @@ public class StreamPainter extends TrackPainter{
|
||||
|
||||
for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
|
||||
proj.drawLine(area.x, y1, area.x+area.width, y1);
|
||||
if(firstTx==lastTx) {
|
||||
for(IEvent txEvent: firstTx.events)
|
||||
drawTx(proj, area, ((ITxEvent)txEvent).getTransaction(), ((ITxEvent)txEvent).getRowIndex(), false);
|
||||
}else{
|
||||
seenTx.clear();
|
||||
ITxEvent highlighed=null;
|
||||
proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE));
|
||||
long selectedId=waveCanvas.currentSelection!=null? waveCanvas.currentSelection.getId():-1;
|
||||
for(EventEntry entry: events.subMap(firstTx.timestamp, true, lastTx.timestamp))
|
||||
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;
|
||||
ITxEvent highlighted = null;
|
||||
for (ITxEvent event : getIntervalIndex().overlapping(beginTime, endTime)) {
|
||||
ITx tx = event.getTransaction();
|
||||
drawTx(proj, area, tx, event.getRowIndex(), false);
|
||||
if (waveCanvas.currentSelectedTx != null && waveCanvas.currentSelectedTx.getId() == tx.getId())
|
||||
highlighted = event;
|
||||
}
|
||||
if (highlighted != null) {
|
||||
proj.setForeground(waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE));
|
||||
drawTx(proj, area, highlighted.getTransaction(), highlighted.getRowIndex(), true);
|
||||
}
|
||||
}
|
||||
seenTx.entrySet().stream().forEach(e -> {
|
||||
drawTx(proj, area, e.getKey(), e.getValue().getRowIndex(), false);
|
||||
});
|
||||
|
||||
if(highlighed!=null){
|
||||
proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE));
|
||||
drawTx(proj, area, highlighed.getTransaction(), highlighed.getRowIndex(), true);
|
||||
}
|
||||
private TxIntervalIndex getIntervalIndex() {
|
||||
stream.getRowCount();
|
||||
IEventList events = stream.getEvents();
|
||||
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 ) {
|
||||
// compute colors
|
||||
Color[] transColor = waveCanvas.styleProvider.computeColor( tx.getGenerator().getName());
|
||||
IWaveform generator = tx.getGenerator();
|
||||
Color[] transColor = waveCanvas.styleProvider.computeColor( generator!=null?generator.getName():"unknown");
|
||||
|
||||
proj.setBackground(transColor[highlighted?1:0]);
|
||||
|
||||
@@ -155,13 +136,15 @@ public class StreamPainter extends TrackPainter{
|
||||
|
||||
public ITx getClicked(Point point) {
|
||||
int lane=point.y/waveCanvas.styleProvider.getTrackHeight();
|
||||
EventEntry firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScale());
|
||||
if(firstTx!=null){
|
||||
do {
|
||||
ITx tx = getTxFromEntry(lane, point.x, firstTx.events);
|
||||
if(tx!=null) return tx;
|
||||
firstTx=stream.getEvents().lowerEntry(firstTx.timestamp);
|
||||
}while(firstTx!=null);
|
||||
long scale = waveCanvas.getScale();
|
||||
long time = (long) point.x * scale;
|
||||
long low = Math.max(0L, (long) point.x - 5) * scale;
|
||||
long high = ((long) point.x + 5) * scale;
|
||||
for (ITxEvent event : getIntervalIndex().overlapping(low, high)) {
|
||||
if (event.getRowIndex() != lane) continue;
|
||||
ITx tx = event.getTransaction();
|
||||
if (event.getKind() == EventKind.SINGLE ||
|
||||
(tx.getBeginTime() <= time && tx.getEndTime() >= time)) return tx;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -172,6 +155,8 @@ public class StreamPainter extends TrackPainter{
|
||||
|
||||
public void setStream(IWaveform stream) {
|
||||
this.stream = stream;
|
||||
intervalIndex = null;
|
||||
indexedEvents = null;
|
||||
}
|
||||
|
||||
protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) {
|
||||
|
||||
+10
@@ -10,12 +10,14 @@
|
||||
*******************************************************************************/
|
||||
package com.minres.scviewer.database.ui.swt.internal;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.graphics.Rectangle;
|
||||
|
||||
import com.minres.scviewer.database.ui.TrackEntry;
|
||||
import com.minres.scviewer.database.ui.WaveformColors;
|
||||
|
||||
public class TrackAreaPainter implements IPainter {
|
||||
@@ -60,6 +62,14 @@ 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){
|
||||
trackVerticalOffset.put(trackPainter.getVerticalOffset()+waveCanvas.rulerHeight, trackPainter);
|
||||
|
||||
|
||||
+31
-13
@@ -18,6 +18,7 @@ import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Optional;
|
||||
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.ControlAdapter;
|
||||
import org.eclipse.swt.events.ControlEvent;
|
||||
@@ -44,6 +45,7 @@ import com.minres.scviewer.database.ui.IWaveformStyleProvider;
|
||||
import com.minres.scviewer.database.ui.IWaveformView;
|
||||
import com.minres.scviewer.database.ui.IWaveformZoom;
|
||||
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.swt.Constants;
|
||||
import com.minres.scviewer.database.ui.swt.internal.slider.ZoomBar;
|
||||
@@ -72,13 +74,15 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
|
||||
protected List<IPainter> painterList;
|
||||
|
||||
ITx currentSelection;
|
||||
ITx currentSelectedTx;
|
||||
|
||||
TrackEntry currentSelectedTrack;
|
||||
|
||||
private List<SelectionAdapter> selectionListeners;
|
||||
|
||||
private RulerPainter rulerPainter;
|
||||
|
||||
private TrackAreaPainter trackAreaPainter;
|
||||
TrackAreaPainter trackAreaPainter;
|
||||
|
||||
private ArrowPainter arrowPainter;
|
||||
|
||||
@@ -214,8 +218,9 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
factor=maxFactor;
|
||||
if(factor!=getScale() || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) {
|
||||
updateScaleFactor(factor);
|
||||
ITx tx = arrowPainter.getTx();
|
||||
arrowPainter.setTx(null);
|
||||
ITx tx = currentSelectedTx;
|
||||
currentSelectedTx=null;
|
||||
arrowPainter.updateSelection();
|
||||
/*
|
||||
* xc = tc/oldScaleFactor
|
||||
* xoffs = xc+origin.x
|
||||
@@ -231,7 +236,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
origin.x=0;
|
||||
}
|
||||
syncSb();
|
||||
arrowPainter.setTx(tx);
|
||||
currentSelectedTx=tx;
|
||||
arrowPainter.updateSelection();
|
||||
redraw();
|
||||
}
|
||||
}
|
||||
@@ -451,12 +457,13 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
return result;
|
||||
}
|
||||
|
||||
public void setSelected(ITx currentSelection) {
|
||||
this.currentSelection = currentSelection;
|
||||
if (currentSelection != null)
|
||||
reveal(currentSelection);
|
||||
arrowPainter.setTx(currentSelection);
|
||||
redraw();
|
||||
public void setSelected(ISelection selection) {
|
||||
WaveformSelection selected = WaveformSelection.from(selection);
|
||||
currentSelectedTrack = selected.track();
|
||||
currentSelectedTx = selected.transaction();
|
||||
if (currentSelectedTx != null) reveal(currentSelectedTx);
|
||||
arrowPainter.updateSelection();
|
||||
if (!isDisposed()) redraw();
|
||||
}
|
||||
|
||||
public void reveal(ITx tx) {
|
||||
@@ -470,9 +477,21 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
} else if (higher > (size.x - origin.x)) {
|
||||
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()) {
|
||||
if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) {
|
||||
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();
|
||||
if(res.isPresent()) {
|
||||
int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex();
|
||||
@@ -484,8 +503,6 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void reveal(IWaveform waveform) {
|
||||
for (IWaveformPainter painter : wave2painterMap.values()) {
|
||||
@@ -601,6 +618,7 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{
|
||||
|
||||
public void setStyleProvider(IWaveformStyleProvider styleProvider) {
|
||||
this.styleProvider=styleProvider;
|
||||
if(!isDisposed())
|
||||
redraw();
|
||||
}
|
||||
|
||||
|
||||
+45
-56
@@ -91,6 +91,7 @@ import com.minres.scviewer.database.ui.IWaveformView;
|
||||
import com.minres.scviewer.database.ui.IWaveformZoom;
|
||||
import com.minres.scviewer.database.ui.IWaveformviewEventListener;
|
||||
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.swt.internal.slider.ZoomBar;
|
||||
|
||||
@@ -531,6 +532,16 @@ 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) {
|
||||
@@ -623,7 +634,7 @@ public class WaveformView implements IWaveformView {
|
||||
private void addPainter(boolean even, TrackEntry streamEntry) {
|
||||
streamEntry.height = styleProvider.getTrackHeight();
|
||||
streamEntry.vOffset = tracksVerticalHeight;
|
||||
if (streamEntry.waveform.getType() == WaveformType.TRANSACTION) {
|
||||
if (streamEntry.waveform.getType().isTransaction()) {
|
||||
streamEntry.currentValue = "";
|
||||
streamEntry.height *= streamEntry.waveform.getRowCount();
|
||||
IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry);
|
||||
@@ -680,7 +691,7 @@ public class WaveformView implements IWaveformView {
|
||||
else
|
||||
entry.currentValue = Double.toString(val);
|
||||
}
|
||||
} else if (entry.waveform.getType() == WaveformType.TRANSACTION) {
|
||||
} else if (entry.waveform.getType().isTransaction()) {
|
||||
ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
|
||||
EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
|
||||
if (firstTx != null) {
|
||||
@@ -796,12 +807,7 @@ public class WaveformView implements IWaveformView {
|
||||
*/
|
||||
@Override
|
||||
public ISelection getSelection() {
|
||||
ArrayList<Object> sel = new ArrayList<>();
|
||||
if (currentTxSelection != null) {
|
||||
sel.add(currentTxSelection);
|
||||
}
|
||||
sel.addAll(currentWaveformSelection);
|
||||
return new StructuredSelection(sel.toArray());
|
||||
return new WaveformSelection(currentTxSelection, currentWaveformSelection).toSelection();
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -841,59 +847,39 @@ public class WaveformView implements IWaveformView {
|
||||
}
|
||||
|
||||
public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
|
||||
boolean selectionChanged = false;
|
||||
WaveformSelection requested = WaveformSelection.from(selection);
|
||||
currentWaveformSelection.forEach(e -> e.selected = false);
|
||||
if (selection instanceof IStructuredSelection) {
|
||||
IStructuredSelection sel = (IStructuredSelection) selection;
|
||||
if (sel.size() == 0) {
|
||||
selectionChanged = currentTxSelection != null || currentWaveformSelection != null;
|
||||
if (!add || (requested.transaction() == null && requested.tracks().isEmpty())) {
|
||||
currentWaveformSelection.clear();
|
||||
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();
|
||||
if (track != null) currentWaveformSelection.add(track);
|
||||
currentTxSelection = track == null ? null : transaction;
|
||||
} else {
|
||||
if (!add)
|
||||
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) {
|
||||
trackEntry = new TrackEntry(txSel.getStream(), styleProvider);
|
||||
streams.add(trackEntry);
|
||||
for (TrackEntry track : requested.tracks())
|
||||
if (!currentWaveformSelection.contains(track)) currentWaveformSelection.add(track);
|
||||
}
|
||||
}
|
||||
currentTxSelection = txSel;
|
||||
currentWaveformSelection.clear();
|
||||
currentWaveformSelection.add(trackEntry);
|
||||
selectionChanged = true;
|
||||
} else if (o instanceof TrackEntry) {
|
||||
TrackEntry e = (TrackEntry)o;
|
||||
if(!currentWaveformSelection.contains(e))
|
||||
currentWaveformSelection.add(e);
|
||||
selectionChanged = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (currentTxSelection != null || !currentWaveformSelection.isEmpty())
|
||||
selectionChanged = true;
|
||||
currentTxSelection = null;
|
||||
currentWaveformSelection.clear();
|
||||
}
|
||||
currentWaveformSelection.forEach(e -> e.selected = true);
|
||||
if (selectionChanged) {
|
||||
currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform));
|
||||
waveformCanvas.setSelected(currentTxSelection);
|
||||
currentWaveformSelection.forEach(e -> {
|
||||
e.selected = true;
|
||||
waveformCanvas.reveal(e.waveform);
|
||||
});
|
||||
waveformCanvas.setSelected(getSelection());
|
||||
valueList.redraw();
|
||||
nameList.redraw();
|
||||
fireSelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
protected void fireSelectionChanged() {
|
||||
if (currentWaveformSelection == null)
|
||||
@@ -942,7 +928,7 @@ public class WaveformView implements IWaveformView {
|
||||
return;
|
||||
TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0)
|
||||
: getEntryFor(currentTxSelection);
|
||||
if (selectedWaveform.waveform.getType() == WaveformType.TRANSACTION && currentTxSelection != null) {
|
||||
if (selectedWaveform.waveform.getType().isTransaction() && currentTxSelection != null) {
|
||||
if (relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)) {
|
||||
ITx transaction = null;
|
||||
if (direction == GotoDirection.NEXT) {
|
||||
@@ -1064,7 +1050,7 @@ public class WaveformView implements IWaveformView {
|
||||
TrackEntry sel = currentWaveformSelection.get(0);
|
||||
long time = getCursorTime();
|
||||
IEventList map = null;
|
||||
if (sel.waveform.getType() == WaveformType.TRANSACTION || sel.waveform.getType() == WaveformType.SIGNAL) {
|
||||
if (sel.waveform.getType().isTransaction() || sel.waveform.getType() == WaveformType.SIGNAL) {
|
||||
map = sel.waveform.getEvents();
|
||||
}
|
||||
if (map != null) {
|
||||
@@ -1376,10 +1362,13 @@ public class WaveformView implements IWaveformView {
|
||||
}
|
||||
|
||||
public TrackEntry getEntryFor(ITx source) {
|
||||
Optional<TrackEntry> optGen = streams.stream().filter(e -> source.getGenerator().equals(e.waveform))
|
||||
if(source.getGenerator()==null) return null;
|
||||
Optional<TrackEntry> optGen = streams.stream()
|
||||
.filter(e -> source.getGenerator().equals(e.waveform))
|
||||
.findFirst();
|
||||
if (optGen.isPresent())
|
||||
return optGen.get();
|
||||
if(source.getStream()==null) return null;
|
||||
Optional<TrackEntry> optStr = streams.stream().filter(e -> source.getStream().equals(e.waveform)).findFirst();
|
||||
if (optStr.isPresent())
|
||||
return optStr.get();
|
||||
@@ -1617,7 +1606,7 @@ public class WaveformView implements IWaveformView {
|
||||
}
|
||||
|
||||
public boolean waveformsContainsTx() {
|
||||
return streams.stream().filter(e -> e.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent();
|
||||
return streams.stream().filter(e -> e.waveform.getType().isTransaction()).findFirst().isPresent();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+4
-4
@@ -21,7 +21,7 @@ enum Direction {
|
||||
}
|
||||
|
||||
private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) {
|
||||
return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width );
|
||||
return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width );
|
||||
}
|
||||
|
||||
private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) {
|
||||
@@ -61,7 +61,7 @@ enum Direction {
|
||||
@Override
|
||||
protected void expand( Control control, int maxExpansion ) {
|
||||
Rectangle bounds = control.getBounds();
|
||||
int expand = expand( bounds.height, maxExpansion );
|
||||
int expand = super.expand( bounds.height, maxExpansion );
|
||||
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 ) {
|
||||
return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height );
|
||||
return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height );
|
||||
}
|
||||
|
||||
private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) {
|
||||
@@ -115,7 +115,7 @@ enum Direction {
|
||||
@Override
|
||||
protected void expand( Control control, int maxExpansion ) {
|
||||
Rectangle bounds = control.getBounds();
|
||||
int expand = expand( bounds.width, maxExpansion );
|
||||
int expand = super.expand( bounds.width, maxExpansion );
|
||||
control.setBounds( bounds.x - expand, bounds.y, bounds.width + expand, bounds.height );
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
|
||||
@@ -36,4 +36,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -1,10 +1,10 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -36,4 +36,15 @@
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
@@ -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.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -6,7 +6,8 @@ Bundle-Version: 4.0.0.qualifier
|
||||
Bundle-Vendor: MINRES Technologies GmbH
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
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
|
||||
Require-Bundle: javax.inject;bundle-version="1.0.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -238,16 +238,6 @@ public class BitVector implements IEvent {
|
||||
return EventKind.SINGLE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the type.
|
||||
*
|
||||
* @return the type
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.SIGNAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Duplicate.
|
||||
*
|
||||
|
||||
@@ -37,16 +37,6 @@ public class DoubleVal implements IEvent {
|
||||
return EventKind.SINGLE;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the type.
|
||||
*
|
||||
* @return the type
|
||||
*/
|
||||
@Override
|
||||
public WaveformType getType() {
|
||||
return WaveformType.SIGNAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Duplicate.
|
||||
*
|
||||
|
||||
+79
-130
@@ -3,193 +3,142 @@ package com.minres.scviewer.database;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
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 {
|
||||
/** 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;
|
||||
|
||||
ArrayList<EventEntry> store = new ArrayList<>();
|
||||
int start = 0;
|
||||
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 void add(long time, IEvent event) {
|
||||
if (built) throw new IllegalStateException("Event list has already been built");
|
||||
pending.add(new TimedEvent(time, event));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasNext() {
|
||||
return pos<(list.end-1);
|
||||
public EventList build() {
|
||||
if (built) throw new IllegalStateException("Event list has already been built");
|
||||
pending.sort((a, b) -> Long.compareUnsigned(a.time(), b.time()));
|
||||
ArrayList<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);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public EventEntry next() {
|
||||
if(hasNext()) {
|
||||
pos++;
|
||||
return list.store.get(pos);
|
||||
} else
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove() {
|
||||
list.store.remove(pos);
|
||||
}
|
||||
|
||||
}
|
||||
private final ArrayList<EventEntry> store;
|
||||
private final int start;
|
||||
private int end;
|
||||
private final boolean unmodifiable;
|
||||
|
||||
public EventList() {
|
||||
this(new ArrayList<>(), 0, 0, false);
|
||||
}
|
||||
|
||||
private EventList(ArrayList<EventEntry> store , int start, int end) {
|
||||
this.store=store;
|
||||
this.start=start;
|
||||
this.end=end;
|
||||
this.unmodifiable=true;
|
||||
private EventList(ArrayList<EventEntry> store, int start, int end, boolean unmodifiable) {
|
||||
this.store = store;
|
||||
this.start = start;
|
||||
this.end = end;
|
||||
this.unmodifiable = unmodifiable;
|
||||
}
|
||||
|
||||
/** 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
|
||||
public IEventList subMap(long from, boolean includeFrom, long to) {
|
||||
//the index of the first element greater than the key, or list.size()
|
||||
int beginIndex = Collections.binarySearch(store, new EventEntry(from));
|
||||
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);
|
||||
if (Long.compareUnsigned(from, to) > 0) throw new IllegalArgumentException("Reversed time range");
|
||||
int first = bound(from, !includeFrom);
|
||||
return new EventList(store, first, Math.max(first, bound(to, true)), true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int size() {
|
||||
return end-start;
|
||||
}
|
||||
public int size() { return end - start; }
|
||||
|
||||
@Override
|
||||
public boolean containsKey(long key) {
|
||||
int index = Collections.binarySearch(store, new EventEntry(key));
|
||||
return index>=0 && index>=start && index<end;
|
||||
EventEntry e = entry(bound(key, false));
|
||||
return e != null && e.timestamp == key;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IEvent[] get(long key) {
|
||||
int index = Collections.binarySearch(store, new EventEntry(key));
|
||||
if(index<0) return null;
|
||||
return index>=start && index<end? store.get(index).events: null;
|
||||
EventEntry e = entry(bound(key, false));
|
||||
return e != null && e.timestamp == key ? e.events : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void put(long key, IEvent value) {
|
||||
if(unmodifiable) throw new UnsupportedOperationException();
|
||||
if(store.size()==0 || store.get(store.size()-1).timestamp < key) {
|
||||
store.add(new EventEntry(key, new IEvent[] {value}));
|
||||
} else {
|
||||
int index = Collections.binarySearch(store, new EventEntry(key));
|
||||
// < 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();
|
||||
if (unmodifiable) throw new UnsupportedOperationException();
|
||||
int index = store.isEmpty() || Long.compareUnsigned(store.get(end - 1).timestamp, key) < 0
|
||||
? end : bound(key, false);
|
||||
if (index < end && store.get(index).timestamp == key) store.get(index).append(value);
|
||||
else store.add(index, new EventEntry(key, new IEvent[] {value}));
|
||||
end = store.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<EventEntry> entrySet() {
|
||||
if(start != 0 || end != store.size())
|
||||
return Collections.unmodifiableList(store.subList(start, end));
|
||||
else
|
||||
return Collections.unmodifiableList(store);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return start==end || store.isEmpty();
|
||||
}
|
||||
public boolean isEmpty() { return start == end; }
|
||||
|
||||
@Override
|
||||
public long firstKey() {
|
||||
if (isEmpty()) throw new NoSuchElementException();
|
||||
return store.get(start).timestamp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long lastKey() {
|
||||
return store.get(end-1).timestamp;
|
||||
}
|
||||
|
||||
// Navigable map functions
|
||||
@Override
|
||||
public EventEntry firstEntry() {
|
||||
return store.get(start);
|
||||
if (isEmpty()) throw new NoSuchElementException();
|
||||
return store.get(end - 1).timestamp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EventEntry lastEntry() {
|
||||
return store.get(end-1);
|
||||
}
|
||||
public EventEntry firstEntry() { return entry(start); }
|
||||
|
||||
@Override
|
||||
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);
|
||||
}
|
||||
public EventEntry lastEntry() { return entry(end - 1); }
|
||||
|
||||
@Override
|
||||
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);
|
||||
}
|
||||
public EventEntry floorEntry(long key) { return entry(bound(key, true) - 1); }
|
||||
|
||||
@Override
|
||||
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);
|
||||
}
|
||||
public EventEntry ceilingEntry(long key) { return entry(bound(key, false)); }
|
||||
|
||||
@Override
|
||||
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);
|
||||
}
|
||||
public EventEntry lowerEntry(long key) { return entry(bound(key, false) - 1); }
|
||||
|
||||
@Override
|
||||
public java.util.Iterator<EventEntry> iterator() {
|
||||
return new Iterator(this);
|
||||
}
|
||||
public EventEntry higherEntry(long key) { return entry(bound(key, true)); }
|
||||
|
||||
@Override
|
||||
public java.util.Iterator<EventEntry> iterator() { return entrySet().iterator(); }
|
||||
}
|
||||
@@ -30,11 +30,4 @@ public interface IEvent {
|
||||
*/
|
||||
public EventKind getKind();
|
||||
|
||||
/**
|
||||
* Gets the type.
|
||||
*
|
||||
* @return the type
|
||||
*/
|
||||
public WaveformType getType();
|
||||
|
||||
}
|
||||
+3
-3
@@ -70,9 +70,9 @@ public interface IEventList extends Iterable<EventEntry> {
|
||||
* {@code fromKey} to {@code toKey}. If {@code fromKey} and
|
||||
* {@code toKey} are equal, the returned map is empty unless
|
||||
* {@code fromInclusive} is true. The
|
||||
* returned map is backed by this map, so changes in the returned map are
|
||||
* reflected in this map, and vice-versa. The returned map supports all
|
||||
* optional map operations that this map supports.
|
||||
* returned view is read-only. Do not structurally modify a mutable source
|
||||
* while a view is in use. EventList.Builder produces frozen sources suitable
|
||||
* for sharing range views.
|
||||
*
|
||||
* @param fromKey low endpoint of the keys in the returned map
|
||||
* @param fromInclusive {@code true} if the low endpoint
|
||||
|
||||
+6
@@ -24,9 +24,15 @@ public class InputFormatException extends Exception {
|
||||
* @param string the string
|
||||
*/
|
||||
public InputFormatException(String string) {
|
||||
super(string);
|
||||
message=string;
|
||||
}
|
||||
|
||||
public InputFormatException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
/** The Constant serialVersionUID. */
|
||||
private static final long serialVersionUID = 8676129878197783368L;
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.minres.scviewer.database;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
/** Publishes one complete value, including empty values, and preserves loading failures. */
|
||||
public final class LazyValue<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;
|
||||
}
|
||||
}
|
||||
}
|
||||
+10
-3
@@ -17,10 +17,17 @@ public enum WaveformType {
|
||||
|
||||
/** The signal. */
|
||||
SIGNAL,
|
||||
/** The transaction. */
|
||||
TRANSACTION,
|
||||
/** The transaction stream. */
|
||||
STREAM,
|
||||
/** The transaction generator. */
|
||||
GENERATOR,
|
||||
/** The filter. */
|
||||
FILTER,
|
||||
/** The blank line. */
|
||||
EMPTY
|
||||
EMPTY;
|
||||
|
||||
/** Whether this waveform contains transactions, in a stream or a generator. */
|
||||
public boolean isTransaction() {
|
||||
return this == STREAM || this == GENERATOR;
|
||||
}
|
||||
}
|
||||
+78
-56
@@ -16,7 +16,7 @@ import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedList;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -37,11 +37,11 @@ import com.minres.scviewer.database.RelationType;
|
||||
public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener {
|
||||
|
||||
/** The loaders. */
|
||||
private static List<IWaveformDbLoaderFactory> loaderFactories = new LinkedList<>();
|
||||
private static final CopyOnWriteArrayList<IWaveformDbLoaderFactory> loaderFactories = new CopyOnWriteArrayList<>();
|
||||
|
||||
private List<IWaveformDbLoader> activeLoader = new ArrayList<>();
|
||||
/** The loaded. */
|
||||
private boolean loaded;
|
||||
private volatile boolean loaded;
|
||||
|
||||
/** The relation types. */
|
||||
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<>()) ;;
|
||||
|
||||
/** The max time. */
|
||||
private long maxTime = 0L;
|
||||
private volatile long maxTime = 0L;
|
||||
|
||||
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
|
||||
*/
|
||||
public synchronized void bind(IWaveformDbLoaderFactory loader) {
|
||||
loaderFactories.add(loader);
|
||||
loaderFactories.addIfAbsent(loader);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -78,7 +78,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||
* @return the loaders
|
||||
*/
|
||||
public static List<IWaveformDbLoaderFactory> getLoaders() {
|
||||
return Collections.unmodifiableList(loaderFactories);
|
||||
return List.copyOf(loaderFactories);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,7 +109,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||
*/
|
||||
@Override
|
||||
public List<IWaveform> getAllWaves() {
|
||||
return new ArrayList<>(waveforms.values());
|
||||
synchronized (waveforms) { return new ArrayList<>(waveforms.values()); }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -120,42 +120,70 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||
*/
|
||||
@Override
|
||||
public boolean load(File inp) {
|
||||
boolean retval = true;
|
||||
for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) {
|
||||
if (loaderFactory.canLoad(inp)) {
|
||||
IWaveformDbLoader loader = loaderFactory.getLoader();
|
||||
loader.addPropertyChangeListener(this);
|
||||
List<PropertyChangeEvent> notifications = new ArrayList<>();
|
||||
boolean result;
|
||||
synchronized (this) {
|
||||
result = loadLocked(inp, notifications);
|
||||
}
|
||||
// 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 {
|
||||
loader.load(inp);
|
||||
activeLoader.add(loader);
|
||||
endTime = loader.getMaxTime();
|
||||
types = new ArrayList<>(loader.getAllRelationTypes());
|
||||
} catch (Exception e) {
|
||||
LOG.error("error loading file "+inp.getName(), e);
|
||||
retval=false;
|
||||
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);
|
||||
}
|
||||
loader.removePropertyChangeListener(this);
|
||||
// for (IWaveform w : loader.getAllWaves()) {
|
||||
// waveforms.put(w.getFullName(), w);
|
||||
// }
|
||||
if (loader.getMaxTime() > maxTime) {
|
||||
maxTime = loader.getMaxTime();
|
||||
// Commit only completed loads; failed loaders never publish partial hierarchies.
|
||||
activeLoader.add(loader);
|
||||
maxTime = Math.max(maxTime, endTime);
|
||||
if (name == null) name = getFileBasename(inp.getName());
|
||||
for (RelationType type : types) if (!relationTypes.contains(type)) relationTypes.add(type);
|
||||
synchronized (pending) {
|
||||
for (PropertyChangeEvent event : pending) applyWaveform(event);
|
||||
if (!pending.isEmpty()) addWaveformNotifications(notifications);
|
||||
}
|
||||
if (name == null)
|
||||
name = getFileBasename(inp.getName());
|
||||
//buildHierarchyNodes();
|
||||
relationTypes.addAll(loader.getAllRelationTypes());
|
||||
}
|
||||
}
|
||||
pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null);
|
||||
loaded = true;
|
||||
return retval;
|
||||
notifications.add(new PropertyChangeEvent(this, IHierNode.LOADING_FINISHED, null, Boolean.TRUE));
|
||||
return true;
|
||||
}
|
||||
notifications.add(new PropertyChangeEvent(this, IHierNode.LOADING_FINISHED, null, Boolean.FALSE));
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
for (IWaveformDbLoader entry : activeLoader) {
|
||||
entry.dispose();
|
||||
public synchronized void close() {
|
||||
for (IWaveformDbLoader loader : activeLoader) {
|
||||
try { loader.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.
|
||||
*
|
||||
@@ -163,7 +191,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||
* @return the file basename
|
||||
*/
|
||||
protected static String getFileBasename(String f) {
|
||||
String ext = "";
|
||||
String ext = f;
|
||||
int i = f.lastIndexOf('.');
|
||||
if (i > 0 && i < f.length() - 1) {
|
||||
ext = f.substring(0, i);
|
||||
@@ -182,33 +210,27 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||
|
||||
@Override
|
||||
public void propertyChange(PropertyChangeEvent evt) {
|
||||
if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
|
||||
|| IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
|
||||
IWaveform waveform = (IWaveform) evt.getNewValue();
|
||||
waveforms.put(waveform.getFullName(), waveform);
|
||||
putInHierarchy(waveform);
|
||||
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);
|
||||
List<PropertyChangeEvent> notifications = new ArrayList<>();
|
||||
synchronized (this) {
|
||||
if (applyWaveform(evt)) addWaveformNotifications(notifications);
|
||||
}
|
||||
notifications.forEach(pcs::firePropertyChange);
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds the hierarchy nodes.
|
||||
*/
|
||||
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 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();
|
||||
waveforms.put(waveform.getFullName(), waveform);
|
||||
if (!IWaveformDbLoader.GENERATOR_ADDED.equals(property)) putInHierarchy(waveform);
|
||||
return true;
|
||||
}
|
||||
|
||||
private void addWaveformNotifications(List<PropertyChangeEvent> notifications) {
|
||||
notifications.add(new PropertyChangeEvent(this, IHierNode.WAVEFORMS, null, new HashMap<>(waveforms)));
|
||||
notifications.add(new PropertyChangeEvent(this, IHierNode.CHILDS, null, new ArrayList<>(childNodes)));
|
||||
}
|
||||
|
||||
private synchronized void putInHierarchy(IWaveform waveform) {
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package com.minres.scviewer.database.tx;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/** Optional indexed access scoped to one transaction stream or generator. */
|
||||
public interface ITransactionProvider {
|
||||
/** Immutable list ordered by begin time and transaction ID; does not load attributes. */
|
||||
List<ITx> getTransactionList();
|
||||
|
||||
/** Returns null when the ID does not belong to this stream or generator. */
|
||||
ITx getTransaction(long id);
|
||||
}
|
||||
@@ -41,6 +41,22 @@ public interface ITx extends Comparable<ITx> {
|
||||
*/
|
||||
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.
|
||||
*
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package com.minres.scviewer.database.tx;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.function.BooleanSupplier;
|
||||
|
||||
import com.minres.scviewer.database.EventEntry;
|
||||
import com.minres.scviewer.database.EventKind;
|
||||
import com.minres.scviewer.database.IEvent;
|
||||
import com.minres.scviewer.database.IEventList;
|
||||
|
||||
public final class TransactionLists {
|
||||
private TransactionLists() {}
|
||||
|
||||
/** Compatibility path for event-backed waveforms; callers can cache the completed result. */
|
||||
public static List<ITx> fromEvents(IEventList events, BooleanSupplier cancelled) {
|
||||
List<ITx> transactions = new ArrayList<>();
|
||||
for (EventEntry entry : events.entrySet()) {
|
||||
if (cancelled.getAsBoolean()) throw new java.util.concurrent.CancellationException();
|
||||
if (entry.events == null) continue;
|
||||
for (IEvent event : entry.events) {
|
||||
if (cancelled.getAsBoolean()) throw new java.util.concurrent.CancellationException();
|
||||
if (event instanceof ITxEvent tx && (event.getKind() == EventKind.BEGIN || event.getKind() == EventKind.SINGLE))
|
||||
transactions.add(tx.getTransaction());
|
||||
}
|
||||
}
|
||||
return sorted(transactions);
|
||||
}
|
||||
|
||||
public static List<ITx> sorted(java.util.Collection<ITx> transactions) {
|
||||
List<ITx> sorted = new ArrayList<>(transactions);
|
||||
sorted.sort(Comparator.comparingLong(ITx::getBeginTime).thenComparingLong(ITx::getId));
|
||||
return List.copyOf(sorted);
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
+51
@@ -0,0 +1,51 @@
|
||||
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,9 +20,26 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</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>
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
eclipse.preferences.version=1
|
||||
encoding/<project>=UTF-8
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
|
||||
org.eclipse.jdt.core.compiler.compliance=17
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=enabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
||||
org.eclipse.jdt.core.compiler.source=17
|
||||
@@ -0,0 +1,4 @@
|
||||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: SCViewer Help
|
||||
Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
|
||||
Bundle-Version: 2.19.4
|
||||
Bundle-Version: 2.20.0
|
||||
Bundle-Vendor: MINRES Technologies GmbH
|
||||
Automatic-Module-Name: com.minres.scviewer.e4.application.help
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>com.minres.scviewer</groupId>
|
||||
<artifactId>com.minres.scviewer.parent</artifactId>
|
||||
<version>2.19.4</version>
|
||||
<version>2.20.0</version>
|
||||
<relativePath>../..</relativePath>
|
||||
</parent>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
Loaded 100 of 182 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user