Merge remote-tracking branch 'eclipse/master'

diff --cc org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
index 132c94b04747c8827808728ab05907b8706f4871,fea3b2c3d51aad937e1abbe2a70f5b269bc0d50c..10c4b4cb60ce862bf8e0b531cde07d8c190b6eca
--- 1/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
--- 2/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java
@@@ -1075,6 -1076,20 +1076,20 @@@ public class ControlFlowView extends Ab
                }
        }
  
 -            if (range != TmfTimeRange.Null) {
+     @TmfSignalHandler
+     public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
+         if (signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) {
+             final TmfTimeRange range = signal.getExperiment().getTimeRange();
++            if (range != TmfTimeRange.NULL_RANGE) {
+                 Display.getDefault().asyncExec(new Runnable() {
+                     @Override
+                     public void run() {
+                         tsfviewer.setTimeBounds(range.getStartTime().getValue(), range.getEndTime().getValue());
+                     }});
+             }
+         }
+     }
+ 
        /**
         * @param source
         * @param experimentTRange
@@@ -1149,4 -1164,4 +1164,4 @@@
        protected int getProviderId() { 
            return LttngCoreProviderFactory.CONTROL_FLOW_LTTNG_SYTH_EVENT_PROVIDER; 
        }
--}
++}

diff --cc org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
index 92acea404e8f4fa1b76cc4a53ffb0c3d885db40c,8fad36aca9761977edef9995ba89e718df127ed9..bbff53f0ef9a53fc4dc7b895842114eae77e1161
--- 1/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
--- 2/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java
@@@ -527,6 -528,20 +528,20 @@@ public class ResourcesView extends AbsT
                }
        }
  
 -            if (range != TmfTimeRange.Null) {
+     @TmfSignalHandler
+     public void experimentUpdated(TmfExperimentUpdatedSignal signal) {
+         if (signal.getExperiment().equals(TmfExperiment.getCurrentExperiment())) {
+             final TmfTimeRange range = signal.getExperiment().getTimeRange();
++            if (range != TmfTimeRange.NULL_RANGE) {
+                 Display.getDefault().asyncExec(new Runnable() {
+                     @Override
+                     public void run() {
+                         tsfviewer.setTimeBounds(range.getStartTime().getValue(), range.getEndTime().getValue());
+                     }});
+             }
+         }
+     }
+ 
        /**
         * @param source
         * @param experimentTRange
@@@ -578,4 -593,4 +593,4 @@@
      protected int getProviderId() { 
          return LttngCoreProviderFactory.RESOURCE_LTTNG_SYTH_EVENT_PROVIDER; 
      }
--}
++}

diff --cc org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
index 14450d90aad8091672b5ed849b0cbcf968b9940c,4b02e7318c215bd37a266d52319ff28cc4002f7f..b7197a3034454364d148909975335675d28a2a33
--- 1/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/experiment/TmfExperiment.java
--- 2/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
@@@ -891,7 -891,9 +891,9 @@@ public class TmfExperiment<T extends IT
              public void handleSuccess() {
  //                long indexingEnd = System.nanoTime();
  
-                 if (getRange() != TmfTimeRange.ETERNITY) {
+                 // 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();