summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorlmcpata2011-10-27 17:41:10 (EDT)
committer Francois Chouinard2011-10-28 17:30:46 (EDT)
commitcc215be76b9c25a1ee7640a3e8df1f92bb56fe4d (patch)
treec1eef0c6d10bec6afd862f88d2fda93f419058bb
parent01fbc3a93860b1db6be300c3f297108b3aec016a (diff)
downloadorg.eclipse.linuxtools-cc215be76b9c25a1ee7640a3e8df1f92bb56fe4d.zip
org.eclipse.linuxtools-cc215be76b9c25a1ee7640a3e8df1f92bb56fe4d.tar.gz
org.eclipse.linuxtools-cc215be76b9c25a1ee7640a3e8df1f92bb56fe4d.tar.bz2
Fix for state experiment manager coalescing.
-rw-r--r--lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
index 8d0e799..25d3421 100644
--- a/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManager.java
@@ -64,6 +64,7 @@ public class StateExperimentManager extends LTTngTreeNode implements ILttExperim
private TmfTimeRange fCheckPointUpdateRange = null;
private long fCheckPointNbEventsHandled = 0;
private final Object fCheckPointUpdateSyncObj = new Object();
+ private boolean fInitial = false;
// ========================================================================
// Constructors
@@ -233,19 +234,12 @@ public class StateExperimentManager extends LTTngTreeNode implements ILttExperim
}
synchronized (fCheckPointUpdateSyncObj) {
- fCheckPointUpdateBusy = true;
+ fCheckPointUpdateBusy = false;
fCheckPointUpdatePending = false;
fCheckPointUpdateIndex = 0;
}
- // trigger data request to build the state system check points
- fStateCheckPointRequest = buildCheckPoints(experiment, experiment.getTimeRange(), true);
-
- if (fStateCheckPointRequest == null) {
- synchronized (fCheckPointUpdateSyncObj) {
- fCheckPointUpdateBusy = false;
- }
- }
+ fInitial = true;
}
/*
@@ -280,7 +274,8 @@ public class StateExperimentManager extends LTTngTreeNode implements ILttExperim
}
// trigger data request to build the state system check points
- fStateCheckPointRequest = buildCheckPoints(experiment, signal.getRange(), false);
+ fStateCheckPointRequest = buildCheckPoints(experiment, signal.getRange(), fInitial);
+ fInitial = false;
if (fStateCheckPointRequest == null) {
synchronized (fCheckPointUpdateSyncObj) {