Merge branch 'release/2.1.6' into develop

com.minres.scviewer.database.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SCViewer database tests
 Bundle-SymbolicName: com.minres.scviewer.database.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GnbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,

com.minres.scviewer.database.test/inputs/my_db_truncated.txlog

@@ -0,0 +1,238 @@
+scv_tr_stream (ID 1, name "tr.pipelined_stream", kind "transactor")
+scv_tr_stream (ID 2, name "tr.addr_stream", kind "transactor")
+scv_tr_stream (ID 3, name "tr.data_stream", kind "transactor")
+scv_tr_generator (ID 4, name "read", scv_tr_stream 1,
+begin_attribute (ID 0, name "addr", type "UNSIGNED")
+end_attribute (ID 1, name "data", type "UNSIGNED")
+)
+scv_tr_generator (ID 5, name "write", scv_tr_stream 1,
+begin_attribute (ID 0, name "addr", type "UNSIGNED")
+end_attribute (ID 1, name "data", type "UNSIGNED")
+)
+scv_tr_generator (ID 6, name "addr", scv_tr_stream 2,
+begin_attribute (ID 0, name "addr", type "UNSIGNED")
+)
+scv_tr_generator (ID 7, name "rdata", scv_tr_stream 3,
+end_attribute (ID 0, name "data", type "UNSIGNED")
+)
+scv_tr_generator (ID 8, name "wdata", scv_tr_stream 3,
+begin_attribute (ID 0, name "data", type "UNSIGNED")
+)
+tx_begin 1 4 0 s
+a 0
+tx_record_attribute 1 "data_size" UNSIGNED = 24
+tx_begin 2 6 0 s
+a 0
+tx_relation "addr_phase" 2 1
+tx_end 2 6 180 ns
+tx_begin 3 7 180 ns
+tx_relation "data_phase" 3 1
+tx_begin 4 4 180 ns
+a 0
+tx_record_attribute 4 "data_size" UNSIGNED = 24
+tx_begin 5 6 180 ns
+a 0
+tx_relation "addr_phase" 5 4
+tx_end 5 6 300 ns
+tx_end 3 7 420 ns
+a 0
+tx_end 1 4 420 ns
+a 0
+tx_begin 6 4 420 ns
+a 1
+tx_record_attribute 6 "data_size" UNSIGNED = 24
+tx_begin 7 6 420 ns
+a 1
+tx_relation "addr_phase" 7 6
+tx_begin 8 7 420 ns
+tx_relation "data_phase" 8 4
+tx_end 7 6 480 ns
+tx_end 8 7 620 ns
+a 0
+tx_end 4 4 620 ns
+a 0
+tx_begin 9 4 620 ns
+a 1
+tx_record_attribute 9 "data_size" UNSIGNED = 24
+tx_begin 10 6 620 ns
+a 1
+tx_relation "addr_phase" 10 9
+tx_begin 11 7 620 ns
+tx_relation "data_phase" 11 6
+tx_end 11 7 700 ns
+a 1
+tx_end 6 4 700 ns
+a 1
+tx_end 10 6 760 ns
+tx_begin 12 7 760 ns
+tx_relation "data_phase" 12 9
+tx_begin 13 4 760 ns
+a 2
+tx_record_attribute 13 "data_size" UNSIGNED = 24
+tx_begin 14 6 760 ns
+a 2
+tx_relation "addr_phase" 14 13
+tx_end 14 6 880 ns
+tx_end 12 7 980 ns
+a 1
+tx_end 9 4 980 ns
+a 1
+tx_begin 15 4 980 ns
+a 2
+tx_record_attribute 15 "data_size" UNSIGNED = 24
+tx_begin 16 6 980 ns
+a 2
+tx_relation "addr_phase" 16 15
+tx_begin 17 7 980 ns
+tx_relation "data_phase" 17 13
+tx_end 16 6 1040 ns
+tx_end 17 7 1200 ns
+a 2
+tx_end 13 4 1200 ns
+a 2
+tx_begin 18 4 1200 ns
+a 120
+tx_record_attribute 18 "data_size" UNSIGNED = 24
+tx_begin 19 6 1200 ns
+a 120
+tx_relation "addr_phase" 19 18
+tx_begin 20 7 1200 ns
+tx_relation "data_phase" 20 15
+tx_end 19 6 1300 ns
+tx_end 20 7 1340 ns
+a 2
+tx_end 15 4 1340 ns
+a 2
+tx_begin 21 4 1340 ns
+a 11
+tx_record_attribute 21 "data_size" UNSIGNED = 24
+tx_begin 22 6 1340 ns
+a 11
+tx_relation "addr_phase" 22 21
+tx_begin 23 7 1340 ns
+tx_relation "data_phase" 23 18
+tx_end 23 7 1420 ns
+a 120
+tx_end 18 4 1420 ns
+a 120
+tx_end 22 6 1540 ns
+tx_begin 24 7 1540 ns
+tx_relation "data_phase" 24 21
+tx_begin 25 4 1540 ns
+a 147
+tx_record_attribute 25 "data_size" UNSIGNED = 24
+tx_begin 26 6 1540 ns
+a 147
+tx_relation "addr_phase" 26 25
+tx_end 24 7 1660 ns
+a 11
+tx_end 21 4 1660 ns
+a 11
+tx_end 26 6 1740 ns
+tx_begin 27 7 1740 ns
+tx_relation "data_phase" 27 25
+tx_begin 28 4 1740 ns
+a 99
+tx_record_attribute 28 "data_size" UNSIGNED = 24
+tx_begin 29 6 1740 ns
+a 99
+tx_relation "addr_phase" 29 28
+tx_end 29 6 1800 ns
+tx_end 27 7 1980 ns
+a 147
+tx_end 25 4 1980 ns
+a 147
+tx_begin 30 4 1980 ns
+a 55
+tx_record_attribute 30 "data_size" UNSIGNED = 24
+tx_begin 31 6 1980 ns
+a 55
+tx_relation "addr_phase" 31 30
+tx_begin 32 7 1980 ns
+tx_relation "data_phase" 32 28
+tx_end 32 7 2060 ns
+a 99
+tx_end 28 4 2060 ns
+a 99
+tx_end 31 6 2100 ns
+tx_begin 33 7 2100 ns
+tx_relation "data_phase" 33 30
+tx_begin 34 4 2100 ns
+a 126
+tx_record_attribute 34 "data_size" UNSIGNED = 24
+tx_begin 35 6 2100 ns
+a 126
+tx_relation "addr_phase" 35 34
+tx_end 33 7 2340 ns
+a 55
+tx_end 30 4 2340 ns
+a 55
+tx_end 35 6 2340 ns
+tx_begin 36 7 2340 ns
+tx_relation "data_phase" 36 34
+tx_begin 37 5 2340 ns
+a 204
+tx_record_attribute 37 "data_size" UNSIGNED = 24
+tx_begin 38 6 2340 ns
+a 204
+tx_relation "addr_phase" 38 37
+tx_end 38 6 2400 ns
+tx_end 36 7 2540 ns
+a 126
+tx_end 34 4 2540 ns
+a 126
+tx_begin 39 5 2540 ns
+a 242
+tx_record_attribute 39 "data_size" UNSIGNED = 24
+tx_begin 40 6 2540 ns
+a 242
+tx_relation "addr_phase" 40 39
+tx_begin 41 8 2540 ns
+a 211
+tx_relation "data_phase" 41 37
+tx_end 41 8 2640 ns
+tx_end 37 5 2640 ns
+a 211
+tx_end 40 6 2780 ns
+tx_begin 42 8 2780 ns
+a 58
+tx_relation "data_phase" 42 39
+tx_begin 43 5 2780 ns
+a 135
+tx_record_attribute 43 "data_size" UNSIGNED = 24
+tx_begin 44 6 2780 ns
+a 135
+tx_relation "addr_phase" 44 43
+tx_end 44 6 2960 ns
+tx_end 42 8 3 us
+tx_end 39 5 3 us
+a 58
+tx_begin 45 5 3 us
+a 26
+tx_record_attribute 45 "data_size" UNSIGNED = 24
+tx_begin 46 6 3 us
+a 26
+tx_relation "addr_phase" 46 45
+tx_begin 47 8 3 us
+a 31
+tx_relation "data_phase" 47 43
+tx_end 47 8 3140 ns
+tx_end 43 5 3140 ns
+a 31
+tx_end 46 6 3200 ns
+tx_begin 48 8 3200 ns
+a 37
+tx_relation "data_phase" 48 45
+tx_begin 49 5 3200 ns
+a 176
+tx_record_attribute 49 "data_size" UNSIGNED = 24
+tx_begin 50 6 3200 ns
+a 176
+tx_relation "addr_phase" 50 49
+tx_end 50 6 3300 ns
+tx_end 48 8 3380 ns
+tx_end 45 5 3380 ns
+a 37
+tx_begin 51 5 3380 ns
+a 58
+tx_record_attribute 51 "data_

com.minres.scviewer.database.test/pom.xml

@@ -2,6 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.database.test</artifactId>
+	<version>1.0.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
@@ -27,5 +28,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<version>1.0.0-SNAPSHOT</version>
 </project>

com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java

@@ -100,6 +100,16 @@ public class DatabaseServicesTest {
 		assertEquals(1,  waveformDb.getChildNodes().size());
 	}
 
+	@Test
+	public void testTxTextTruncated() throws Exception {
+		File f = new File("inputs/my_db_truncated.txlog").getAbsoluteFile();
+		assertTrue(f.exists());
+		waveformDb.load(f);
+		assertNotNull(waveformDb);
+		assertEquals(3,  waveformDb.getAllWaves().size());
+		assertEquals(1,  waveformDb.getChildNodes().size());
+	}
+
 	//@Test
 	public void testTxLDb() throws Exception {
 		File f = new File("inputs/my_ldb.txldb").getAbsoluteFile();

com.minres.scviewer.database.text/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"

com.minres.scviewer.database.text/pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.database.text</artifactId>
-	<version>2.0.1-SNAPSHOT</version>
+	<version>2.0.2-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy

@@ -86,11 +86,16 @@ public class TextDbLoader implements IWaveformDbLoader{
 				calculateConcurrencyIndicees()
 				return true
 			}
+		} catch (IndexOutOfBoundsException e) {
+			return false
+		} catch (NumberFormatException e) {
+			return false
 		} catch(EOFException e) {
 			return true;
 		} catch(Exception e) {
-			System.out.println("---->>> Exception caught while loading database. StackTrace following... ");
+			System.out.println("---->>> Exception "+e.toString()+" caught while loading database");
-			e.printStackTrace()
+			//System.out.println("---->>> Exception "+e.toString()+" caught while loading database. StackTrace following... ");
+			//e.printStackTrace()
 		}
 		return false;
 	}
@@ -129,7 +134,9 @@ public class TextDbLoader implements IWaveformDbLoader{
 			case "ms":return 1000000000000L
 			case "s": return 1000000000000000L
 		}
+		return "fs"
 	}
+	
 	private def parseInput(InputStream inputStream){
 		def streamsById = [:]
 		def generatorsById = [:]

com.minres.scviewer.e4.application/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.1.4.qualifier
+Bundle-Version: 2.1.6.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
   org.eclipse.core.runtime;bundle-version="3.11.1",

com.minres.scviewer.e4.application/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>com.minres.scviewer.e4.application</artifactId>
-  <version>2.1.4-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>

com.minres.scviewer.e4.product/pom.xml

@@ -10,7 +10,7 @@
 		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.1.4-SNAPSHOT</version>
+  	<version>2.1.6-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>

com.minres.scviewer.e4.product/scviewer.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.1.4.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.1.6.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>