From 672a642a70393f70f0ccc299d339472c6aba85a0 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Tue, 30 Jul 2013 13:17:52 -0400 Subject: [PATCH] tmf: Remove the concept of block size in event requests This hasn't been used in a while, so we can remove all references to it. Change-Id: I62cc5626836c4ec7a81980e1b284c3e3fa402da0 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/14984 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann Tested-by: Bernd Hufmann --- .../tests/component/TmfEventProviderTest.java | 43 ++------ .../tests/ctfadaptor/EventContextTest.java | 2 +- .../ctfadaptor/headless/RequestBenchmark.java | 2 +- .../request/TmfCoalescedDataRequestTest.java | 102 ++++++++---------- .../request/TmfCoalescedEventRequestTest.java | 53 ++++----- .../tests/request/TmfDataRequestTest.java | 24 ++--- .../tests/request/TmfEventRequestTest.java | 8 +- .../core/tests/request/TmfSchedulerTest.java | 4 - .../core/tests/trace/TmfExperimentTest.java | 49 ++------- .../trace/TmfMultiTraceExperimentTest.java | 50 ++------- .../tmf/core/tests/trace/TmfTraceTest.java | 30 ++---- .../TmfSyntheticEventProviderStub.java | 3 +- .../stubs/request/TmfDataRequestStub.java | 17 +-- .../stubs/request/TmfEventRequestStub.java | 10 +- .../core/request/TmfCoalescedDataRequest.java | 9 +- .../request/TmfCoalescedEventRequest.java | 9 +- .../tmf/core/statesystem/HistoryBuilder.java | 5 - .../partial/PartialHistoryBackend.java | 8 -- .../tmf/core/component/TmfDataProvider.java | 9 +- .../tmf/core/component/TmfEventProvider.java | 8 +- .../tmf/core/request/ITmfDataRequest.java | 5 - .../tmf/core/request/TmfDataRequest.java | 23 +--- .../tmf/core/request/TmfEventRequest.java | 10 +- .../core/statistics/TmfEventsStatistics.java | 5 +- .../tmf/core/trace/TmfCheckpointIndexer.java | 4 +- .../tmf/ui/viewers/events/TmfEventsCache.java | 2 - .../tmf/ui/viewers/events/TmfEventsTable.java | 6 +- .../ui/views/histogram/HistogramRequest.java | 5 +- .../uml2sd/loader/TmfUml2SDSyncLoader.java | 22 ++-- 29 files changed, 164 insertions(+), 363 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java index 1010028050..70027e9bb1 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java @@ -99,7 +99,6 @@ public class TmfEventProviderTest { */ @Test public void testGetPlainEvents() { - final int BLOCK_SIZE = 100; final int NB_EVENTS = 1000; final Vector requestedEvents = new Vector(); @@ -110,7 +109,7 @@ public class TmfEventProviderTest { TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { + range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -140,8 +139,6 @@ public class TmfEventProviderTest { */ @Test public void testCancelRequests() { - - final int BLOCK_SIZE = 100; final int NB_EVENTS = 1000; final int NUMBER_EVENTS_BEFORE_CANCEL_REQ1 = 10; final int NUMBER_EVENTS_BEFORE_CANCEL_REQ2 = 800; @@ -158,7 +155,7 @@ public class TmfEventProviderTest { // Create first request final TmfEventRequest request1 = new TmfEventRequest(ITmfEvent.class, - range, 0, NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { + range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -186,7 +183,7 @@ public class TmfEventProviderTest { // Create second request final TmfEventRequest request2 = new TmfEventRequest(ITmfEvent.class, - range, 0, NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { + range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -250,7 +247,7 @@ public class TmfEventProviderTest { } private static void getSyntheticData(final TmfTimeRange range, - final int nbEvents, final int blockSize) throws InterruptedException { + final int nbEvents) throws InterruptedException { final Vector requestedEvents = new Vector(); @@ -260,7 +257,7 @@ public class TmfEventProviderTest { ITmfDataProvider provider = eventProviders[0]; final TmfEventRequest request = new TmfEventRequest(TmfSyntheticEventStub.class, range, - 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -292,33 +289,7 @@ public class TmfEventProviderTest { public void testGetSyntheticEvents_EqualBlockSizes() { TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); try { - getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE); - } catch (InterruptedException e) { - fail(); - } - } - - /** - * Test getSyntheticEvents for smaller block sizes. - */ - @Test - public void testGetSyntheticEvents_SmallerBlock() { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - try { - getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE / 2); - } catch (InterruptedException e) { - fail(); - } - } - - /** - * Test getSyntheticEvents for larger block sizes. - */ - @Test - public void testGetSyntheticEvents_LargerBlock() { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - try { - getSyntheticData(range, 1000, TmfSyntheticEventProviderStub.BLOCK_SIZE * 2); + getSyntheticData(range, 1000); } catch (InterruptedException e) { fail(); } @@ -333,7 +304,7 @@ public class TmfEventProviderTest { TmfTimestamp end = new TmfTimestamp(1000, (byte) -3, 0); TmfTimeRange range = new TmfTimeRange(start, end); try { - getSyntheticData(range, -1, TmfSyntheticEventProviderStub.BLOCK_SIZE); + getSyntheticData(range, -1); } catch (InterruptedException e) { fail(); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/EventContextTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/EventContextTest.java index 6aeb2b0154..d59a5014e0 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/EventContextTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/EventContextTest.java @@ -227,7 +227,7 @@ public class EventContextTest { public EventContextTestRequest(long timestamp) { super(CtfTmfEvent.class, new TmfTimeRange(new CtfTmfTimestamp(timestamp), TmfTimestamp.BIG_CRUNCH), - 0, 1, 1, ExecutionType.FOREGROUND); + 0, 1, ExecutionType.FOREGROUND); } @Override diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java index 9e65a864ff..ecd8d38fd7 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/RequestBenchmark.java @@ -30,7 +30,7 @@ public class RequestBenchmark extends TmfEventRequest { private RequestBenchmark(final Class dataType, final TmfTimeRange range, final int nbRequested) { - super(dataType, range, 0, nbRequested, 1, ExecutionType.FOREGROUND); + super(dataType, range, 0, nbRequested, ExecutionType.FOREGROUND); } // Path of the trace diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java index 14cb47d5fd..b04909b1e1 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java @@ -53,20 +53,20 @@ public class TmfCoalescedDataRequestTest { @Before public void setUp() { TmfDataRequest.reset(); - fRequest1 = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - fRequest2 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 100, 200, ExecutionType.FOREGROUND); - fRequest3 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, 200, ExecutionType.FOREGROUND); - fRequest4 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, 300, ExecutionType.FOREGROUND); + fRequest1 = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + fRequest2 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 100, ExecutionType.FOREGROUND); + fRequest3 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, ExecutionType.FOREGROUND); + fRequest4 = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, ExecutionType.FOREGROUND); - fRequest1b = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - fRequest1c = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); + fRequest1b = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + fRequest1c = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); fRequestCount = fRequest1c.getRequestId() + 1; } private static TmfCoalescedDataRequest setupTestRequest(final boolean[] flags) { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND) { + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND) { @Override public void handleCompleted() { super.handleCompleted(); @@ -100,7 +100,7 @@ public class TmfCoalescedDataRequestTest { @Test public void testTmfCoalescedDataRequestIndexNbEventsBlocksize() { - TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); + TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", ITmfEvent.class, request.getDataType()); @@ -169,10 +169,10 @@ public class TmfCoalescedDataRequestTest { @Test public void testToString() { - String expected1 = "[TmfCoalescedDataRequest(0,ITmfEvent,10,100,200)]"; - String expected2 = "[TmfCoalescedDataRequest(1,ITmfEvent,20,100,200)]"; - String expected3 = "[TmfCoalescedDataRequest(2,ITmfEvent,20,200,200)]"; - String expected4 = "[TmfCoalescedDataRequest(3,ITmfEvent,20,200,300)]"; + String expected1 = "[TmfCoalescedDataRequest(0,ITmfEvent,10,100)]"; + String expected2 = "[TmfCoalescedDataRequest(1,ITmfEvent,20,100)]"; + String expected3 = "[TmfCoalescedDataRequest(2,ITmfEvent,20,200)]"; + String expected4 = "[TmfCoalescedDataRequest(3,ITmfEvent,20,200)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); @@ -186,15 +186,15 @@ public class TmfCoalescedDataRequestTest { @Test public void testIsCompatible() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - TmfDataRequest request2 = new TmfDataRequestStub(ITmfEvent.class, 5, 100, 200); - TmfDataRequest request3 = new TmfDataRequestStub(ITmfEvent.class, 5, 4, 200); - TmfDataRequest request4 = new TmfDataRequestStub(ITmfEvent.class, 5, 5, 200); - TmfDataRequest request5 = new TmfDataRequestStub(ITmfEvent.class, 15, 100, 200); - TmfDataRequest request6 = new TmfDataRequestStub(ITmfEvent.class, 100, 100, 200); - TmfDataRequest request7 = new TmfDataRequestStub(ITmfEvent.class, 110, 100, 200); - TmfDataRequest request8 = new TmfDataRequestStub(ITmfEvent.class, 111, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + TmfDataRequest request2 = new TmfDataRequestStub(ITmfEvent.class, 5, 100); + TmfDataRequest request3 = new TmfDataRequestStub(ITmfEvent.class, 5, 4); + TmfDataRequest request4 = new TmfDataRequestStub(ITmfEvent.class, 5, 5); + TmfDataRequest request5 = new TmfDataRequestStub(ITmfEvent.class, 15, 100); + TmfDataRequest request6 = new TmfDataRequestStub(ITmfEvent.class, 100, 100); + TmfDataRequest request7 = new TmfDataRequestStub(ITmfEvent.class, 110, 100); + TmfDataRequest request8 = new TmfDataRequestStub(ITmfEvent.class, 111, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request1)); assertTrue("isCompatible", coalescedRequest.isCompatible(request2)); @@ -205,8 +205,8 @@ public class TmfCoalescedDataRequestTest { assertTrue("isCompatible", coalescedRequest.isCompatible(request7)); assertTrue("isCompatible", coalescedRequest.isCompatible(request8)); - TmfDataRequest request9 = new TmfDataRequestStub(ITmfEvent.class, 5, 3, 200); - TmfDataRequest request10 = new TmfDataRequestStub(ITmfEvent.class, 112, 100, 200); + TmfDataRequest request9 = new TmfDataRequestStub(ITmfEvent.class, 5, 3); + TmfDataRequest request10 = new TmfDataRequestStub(ITmfEvent.class, 112, 100); assertFalse("isCompatible", coalescedRequest.isCompatible(request9)); assertFalse("isCompatible", coalescedRequest.isCompatible(request10)); @@ -218,98 +218,90 @@ public class TmfCoalescedDataRequestTest { @Test public void testAddRequest1() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 10, coalescedRequest.getIndex()); assertEquals("addRequest", 100, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest2() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 5, coalescedRequest.getIndex()); assertEquals("addRequest", 105, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest3() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 4, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 4); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 5, coalescedRequest.getIndex()); assertEquals("addRequest", 105, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest4() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 5, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 5); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 5, coalescedRequest.getIndex()); assertEquals("addRequest", 105, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest5() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 15, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 15, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 10, coalescedRequest.getIndex()); assertEquals("addRequest", 105, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest6() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 100, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 100, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 10, coalescedRequest.getIndex()); assertEquals("addRequest", 190, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest7() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 110, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 110, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 10, coalescedRequest.getIndex()); assertEquals("addRequest", 200, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } @Test public void testAddRequest8() { - TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200, ExecutionType.FOREGROUND); - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 111, 100, 200); + TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, ExecutionType.FOREGROUND); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 111, 100); assertTrue("isCompatible", coalescedRequest.isCompatible(request)); coalescedRequest.addRequest(request); assertEquals("addRequest", 10, coalescedRequest.getIndex()); assertEquals("addRequest", 201, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); } // ------------------------------------------------------------------------ @@ -321,8 +313,8 @@ public class TmfCoalescedDataRequestTest { // Test request final boolean[] crFlags = new boolean[4]; TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -357,8 +349,8 @@ public class TmfCoalescedDataRequestTest { public void testFail() { final boolean[] crFlags = new boolean[4]; TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -393,8 +385,8 @@ public class TmfCoalescedDataRequestTest { public void testCancel() { final boolean[] crFlags = new boolean[4]; TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); request.addRequest(subRequest1); request.addRequest(subRequest2); @@ -429,8 +421,8 @@ public class TmfCoalescedDataRequestTest { public void testCancelSubRequests() { final boolean[] crFlags = new boolean[4]; TmfCoalescedDataRequest request = setupTestRequest(crFlags); - TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); request.addRequest(subRequest1); request.addRequest(subRequest2); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java index 4f69c748a2..cedc1c1638 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java @@ -75,20 +75,20 @@ public class TmfCoalescedEventRequestTest { @Before public void setUp() { TmfDataRequest.reset(); - fRequest1 = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND); - fRequest2 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 100, 200, ExecutionType.FOREGROUND); - fRequest3 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 200, 200, ExecutionType.FOREGROUND); - fRequest4 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 200, 300, ExecutionType.FOREGROUND); + fRequest1 = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND); + fRequest2 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 100, ExecutionType.FOREGROUND); + fRequest3 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 200, ExecutionType.FOREGROUND); + fRequest4 = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 0, 200, ExecutionType.FOREGROUND); - fRequest1b = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND); - fRequest1c = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND); + fRequest1b = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND); + fRequest1c = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND); fRequestCount = fRequest1c.getRequestId() + 1; } private TmfCoalescedEventRequest setupTestRequest(final boolean[] flags) { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND) { + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND) { @Override public void handleCompleted() { super.handleCompleted(); @@ -122,7 +122,7 @@ public class TmfCoalescedEventRequestTest { @Test public void testTmfCoalescedEventRequestIndexNbEventsBlocksize() { - TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND); + TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", ITmfEvent.class, request.getDataType()); @@ -180,19 +180,16 @@ public class TmfCoalescedEventRequestTest { fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested(), - TmfDataRequest.DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); TmfCoalescedDataRequest dataRequest2 = new TmfCoalescedDataRequest( fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested(), - TmfDataRequest.DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); TmfCoalescedDataRequest dataRequest3 = new TmfCoalescedDataRequest( fRequest3.getDataType(), fRequest3.getIndex(), fRequest3.getNbRequested(), - TmfDataRequest.DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); assertTrue("equals", fRequest1.equals(dataRequest2)); @@ -218,10 +215,10 @@ public class TmfCoalescedEventRequestTest { @Test public void testToString() { - String expected1 = "[TmfCoalescedEventRequest(0,ITmfEvent," + range1 + ",0,100,200)]"; - String expected2 = "[TmfCoalescedEventRequest(1,ITmfEvent," + range2 + ",0,100,200)]"; - String expected3 = "[TmfCoalescedEventRequest(2,ITmfEvent," + range2 + ",0,200,200)]"; - String expected4 = "[TmfCoalescedEventRequest(3,ITmfEvent," + range2 + ",0,200,300)]"; + String expected1 = "[TmfCoalescedEventRequest(0,ITmfEvent," + range1 + ",0,100)]"; + String expected2 = "[TmfCoalescedEventRequest(1,ITmfEvent," + range2 + ",0,100)]"; + String expected3 = "[TmfCoalescedEventRequest(2,ITmfEvent," + range2 + ",0,200)]"; + String expected4 = "[TmfCoalescedEventRequest(3,ITmfEvent," + range2 + ",0,200)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); @@ -235,7 +232,7 @@ public class TmfCoalescedEventRequestTest { @Test public void testIsCompatible() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, 200, ExecutionType.FOREGROUND); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 100, ExecutionType.FOREGROUND); TmfEventRequest req1 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200); TmfEventRequest req2 = new TmfEventRequestStub(ITmfEvent.class, range2, 100, 200); TmfEventRequest req3 = new TmfEventRequestStub(ITmfEvent.class, range1, 101, 200); @@ -251,7 +248,7 @@ public class TmfCoalescedEventRequestTest { @Test public void testAddEvent1() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 2147483647, 200, ExecutionType.FOREGROUND); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 2147483647, ExecutionType.FOREGROUND); TmfEventRequest req1 = new TmfEventRequestStub(ITmfEvent.class, range1, 0, 2147483647, 200); TmfEventRequest req2 = new TmfEventRequestStub(ITmfEvent.class, range1, 1, 2147483647, 200); @@ -263,13 +260,11 @@ public class TmfCoalescedEventRequestTest { assertEquals("addRequest", 0, coalescedRequest.getIndex()); assertEquals("addRequest", 2147483647, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); - } @Test public void testAddEvent2() { - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 1, 2147483647, 200, ExecutionType.FOREGROUND); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 1, 2147483647, ExecutionType.FOREGROUND); TmfEventRequest req1 = new TmfEventRequestStub(ITmfEvent.class, range1, 1, 2147483647, 200); TmfEventRequest req2 = new TmfEventRequestStub(ITmfEvent.class, range1, 0, 2147483647, 200); @@ -281,8 +276,6 @@ public class TmfCoalescedEventRequestTest { assertEquals("addRequest", 0, coalescedRequest.getIndex()); assertEquals("addRequest", 2147483647, coalescedRequest.getNbRequested()); - assertEquals("addRequest", 200, coalescedRequest.getBlockSize()); - } // ------------------------------------------------------------------------ @@ -401,7 +394,6 @@ public class TmfCoalescedEventRequestTest { private static final String DIRECTORY = "testfiles"; private static final String TEST_STREAM = "A-Test-10K"; private static final int NB_EVENTS = 5000; - private static final int BLOCK_SIZE = 100; // Initialize the test trace private TmfTraceStub fTrace = null; @@ -452,14 +444,13 @@ public class TmfCoalescedEventRequestTest { requestedEvents1 = new Vector(); request1 = new TmfEventRequest(ITmfEvent.class, range, signal.fIndex, - NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { - int nbRead = 0; + NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); if (!isCompleted()) { requestedEvents1.add(event); - if (++nbRead >= BLOCK_SIZE && signal.forceCancel) { + if (signal.forceCancel) { cancel(); } } @@ -468,8 +459,7 @@ public class TmfCoalescedEventRequestTest { requestedEvents2 = new Vector(); request2 = new TmfEventRequest(ITmfEvent.class, range, - signal.fIndex + REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE, - ExecutionType.FOREGROUND) { + signal.fIndex + REQUEST_OFFSET, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -481,8 +471,7 @@ public class TmfCoalescedEventRequestTest { requestedEvents3 = new Vector(); request3 = new TmfEventRequest(ITmfEvent.class, range, - signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE, - ExecutionType.FOREGROUND) { + signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(ITmfEvent event) { super.handleData(event); @@ -557,7 +546,6 @@ public class TmfCoalescedEventRequestTest { request2.waitForCompletion(); request3.waitForCompletion(); - assertEquals("Request1: nbEvents", BLOCK_SIZE, requestedEvents1.size()); assertTrue("Request1: isCompleted", request1.isCompleted()); assertTrue("Request1: isCancelled", request1.isCancelled()); @@ -571,9 +559,6 @@ public class TmfCoalescedEventRequestTest { // Ensure that we have distinct events. // Don't go overboard: we are not validating the stub! - for (int i = 0; i < BLOCK_SIZE; i++) { - assertEquals("Distinct events", i + 1 + request1.getIndex(), requestedEvents1.get(i).getTimestamp().getValue()); - } for (int i = 0; i < NB_EVENTS; i++) { assertEquals("Distinct events", i + 1 + request2.getIndex(), requestedEvents2.get(i).getTimestamp().getValue()); assertEquals("Distinct events", i + 1 + request3.getIndex(), requestedEvents3.get(i).getTimestamp().getValue()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java index bd0ad315c0..3ef49e5449 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java @@ -49,18 +49,18 @@ public class TmfDataRequestTest { @Before public void setUp() { TmfDataRequest.reset(); - fRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - fRequest2 = new TmfDataRequestStub(ITmfEvent.class, 20, 100, 200); - fRequest3 = new TmfDataRequestStub(ITmfEvent.class, 20, 200, 200); - fRequest4 = new TmfDataRequestStub(ITmfEvent.class, 20, 200, 300); - fRequest1b = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); - fRequest1c = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + fRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + fRequest2 = new TmfDataRequestStub(ITmfEvent.class, 20, 100); + fRequest3 = new TmfDataRequestStub(ITmfEvent.class, 20, 200); + fRequest4 = new TmfDataRequestStub(ITmfEvent.class, 20, 200); + fRequest1b = new TmfDataRequestStub(ITmfEvent.class, 10, 100); + fRequest1c = new TmfDataRequestStub(ITmfEvent.class, 10, 100); fRequestCount = fRequest1c.getRequestId() + 1; } private static TmfDataRequest setupTestRequest(final boolean[] flags) { - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200) { + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100) { @Override public void handleCompleted() { super.handleCompleted(); @@ -145,7 +145,7 @@ public class TmfDataRequestTest { @Test public void testTmfDataRequestIndexNbEventsBlocksize() { - TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200); + TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100); assertEquals("getRequestId", fRequestCount++, request.getRequestId()); assertEquals("getDataType", ITmfEvent.class, request.getDataType()); @@ -214,10 +214,10 @@ public class TmfDataRequestTest { @Test public void testToString() { - String expected1 = "[TmfDataRequest(0,ITmfEvent,10,100,200)]"; - String expected2 = "[TmfDataRequest(1,ITmfEvent,20,100,200)]"; - String expected3 = "[TmfDataRequest(2,ITmfEvent,20,200,200)]"; - String expected4 = "[TmfDataRequest(3,ITmfEvent,20,200,300)]"; + String expected1 = "[TmfDataRequest(0,ITmfEvent,10,100)]"; + String expected2 = "[TmfDataRequest(1,ITmfEvent,20,100)]"; + String expected3 = "[TmfDataRequest(2,ITmfEvent,20,200)]"; + String expected4 = "[TmfDataRequest(3,ITmfEvent,20,200)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java index e1b0ce369e..93d3d1a049 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java @@ -235,10 +235,10 @@ public class TmfEventRequestTest { @Test public void testToString() { - String expected1 = "[TmfEventRequest(0,ITmfEvent," + range1 + ",0,100,200)]"; - String expected2 = "[TmfEventRequest(1,ITmfEvent," + range2 + ",0,100,200)]"; - String expected3 = "[TmfEventRequest(2,ITmfEvent," + range2 + ",0,200,200)]"; - String expected4 = "[TmfEventRequest(3,ITmfEvent," + range2 + ",0,200,300)]"; + String expected1 = "[TmfEventRequest(0,ITmfEvent," + range1 + ",0,100)]"; + String expected2 = "[TmfEventRequest(1,ITmfEvent," + range2 + ",0,100)]"; + String expected3 = "[TmfEventRequest(2,ITmfEvent," + range2 + ",0,200)]"; + String expected4 = "[TmfEventRequest(3,ITmfEvent," + range2 + ",0,200)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java index 58d7b80115..94d57166ed 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfSchedulerTest.java @@ -377,7 +377,6 @@ public class TmfSchedulerTest { // ------------------------------------------------------------------------ private class BackgroundRequest extends TmfEventRequest { - private static final int CHUNK_SIZE = 0; private int nbEvents = 0; private String backgroundName; @@ -386,7 +385,6 @@ public class TmfSchedulerTest { timeRange, 0, TmfDataRequest.ALL_DATA, - CHUNK_SIZE, ExecutionType.BACKGROUND); backgroundName = getExecType().toString() + ++fBackgroundId; } @@ -406,7 +404,6 @@ public class TmfSchedulerTest { } private class ForegroundRequest extends TmfEventRequest { - private static final int CHUNK_SIZE = 0; private int nbEvents = 0; private String foregroundName; @@ -415,7 +412,6 @@ public class TmfSchedulerTest { timeRange, 0, TmfDataRequest.ALL_DATA, - CHUNK_SIZE, ExecutionType.FOREGROUND); foregroundName = getExecType().toString() + ++fForegroundId; } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java index fb8a730574..3792321f59 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java @@ -825,42 +825,12 @@ public class TmfExperimentTest { @Test public void testProcessRequestForNbEvents() throws InterruptedException { - final int blockSize = 100; final int nbEvents = 1000; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { - @Override - public void handleData(final ITmfEvent event) { - super.handleData(event); - requestedEvents.add(event); - } - }; - fExperiment.sendRequest(request); - request.waitForCompletion(); - - assertEquals("nbEvents", nbEvents, requestedEvents.size()); - assertTrue("isCompleted", request.isCompleted()); - assertFalse("isCancelled", request.isCancelled()); - - // Ensure that we have distinct events. - // Don't go overboard: we are not validating the stub! - for (int i = 0; i < nbEvents; i++) { - assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue()); - } - } - - @Test - public void testProcessRequestForNbEvents2() throws InterruptedException { - final int blockSize = 2 * NB_EVENTS; - final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); - - final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -884,13 +854,12 @@ public class TmfExperimentTest { @Test public void testProcessRequestForAllEvents() throws InterruptedException { final int nbEvents = TmfDataRequest.ALL_DATA; - final int blockSize = 1; final Vector requestedEvents = new Vector(); final long nbExpectedEvents = NB_EVENTS; final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -917,25 +886,27 @@ public class TmfExperimentTest { @Test public void testCancel() throws InterruptedException { - final int nbEvents = NB_EVENTS; - final int blockSize = BLOCK_SIZE; + final int nbEvents = NB_EVENTS; + final int limit = BLOCK_SIZE; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { int nbRead = 0; + @Override public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); - if (++nbRead == blockSize) { + if (++nbRead == limit) { cancel(); } } + @Override public void handleCancel() { - if (requestedEvents.size() < blockSize) { + if (requestedEvents.size() < limit) { System.out.println("aie"); } } @@ -943,7 +914,7 @@ public class TmfExperimentTest { fExperiment.sendRequest(request); request.waitForCompletion(); - assertEquals("nbEvents", blockSize, requestedEvents.size()); + assertEquals("nbEvents", limit, requestedEvents.size()); assertTrue("isCompleted", request.isCompleted()); assertTrue("isCancelled", request.isCancelled()); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java index 088bc1abf8..e04ff345d6 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java @@ -678,42 +678,12 @@ public class TmfMultiTraceExperimentTest { @Test public void testProcessRequestForNbEvents() throws InterruptedException { - final int blockSize = 100; final int nbEvents = 1000; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { - @Override - public void handleData(final ITmfEvent event) { - super.handleData(event); - requestedEvents.add(event); - } - }; - fExperiment.sendRequest(request); - request.waitForCompletion(); - - assertEquals("nbEvents", nbEvents, requestedEvents.size()); - assertTrue("isCompleted", request.isCompleted()); - assertFalse("isCancelled", request.isCancelled()); - - // Ensure that we have distinct events. - // Don't go overboard: we are not validating the stub! - for (int i = 0; i < nbEvents; i++) { - assertEquals("Distinct events", i+1, requestedEvents.get(i).getTimestamp().getValue()); - } - } - - @Test - public void testProcessRequestForNbEvents2() throws InterruptedException { - final int blockSize = 2 * NB_EVENTS; - final int nbEvents = 1000; - final Vector requestedEvents = new Vector(); - - final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -737,13 +707,12 @@ public class TmfMultiTraceExperimentTest { @Test public void testProcessRequestForAllEvents() throws InterruptedException { final int nbEvents = TmfDataRequest.ALL_DATA; - final int blockSize = 1; final Vector requestedEvents = new Vector(); final long nbExpectedEvents = NB_EVENTS; final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -771,32 +740,27 @@ public class TmfMultiTraceExperimentTest { @Test public void testCancel() throws InterruptedException { final int nbEvents = NB_EVENTS; - final int blockSize = BLOCK_SIZE; + final int limit = BLOCK_SIZE; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { int nbRead = 0; + @Override public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); - if (++nbRead == blockSize) { + if (++nbRead == limit) { cancel(); } } - @Override - public void handleCancel() { - if (requestedEvents.size() < blockSize) { - System.out.println("aie"); - } - } }; fExperiment.sendRequest(request); request.waitForCompletion(); - assertEquals("nbEvents", blockSize, requestedEvents.size()); + assertEquals("nbEvents", limit, requestedEvents.size()); assertTrue("isCompleted", request.isCompleted()); assertTrue("isCancelled", request.isCancelled()); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java index 5b03ce2b30..c5303c17ec 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java @@ -95,7 +95,7 @@ public class TmfTraceTest { try { final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); final File test = new File(FileLocator.toFileURL(location).toURI()); - fTrace = new TmfTraceStub(test.toURI().getPath(), BLOCK_SIZE); + fTrace = new TmfTraceStub(test.toURI().getPath()); fTrace.indexTrace(true); } catch (final TmfTraceException e) { e.printStackTrace(); @@ -176,7 +176,7 @@ public class TmfTraceTest { try { final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(DIRECTORY + File.separator + TEST_STREAM), null); testfile = new File(FileLocator.toFileURL(location).toURI()); - trace = new TmfTraceStub(testfile.toURI().getPath(), BLOCK_SIZE); + trace = new TmfTraceStub(testfile.toURI().getPath()); trace.indexTrace(true); } catch (final URISyntaxException e) { fail("URISyntaxException"); @@ -187,7 +187,6 @@ public class TmfTraceTest { assertEquals("getType", ITmfEvent.class, trace.getType()); assertNull ("getResource", trace.getResource()); assertEquals("getPath", testfile.toURI().getPath(), trace.getPath()); - assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize()); assertEquals("getStreamingInterval", 0, trace.getStreamingInterval()); assertEquals("getName", TEST_STREAM, trace.getName()); @@ -218,7 +217,6 @@ public class TmfTraceTest { assertEquals("getType", ITmfEvent.class, trace.getType()); assertNull ("getResource", trace.getResource()); assertEquals("getPath", testfile.toURI().getPath(), trace.getPath()); - assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize()); assertEquals("getStreamingInterval", 0, trace.getStreamingInterval()); assertEquals("getName", TEST_STREAM, trace.getName()); @@ -250,7 +248,6 @@ public class TmfTraceTest { assertEquals("getType", ITmfEvent.class, trace.getType()); assertNull ("getResource", trace.getResource()); assertEquals("getPath", testfile.toURI().getPath(), trace.getPath()); - assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize()); assertEquals("getStreamingInterval", interval, trace.getStreamingInterval()); assertEquals("getName", TEST_STREAM, trace.getName()); @@ -283,7 +280,6 @@ public class TmfTraceTest { assertEquals("getType", ITmfEvent.class, trace.getType()); assertNull ("getResource", trace.getResource()); assertEquals("getPath", testfile.toURI().getPath(), trace.getPath()); - assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize()); assertEquals("getStreamingInterval", 0, trace.getStreamingInterval()); assertEquals("getName", TEST_STREAM, trace.getName()); @@ -1239,12 +1235,11 @@ public class TmfTraceTest { @Test public void testProcessEventRequestForAllEvents() throws InterruptedException { - final int blockSize = 1; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, NB_EVENTS, blockSize, ExecutionType.FOREGROUND) { + range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -1268,13 +1263,12 @@ public class TmfTraceTest { @Test public void testProcessEventRequestForNbEvents() throws InterruptedException { - final int blockSize = 100; final int nbEvents = 1000; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -1298,14 +1292,13 @@ public class TmfTraceTest { @Test public void testProcessEventRequestForSomeEvents() throws InterruptedException { - final int blockSize = 1; final long startTime = 100; final int nbEvents = 1000; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, 0, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -1329,7 +1322,6 @@ public class TmfTraceTest { @Test public void testProcessEventRequestForOtherEvents() throws InterruptedException { - final int blockSize = 1; final int startIndex = 99; final long startTime = 100; final int nbEvents = 1000; @@ -1337,7 +1329,7 @@ public class TmfTraceTest { final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, startIndex, nbEvents, blockSize, ExecutionType.FOREGROUND) { + range, startIndex, nbEvents, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -1368,7 +1360,6 @@ public class TmfTraceTest { final TmfDataRequest request = new TmfDataRequest(ITmfEvent.class, startIndex, nbEvents, - TmfDataRequest.DEFAULT_BLOCK_SIZE, TmfDataRequest.ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { @@ -1397,17 +1388,19 @@ public class TmfTraceTest { @Test public void testCancel() throws InterruptedException { + final int limit = BLOCK_SIZE; final Vector requestedEvents = new Vector(); final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, - range, 0, NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { + range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { int nbRead = 0; + @Override public void handleData(final ITmfEvent event) { super.handleData(event); requestedEvents.add(event); - if (++nbRead == BLOCK_SIZE) { + if (++nbRead == limit) { cancel(); } } @@ -1416,7 +1409,7 @@ public class TmfTraceTest { providers[0].sendRequest(request); request.waitForCompletion(); - assertEquals("nbEvents", BLOCK_SIZE, requestedEvents.size()); + assertEquals("nbEvents", limit, requestedEvents.size()); assertTrue("isCompleted", request.isCompleted()); assertTrue("isCancelled", request.isCancelled()); } @@ -1430,7 +1423,6 @@ public class TmfTraceTest { assertFalse ("Open trace", fTrace == null); assertEquals("getType", ITmfEvent.class, fTrace.getType()); assertNull ("getResource", fTrace.getResource()); - assertEquals("getCacheSize", BLOCK_SIZE, fTrace.getCacheSize()); assertEquals("getStreamingInterval", 0, fTrace.getStreamingInterval()); assertEquals("getName", TEST_STREAM, fTrace.getName()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java index 9ec7e1b21b..524d512737 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java @@ -35,7 +35,6 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; @SuppressWarnings("javadoc") public class TmfSyntheticEventProviderStub extends TmfEventProvider { - public static final int BLOCK_SIZE = 100; public static final int NB_EVENTS = 1000; public TmfSyntheticEventProviderStub() { @@ -58,7 +57,7 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider { final TmfEventRequest eventRequest = (TmfEventRequest) request; final TmfTimeRange range = eventRequest.getRange(); final TmfEventRequest subRequest = - new TmfEventRequest(ITmfEvent.class, range, 0, NB_EVENTS, BLOCK_SIZE, ExecutionType.FOREGROUND) { + new TmfEventRequest(ITmfEvent.class, range, 0, NB_EVENTS, ExecutionType.FOREGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java index 164002248c..e36dd2c939 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java @@ -26,7 +26,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param dataType the request data type */ public TmfDataRequestStub(final Class dataType) { - super(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + super(dataType, 0, ALL_DATA, ExecutionType.FOREGROUND); } /** @@ -34,7 +34,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param index the initial event index */ public TmfDataRequestStub(final Class dataType, final int index) { - super(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + super(dataType, index, ALL_DATA, ExecutionType.FOREGROUND); } /** @@ -44,18 +44,7 @@ public class TmfDataRequestStub extends TmfDataRequest { */ public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested) { - super(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); - } - - /** - * @param dataType the request data type - * @param index the initial event index - * @param nbRequested the number of events requested - * @param blockSize the event block size - */ - public TmfDataRequestStub(final Class dataType, - final int index, final int nbRequested, final int blockSize) { - super(dataType, index, nbRequested, blockSize, ExecutionType.FOREGROUND); + super(dataType, index, nbRequested, ExecutionType.FOREGROUND); } @Override diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java index b74622285a..eb1d741f3e 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java @@ -25,7 +25,7 @@ public class TmfEventRequestStub extends TmfEventRequest { * @param dataType the event type */ public TmfEventRequestStub(final Class dataType) { - super(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + super(dataType, TmfTimeRange.ETERNITY, 0, ALL_DATA, ExecutionType.FOREGROUND); } /** @@ -33,7 +33,7 @@ public class TmfEventRequestStub extends TmfEventRequest { * @param range the requested time range */ public TmfEventRequestStub(final Class dataType, final TmfTimeRange range) { - super(dataType, range, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + super(dataType, range, 0, ALL_DATA, ExecutionType.FOREGROUND); } /** @@ -42,7 +42,7 @@ public class TmfEventRequestStub extends TmfEventRequest { * @param nbRequested the number of events requested */ public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested) { - super(dataType, range, 0, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND); + super(dataType, range, 0, nbRequested, ExecutionType.FOREGROUND); } /** @@ -52,7 +52,7 @@ public class TmfEventRequestStub extends TmfEventRequest { * @param blockSize the event block size */ public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested, final int blockSize) { - super(dataType, range, 0, nbRequested, blockSize, ExecutionType.FOREGROUND); + super(dataType, range, 0, nbRequested, ExecutionType.FOREGROUND); } /** @@ -63,7 +63,7 @@ public class TmfEventRequestStub extends TmfEventRequest { * @param blockSize the event block size */ public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final long index, final int nbRequested, final int blockSize) { - super(dataType, range, index, nbRequested, blockSize, ExecutionType.FOREGROUND); + super(dataType, range, index, nbRequested, ExecutionType.FOREGROUND); } @Override diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java index 569542fbc7..eae226b716 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java @@ -52,19 +52,14 @@ public class TmfCoalescedDataRequest extends TmfDataRequest { * @param nbRequested * The number of events requested. You can use * {@link TmfDataRequest#ALL_DATA} to request all events. - * @param blockSize - * The number of events per block. You can use - * {@link TmfDataRequest#DEFAULT_BLOCK_SIZE} to use a default - * value. * @param priority * The requested execution priority */ public TmfCoalescedDataRequest(Class dataType, long index, int nbRequested, - int blockSize, ExecutionType priority) { - super(ITmfEvent.class, index, nbRequested, blockSize, priority); + super(ITmfEvent.class, index, nbRequested, priority); } // ------------------------------------------------------------------------ @@ -277,6 +272,6 @@ public class TmfCoalescedDataRequest extends TmfDataRequest { @SuppressWarnings("nls") public String toString() { return "[TmfCoalescedDataRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + + "," + getIndex() + "," + getNbRequested() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java index fd2d4d518a..62d8349b43 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java @@ -53,10 +53,6 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements * @param nbRequested * The number of events requested. You can use * {@link TmfDataRequest#ALL_DATA} to request all events. - * @param blockSize - * The number of events per block. You can use - * {@link TmfDataRequest#DEFAULT_BLOCK_SIZE} to use a default - * value. * @param priority * The requested execution priority */ @@ -64,9 +60,8 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements TmfTimeRange range, long index, int nbRequested, - int blockSize, ExecutionType priority) { - super(ITmfEvent.class, index, nbRequested, blockSize, priority); + super(ITmfEvent.class, index, nbRequested, priority); fRange = range; if (TmfCoreTracer.isRequestTraced()) { @@ -201,7 +196,7 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements @SuppressWarnings("nls") public String toString() { return "[TmfCoalescedEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getRange() + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + + "," + getRange() + "," + getIndex() + "," + getNbRequested() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java index 12e6bf89ac..6abe91c55d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/HistoryBuilder.java @@ -225,10 +225,6 @@ public class HistoryBuilder extends TmfComponent { } class StateSystemBuildRequest extends TmfEventRequest { - - /** The amount of events queried at a time through the requests */ - private static final int CHUNK_SIZE = 50000; - private final HistoryBuilder builder; private final ITmfStateProvider sci; private final ITmfTrace trace; @@ -238,7 +234,6 @@ class StateSystemBuildRequest extends TmfEventRequest { TmfTimeRange.ETERNITY, 0, TmfDataRequest.ALL_DATA, - CHUNK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND); this.builder = builder; this.sci = builder.getStateProvider(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/partial/PartialHistoryBackend.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/partial/PartialHistoryBackend.java index 6ac15b551d..a73c5c0e8d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/partial/PartialHistoryBackend.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/statesystem/backends/partial/PartialHistoryBackend.java @@ -283,10 +283,6 @@ public class PartialHistoryBackend implements IStateHistoryBackend { // ------------------------------------------------------------------------ private class CheckpointsRequest extends TmfEventRequest { - - /** The amount of events queried at a time through the requests */ - private static final int CHUNK_SIZE = 50000; - private final ITmfTrace trace; private final Map checkpts; private long eventCount; @@ -297,7 +293,6 @@ public class PartialHistoryBackend implements IStateHistoryBackend { TmfTimeRange.ETERNITY, 0, TmfDataRequest.ALL_DATA, - CHUNK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND); checkpoints.clear(); this.trace = input.getTrace(); @@ -331,8 +326,6 @@ public class PartialHistoryBackend implements IStateHistoryBackend { } private class PartialStateSystemRequest extends TmfEventRequest { - - private static final int CHUNK_SIZE = 50000; private final ITmfStateProvider sci; private final ITmfTrace trace; @@ -341,7 +334,6 @@ public class PartialHistoryBackend implements IStateHistoryBackend { range, 0, TmfDataRequest.ALL_DATA, - CHUNK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND); this.sci = sci; this.trace = sci.getTrace(); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java index fda7d41ca8..cb0e348489 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfDataProvider.java @@ -264,7 +264,7 @@ public abstract class TmfDataProvider extends TmfComponent implements ITmfDataPr protected void newCoalescedDataRequest(ITmfDataRequest request) { synchronized (fLock) { TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(request.getDataType(), request.getIndex(), - request.getNbRequested(), request.getBlockSize(), request.getExecType()); + request.getNbRequested(), request.getExecType()); coalescedRequest.addRequest(request); if (TmfCoreTracer.isRequestTraced()) { TmfCoreTracer.traceRequest(request, "COALESCED with " + coalescedRequest.getRequestId()); //$NON-NLS-1$ @@ -304,7 +304,7 @@ public abstract class TmfDataProvider extends TmfComponent implements ITmfDataPr if (request.getExecType() == ExecutionType.FOREGROUND) { queueRequest(request); } else { - queueBackgroundRequest(request, request.getBlockSize(), true); + queueBackgroundRequest(request, true); } } @@ -335,12 +335,11 @@ public abstract class TmfDataProvider extends TmfComponent implements ITmfDataPr * * @param request * The request - * @param blockSize - * The request should be split in chunks of this size * @param indexing * Should we index the chunks + * @since 3.0 */ - protected void queueBackgroundRequest(final ITmfDataRequest request, final int blockSize, final boolean indexing) { + protected void queueBackgroundRequest(final ITmfDataRequest request, final boolean indexing) { queueRequest(request); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java index 9a84d00b31..7f661679f4 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/component/TmfEventProvider.java @@ -98,8 +98,12 @@ public abstract class TmfEventProvider extends TmfDataProvider { protected synchronized void newCoalescedDataRequest(ITmfDataRequest request) { if (request instanceof ITmfEventRequest) { ITmfEventRequest eventRequest = (ITmfEventRequest) request; - TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(eventRequest.getDataType(), eventRequest.getRange(), - eventRequest.getIndex(), eventRequest.getNbRequested(), eventRequest.getBlockSize(), eventRequest.getExecType()); + TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest( + eventRequest.getDataType(), + eventRequest.getRange(), + eventRequest.getIndex(), + eventRequest.getNbRequested(), + eventRequest.getExecType()); coalescedRequest.addRequest(eventRequest); if (TmfCoreTracer.isRequestTraced()) { TmfCoreTracer.traceRequest(request, "COALESCED with " + coalescedRequest.getRequestId()); //$NON-NLS-1$ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java index f41bf094ba..36dbdbf5f2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/ITmfDataRequest.java @@ -69,11 +69,6 @@ public interface ITmfDataRequest { */ int getNbRequested(); - /** - * @return the block size (for BG requests) - */ - int getBlockSize(); - /** * @return the number of events read so far */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index d11ae0ff50..7253122c8d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -80,9 +80,6 @@ public abstract class TmfDataRequest implements ITmfDataRequest { // Constants // ------------------------------------------------------------------------ - /** The default maximum number of events per chunk */ - public static final int DEFAULT_BLOCK_SIZE = 1000; - /** The request count for all the events */ public static final int ALL_DATA = Integer.MAX_VALUE; @@ -104,9 +101,6 @@ public abstract class TmfDataRequest implements ITmfDataRequest { /** The number of requested events (ALL_DATA for all) */ protected int fNbRequested; - /** The block size (for BG requests) */ - private final int fBlockSize; - /** The number of reads so far */ private int fNbRead; @@ -141,22 +135,17 @@ public abstract class TmfDataRequest implements ITmfDataRequest { * The number of events requested. You can use * {@link TmfDataRequest#ALL_DATA} to specify you want all events * in the trace. - * @param blockSize - * The number of events per block. You can use - * {@link TmfDataRequest#DEFAULT_BLOCK_SIZE}. * @param priority * The requested execution priority. */ public TmfDataRequest(Class dataType, long index, int nbRequested, - int blockSize, ExecutionType priority) { fRequestId = fRequestNumber++; fDataType = dataType; fIndex = index; fNbRequested = nbRequested; - fBlockSize = blockSize; fExecType = priority; fNbRead = 0; @@ -213,14 +202,6 @@ public abstract class TmfDataRequest implements ITmfDataRequest { return fNbRequested; } - /** - * @return the block size (for BG requests) - */ - @Override - public int getBlockSize() { - return fBlockSize; - } - /** * @return the number of events read so far */ @@ -471,7 +452,7 @@ public abstract class TmfDataRequest implements ITmfDataRequest { @Override @SuppressWarnings("nls") public String toString() { - return "[TmfDataRequest(" + fRequestId + "," + fDataType.getSimpleName() + "," + fIndex + "," + fNbRequested - + "," + getBlockSize() + ")]"; + return "[TmfDataRequest(" + fRequestId + "," + fDataType.getSimpleName() + + "," + fIndex + "," + fNbRequested + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java index c7a94ccf86..a12f683905 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java @@ -52,20 +52,16 @@ public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEven * The number of events requested. You can use * {@link TmfEventRequest#ALL_DATA} to indicate you want all * events in the time range. - * @param blockSize - * The number of events per block. You can use - * {@link TmfDataRequest#DEFAULT_BLOCK_SIZE}. * @param priority * The requested execution priority. - * @since 2.0 + * @since 3.0 */ public TmfEventRequest(Class dataType, TmfTimeRange range, long index, int nbRequested, - int blockSize, ExecutionType priority) { - super(dataType, index, nbRequested, blockSize, priority); + super(dataType, index, nbRequested, priority); fRange = range; if (TmfCoreTracer.isRequestTraced()) { @@ -133,7 +129,7 @@ public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEven @SuppressWarnings("nls") public String toString() { return "[TmfEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getRange() + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + + "," + getRange() + "," + getIndex() + "," + getNbRequested() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfEventsStatistics.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfEventsStatistics.java index c08978a9fb..e770b33744 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfEventsStatistics.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statistics/TmfEventsStatistics.java @@ -224,7 +224,7 @@ public class TmfEventsStatistics implements ITmfStatistics { public StatsTotalRequest(ITmfTrace trace, TmfTimeRange range) { super(trace.getEventType(), range, 0, TmfDataRequest.ALL_DATA, - trace.getCacheSize(), ITmfDataRequest.ExecutionType.BACKGROUND); + ITmfDataRequest.ExecutionType.BACKGROUND); total = 0; } @@ -254,7 +254,7 @@ public class TmfEventsStatistics implements ITmfStatistics { public StatsPerTypeRequest(ITmfTrace trace, TmfTimeRange range) { super(trace.getEventType(), range, 0, TmfDataRequest.ALL_DATA, - trace.getCacheSize(), ITmfDataRequest.ExecutionType.BACKGROUND); + ITmfDataRequest.ExecutionType.BACKGROUND); this.stats = new HashMap(); } @@ -310,7 +310,6 @@ public class TmfEventsStatistics implements ITmfStatistics { new TmfTimestamp(endTime, SCALE)), 0, TmfDataRequest.ALL_DATA, - trace.getCacheSize(), ITmfDataRequest.ExecutionType.BACKGROUND); /* Prepare the results map, with all counts at 0 */ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java index f8964ea143..8171bddceb 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpointIndexer.java @@ -165,8 +165,8 @@ public class TmfCheckpointIndexer implements ITmfTraceIndexer { // Build a background request for all the trace data. The index is // updated as we go by readNextEvent(). fIndexingRequest = new TmfEventRequest(ITmfEvent.class, - range, offset, TmfDataRequest.ALL_DATA, fCheckpointInterval, ITmfDataRequest.ExecutionType.BACKGROUND) - { + range, offset, TmfDataRequest.ALL_DATA, + ITmfDataRequest.ExecutionType.BACKGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java index 9a1afb1c93..9135b4669f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsCache.java @@ -242,7 +242,6 @@ public class TmfEventsCache { DataRequest(Class dataType, ITmfFilter reqFilter, int start, int nbRequested) { super(dataType, start, nbRequested, - TmfDataRequest.DEFAULT_BLOCK_SIZE, TmfDataRequest.ExecutionType.FOREGROUND); requestFilter = reqFilter; requestRank = start; @@ -336,7 +335,6 @@ public class TmfEventsCache { TmfDataRequest request = new TmfDataRequest(ITmfEvent.class, startIndex, nbRequested, - TmfDataRequest.DEFAULT_BLOCK_SIZE, TmfDataRequest.ExecutionType.FOREGROUND) { private int count = 0; private long rank = startIndex; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java index 4484eedac5..5f8a53d656 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java @@ -1394,7 +1394,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS return; } request = new TmfDataRequest(ITmfEvent.class, (int) fFilterCheckCount, - nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { + nbRequested, ExecutionType.BACKGROUND) { @Override public void handleData(final ITmfEvent event) { super.handleData(event); @@ -1632,7 +1632,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS if (direction == Direction.BACKWARD) { rank = Math.max(0, rank - fTrace.getCacheSize() + 1); } - request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) { + request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested, ExecutionType.BACKGROUND) { long currentRank = rank; @Override @@ -2148,7 +2148,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS // do the work to select the actual event with the timestamp specified in the signal. This procedure prevents // the method fTrace.getRank() from interfering and delaying ongoing requests. final TmfDataRequest subRequest = new TmfDataRequest(ITmfEvent.class, - 0, 1, TmfDataRequest.DEFAULT_BLOCK_SIZE, ExecutionType.FOREGROUND) { + 0, 1, ExecutionType.FOREGROUND) { TmfTimestamp ts = new TmfTimestamp(signal.getCurrentTime()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java index 7df67cb160..f9af599aff 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramRequest.java @@ -20,7 +20,6 @@ import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest; import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; -import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; /** * Class to request events for given time range from a trace to fill a HistogramDataModel and HistogramView. @@ -65,9 +64,7 @@ public class HistogramRequest extends TmfEventRequest { public HistogramRequest(HistogramDataModel histogram, TmfTimeRange range, int rank, int nbEvents, int blockSize, ITmfDataRequest.ExecutionType execType) { - super(ITmfEvent.class, range, rank, nbEvents, - (blockSize > 0) ? blockSize : ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, - execType); + super(ITmfEvent.class, range, rank, nbEvents, execType); fHistogram = histogram; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java index c5df2283a3..af9887925e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/loader/TmfUml2SDSyncLoader.java @@ -106,14 +106,12 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, // ------------------------------------------------------------------------ // Constants // ------------------------------------------------------------------------ + /** * Default title name. */ protected static final String TITLE = Messages.TmfUml2SDSyncLoader_ViewName; - /** - * Default block size for background request. - */ - protected static final int DEFAULT_BLOCK_SIZE = 50000; + /** * Maximum number of messages per page. */ @@ -314,7 +312,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, TmfTimeRange window = TmfTimeRange.ETERNITY; - fIndexRequest = new TmfEventRequest(ITmfEvent.class, window, 0, TmfDataRequest.ALL_DATA, DEFAULT_BLOCK_SIZE, ITmfDataRequest.ExecutionType.BACKGROUND) { + fIndexRequest = new TmfEventRequest(ITmfEvent.class, window, 0, TmfDataRequest.ALL_DATA, ITmfDataRequest.ExecutionType.BACKGROUND) { private ITmfTimestamp fFirstTime = null; private ITmfTimestamp fLastTime = null; @@ -1079,7 +1077,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, window = TmfTimeRange.ETERNITY; } - fPageRequest = new TmfEventRequest(ITmfEvent.class, window, 0, TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.FOREGROUND) { + fPageRequest = new TmfEventRequest(ITmfEvent.class, window, 0, TmfDataRequest.ALL_DATA, ITmfDataRequest.ExecutionType.FOREGROUND) { private final List fSdEvent = new ArrayList(); @Override @@ -1250,7 +1248,7 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, */ public SearchJob(Criteria findCriteria, TmfTimeRange window) { super(Messages.TmfUml2SDSyncLoader_SearchJobDescrition); - fSearchRequest = new SearchEventRequest(window, TmfDataRequest.ALL_DATA, 1, ITmfDataRequest.ExecutionType.FOREGROUND, findCriteria); + fSearchRequest = new SearchEventRequest(window, TmfDataRequest.ALL_DATA, ITmfDataRequest.ExecutionType.FOREGROUND, findCriteria); } @Override @@ -1343,25 +1341,23 @@ public class TmfUml2SDSyncLoader extends TmfComponent implements IUml2SDLoader, * Constructor * @param range @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#TmfEventRequest(...) * @param nbRequested @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#handleData(...) - * @param blockSize @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#handleData(...) * @param execType @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#handleData(...) * @param criteria The search criteria */ - public SearchEventRequest(TmfTimeRange range, int nbRequested, int blockSize, ExecutionType execType, Criteria criteria) { - this(range, nbRequested, blockSize, execType, criteria, null); + public SearchEventRequest(TmfTimeRange range, int nbRequested, ExecutionType execType, Criteria criteria) { + this(range, nbRequested, execType, criteria, null); } /** * Constructor * @param range @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#TmfEventRequest(...) * @param nbRequested @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#TmfEventRequest(...) - * @param blockSize @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#TmfEventRequest(...) * @param execType @see org.eclipse.linuxtools.tmf.request.TmfEventRequest#TmfEventRequest(...) * @param criteria The search criteria * @param monitor progress monitor */ - public SearchEventRequest(TmfTimeRange range, int nbRequested, int blockSize, ExecutionType execType, Criteria criteria, IProgressMonitor monitor) { - super(ITmfEvent.class, range, 0, nbRequested, blockSize, execType); + public SearchEventRequest(TmfTimeRange range, int nbRequested, ExecutionType execType, Criteria criteria, IProgressMonitor monitor) { + super(ITmfEvent.class, range, 0, nbRequested, execType); fCriteria = new Criteria(criteria); fMonitor = monitor; } -- 2.34.1