Merge remote-tracking branch 'eclipse/master'

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core / src / org / eclipse / linuxtools / tmf / core / experiment / TmfExperiment.java

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
index 4b02e7318c215bd37a266d52319ff28cc4002f7f..b7197a3034454364d148909975335675d28a2a33 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
@@ -122,7 +122,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
      * @param indexPageSize
      */
     public TmfExperiment(Class<T> type, String id, ITmfTrace<T>[] traces, ITmfTimestamp epoch, int indexPageSize) {
-        this(type, id, traces, TmfTimestamp.Zero, indexPageSize, false);
+        this(type, id, traces, TmfTimestamp.ZERO, indexPageSize, false);
     }
 
     public TmfExperiment(Class<T> type, String id, ITmfTrace<T>[] traces, ITmfTimestamp epoch, int indexPageSize, boolean preIndexExperiment) {
@@ -131,7 +131,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
         fTraces = traces;
         fEpoch = epoch;
         fIndexPageSize = indexPageSize;
-        fTimeRange = TmfTimeRange.Null;
+        fTimeRange = TmfTimeRange.NULL_RANGE;
 
         if (preIndexExperiment) {
             indexExperiment(true);
@@ -150,7 +150,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
      * @param traces
      */
     public TmfExperiment(Class<T> type, String id, ITmfTrace<T>[] traces) {
-        this(type, id, traces, TmfTimestamp.Zero, DEFAULT_INDEX_PAGE_SIZE);
+        this(type, id, traces, TmfTimestamp.ZERO, DEFAULT_INDEX_PAGE_SIZE);
     }
 
     /**
@@ -160,7 +160,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
      * @param indexPageSize
      */
     public TmfExperiment(Class<T> type, String id, ITmfTrace<T>[] traces, int indexPageSize) {
-        this(type, id, traces, TmfTimestamp.Zero, indexPageSize);
+        this(type, id, traces, TmfTimestamp.ZERO, indexPageSize);
     }
 
     /**
@@ -305,8 +305,8 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
      * Update the global time range
      */
     protected void updateTimeRange() {
-        ITmfTimestamp startTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getStartTime() : TmfTimestamp.BigCrunch;
-        ITmfTimestamp endTime = fTimeRange != TmfTimeRange.Null ? fTimeRange.getEndTime() : TmfTimestamp.BigBang;
+        ITmfTimestamp startTime = fTimeRange != TmfTimeRange.NULL_RANGE ? fTimeRange.getStartTime() : TmfTimestamp.BIG_CRUNCH;
+        ITmfTimestamp endTime = fTimeRange != TmfTimeRange.NULL_RANGE ? fTimeRange.getEndTime() : TmfTimestamp.BIG_BANG;
 
         for (ITmfTrace<T> trace : fTraces) {
             ITmfTimestamp traceStartTime = trace.getStartTime();
@@ -328,7 +328,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
         ITmfTimestamp timestamp = (request instanceof ITmfEventRequest<?>) ? ((ITmfEventRequest<T>) request).getRange().getStartTime()
                 : null;
 
-        if (TmfTimestamp.BigBang.equals(timestamp) || request.getIndex() > 0) {
+        if (TmfTimestamp.BIG_BANG.equals(timestamp) || request.getIndex() > 0) {
             timestamp = null; // use request index
         }
 
@@ -423,7 +423,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
 //             Tracer.trace("Ctx: seekEvent(TS) - start");
 
         if (timestamp == null) {
-            timestamp = TmfTimestamp.BigBang;
+            timestamp = TmfTimestamp.BIG_BANG;
         }
 
         // First, find the right checkpoint
@@ -587,7 +587,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
             return null;
         }
         int trace = TmfExperimentContext.NO_TRACE;
-        ITmfTimestamp timestamp = TmfTimestamp.BigCrunch;
+        ITmfTimestamp timestamp = TmfTimestamp.BIG_CRUNCH;
         if (eventArray.length == 1) {
             if (eventArray[0] != null) {
                 timestamp = eventArray[0].getTimestamp();
@@ -680,7 +680,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
 
         // Scan the candidate events and identify the "next" trace to read from
         int trace = TmfExperimentContext.NO_TRACE;
-        ITmfTimestamp timestamp = TmfTimestamp.BigCrunch;
+        ITmfTimestamp timestamp = TmfTimestamp.BIG_CRUNCH;
         for (int i = 0; i < expContext.getTraces().length; i++) {
             ITmfEvent event = expContext.getEvents()[i];
             if (event != null && event.getTimestamp() != null) {
@@ -727,7 +727,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
             if (event == null) {
                 return;
             }
-            TmfTimeRange timeRange = new TmfTimeRange(event.getTimestamp().clone(), TmfTimestamp.BigCrunch);
+            TmfTimeRange timeRange = new TmfTimeRange(event.getTimestamp().clone(), TmfTimestamp.BIG_CRUNCH);
             final TmfExperimentRangeUpdatedSignal signal = new TmfExperimentRangeUpdatedSignal(this, this, timeRange);
 
             // Broadcast in separate thread to prevent deadlock
@@ -748,8 +748,8 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
             public void run() {
                 while (!fExecutor.isShutdown()) {
                     if (!isIndexingBusy()) {
-                        ITmfTimestamp startTimestamp = TmfTimestamp.BigCrunch;
-                        ITmfTimestamp endTimestamp = TmfTimestamp.BigBang;
+                        ITmfTimestamp startTimestamp = TmfTimestamp.BIG_CRUNCH;
+                        ITmfTimestamp endTimestamp = TmfTimestamp.BIG_BANG;
                         for (ITmfTrace<T> trace : fTraces) {
                             if (trace.getStartTime().compareTo(startTimestamp) < 0) {
                                 startTimestamp = trace.getStartTime();
@@ -805,7 +805,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
     private static final int DEFAULT_INDEX_PAGE_SIZE = 5000;
     protected int fIndexPageSize;
     protected boolean fIndexing = false;
-    protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.Null;
+    protected TmfTimeRange fIndexingPendingRange = TmfTimeRange.NULL_RANGE;
 
     private Integer fEndSynchReference;
 
@@ -827,7 +827,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
     }
 
     protected void indexExperiment(boolean waitForCompletion) {
-        indexExperiment(waitForCompletion, 0, TmfTimeRange.Eternity);
+        indexExperiment(waitForCompletion, 0, TmfTimeRange.ETERNITY);
     }
 
     @SuppressWarnings("unchecked")
@@ -864,8 +864,8 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
 
 //            long indexingStart = System.nanoTime();
 
-            ITmfTimestamp startTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getStartTime();
-            ITmfTimestamp lastTime = (fTimeRange == TmfTimeRange.Null) ? null : fTimeRange.getEndTime();
+            ITmfTimestamp startTime = (fTimeRange == TmfTimeRange.NULL_RANGE) ? null : fTimeRange.getStartTime();
+            ITmfTimestamp lastTime = (fTimeRange == TmfTimeRange.NULL_RANGE) ? null : fTimeRange.getEndTime();
             long initialNbEvents = fNbEvents;
 
             @Override
@@ -893,7 +893,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
 
                 // if the end time is a real value then it is the streaming safe time stamp
                 // set the last time to the safe time stamp to prevent unnecessary indexing requests
-                if (getRange().getEndTime() != TmfTimestamp.BigCrunch) {
+                if (getRange().getEndTime() != TmfTimestamp.BIG_CRUNCH) {
                     lastTime = getRange().getEndTime();
                 }
                 updateExperiment();
@@ -913,9 +913,9 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
                 super.handleCompleted();
                 synchronized (fCheckpoints) {
                     fIndexing = false;
-                    if (fIndexingPendingRange != TmfTimeRange.Null) {
+                    if (fIndexingPendingRange != TmfTimeRange.NULL_RANGE) {
                         indexExperiment(false, (int) fNbEvents, fIndexingPendingRange);
-                        fIndexingPendingRange = TmfTimeRange.Null;
+                        fIndexingPendingRange = TmfTimeRange.NULL_RANGE;
                     }
                 }
             }
@@ -987,7 +987,7 @@ public class TmfExperiment<T extends ITmfEvent> extends TmfEventProvider<T> impl
             if (trace == signal.getTrace()) {
                 synchronized (fCheckpoints) {
                     if (fIndexing) {
-                        if (fIndexingPendingRange == TmfTimeRange.Null) {
+                        if (fIndexingPendingRange == TmfTimeRange.NULL_RANGE) {
                             fIndexingPendingRange = signal.getRange();
                         } else {
                             ITmfTimestamp startTime = fIndexingPendingRange.getStartTime();