Rationalize ITmfTrace.initTrace()
authorFrancois Chouinard <fchouinard@gmail.com>
Tue, 27 Mar 2012 19:54:32 +0000 (15:54 -0400)
committerFrancois Chouinard <fchouinard@gmail.com>
Thu, 29 Mar 2012 17:09:40 +0000 (13:09 -0400)
19 files changed:
org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTextTrace.java
org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/trace/LTTngTrace.java
org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/internal/lttng/stubs/LTTngTraceStub.java
org.eclipse.linuxtools.lttng2.kernel.core.tests/src/org/eclipse/linuxtools/lttng2/kernel/core/tests/stateprovider/CTFTestFiles.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/TestParams.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java
org.eclipse.linuxtools.tmf.core/build.properties
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperimentContext.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
org.eclipse.linuxtools.tmf.ui/schema/org.eclipse.linuxtools.tmf.ui.tracetype.exsd
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenTraceHandler.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java

index 072abd96471813380b182bd9d4f99b96b2d7500a..c39d00f6994137a936bf40e531e3cb6100c686fa 100644 (file)
@@ -106,22 +106,6 @@ public class LTTngTextTrace extends TmfTrace<LttngEvent> {
        fCheckpoints = oldTrace.fCheckpoints;
     }
     
-       @Override
-       public LTTngTextTrace copy() {
-               
-               LTTngTextTrace returnedTrace = null;
-       
-       try {
-               returnedTrace = new LTTngTextTrace(this);
-       }
-       catch (Exception e) {
-               System.out.println("ERROR : Could not create LTTngTextTrace copy (createTraceCopy)"); //$NON-NLS-1$
-               e.printStackTrace(); 
-       }
-       
-       return returnedTrace;
-       }
-    
     private boolean positionToFirstEvent() {
        
        boolean isSuccessful = true;
index fae7b95305e7292b743badbdf96214295e09ac9d..e50fcedc22607f0f9fc7ef6e99fccbda92772aa3 100644 (file)
@@ -116,27 +116,12 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
     }
 
     @Override
-    public void initTrace(String name, String path, Class<LttngEvent> eventType) throws FileNotFoundException {
-        initLTTngTrace(name, path, eventType, CHECKPOINT_PAGE_SIZE, false);
+    public void initTrace(String name, String path, Class<LttngEvent> eventType, int pageSize) throws FileNotFoundException {
+        initLTTngTrace(name, path, eventType, pageSize, false);
     }
 
-    @Override
-    public void initTrace(String name, String path, Class<LttngEvent> eventType, int cacheSize) throws FileNotFoundException {
-        initLTTngTrace(name, path, eventType, cacheSize, false);
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<LttngEvent> eventType, boolean indexTrace) throws FileNotFoundException {
-        initLTTngTrace(name, path, eventType, CHECKPOINT_PAGE_SIZE, indexTrace);
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<LttngEvent> eventType, int cacheSize, boolean indexTrace) throws FileNotFoundException {
-        initLTTngTrace(name, path, eventType, cacheSize, indexTrace);
-    }
-
-    private synchronized void initLTTngTrace(String name, String path, Class<LttngEvent> eventType, int cacheSize, boolean indexTrace) throws FileNotFoundException {
-        super.initTrace(name, path, eventType, indexTrace);
+    private synchronized void initLTTngTrace(String name, String path, Class<LttngEvent> eventType, int pageSize, boolean indexTrace) throws FileNotFoundException {
+        super.initTrace(name, path, eventType, (pageSize > 0) ? pageSize : CHECKPOINT_PAGE_SIZE);
         try {
             currentJniTrace = JniTraceFactory.getJniTrace(path, traceLibPath, SHOW_LTT_DEBUG_DEFAULT);
         } catch (Exception e) {
@@ -320,7 +305,9 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
     public LTTngTrace(String name, String path, String traceLibPath, boolean waitForCompletion, boolean bypassIndexing)
             throws Exception {
         super(name, LttngEvent.class, path, CHECKPOINT_PAGE_SIZE, false);
-        initTrace(name, path, LttngEvent.class, !bypassIndexing);
+        initTrace(name, path, LttngEvent.class, CHECKPOINT_PAGE_SIZE);
+        if (!bypassIndexing)
+            indexTrace(false);
         this.traceLibPath = traceLibPath;
     }
 
@@ -333,20 +320,6 @@ public class LTTngTrace extends TmfTrace<LttngEvent> {
         setTimeRange(new TmfTimeRange(new LttngTimestamp(other.getStartTime()), new LttngTimestamp(other.getEndTime())));
     }
 
-    @Override
-    public LTTngTrace copy() {
-        LTTngTrace returnedTrace = null;
-
-        try {
-            returnedTrace = new LTTngTrace(this);
-        } catch (Exception e) {
-            System.out.println("ERROR : Could not create LTTngTrace copy (createTraceCopy)."); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-
-        return returnedTrace;
-    }
-
     @Override
     public synchronized LTTngTrace clone() {
         LTTngTrace clone = null;
index 1930dbf02494ea20762991f85cf534924f754e80..f987d9b40fe318dfe8fb1f0e54a101e90a2cb79b 100644 (file)
@@ -21,7 +21,6 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
 import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
@@ -70,18 +69,6 @@ public class LTTngTraceStub extends TmfTrace<LttngEvent> {
 //     indexTrace(true);
     }
     
-       @Override
-       public ITmfTrace<LttngEvent> copy() {
-               ITmfTrace<LttngEvent> returnedValue = null;
-               try {
-                       returnedValue = new LTTngTraceStub(this.getName());
-               }
-               catch (FileNotFoundException e) {
-                       e.printStackTrace();
-               }
-               return returnedValue;
-       }
-    
     // ========================================================================
     // Accessors
     // ========================================================================
index 2c8cffb19397345fa1a3a6a225f8919684207d85..d008558062b12d17f8840bb183c2313739de205f 100644 (file)
@@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace;
 public abstract class CTFTestFiles {
 
     public final static long NANOSECS_PER_SEC = 1000000000L;
+    private final static int PAGE_SIZE = 1000;
 
     /*
      * To run these tests, you will need to download the following trace, at:
@@ -43,7 +44,7 @@ public abstract class CTFTestFiles {
     public static CtfTmfTrace getTestTrace() throws FileNotFoundException {
         if (trace == null) {
             trace = new CtfTmfTrace();
-            trace.initTrace("test-trace2", traceFile, CtfTmfEvent.class); //$NON-NLS-1$
+            trace.initTrace("test-trace2", traceFile, CtfTmfEvent.class, PAGE_SIZE); //$NON-NLS-1$
         }
         return trace;
     }
index 5deda663e0b260d8d1ecabf0677da2acadf6af86..cbf149d82a2006240d780aa39860bb3faee21ce3 100644 (file)
@@ -15,7 +15,9 @@ public abstract class TestParams {
     
     private static final File emptyFile = new File(""); //$NON-NLS-1$
     private static CtfTmfTrace emptyTrace = new CtfTmfTrace();
-    
+
+    private final static int PAGE_SIZE = 1000;
+
     public static File getEmptyFile() {
         return emptyFile;
     }
@@ -27,7 +29,7 @@ public abstract class TestParams {
     public static CtfTmfTrace createTrace() throws FileNotFoundException {
         if ( testTrace1 == null ) {
             testTrace1 = new CtfTmfTrace();
-            testTrace1.initTrace("test-trace", testTracePath1, CtfTmfEvent.class); //$NON-NLS-1$
+            testTrace1.initTrace("test-trace", testTracePath1, CtfTmfEvent.class,PAGE_SIZE); //$NON-NLS-1$
         }
         return testTrace1;
     }
index 2ac183c73818a0838cd0520da3c07e62a537e9c6..3d51b712f2da3716812243bbd7b45d135f77cace 100644 (file)
@@ -24,7 +24,6 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.parser.ITmfEventParser;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
-import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
 import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
@@ -121,13 +120,6 @@ public class TmfTraceStub extends TmfTrace<TmfEvent> {
        return clone;
     }
  
-    @Override
-       public ITmfTrace<TmfEvent> copy() {
-               ITmfTrace<TmfEvent> returnedValue = null;
-               returnedValue = clone();
-               return returnedValue;
-       }
-    
     // ------------------------------------------------------------------------
     // Accessors
     // ------------------------------------------------------------------------
index 00e586480bb1f0866509c417b817ba8a4277269c..25b203b9e301ac36bb98a5fae001cc7446b5820f 100644 (file)
@@ -1,7 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               plugin.xml,\
                plugin.properties,\
                about.html,\
                .
index e2c2cbfe9e27457e2ab4b3e742036c6b964d5be0..3a81bbb0ba68dc0ba038526731f8bdffab8eac9d 100644 (file)
@@ -70,7 +70,7 @@ public class CtfTmfTrace extends TmfEventProvider<CtfTmfEvent> implements
     }
 
     @Override
-    public void initTrace(String name, String path, Class<CtfTmfEvent> eventType)
+    public void initTrace(String name, String path, Class<CtfTmfEvent> eventType, int pageSize)
             throws FileNotFoundException {
         try {
             this.fTrace = new CTFTrace(path);
@@ -96,24 +96,7 @@ public class CtfTmfTrace extends TmfEventProvider<CtfTmfEvent> implements
     }
 
     @Override
-    public void initTrace(String name, String path,
-            Class<CtfTmfEvent> eventType, int cacheSize)
-            throws FileNotFoundException {
-        this.initTrace(name, path, eventType);
-    }
-
-    @Override
-    public void initTrace(String name, String path,
-            Class<CtfTmfEvent> eventType, boolean indexTrace)
-            throws FileNotFoundException {
-        this.initTrace(name, path, eventType);
-    }
-
-    @Override
-    public void initTrace(String name, String path,
-            Class<CtfTmfEvent> eventType, int cacheSize, boolean indexTrace)
-            throws FileNotFoundException {
-        this.initTrace(name, path, eventType);
+    public void indexTrace(boolean waitForCompletion) {
     }
 
     @Override
@@ -148,12 +131,6 @@ public class CtfTmfTrace extends TmfEventProvider<CtfTmfEvent> implements
         return clone;
     }
 
-    @Override
-    public ITmfTrace<CtfTmfEvent> copy() {
-        // FIXME not yet implemented
-        return null;
-    }
-
     // ------------------------------------------------------------------------
     // Accessors
     // ------------------------------------------------------------------------
@@ -337,4 +314,5 @@ public class CtfTmfTrace extends TmfEventProvider<CtfTmfEvent> implements
     CTFTrace getCTFTrace() {
         return fTrace;
     }
+
 }
index 8b493dc81439aee745a05b7a295107f50d50ae8b..9a4c1b7b0c8a2f37790ce6e6c37bd8d7b43f59df 100644 (file)
@@ -37,7 +37,6 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentRangeUpdatedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentUpdatedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
-import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
@@ -97,25 +96,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
     }
 
     @Override
-    public void initTrace(String name, String path, Class<T> eventType) {
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, boolean indexTrace) {
-        if (indexTrace) {
-            initializeStreamingMonitor();
-        }
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize) {
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize, boolean indexTrace) {
-        if (indexTrace) {
-            initializeStreamingMonitor();
-        }
+    public void initTrace(String name, String path, Class<T> eventType, int pageSize) {
     }
 
     /**
@@ -138,8 +119,8 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
         fTimeRange = TmfTimeRange.NULL_RANGE;
 
         if (preIndexExperiment) {
-          indexExperiment(true);
-          updateTimeRange();
+            indexExperiment(true, 0, TmfTimeRange.ETERNITY);
+            updateTimeRange();
         }
     }
 
@@ -166,34 +147,6 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
         this(type, id, traces, TmfTimestamp.ZERO, indexPageSize);
     }
 
-    /**
-     * Copy constructor
-     * 
-     * @param other
-     */
-    @SuppressWarnings("unchecked")
-    public TmfExperiment(TmfExperiment<T> other) {
-        super(other.getName() + "(copy)", other.fType); //$NON-NLS-1$
-
-        fEpoch = other.fEpoch;
-        fIndexPageSize = other.fIndexPageSize;
-
-        fTraces = new ITmfTrace[other.fTraces.length];
-        for (int trace = 0; trace < other.fTraces.length; trace++) {
-            fTraces[trace] = other.fTraces[trace].copy();
-        }
-
-        fNbEvents = other.fNbEvents;
-        fTimeRange = other.fTimeRange;
-    }
-
-    @Override
-    public TmfExperiment<T> copy() {
-        TmfExperiment<T> experiment = new TmfExperiment<T>(this);
-        TmfSignalManager.deregister(experiment);
-        return experiment;
-    }
-
     /**
      * Clears the experiment
      */
@@ -831,8 +784,11 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
         }
     }
 
-    protected void indexExperiment(boolean waitForCompletion) {
-        indexExperiment(waitForCompletion, 0, TmfTimeRange.ETERNITY);
+    @Override
+    public void indexTrace(boolean waitForCompletion) {
+        if (waitForCompletion) {
+            initializeStreamingMonitor();
+        }
     }
 
     @SuppressWarnings("unchecked")
index 785f6ac82994f5feb31fc344dc0d654b0d3cec6a..4e8e65fdb920111f0f2d90a8e00d78527d2705bb 100644 (file)
@@ -45,7 +45,7 @@ public class TmfExperimentContext extends TmfContext {
        // ------------------------------------------------------------------------
 
        private ITmfTrace<?>[]  fTraces = new ITmfTrace[0];
-       private TmfContext[] fContexts;
+       private ITmfContext[] fContexts;
        private ITmfEvent[]   fEvents;
        private int lastTraceRead;
 
@@ -53,7 +53,7 @@ public class TmfExperimentContext extends TmfContext {
        // Constructors
        // ------------------------------------------------------------------------
 
-       public TmfExperimentContext(ITmfTrace<?>[] traces, TmfContext[] contexts) {
+       public TmfExperimentContext(ITmfTrace<?>[] traces, ITmfContext[] contexts) {
                super();
                fTraces   = traces;
                fContexts = contexts;
@@ -88,8 +88,8 @@ public class TmfExperimentContext extends TmfContext {
                setLastTrace(other.lastTraceRead);
        }
 
-       private TmfContext[] cloneContexts() {
-               TmfContext[] contexts = new TmfContext[fContexts.length];
+       private ITmfContext[] cloneContexts() {
+               ITmfContext[] contexts = new TmfContext[fContexts.length];
                for (int i = 0; i < fContexts.length; i++)
                        contexts[i] = fContexts[i].clone();
                return contexts;
index 0054c5feff400c6a774d24fa4e085dcf5c25f30d..b032ec10c8fb9c3f39fbb97eaf30cfe7b7d521e5 100644 (file)
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2011 Ericsson
+ * Copyright (c) 2009, 2011, 2012 Ericsson
  * 
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -8,6 +8,7 @@
  * 
  * Contributors:
  *   Francois Chouinard - Initial API and implementation
+ *   Francois Chouinard - Updated as per TMF Trace Model 1.0
  *******************************************************************************/
 
 package org.eclipse.linuxtools.tmf.core.trace;
@@ -24,22 +25,29 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 /**
  * <b><u>ITmfTrace</u></b>
  * <p>
+ * The basic event trace structure in the TMF.
  */
 public interface ITmfTrace<T extends ITmfEvent> extends ITmfComponent {
 
-    // initTrace variants
-    public void initTrace(String name, String path, Class<T> eventType) throws FileNotFoundException;
+    // ------------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------------
 
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize) throws FileNotFoundException;
+    // ------------------------------------------------------------------------
+    // Initializers
+    // ------------------------------------------------------------------------
 
-    public void initTrace(String name, String path, Class<T> eventType, boolean indexTrace) throws FileNotFoundException;
+    // initTrace variants
+    public void initTrace(String name, String path, Class<T> eventType, int pageSize) throws FileNotFoundException;
 
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize, boolean indexTrace) throws FileNotFoundException;
+    public void indexTrace(boolean waitForCompletion);
 
     // Trace type validation
     public boolean validate(IProject project, String path);
 
-    public ITmfTrace<T> copy();
+    // ------------------------------------------------------------------------
+    // Getters
+    // ------------------------------------------------------------------------
 
     /**
      * @return the trace path
@@ -76,6 +84,10 @@ public interface ITmfTrace<T extends ITmfEvent> extends ITmfComponent {
      */
     public long getStreamingInterval();
 
+    // ------------------------------------------------------------------------
+    // Seek operations
+    // ------------------------------------------------------------------------
+
     /**
      * Positions the trace at the first event with the specified timestamp or index (i.e. the nth event in the trace).
      * 
@@ -101,6 +113,30 @@ public interface ITmfTrace<T extends ITmfEvent> extends ITmfComponent {
      */
     public ITmfContext seekLocation(double ratio);
 
+    // ------------------------------------------------------------------------
+    // Read operations
+    // ------------------------------------------------------------------------
+
+    /**
+     * Return the event pointed by the supplied context (or null if no event left) and updates the context to the next
+     * event.
+     * 
+     * @return the next event in the stream
+     */
+    public ITmfEvent getNextEvent(ITmfContext context);
+
+    /**
+     * Return the event pointed by the supplied context (or null if no event left) and *does not* update the context.
+     * 
+     * @return the next event in the stream
+     */
+    public ITmfEvent parseEvent(ITmfContext context);
+
+
+    // ------------------------------------------------------------------------
+    // misc
+    // ------------------------------------------------------------------------
+
     /**
      * Returns the ratio corresponding to the specified location.
      * 
@@ -121,21 +157,6 @@ public interface ITmfTrace<T extends ITmfEvent> extends ITmfComponent {
      */
     public long getRank(ITmfTimestamp timestamp);
 
-    /**
-     * Return the event pointed by the supplied context (or null if no event left) and updates the context to the next
-     * event.
-     * 
-     * @return the next event in the stream
-     */
-    public ITmfEvent getNextEvent(ITmfContext context);
-
-    /**
-     * Return the event pointed by the supplied context (or null if no event left) and *does not* update the context.
-     * 
-     * @return the next event in the stream
-     */
-    public ITmfEvent parseEvent(ITmfContext context);
-
     /**
      * Set the resource used for persistent properties on this trace
      * @param resource the properties resource
@@ -147,4 +168,5 @@ public interface ITmfTrace<T extends ITmfEvent> extends ITmfComponent {
      * @return the properties resource or null if none is set
      */
     public IResource getResource();
+
 }
index bd3ff6ea23af6a539ea1e997331b21b7bf9257f0..7109971a228ffab289345a3c36965792c925bcd1 100644 (file)
@@ -97,26 +97,11 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
     }
 
     @Override
-    public void initTrace(String name, String path, Class<T> eventType) throws FileNotFoundException {
-        initTmfTrace(name, path, eventType, DEFAULT_INDEX_PAGE_SIZE, false);
+    public void initTrace(String name, String path, Class<T> eventType, int pageSize) throws FileNotFoundException {
+        initTmfTrace(name, path, eventType, pageSize, false);
     }
 
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize) throws FileNotFoundException {
-        initTmfTrace(name, path, eventType, cacheSize, false);
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, boolean indexTrace) throws FileNotFoundException {
-        initTmfTrace(name, path, eventType, DEFAULT_INDEX_PAGE_SIZE, indexTrace);
-    }
-
-    @Override
-    public void initTrace(String name, String path, Class<T> eventType, int cacheSize, boolean indexTrace) throws FileNotFoundException {
-        initTmfTrace(name, path, eventType, cacheSize, indexTrace);
-    }
-
-    private void initTmfTrace(String name, String path, Class<T> eventType, int cacheSize, boolean indexTrace) throws FileNotFoundException {
+    private void initTmfTrace(String name, String path, Class<T> eventType, int pageSize, boolean indexTrace) throws FileNotFoundException {
         fPath = path;
         if (name != null) {
             fTraceName = name;
@@ -129,7 +114,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
             }
         }
         super.init(fTraceName, eventType);
-        fIndexPageSize = (cacheSize > 0) ? cacheSize : DEFAULT_INDEX_PAGE_SIZE;
+        fIndexPageSize = (pageSize > 0) ? pageSize : DEFAULT_INDEX_PAGE_SIZE;
         if (indexTrace)
             indexTrace(false);
     }
@@ -174,7 +159,7 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      */
     protected TmfTrace(String name, Class<T> type, String path, int cacheSize, boolean indexTrace) throws FileNotFoundException {
         super();
-         initTrace(name, path, type, cacheSize, indexTrace);
+        initTmfTrace(name, path, type, cacheSize, indexTrace);
     }
 
     @SuppressWarnings("unchecked")
@@ -477,8 +462,9 @@ public abstract class TmfTrace<T extends ITmfEvent> extends TmfEventProvider<T>
      * event).
      */
 
+    @Override
     @SuppressWarnings({ "unchecked" })
-    protected void indexTrace(boolean waitForCompletion) {
+    public void indexTrace(boolean waitForCompletion) {
 
         final Job job = new Job("Indexing " + getName() + "...") { //$NON-NLS-1$ //$NON-NLS-2$
             @Override
index 9598096205186035092fd47d74c29851462d7736..f51f6822b374f187e5b8801e40935e28a154363c 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.linuxtools.tmf" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.linuxtools.tmf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appinfo>
-         <meta.schema plugin="org.eclipse.linuxtools.tmf" id="org.eclipse.linuxtools.tmf.tracetype" name="TMF Trace Type"/>
+         <meta.schema plugin="org.eclipse.linuxtools.tmf.ui" id="tracetype" name="TMF Trace Type"/>
       </appinfo>
       <documentation>
          This extension point is used to contribute new trace types to the generic components of the TMF framework.
@@ -93,7 +93,7 @@
                   an optional attribute that is composed of the category ID. The referenced category must be declared in a corresponding category element.
                </documentation>
                <appinfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.linuxtools.tmf.tracetype/category/@id"/>
+                  <meta.attribute kind="identifier" basedOn="org.eclipse.linuxtools.tmf.ui.tracetype/category/@id"/>
                </appinfo>
             </annotation>
          </attribute>
index 653c7c973c8d86a4be6bd35359c0f19ad69f9e81..3790a24b7b9270cdb9a3a4b841b0ed6101c2f8d0 100644 (file)
@@ -27,7 +27,6 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;\r
-import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;\r
@@ -35,7 +34,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;
 public class CustomTxtTrace extends TmfTrace<CustomTxtEvent> {\r
 \r
     private static final TmfLocation<Long> NULL_LOCATION = new TmfLocation<Long>((Long) null);\r
-    private static final int CACHE_SIZE = 100;\r
+    private static final int DEFAULT_PAGE_SIZE = 100;\r
 \r
     private CustomTxtTraceDefinition fDefinition;\r
     private CustomTxtEventType fEventType;\r
@@ -52,15 +51,8 @@ public class CustomTxtTrace extends TmfTrace<CustomTxtEvent> {
     }\r
 \r
     @Override\r
-    public void initTrace(String name, String path, Class<CustomTxtEvent> eventType, boolean indexTrace) throws FileNotFoundException {\r
-        super.initTrace(name, path, eventType, CACHE_SIZE, indexTrace);\r
-    }\r
-\r
-    @Override\r
-       @SuppressWarnings({ "unchecked", "rawtypes" })\r
-       public ITmfTrace copy() {\r
-        // TODO Auto-generated method stub\r
-        return null;\r
+    public void initTrace(String name, String path, Class<CustomTxtEvent> eventType, int pageSize) throws FileNotFoundException {\r
+        super.initTrace(name, path, eventType, (pageSize > 0) ? pageSize : DEFAULT_PAGE_SIZE);\r
     }\r
 \r
     @Override\r
index bd32e46d919ba9b012a8f6c9aeed6136f90a3b51..6bade33af351038e7bf42abb8fc13bfb69eb3d90 100644 (file)
@@ -29,7 +29,6 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;\r
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;\r
-import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;\r
 import org.eclipse.linuxtools.tmf.core.trace.TmfTrace;\r
@@ -46,7 +45,7 @@ import org.xml.sax.SAXParseException;
 public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {\r
 \r
     private static final TmfLocation<Long> NULL_LOCATION = new TmfLocation<Long>((Long) null);\r
-    private static final int CACHE_SIZE = 100;\r
+    private static final int DEFAULT_PAGE_SIZE = 100;\r
 \r
     private CustomXmlTraceDefinition fDefinition;\r
     private CustomXmlEventType fEventType;\r
@@ -66,8 +65,8 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
     }\r
 \r
     @Override\r
-    public void initTrace(String name, String path, Class<CustomXmlEvent> eventType, boolean indexTrace) throws FileNotFoundException {\r
-        super.initTrace(name, path, eventType, CACHE_SIZE, indexTrace);\r
+    public void initTrace(String name, String path, Class<CustomXmlEvent> eventType, int pageSize) throws FileNotFoundException {\r
+        super.initTrace(name, path, eventType, (pageSize > 0) ? pageSize : DEFAULT_PAGE_SIZE);\r
     }\r
 \r
     @Override\r
@@ -142,13 +141,6 @@ public class CustomXmlTrace extends TmfTrace<CustomXmlEvent> {
         }\r
         return 0;\r
     }\r
-\r
-    @Override\r
-    @SuppressWarnings({ "rawtypes", "unchecked" })\r
-       public ITmfTrace copy() {\r
-        // TODO Auto-generated method stub\r
-        return null;\r
-    }\r
     \r
     @Override\r
     public ITmfLocation<?> getCurrentLocation() {\r
index 4547c7c97e0b2e84643ab0a237e8c8c54243b2da..7399f8ab8879ccfe28527c01b179af5f3cb6a8a1 100644 (file)
@@ -140,7 +140,7 @@ public class OpenExperimentHandler extends AbstractHandler {
                     return null;
                 }
                 try {
-                    trace.initTrace(element.getName(), element.getLocation().getPath(), traceEvent.getClass(), false);
+                    trace.initTrace(element.getName(), element.getLocation().getPath(), traceEvent.getClass(), 0);
                 } catch (FileNotFoundException e) {
                     displayErrorMsg(""); //$NON-NLS-1$
                 }
@@ -177,7 +177,8 @@ public class OpenExperimentHandler extends AbstractHandler {
                 } else {
                     activePage.openEditor(editorInput, editorId);
                 }
-                experiment.initTrace(null, null, null, true);
+                experiment.initTrace(null, null, null, 0);
+                experiment.indexTrace(true);
                 IDE.setDefaultEditor(file, editorId);
                 // editor should dispose the experiment on close
             } else {
index 3bd88b6173eb7b3e2339d5ab4cd2956cc7985be6..96d0ee5ac0c423a8fcf0cc8dd3513ca3084a7720 100644 (file)
@@ -139,7 +139,9 @@ public class OpenTraceHandler extends AbstractHandler {
         boolean usesEditor = editorId != null && editorId.length() > 0;
 
         try {
-            trace.initTrace(fTrace.getName(), fTrace.getLocation().getPath(), traceEvent.getClass(), usesEditor);
+            trace.initTrace(fTrace.getName(), fTrace.getLocation().getPath(), traceEvent.getClass(), 0);
+            if (usesEditor)
+                trace.indexTrace(false);
         } catch (FileNotFoundException e) {
             displayErrorMsg(Messages.OpenTraceHandler_NoTrace);
             return null;
index 857ff620c168f0cee92f55e0fede7c1e3b4eb58d..2ad773c15de17b14c65973fe20d6fd38660888b4 100644 (file)
@@ -136,7 +136,7 @@ public class EventsViewEditor extends TmfEditor {
                                     throw new PartInitException(Messages.OpenExperimentHandler_NoTraceType);
                                 }
                                 try {
-                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), false);
+                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);
                                 } catch (FileNotFoundException e) {
                                 }
                                 trace.setResource(traceElement.getResource());
@@ -167,7 +167,7 @@ public class EventsViewEditor extends TmfEditor {
                                 throw new PartInitException(Messages.OpenTraceHandler_NoTraceType);
                             }
                             try {
-                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), false);
+                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);
                             } catch (FileNotFoundException e) {
                             }
                             trace.setResource(traceElement.getResource());
@@ -194,7 +194,8 @@ public class EventsViewEditor extends TmfEditor {
                                 throw new PartInitException(Messages.OpenTraceHandler_NoTraceType);
                             }
                             try {
-                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), true);
+                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);
+                                trace.indexTrace(false);
                             } catch (FileNotFoundException e) {
                             }
                             if (trace instanceof TmfTrace) {
index 058e2cf21b56c782cd850c942327ff9897c66951..acfe0d17daa600152ac9fde0654a8846b455d900 100644 (file)
@@ -130,7 +130,7 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
                                     throw new PartInitException(Messages.OpenExperimentHandler_NoTraceType);\r
                                 }\r
                                 try {\r
-                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), false);\r
+                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);\r
                                 } catch (FileNotFoundException e) {\r
                                 }\r
                                 trace.setResource(traceElement.getResource());\r
@@ -140,7 +140,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
                             TmfExperiment experiment = new TmfExperiment(TmfEvent.class, experimentElement.getName(), traces, cacheSize);\r
                             experiment.setBookmarksFile(fFile);\r
                             fTrace = experiment;\r
-                            experiment.initTrace(null, null, null, true);\r
+                            experiment.initTrace(null, null, null, 0);\r
+                            experiment.indexTrace(true);\r
                             break;\r
                         }\r
                     }\r
@@ -160,7 +161,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
                                 throw new PartInitException(Messages.OpenTraceHandler_NoTraceType);\r
                             }\r
                             try {\r
-                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), true);\r
+                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);\r
+                                trace.indexTrace(false);\r
                             } catch (FileNotFoundException e) {\r
                             }\r
                             trace.setResource(traceElement.getResource());\r
@@ -182,7 +184,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
                                 throw new PartInitException(Messages.OpenTraceHandler_NoTraceType);\r
                             }\r
                             try {\r
-                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), true);\r
+                                trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass(), 0);\r
+                                trace.indexTrace(false);\r
                             } catch (FileNotFoundException e) {\r
                             }\r
                             if (trace instanceof TmfTrace) {\r
@@ -497,7 +500,8 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
                             fTrace = (ITmfTrace<?>) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR);\r
                             TmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);\r
                             String path = fFile.getLocationURI().getPath();\r
-                            fTrace.initTrace(name, path, event.getClass(), true);\r
+                            fTrace.initTrace(name, path, event.getClass(), 0);\r
+                            fTrace.indexTrace(false);\r
                             break;\r
                         }\r
                     }\r
This page took 0.042696 seconds and 5 git commands to generate.