/*******************************************************************************\r
* Copyright (c) 2012 Ericsson\r
- * \r
+ *\r
* All rights reserved. This program and the accompanying materials are\r
* made available under the terms of the Eclipse Public License v1.0 which\r
* accompanies this distribution, and is available at\r
* http://www.eclipse.org/legal/epl-v10.html\r
- * \r
+ *\r
* Contributors:\r
* Patrick Tasse - Initial API and implementation\r
*******************************************************************************/\r
\r
import java.util.ArrayList;\r
import java.util.Arrays;\r
-import java.util.HashMap;\r
+import java.util.Comparator;\r
import java.util.Iterator;\r
import java.util.List;\r
-import java.util.Map;\r
\r
import org.eclipse.core.runtime.IProgressMonitor;\r
import org.eclipse.core.runtime.NullProgressMonitor;\r
import org.eclipse.jface.action.Action;\r
import org.eclipse.jface.action.IToolBarManager;\r
import org.eclipse.jface.action.Separator;\r
+import org.eclipse.linuxtools.internal.lttng2.kernel.core.Attributes;\r
import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages;\r
import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesEntry.Type;\r
-import org.eclipse.linuxtools.lttng2.kernel.core.trace.Attributes;\r
import org.eclipse.linuxtools.lttng2.kernel.core.trace.CtfKernelTrace;\r
import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp;\r
import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;\r
import org.eclipse.linuxtools.tmf.core.signal.TmfExperimentSelectedSignal;\r
import org.eclipse.linuxtools.tmf.core.signal.TmfRangeSynchSignal;\r
import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;\r
+import org.eclipse.linuxtools.tmf.core.signal.TmfStateSystemBuildCompleted;\r
import org.eclipse.linuxtools.tmf.core.signal.TmfTimeSynchSignal;\r
import org.eclipse.linuxtools.tmf.core.statesystem.IStateSystemQuerier;\r
+import org.eclipse.linuxtools.tmf.core.statesystem.IStateSystemQuerier2;\r
import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;\r
import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment;\r
import org.eclipse.linuxtools.tmf.ui.views.TmfView;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphRangeListener;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.ITimeGraphTimeListener;\r
-import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.StateItem;\r
-import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.TimeGraphPresentationProvider;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.TimeGraphRangeUpdateEvent;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.TimeGraphTimeEvent;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.TimeGraphViewer;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.ITimeGraphEntry;\r
import org.eclipse.linuxtools.tmf.ui.widgets.timegraph.model.TimeEvent;\r
import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.graphics.RGB;\r
import org.eclipse.swt.widgets.Composite;\r
import org.eclipse.swt.widgets.Display;\r
import org.eclipse.ui.IActionBars;\r
\r
+/**\r
+ * Main implementation for the LTTng 2.0 kernel Resource view\r
+ *\r
+ * @author Patrick Tasse\r
+ */\r
public class ResourcesView extends TmfView {\r
\r
// ------------------------------------------------------------------------\r
// Constants\r
// ------------------------------------------------------------------------\r
\r
- /**\r
- * View ID.\r
- */\r
+ /** View ID. */\r
public static final String ID = "org.eclipse.linuxtools.lttng2.kernel.ui.views.resources"; //$NON-NLS-1$\r
\r
+ /** Initial time range */\r
+ private static final long INITIAL_WINDOW_OFFSET = (1L * 100 * 1000 * 1000); // .1sec\r
+\r
/**\r
- * Initial time range\r
+ * Redraw state enum\r
*/\r
- private static final long INITIAL_WINDOW_OFFSET = (1L * 100 * 1000 * 1000); // .1sec\r
+ private enum State { IDLE, BUSY, PENDING }\r
\r
// ------------------------------------------------------------------------\r
// Fields\r
// The time graph entry list\r
private ArrayList<TraceEntry> fEntryList;\r
\r
+ // The time graph entry list synchronization object\r
+ final private Object fEntryListSyncObj = new Object();\r
+\r
// The start time\r
private long fStartTime;\r
\r
private long fEndTime;\r
\r
// The display width\r
- private int fDisplayWidth;\r
+ private final int fDisplayWidth;\r
\r
// The next resource action\r
private Action fNextResourceAction;\r
// The zoom thread\r
private ZoomThread fZoomThread;\r
\r
+ // The redraw state used to prevent unnecessary queuing of display runnables\r
+ private State fRedrawState = State.IDLE;\r
+\r
+ // The redraw synchronization object\r
+ final private Object fSyncObj = new Object();\r
+\r
// ------------------------------------------------------------------------\r
// Classes\r
// ------------------------------------------------------------------------\r
\r
private class TraceEntry implements ITimeGraphEntry {\r
- private CtfKernelTrace fTrace;\r
- public ArrayList<ResourcesEntry> fChildren;\r
- public String fName;\r
-\r
- public TraceEntry(CtfKernelTrace trace, String name) {\r
+ // The Trace\r
+ private final CtfKernelTrace fTrace;\r
+ // The start time\r
+ private final long fTraceStartTime;\r
+ // The end time\r
+ private final long fTraceEndTime;\r
+ // The children of the entry\r
+ private final ArrayList<ResourcesEntry> fChildren;\r
+ // The name of entry\r
+ private final String fName;\r
+\r
+ public TraceEntry(CtfKernelTrace trace, String name, long startTime, long endTime) {\r
fTrace = trace;\r
fChildren = new ArrayList<ResourcesEntry>();\r
fName = name;\r
+ fTraceStartTime = startTime;\r
+ fTraceEndTime = endTime;\r
}\r
\r
@Override\r
\r
@Override\r
public long getStartTime() {\r
- return -1;\r
+ return fTraceStartTime;\r
}\r
\r
@Override\r
public long getEndTime() {\r
- return -1;\r
+ return fTraceEndTime;\r
+ }\r
+\r
+ @Override\r
+ public boolean hasTimeEvents() {\r
+ return false;\r
}\r
\r
@Override\r
}\r
}\r
\r
+ private static class TraceEntryComparator implements Comparator<ITimeGraphEntry> {\r
+ @Override\r
+ public int compare(ITimeGraphEntry o1, ITimeGraphEntry o2) {\r
+ int result = o1.getStartTime() < o2.getStartTime() ? -1 : o1.getStartTime() > o2.getStartTime() ? 1 : 0;\r
+ if (result == 0) {\r
+ result = o1.getName().compareTo(o2.getName());\r
+ }\r
+ return result;\r
+ }\r
+ }\r
+\r
private class ZoomThread extends Thread {\r
- private long fZoomStartTime;\r
- private long fZoomEndTime;\r
- private IProgressMonitor fMonitor;\r
+ private final long fZoomStartTime;\r
+ private final long fZoomEndTime;\r
+ private final IProgressMonitor fMonitor;\r
\r
public ZoomThread(long startTime, long endTime) {\r
super("ResourcesView zoom"); //$NON-NLS-1$\r
\r
@Override\r
public void run() {\r
- if (fEntryList == null) {\r
+ ArrayList<TraceEntry> entryList = null;\r
+ synchronized (fEntryListSyncObj) {\r
+ entryList = fEntryList;\r
+ }\r
+ if (entryList == null) {\r
return;\r
}\r
long resolution = Math.max(1, (fZoomEndTime - fZoomStartTime) / fDisplayWidth);\r
- for (TraceEntry traceEntry : fEntryList) {\r
+ for (TraceEntry traceEntry : entryList) {\r
for (ITimeGraphEntry child : traceEntry.getChildren()) {\r
- ResourcesEntry entry = (ResourcesEntry) child;\r
if (fMonitor.isCanceled()) {\r
break;\r
}\r
- List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, resolution, true, fMonitor);\r
- if (fMonitor.isCanceled()) {\r
- break;\r
+ ResourcesEntry entry = (ResourcesEntry) child;\r
+ if (fZoomStartTime <= fStartTime && fZoomEndTime >= fEndTime) {\r
+ entry.setZoomedEventList(null);\r
+ } else {\r
+ List<ITimeEvent> zoomedEventList = getEventList(entry, fZoomStartTime, fZoomEndTime, resolution, true, fMonitor);\r
+ if (zoomedEventList != null) {\r
+ entry.setZoomedEventList(zoomedEventList);\r
+ }\r
}\r
- entry.setZoomedEventList(zoomedEventList);\r
redraw();\r
}\r
}\r
// Constructors\r
// ------------------------------------------------------------------------\r
\r
+ /**\r
+ * Default constructor\r
+ */\r
public ResourcesView() {\r
super(ID);\r
fDisplayWidth = Display.getDefault().getBounds().width;\r
public void createPartControl(Composite parent) {\r
fTimeGraphViewer = new TimeGraphViewer(parent, SWT.NONE);\r
\r
- fTimeGraphViewer.setTimeGraphProvider(new TimeGraphPresentationProvider() {\r
- private static final String UNKNOWN = "UNKNOWN"; //$NON-NLS-1$\r
- private static final String IDLE = "IDLE"; //$NON-NLS-1$\r
- private static final String BUSY = "BUSY"; //$NON-NLS-1$\r
- private static final String INTERRUPTED = "INTERRUPTED"; //$NON-NLS-1$\r
- private static final String RAISED = "RAISED"; //$NON-NLS-1$\r
- private static final String ACTIVE = "ACTIVE"; //$NON-NLS-1$\r
-\r
- @Override \r
- public String getStateTypeName() {\r
- return Messages.ResourcesView_stateTypeName;\r
- }\r
-\r
- @Override\r
- public String getEventName(ITimeEvent event) {\r
- if (event instanceof ResourcesEvent) {\r
- ResourcesEvent resourcesEvent = (ResourcesEvent) event;\r
- if (resourcesEvent.getType() == Type.CPU) {\r
- int currentThread = resourcesEvent.getValue();\r
- if (currentThread == 0) {\r
- return IDLE;\r
- } else {\r
- return BUSY;\r
- }\r
- } else if (resourcesEvent.getType() == Type.IRQ || resourcesEvent.getType() == Type.SOFT_IRQ) {\r
- int cpu = resourcesEvent.getValue();\r
- if (cpu == Attributes.SOFT_IRQ_RAISED) {\r
- return RAISED;\r
- }\r
- return ACTIVE;\r
- } else {\r
- return null;\r
- }\r
- }\r
- return UNKNOWN;\r
- }\r
-\r
- @Override\r
- public Map<String, String> getEventHoverToolTipInfo(ITimeEvent event) {\r
- \r
- Map<String, String> retMap = new HashMap<String, String>();\r
- if (event instanceof ResourcesEvent) {\r
-\r
- ResourcesEvent resourcesEvent = (ResourcesEvent) event;\r
-\r
- if (resourcesEvent.getType().equals(Type.IRQ) || resourcesEvent.getType().equals(Type.SOFT_IRQ)) {\r
- int cpu = resourcesEvent.getValue();\r
- if (cpu >= 0) {\r
- retMap.put(Messages.ResourcesView_attributeCpuName, String.valueOf(cpu));\r
- }\r
- }\r
- }\r
-\r
- return retMap;\r
- }\r
-\r
- @Override\r
- public StateItem[] getStateTable() {\r
- return new StateItem[] {\r
- new StateItem(new RGB(100, 100, 100), UNKNOWN),\r
- new StateItem(new RGB(200, 200, 200), IDLE),\r
- new StateItem(new RGB(0, 200, 0), BUSY),\r
- new StateItem(new RGB(200, 100, 100), INTERRUPTED),\r
- new StateItem(new RGB(200, 200, 0), RAISED),\r
- new StateItem(new RGB(200, 150, 100), ACTIVE)\r
- };\r
- }\r
-\r
- @Override\r
- public int getStateTableIndex(ITimeEvent event) {\r
- if (event instanceof ResourcesEvent) {\r
- ResourcesEvent resourcesEvent = (ResourcesEvent) event;\r
- if (resourcesEvent.getType() == Type.CPU) {\r
- int currentThread = resourcesEvent.getValue();\r
- if (currentThread == 0) {\r
- return 1; // IDLE\r
- } else {\r
- return 2; // BUSY\r
- }\r
- } else if (resourcesEvent.getType() == Type.IRQ || resourcesEvent.getType() == Type.SOFT_IRQ) {\r
- int cpu = resourcesEvent.getValue();\r
- if (cpu == Attributes.SOFT_IRQ_RAISED) {\r
- return 4; // RAISED\r
- }\r
- return 5; // ACTIVE\r
- } else {\r
- return -1; // NULL\r
- }\r
- }\r
- return 0; // UNKNOWN\r
- }\r
- });\r
+ fTimeGraphViewer.setTimeGraphProvider(new ResourcesPresentationProvider());\r
\r
fTimeGraphViewer.setTimeCalendarFormat(true);\r
\r
// Signal handlers\r
// ------------------------------------------------------------------------\r
\r
+ /**\r
+ * Handler for the ExperimentSelected signal\r
+ *\r
+ * @param signal\r
+ * The incoming signal\r
+ */\r
@TmfSignalHandler\r
public void experimentSelected(final TmfExperimentSelectedSignal<? extends TmfEvent> signal) {\r
if (signal.getExperiment().equals(fSelectedExperiment)) {\r
thread.start();\r
}\r
\r
+ /**\r
+ * Handler for the TimeSynch signal\r
+ *\r
+ * @param signal\r
+ * The incoming signal\r
+ */\r
@TmfSignalHandler\r
public void synchToTime(final TmfTimeSynchSignal signal) {\r
- if (signal.getSource() == this) {\r
+ if (signal.getSource() == this || fSelectedExperiment == null) {\r
return;\r
}\r
final long time = signal.getCurrentTime().normalize(0, -9).getValue();\r
return;\r
}\r
fTimeGraphViewer.setSelectedTime(time, true);\r
+ startZoomThread(fTimeGraphViewer.getTime0(), fTimeGraphViewer.getTime1());\r
}\r
});\r
}\r
\r
+ /**\r
+ * Handler for the RangeSynch signal\r
+ *\r
+ * @param signal\r
+ * The incoming signal\r
+ */\r
@TmfSignalHandler\r
public void synchToRange(final TmfRangeSynchSignal signal) {\r
- if (signal.getSource() == this) {\r
+ if (signal.getSource() == this || fSelectedExperiment == null) {\r
return;\r
}\r
final long startTime = signal.getCurrentRange().getStartTime().normalize(0, -9).getValue();\r
return;\r
}\r
fTimeGraphViewer.setStartFinishTime(startTime, endTime);\r
- fTimeGraphViewer.setSelectedTime(time, true);\r
+ fTimeGraphViewer.setSelectedTime(time, false);\r
startZoomThread(startTime, endTime);\r
}\r
});\r
}\r
\r
+ /**\r
+ * Handler for the StatesystemBuildCompleted signal\r
+ *\r
+ * @param signal\r
+ * The incoming signal\r
+ */\r
+ @TmfSignalHandler\r
+ public void stateSystemBuildCompleted (final TmfStateSystemBuildCompleted signal) {\r
+ final TmfExperiment<?> selectedExperiment = fSelectedExperiment;\r
+ if (selectedExperiment == null || selectedExperiment.getTraces() == null) {\r
+ return;\r
+ }\r
+ for (ITmfTrace<?> trace : selectedExperiment.getTraces()) {\r
+ if (trace == signal.getTrace() && trace instanceof CtfKernelTrace) {\r
+ final Thread thread = new Thread("ResourcesView build") { //$NON-NLS-1$\r
+ @Override\r
+ public void run() {\r
+ // rebuild the model\r
+ selectExperiment(selectedExperiment);\r
+ }\r
+ };\r
+ thread.start();\r
+ }\r
+ }\r
+ }\r
+\r
// ------------------------------------------------------------------------\r
// Internal\r
// ------------------------------------------------------------------------\r
fStartTime = Long.MAX_VALUE;\r
fEndTime = Long.MIN_VALUE;\r
fSelectedExperiment = (TmfExperiment<ITmfEvent>) experiment;\r
- fEntryList = new ArrayList<TraceEntry>();\r
+ ArrayList<TraceEntry> entryList = new ArrayList<TraceEntry>();\r
for (ITmfTrace<?> trace : experiment.getTraces()) {\r
if (trace instanceof CtfKernelTrace) {\r
CtfKernelTrace ctfKernelTrace = (CtfKernelTrace) trace;\r
- TraceEntry groupEntry = new TraceEntry(ctfKernelTrace, trace.getName());\r
- fEntryList.add(groupEntry);\r
IStateSystemQuerier ssq = ctfKernelTrace.getStateSystem();\r
long startTime = ssq.getStartTime();\r
long endTime = ssq.getCurrentEndTime() + 1;\r
+ TraceEntry groupEntry = new TraceEntry(ctfKernelTrace, trace.getName(), startTime, endTime);\r
+ entryList.add(groupEntry);\r
fStartTime = Math.min(fStartTime, startTime);\r
fEndTime = Math.max(fEndTime, endTime);\r
List<Integer> cpuQuarks = ssq.getQuarks(Attributes.CPUS, "*"); //$NON-NLS-1$\r
}\r
}\r
}\r
+ synchronized (fEntryListSyncObj) {\r
+ fEntryList = (ArrayList<TraceEntry>) entryList.clone();\r
+ }\r
refresh(INITIAL_WINDOW_OFFSET);\r
- for (TraceEntry traceEntry : fEntryList) {\r
- CtfKernelTrace ctfKernelTrace = ((TraceEntry) traceEntry).getTrace();\r
+ for (TraceEntry traceEntry : entryList) {\r
+ CtfKernelTrace ctfKernelTrace = traceEntry.getTrace();\r
IStateSystemQuerier ssq = ctfKernelTrace.getStateSystem();\r
long startTime = ssq.getStartTime();\r
long endTime = ssq.getCurrentEndTime() + 1;\r
}\r
}\r
\r
- private List<ITimeEvent> getEventList(ResourcesEntry entry, long startTime, long endTime, long resolution, boolean includeNull, IProgressMonitor monitor) {\r
+ private static List<ITimeEvent> getEventList(ResourcesEntry entry,\r
+ long startTime, long endTime, long resolution, boolean includeNull,\r
+ IProgressMonitor monitor) {\r
+ IStateSystemQuerier2 ssq = (IStateSystemQuerier2) entry.getTrace().getStateSystem();\r
+ startTime = Math.max(startTime, ssq.getStartTime());\r
+ endTime = Math.min(endTime, ssq.getCurrentEndTime() + 1);\r
if (endTime <= startTime) {\r
return null;\r
}\r
- IStateSystemQuerier ssq = entry.getTrace().getStateSystem();\r
List<ITimeEvent> eventList = null;\r
int quark = entry.getQuark();\r
try {\r
if (entry.getType().equals(Type.CPU)) {\r
- int currentThreadQuark = ssq.getQuarkRelative(quark, Attributes.CURRENT_THREAD);\r
- List<ITmfStateInterval> currentThreadIntervals = ssq.queryHistoryRange(currentThreadQuark, startTime, endTime - 1, resolution);\r
- eventList = new ArrayList<ITimeEvent>(currentThreadIntervals.size());\r
+ int statusQuark = ssq.getQuarkRelative(quark, Attributes.STATUS);\r
+ List<ITmfStateInterval> statusIntervals = ssq.queryHistoryRange(statusQuark, startTime, endTime - 1, resolution, monitor);\r
+ eventList = new ArrayList<ITimeEvent>(statusIntervals.size());\r
long lastEndTime = -1;\r
- for (ITmfStateInterval currentThreadInterval : currentThreadIntervals) {\r
+ for (ITmfStateInterval statusInterval : statusIntervals) {\r
if (monitor.isCanceled()) {\r
return null;\r
}\r
- if (!currentThreadInterval.getStateValue().isNull()) {\r
- int currentThread = currentThreadInterval.getStateValue().unboxInt();\r
- long time = currentThreadInterval.getStartTime();\r
- long duration = currentThreadInterval.getEndTime() - time + 1;\r
+ int status = statusInterval.getStateValue().unboxInt();\r
+ long time = statusInterval.getStartTime();\r
+ long duration = statusInterval.getEndTime() - time + 1;\r
+ if (!statusInterval.getStateValue().isNull()) {\r
if (lastEndTime != time && lastEndTime != -1) {\r
eventList.add(new TimeEvent(entry, lastEndTime, time - lastEndTime));\r
}\r
- eventList.add(new ResourcesEvent(entry, time, duration, currentThread));\r
+ eventList.add(new ResourcesEvent(entry, time, duration, status));\r
lastEndTime = time + duration;\r
+ } else {\r
+ if (includeNull) {\r
+ eventList.add(new ResourcesEvent(entry, time, duration));\r
+ }\r
}\r
}\r
} else if (entry.getType().equals(Type.IRQ)) {\r
- List<ITmfStateInterval> irqIntervals = ssq.queryHistoryRange(quark, startTime, endTime - 1, resolution);\r
+ List<ITmfStateInterval> irqIntervals = ssq.queryHistoryRange(quark, startTime, endTime - 1, resolution, monitor);\r
eventList = new ArrayList<ITimeEvent>(irqIntervals.size());\r
long lastEndTime = -1;\r
boolean lastIsNull = true;\r
lastEndTime = time + duration;\r
}\r
} else if (entry.getType().equals(Type.SOFT_IRQ)) {\r
- List<ITmfStateInterval> softIrqIntervals = ssq.queryHistoryRange(quark, startTime, endTime - 1, resolution);\r
+ List<ITmfStateInterval> softIrqIntervals = ssq.queryHistoryRange(quark, startTime, endTime - 1, resolution, monitor);\r
eventList = new ArrayList<ITimeEvent>(softIrqIntervals.size());\r
long lastEndTime = -1;\r
boolean lastIsNull = true;\r
if (fTimeGraphViewer.getControl().isDisposed()) {\r
return;\r
}\r
- ITimeGraphEntry[] entries = fEntryList.toArray(new ITimeGraphEntry[0]);\r
- Arrays.sort(entries);\r
+ ITimeGraphEntry[] entries = null;\r
+ synchronized (fEntryListSyncObj) {\r
+ entries = fEntryList.toArray(new ITimeGraphEntry[0]);\r
+ }\r
+ Arrays.sort(entries, new TraceEntryComparator());\r
fTimeGraphViewer.setInput(entries);\r
fTimeGraphViewer.setTimeBounds(fStartTime, fEndTime);\r
\r
\r
\r
private void redraw() {\r
+ synchronized (fSyncObj) {\r
+ if (fRedrawState == State.IDLE) {\r
+ fRedrawState = State.BUSY;\r
+ } else {\r
+ fRedrawState = State.PENDING;\r
+ return;\r
+ }\r
+ }\r
Display.getDefault().asyncExec(new Runnable() {\r
@Override\r
public void run() {\r
}\r
fTimeGraphViewer.getControl().redraw();\r
fTimeGraphViewer.getControl().update();\r
+ synchronized (fSyncObj) {\r
+ if (fRedrawState == State.PENDING) {\r
+ fRedrawState = State.IDLE;\r
+ redraw();\r
+ } else {\r
+ fRedrawState = State.IDLE;\r
+ }\r
+ }\r
}\r
});\r
}\r
projects / deliverable / tracecompass.git / blobdiff