Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml26
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore1
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml55
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java7
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java26
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java7
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml25
-rw-r--r--libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties1
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngConstants.java4
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java1
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java3
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java5
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java12
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java2
-rw-r--r--pom.xml2
30 files changed, 61 insertions, 181 deletions
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
deleted file mode 100644
index 367ff06c67..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp-feature/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.libhover</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-
- <name>Linux Tools Devhelp Libhover Feature</name>
-
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore
deleted file mode 100644
index e660fd93d3..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin/
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
deleted file mode 100644
index 1047367405..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.devhelp.tests</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
- <name>Linux Tools Devhelp Core Tests Plug-in</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <excludes>
- <!-- test mojo matches TestProject be default and treats it as PojoTest -->
- <exclude>**/Test*.class</exclude>
- </excludes>
- <testSuite>org.eclipse.linuxtools.cdt.libhover.devhelp.tests</testSuite>
- <testClass>org.eclipse.linuxtools.cdt.libhover.devhelp.test.AllTests</testClass>
- <useUIHarness>true</useUIHarness>
- <useUIThread>true</useUIThread>
- <product>org.eclipse.sdk.ide</product>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
index f48d69fb3a..43ad04d3f1 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/Activator.java
@@ -1,10 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
import org.osgi.framework.BundleActivator;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java
deleted file mode 100644
index 483f838776..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/AllTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Run this suite as JUnit plug-in test.
- *
- */
-@RunWith(Suite.class)
-@SuiteClasses({
- CheckDevhelp.class,
- }
-)
-
-public class AllTests {
- // empty
-}
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
index 4210c6f1d3..e12664a958 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp.tests/src/org/eclipse/linuxtools/cdt/libhover/devhelp/test/CheckDevhelp.java
@@ -1,10 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
package org.eclipse.linuxtools.cdt.libhover.devhelp.test;
import java.io.File;
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml b/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
deleted file mode 100644
index 5f84aa5d1f..0000000000
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.devhelp/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2011, Red Hat, Inc.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>linuxtools-libhover-parent</artifactId>
- <groupId>org.eclipse.linuxtools.cdt.libhover</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.eclipse.linuxtools.cdt.libhover.devhelp</artifactId>
- <version>0.7.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <name>Linux Tools Devhelp Libhover Plug-in</name>
-</project>
diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
index 2220fabe27..513b917ab0 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.newlib/build.properties
@@ -1,5 +1,6 @@
bin.includes = META-INF/,\
plugin.xml,\
toc.xml,\
+ data/,\
plugin.properties
src.includes = about.html
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
index fb5277834f..86a6d23ad9 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java
@@ -13,6 +13,7 @@ package org.eclipse.linuxtools.lttng.ui.views.common;
import java.util.Arrays;
+import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
import org.eclipse.linuxtools.lttng.control.LttngSyntheticEventProvider;
import org.eclipse.linuxtools.lttng.event.LttngSyntheticEvent;
@@ -71,7 +72,6 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu
*/
protected static final Long INPUT_CHANGED_REFRESH = 75000L;
private static final long DEFAULT_OFFSET = 0L;
- private static final int DEFAULT_CHUNK = 1;
protected boolean synch = true; // time synchronization, used to be an option
protected ITimeAnalysisViewer tsfviewer = null;
@@ -388,7 +388,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu
fCurrentRequest = new LttngSyntEventRequest(
requestTrange, DEFAULT_OFFSET, TmfDataRequest.ALL_DATA,
- DEFAULT_CHUNK, this, experimentTRange, getEventProcessor(),
+ LttngConstants.DEFAULT_BLOCK_SIZE, this, experimentTRange, getEventProcessor(),
TmfExperiment.getCurrentExperiment().getName(), execType) {
Long fCount = getSynEventCount();
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java
index 0d8b866557..051dcddb1a 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java
@@ -11,6 +11,7 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.histogram;
+import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.widgets.Composite;
@@ -22,8 +23,9 @@ import org.eclipse.swt.widgets.Composite;
* <p>
*/
public abstract class HistogramConstant {
+
// Constants relative to requests
- public final static int MAX_EVENTS_PER_READ = 1;
+// public final static int MAX_EVENTS_PER_READ = LttngConstants.DEFAULT_BLOCK_SIZE;
public final static int REDRAW_EVERY_NB_EVENTS = 20000;
public final static Boolean SKIP_EMPTY_INTERVALS_WHEN_CALCULATING_AVERAGE = true;
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
index 3fa66dbb45..8990950c5f 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramRequest.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.linuxtools.lttng.ui.views.histogram;
+import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.linuxtools.lttng.event.LttngEvent;
import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
import org.eclipse.linuxtools.tmf.request.ITmfDataRequest;
@@ -55,7 +56,7 @@ public class HistogramRequest extends TmfEventRequest<LttngEvent> {
* @see org.eclipse.linuxtools.tmf.request.TmfEventRequest
*/
public HistogramRequest(TmfTimeRange range, int nbRequested, HistogramCanvas newParentCanvas, long timeInterval, ITmfDataRequest.ExecutionType execType) {
- super((Class<LttngEvent>)LttngEvent.class, range, nbRequested, HistogramConstant.MAX_EVENTS_PER_READ, execType);
+ super((Class<LttngEvent>)LttngEvent.class, range, nbRequested, LttngConstants.DEFAULT_BLOCK_SIZE, execType);
setIsCompleted(false);
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngConstants.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngConstants.java
index 3eee98603a..1a5d44bf2f 100644
--- a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngConstants.java
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/LttngConstants.java
@@ -81,4 +81,8 @@ public class LttngConstants {
*/
public static final int STATS_CATEGORY_ID = 0xC << STATS_ID_SHIFT;
+ /**
+ * <h4>Background requests block size </h4>
+ */
+ public static final int DEFAULT_BLOCK_SIZE = 50000;
} \ No newline at end of file
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java
index 031d011797..738f23820b 100644
--- a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/control/LttngSyntheticEventProvider.java
@@ -19,6 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.Vector;
+import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.linuxtools.lttng.TraceDebug;
import org.eclipse.linuxtools.lttng.event.LttngEvent;
import org.eclipse.linuxtools.lttng.event.LttngEventType;
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
index 1093ec5959..a5ed41ab15 100644
--- a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
@@ -15,6 +15,7 @@ package org.eclipse.linuxtools.lttng.state.experiment;
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.linuxtools.lttng.LttngConstants;
import org.eclipse.linuxtools.lttng.TraceDebug;
import org.eclipse.linuxtools.lttng.control.LttngCoreProviderFactory;
import org.eclipse.linuxtools.lttng.event.LttngEvent;
@@ -343,7 +344,7 @@ public class StateExperimentManager extends LTTngTreeNode implements
// Prepare event data request to build state model
ITmfEventRequest<LttngEvent> request = new TmfEventRequest<LttngEvent>(
LttngEvent.class, TmfTimeRange.Eternity,
- TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.BACKGROUND) {
+ TmfDataRequest.ALL_DATA, LttngConstants.DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) {
long nbEventsHandled = 0;
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
index 0a01c454a1..007316923f 100644
--- a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTextTrace.java
@@ -55,7 +55,7 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> implements ITmfTrace {
private boolean showDebug = false;
public LTTngTextTrace(String path) throws Exception {
- this(path, false);
+ this(path, true); // false);
}
public LTTngTextTrace(String path, boolean skipIndexing) throws Exception {
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
index b2f19f7711..db023abe07 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java
@@ -213,10 +213,10 @@ public class TmfCoalescedDataRequestTest extends TestCase {
// ------------------------------------------------------------------------
public void testToString() {
- String expected1 = "[TmfCoalescedDataRequest(0,TmfEvent,10,100)]";
- String expected2 = "[TmfCoalescedDataRequest(1,TmfEvent,20,100)]";
- String expected3 = "[TmfCoalescedDataRequest(2,TmfEvent,20,200)]";
- String expected4 = "[TmfCoalescedDataRequest(3,TmfEvent,20,200)]";
+ String expected1 = "[TmfCoalescedDataRequest(0,TmfEvent,10,100,200)]";
+ String expected2 = "[TmfCoalescedDataRequest(1,TmfEvent,20,100,200)]";
+ String expected3 = "[TmfCoalescedDataRequest(2,TmfEvent,20,200,200)]";
+ String expected4 = "[TmfCoalescedDataRequest(3,TmfEvent,20,200,300)]";
assertEquals("toString", expected1, fRequest1.toString());
assertEquals("toString", expected2, fRequest2.toString());
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
index aba098f500..7599a80b71 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java
@@ -247,10 +247,10 @@ public class TmfCoalescedEventRequestTest extends TestCase {
// ------------------------------------------------------------------------
public void testToString() {
- String expected1 = "[TmfCoalescedEventRequest(0,TmfEvent," + range1 + ",100)]";
- String expected2 = "[TmfCoalescedEventRequest(1,TmfEvent," + range2 + ",100)]";
- String expected3 = "[TmfCoalescedEventRequest(2,TmfEvent," + range2 + ",200)]";
- String expected4 = "[TmfCoalescedEventRequest(3,TmfEvent," + range2 + ",200)]";
+ String expected1 = "[TmfCoalescedEventRequest(0,TmfEvent," + range1 + ",100,200)]";
+ String expected2 = "[TmfCoalescedEventRequest(1,TmfEvent," + range2 + ",100,200)]";
+ String expected3 = "[TmfCoalescedEventRequest(2,TmfEvent," + range2 + ",200,200)]";
+ String expected4 = "[TmfCoalescedEventRequest(3,TmfEvent," + range2 + ",200,300)]";
assertEquals("toString", expected1, fRequest1.toString());
assertEquals("toString", expected2, fRequest2.toString());
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
index e6b9686584..9f879da557 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
@@ -208,10 +208,10 @@ public class TmfDataRequestTest extends TestCase {
// ------------------------------------------------------------------------
public void testToString() {
- String expected1 = "[TmfDataRequest(0,TmfEvent,10,100)]";
- String expected2 = "[TmfDataRequest(1,TmfEvent,20,100)]";
- String expected3 = "[TmfDataRequest(2,TmfEvent,20,200)]";
- String expected4 = "[TmfDataRequest(3,TmfEvent,20,200)]";
+ String expected1 = "[TmfDataRequest(0,TmfEvent,10,100,200)]";
+ String expected2 = "[TmfDataRequest(1,TmfEvent,20,100,200)]";
+ String expected3 = "[TmfDataRequest(2,TmfEvent,20,200,200)]";
+ String expected4 = "[TmfDataRequest(3,TmfEvent,20,200,300)]";
assertEquals("toString", expected1, fRequest1.toString());
assertEquals("toString", expected2, fRequest2.toString());
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
index 06d5b02f50..513a1f0a6d 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java
@@ -229,10 +229,10 @@ public class TmfEventRequestTest extends TestCase {
// ------------------------------------------------------------------------
public void testToString() {
- String expected1 = "[TmfEventRequest(0,TmfEvent," + range1 + ",100)]";
- String expected2 = "[TmfEventRequest(1,TmfEvent," + range2 + ",100)]";
- String expected3 = "[TmfEventRequest(2,TmfEvent," + range2 + ",200)]";
- String expected4 = "[TmfEventRequest(3,TmfEvent," + range2 + ",200)]";
+ String expected1 = "[TmfEventRequest(0,TmfEvent," + range1 + ",100,200)]";
+ String expected2 = "[TmfEventRequest(1,TmfEvent," + range2 + ",100,200)]";
+ String expected3 = "[TmfEventRequest(2,TmfEvent," + range2 + ",200,200)]";
+ String expected4 = "[TmfEventRequest(3,TmfEvent," + range2 + ",200,300)]";
assertEquals("toString", expected1, fRequest1.toString());
assertEquals("toString", expected2, fRequest2.toString());
diff --git a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
index bf14b28d11..7bab7ba5c6 100644
--- a/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
+++ b/lttng/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java
@@ -76,7 +76,7 @@ public class TmfTraceStub extends TmfTrace<TmfEvent> {
* @throws FileNotFoundException
*/
public TmfTraceStub(String filename, int cacheSize, boolean waitForCompletion) throws FileNotFoundException {
- super(filename, TmfEvent.class, filename, cacheSize);
+ super(filename, TmfEvent.class, filename, cacheSize, false);
fTrace = new RandomAccessFile(filename, "r");
fParser = new TmfEventParserStub();
}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
index 3174650f94..23318b196e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java
@@ -195,7 +195,7 @@ public abstract class TmfDataProvider<T extends TmfData> extends TmfComponent im
protected void newCoalescedDataRequest(ITmfDataRequest<T> request) {
synchronized(fLock) {
TmfCoalescedDataRequest<T> coalescedRequest = new TmfCoalescedDataRequest<T>(
- fType, request.getIndex(), request.getNbRequested(),request.getExecType());
+ fType, request.getIndex(), request.getNbRequested(), request.getBlockSize(), request.getExecType());
coalescedRequest.addRequest(request);
if (Tracer.isRequestTraced()) {
Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); //$NON-NLS-1$
@@ -227,7 +227,7 @@ public abstract class TmfDataProvider<T extends TmfData> extends TmfComponent im
if (request.getExecType() == ExecutionType.FOREGROUND)
queueRequest(request);
else
- queueBackgroundRequest(request, DEFAULT_BLOCK_SIZE, true);
+ queueBackgroundRequest(request, request.getBlockSize(), true);
}
protected void queueRequest(final ITmfDataRequest<T> request) {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
index 1cf2e79276..78fa1aa2ec 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java
@@ -53,7 +53,9 @@ public abstract class TmfEventProvider<T extends TmfEvent> extends TmfDataProvid
if (request instanceof ITmfEventRequest<?>) {
ITmfEventRequest<T> eventRequest = (ITmfEventRequest<T>) request;
TmfCoalescedEventRequest<T> coalescedRequest =
- new TmfCoalescedEventRequest<T>(fType, eventRequest.getRange(), eventRequest.getNbRequested(), eventRequest.getExecType());
+ new TmfCoalescedEventRequest<T>(
+ fType, eventRequest.getRange(), eventRequest.getNbRequested(), eventRequest.getBlockSize(),
+ eventRequest.getExecType());
coalescedRequest.addRequest(eventRequest);
if (Tracer.isRequestTraced()) {
Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); //$NON-NLS-1$
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
index d7cc787222..08018fddf6 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java
@@ -721,7 +721,7 @@ public class TmfExperiment<T extends TmfEvent> extends TmfEventProvider<T> imple
// System.out.println(System.currentTimeMillis() + ": Experiment indexing started");
ITmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, TmfTimeRange.Eternity,
- TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.BACKGROUND) {
+ TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) {
// long indexingStart = System.nanoTime();
@@ -854,7 +854,7 @@ public class TmfExperiment<T extends TmfEvent> extends TmfEventProvider<T> imple
// TmfEventRequest<T> subRequest = new TmfEventRequest<T>(eventRequest.getDataType(), new TmfTimeRange(timestamp[0], endTS), CHUNK_SIZE[0], eventRequest.getBlockize(), ExecutionType.BACKGROUND)
// TmfDataRequest<T> subRequest = new TmfDataRequest<T>(eventRequest.getDataType(), nbRead[0], CHUNK_SIZE[0], eventRequest.getBlockize(), ExecutionType.BACKGROUND)
- TmfDataRequest<T> subRequest = new TmfDataRequest<T>(eventRequest.getDataType(), nbRead[0], CHUNK_SIZE[0], ExecutionType.BACKGROUND)
+ TmfDataRequest<T> subRequest = new TmfDataRequest<T>(eventRequest.getDataType(), nbRead[0], CHUNK_SIZE[0], blockSize, ExecutionType.BACKGROUND)
{
@Override
public void handleData(T data) {
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
index 7153383611..9e3760f74e 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/ITmfDataRequest.java
@@ -57,6 +57,11 @@ public interface ITmfDataRequest<T extends TmfData> {
public int getNbRequested();
/**
+ * @return the block size (for BG requests)
+ */
+ public int getBlockSize();
+
+ /**
* @return the number of events read so far
*/
public int getNbRead();
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
index 262eabe26a..738e8f1b67 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java
@@ -228,6 +228,6 @@ public class TmfCoalescedDataRequest<T extends TmfData> extends TmfDataRequest<T
@SuppressWarnings("nls")
public String toString() {
return "[TmfCoalescedDataRequest(" + getRequestId() + "," + getDataType().getSimpleName()
- + "," + getIndex() + "," + getNbRequested() + ")]";
+ + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]";
}
}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
index b5fc5fef7e..077aa8d96c 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java
@@ -172,7 +172,7 @@ public class TmfCoalescedEventRequest<T extends TmfEvent> extends TmfCoalescedDa
@SuppressWarnings("nls")
public String toString() {
return "[TmfCoalescedEventRequest(" + getRequestId() + "," + getDataType().getSimpleName()
- + "," + getRange() + "," + getNbRequested() + ")]";
+ + "," + getRange() + "," + getNbRequested() + "," + getBlockSize() + ")]";
}
}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
index 7eba296f22..400215c94a 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
@@ -92,6 +92,7 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
private final int fRequestId; // A unique request ID
private final int fIndex; // The index (rank) of the requested event
private final int fNbRequested; // The number of requested events (ALL_DATA for all)
+ private final int fBlockSize; // The block size (for BG requests)
private int fNbRead; // The number of reads so far
private CountDownLatch startedLatch = new CountDownLatch(1);
@@ -165,6 +166,7 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
fDataType = dataType;
fIndex = index;
fNbRequested = nbRequested;
+ fBlockSize = blockSize;
fExecType = execType;
fNbRead = 0;
if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "created"); //$NON-NLS-1$
@@ -215,6 +217,14 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
}
/**
+ * @return the block size (for BG requests)
+ */
+ @Override
+ public int getBlockSize() {
+ return fBlockSize;
+ }
+
+ /**
* @return the number of events read so far
*/
@Override
@@ -438,6 +448,6 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
@SuppressWarnings("nls")
public String toString() {
return "[TmfDataRequest(" + fRequestId + "," + fDataType.getSimpleName() +
- "," + fIndex + "," + fNbRequested + ")]";
+ "," + fIndex + "," + fNbRequested + "," + getBlockSize() + ")]";
}
}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
index f86793dc4b..02040b76f4 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java
@@ -115,7 +115,7 @@ public abstract class TmfEventRequest<T extends TmfEvent> extends TmfDataRequest
@SuppressWarnings("nls")
public String toString() {
return "[TmfEventRequest(" + getRequestId() + "," + getDataType().getSimpleName()
- + "," + getRange() + "," + getNbRequested() + ")]";
+ + "," + getRange() + "," + getNbRequested() + "," + getBlockSize() + ")]";
}
}
diff --git a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java
index 6dcf6aedc5..12d0964d57 100644
--- a/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java
+++ b/lttng/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java
@@ -451,7 +451,7 @@ public abstract class TmfTrace<T extends TmfEvent> extends TmfEventProvider<T> i
fCheckpoints.clear();
ITmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, TmfTimeRange.Eternity,
- TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.BACKGROUND) {
+ TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) {
TmfTimestamp startTime = null;
TmfTimestamp lastTime = null;
diff --git a/pom.xml b/pom.xml
index be71d6a4dd..25f9dc6a95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
<properties>
<eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
<platform-version>[3.7,3.8)</platform-version>
- <cdt-site>https://hudson.eclipse.org/hudson/job/cdt-nightly/lastSuccessfulBuild/artifact/update-site</cdt-site>
+ <cdt-site>http://download.eclipse.org/tools/cdt/updates/indigo</cdt-site>
</properties>
</profile>
</profiles>

Back to the top