--- /dev/null
+/*******************************************************************************\r
+ * Copyright (c) 2011 Ericsson\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
+ * Contributors:\r
+ * Patrick Tasse - Initial API and implementation\r
+ ******************************************************************************/\r
+\r
+package org.eclipse.linuxtools.tmf.ui.viewers.events;\r
+\r
+import java.util.ArrayList;\r
+\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+import org.eclipse.core.runtime.jobs.Job;\r
+import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;\r
+import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.filter.ITmfFilter;\r
+import org.eclipse.linuxtools.tmf.request.TmfDataRequest;\r
+import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\r
+\r
+public class TmfEventsCache {\r
+\r
+ public class CachedEvent {\r
+ TmfEvent event;\r
+ long rank;\r
+\r
+ public CachedEvent (TmfEvent event, long rank) {\r
+ this.event = event;\r
+ this.rank = rank;\r
+ }\r
+ }\r
+\r
+ private CachedEvent[] fCache;\r
+ private int fCacheStartIndex = 0;\r
+ private int fCacheEndIndex = 0;\r
+\r
+ private ITmfTrace fTrace;\r
+ private TmfEventsTable fTable;\r
+ private ITmfFilter fFilter;\r
+ private ArrayList<Integer> fFilterIndex = new ArrayList<Integer>(); // contains the event rank at each 'cache size' filtered events\r
+\r
+ public TmfEventsCache(int cacheSize, TmfEventsTable table) {\r
+ fCache = new CachedEvent[cacheSize];\r
+ fTable = table;\r
+ }\r
+ \r
+ public void setTrace(ITmfTrace trace) {\r
+ fTrace = trace;\r
+ clear();\r
+ }\r
+ \r
+ public void clear() {\r
+ fCacheStartIndex = 0;\r
+ fCacheEndIndex = 0;\r
+ fFilterIndex.clear();\r
+ }\r
+\r
+ public void applyFilter(ITmfFilter filter) {\r
+ fFilter = filter;\r
+ clear();\r
+ }\r
+ \r
+ public void clearFilter() {\r
+ fFilter = null;\r
+ clear();\r
+ }\r
+ \r
+ public CachedEvent getEvent(int index) {\r
+ if ((index >= fCacheStartIndex) && (index < fCacheEndIndex)) {\r
+ int i = index - fCacheStartIndex;\r
+ return fCache[i];\r
+ }\r
+ populateCache(index);\r
+ return null;\r
+ }\r
+\r
+ public CachedEvent peekEvent(int index) {\r
+ if ((index >= fCacheStartIndex) && (index < fCacheEndIndex)) {\r
+ int i = index - fCacheStartIndex;\r
+ return fCache[i];\r
+ }\r
+ return null;\r
+ }\r
+ \r
+ public synchronized void storeEvent(TmfEvent event, long rank, int index) {\r
+ if (fCacheStartIndex == fCacheEndIndex) {\r
+ fCacheStartIndex = index;\r
+ fCacheEndIndex = index;\r
+ }\r
+ if (index == fCacheEndIndex) {\r
+ int i = index - fCacheStartIndex;\r
+ if (i < fCache.length) {\r
+ fCache[i] = new CachedEvent(event.clone(), rank);\r
+ fCacheEndIndex++;\r
+ }\r
+ }\r
+ if (fFilter != null && index % fCache.length == 0) {\r
+ int i = index / fCache.length;\r
+ fFilterIndex.add(i, new Integer((int) rank));\r
+ }\r
+ }\r
+ \r
+ @SuppressWarnings("unchecked")\r
+ public int getFilteredEventIndex(final long rank) {\r
+ int current;\r
+ int startRank;\r
+ TmfDataRequest<TmfEvent> request;\r
+ synchronized (this) {\r
+ int start = 0;\r
+ int end = fFilterIndex.size();\r
+ \r
+ if (fCacheEndIndex - fCacheStartIndex > 1) {\r
+ if (rank < fCache[0].rank) {\r
+ end = fCacheStartIndex / fCache.length + 1;\r
+ } else if (rank > fCache[fCacheEndIndex - fCacheStartIndex - 1].rank) {\r
+ start = fCacheEndIndex / fCache.length;\r
+ } else {\r
+ for (int i = 0; i < fCacheEndIndex - fCacheStartIndex; i++) {\r
+ if (fCache[i].rank >= rank) {\r
+ return fCacheStartIndex + i;\r
+ }\r
+ }\r
+ return fCacheEndIndex;\r
+ }\r
+ }\r
+ \r
+ current = (start + end) / 2;\r
+ while (current != start) {\r
+ if (rank < fFilterIndex.get(current)) {\r
+ end = current;\r
+ current = (start + end) / 2;\r
+ } else {\r
+ start = current;\r
+ current = (start + end) / 2;\r
+ }\r
+ }\r
+ startRank = fFilterIndex.get(current);\r
+ }\r
+ \r
+ final int index = current * fCache.length;\r
+ \r
+ class DataRequest<T extends TmfEvent> extends TmfDataRequest<T> {\r
+ int fRank;\r
+ int fIndex;\r
+ \r
+ DataRequest(Class<T> dataType, int start, int nbRequested) {\r
+ super(dataType, start, nbRequested);\r
+ fRank = start;\r
+ fIndex = index;\r
+ }\r
+ \r
+ @Override\r
+ public void handleData(T event) {\r
+ super.handleData(event);\r
+ if (isCancelled()) return;\r
+ if (fRank >= rank) {\r
+ cancel();\r
+ return;\r
+ }\r
+ fRank++;\r
+ if (fFilter.matches(event)) {\r
+ fIndex++;\r
+ }\r
+ }\r
+\r
+ public int getFilteredIndex() {\r
+ return fIndex;\r
+ }\r
+ }\r
+ \r
+ request = new DataRequest<TmfEvent>(TmfEvent.class, startRank, TmfDataRequest.ALL_DATA);\r
+ ((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
+ try {\r
+ request.waitForCompletion();\r
+ return ((DataRequest<TmfEvent>) request).getFilteredIndex();\r
+ } catch (InterruptedException e) {\r
+ }\r
+ return 0;\r
+ }\r
+ \r
+ // ------------------------------------------------------------------------\r
+ // Event cache population\r
+ // ------------------------------------------------------------------------\r
+ \r
+ // The event fetching job\r
+ private Job job;\r
+ private synchronized void populateCache(final int index) {\r
+\r
+ /* Check if the current job will fetch the requested event:\r
+ * 1. The job must exist\r
+ * 2. It must be running (i.e. not completed)\r
+ * 3. The requested index must be within the cache range\r
+ * \r
+ * If the job meets these conditions, we simply exit.\r
+ * Otherwise, we create a new job but we might have to cancel\r
+ * an existing job for an obsolete range.\r
+ */\r
+ if (job != null) {\r
+ if (job.getState() != Job.NONE) {\r
+ if (index >= fCacheStartIndex && index < (fCacheStartIndex + fCache.length)) {\r
+ return;\r
+ }\r
+ // The new index is out of the requested range\r
+ // Kill the job and start a new one\r
+ job.cancel();\r
+ }\r
+ }\r
+ \r
+ fCacheStartIndex = index;\r
+ fCacheEndIndex = index;\r
+\r
+ job = new Job("Fetching Events") { //$NON-NLS-1$\r
+ private int startIndex = index;\r
+ private int skipCount = 0;\r
+ @Override\r
+ @SuppressWarnings("unchecked")\r
+ protected IStatus run(final IProgressMonitor monitor) {\r
+\r
+ int nbRequested;\r
+ if (fFilter == null) {\r
+ nbRequested = fCache.length;\r
+ } else {\r
+ nbRequested = TmfDataRequest.ALL_DATA;\r
+ int i = index / fCache.length;\r
+ if (i < fFilterIndex.size()) {\r
+ startIndex = fFilterIndex.get(i);\r
+ skipCount = index - (i * fCache.length);\r
+ }\r
+ }\r
+ \r
+ TmfDataRequest<TmfEvent> request = new TmfDataRequest<TmfEvent>(TmfEvent.class, startIndex, nbRequested) {\r
+ private int count = 0;\r
+ private long rank = startIndex;\r
+ @Override\r
+ public void handleData(TmfEvent event) {\r
+ // If the job is canceled, cancel the request so waitForCompletion() will unlock\r
+ if (monitor.isCanceled()) {\r
+ cancel();\r
+ return;\r
+ }\r
+ super.handleData(event);\r
+ if (event != null) {\r
+ if ((fFilter == null || fFilter.matches(event)) && skipCount-- <= 0) {\r
+ synchronized (TmfEventsCache.this) {\r
+ fCache[count] = new CachedEvent(event.clone(), rank);\r
+ count++;\r
+ fCacheEndIndex++;\r
+ }\r
+ if (fFilter != null) {\r
+ fTable.cacheUpdated(false);\r
+ }\r
+ }\r
+ }\r
+ if (count >= fCache.length) {\r
+ cancel();\r
+ } else if (fFilter != null && count >= fTable.getTable().getItemCount() - 3) { // -1 for header row, -2 for top and bottom filter status rows\r
+ cancel();\r
+ }\r
+ rank++;\r
+ }\r
+ };\r
+\r
+ ((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
+ try {\r
+ request.waitForCompletion();\r
+ } catch (InterruptedException e) {\r
+ e.printStackTrace();\r
+ }\r
+\r
+ fTable.cacheUpdated(true);\r
+ \r
+ // Flag the UI thread that the cache is ready\r
+ if (monitor.isCanceled()) {\r
+ return Status.CANCEL_STATUS;\r
+ } else {\r
+ return Status.OK_STATUS;\r
+ }\r
+ }\r
+ };\r
+ //job.setSystem(true);\r
+ job.setPriority(Job.SHORT);\r
+ job.schedule();\r
+ }\r
+\r
+}\r
import org.eclipse.linuxtools.tmf.component.TmfComponent;\r
import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
import org.eclipse.linuxtools.tmf.event.TmfEventContent;\r
+import org.eclipse.linuxtools.tmf.event.TmfTimeRange;\r
import org.eclipse.linuxtools.tmf.event.TmfTimestamp;\r
import org.eclipse.linuxtools.tmf.filter.ITmfFilter;\r
import org.eclipse.linuxtools.tmf.filter.model.ITmfFilterTreeNode;\r
import org.eclipse.linuxtools.tmf.filter.model.TmfFilterNode;\r
import org.eclipse.linuxtools.tmf.request.ITmfDataRequest.ExecutionType;\r
import org.eclipse.linuxtools.tmf.request.TmfDataRequest;\r
+import org.eclipse.linuxtools.tmf.request.TmfEventRequest;\r
import org.eclipse.linuxtools.tmf.signal.TmfExperimentUpdatedSignal;\r
import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;\r
import org.eclipse.linuxtools.tmf.signal.TmfTimeSynchSignal;\r
import org.eclipse.linuxtools.tmf.trace.ITmfTrace;\r
import org.eclipse.linuxtools.tmf.ui.TmfUiPlugin;\r
import org.eclipse.linuxtools.tmf.ui.internal.Messages;\r
+import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsCache.CachedEvent;\r
import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSetting;\r
import org.eclipse.linuxtools.tmf.ui.views.colors.ColorSettingsManager;\r
import org.eclipse.linuxtools.tmf.ui.views.colors.IColorSettingsListener;\r
protected long fSelectedRank = 0;\r
\r
// Filter data\r
- protected ArrayList<FilteredEvent> fFilteredEventCache = new ArrayList<FilteredEvent>();\r
protected long fFilterMatchCount;\r
protected long fFilterCheckCount;\r
protected FilterThread fFilterThread;\r
new ColumnData(COLUMN_NAMES[4], 100, SWT.LEFT)\r
};\r
\r
- private class FilteredEvent {\r
- TmfEvent event;\r
- long rank;\r
-\r
- public FilteredEvent (TmfEvent event, long rank) {\r
- this.event = event;\r
- this.rank = rank;\r
- }\r
- }\r
- \r
- // ------------------------------------------------------------------------\r
// Event cache\r
- // ------------------------------------------------------------------------\r
+ private final TmfEventsCache fCache;\r
+ private boolean fCacheUpdateBusy = false;\r
+ private boolean fCacheUpdatePending = false;\r
+ private boolean fCacheUpdateCompleted = false;\r
+ private Object fCacheUpdateSyncObj = new Object();\r
\r
- private final int fCacheSize;\r
- private TmfEvent[] fCache;\r
- private int fCacheStartIndex = 0;\r
- private int fCacheEndIndex = 0;\r
\r
private boolean fDisposeOnClose;\r
\r
}\r
});\r
\r
- fCacheSize = Math.max(cacheSize, Display.getDefault().getBounds().height / fTable.getItemHeight());\r
- fCache = new TmfEvent[fCacheSize];\r
+ cacheSize = Math.max(cacheSize, Display.getDefault().getBounds().height / fTable.getItemHeight());\r
+ fCache = new TmfEventsCache(cacheSize, this);\r
\r
// Handle the table item requests \r
fTable.addListener(SWT.SetData, new Listener() {\r
public void handleEvent(Event event) {\r
\r
final TableItem item = (TableItem) event.item;\r
- final int index = event.index - 1; // -1 for the header row\r
-\r
- if (index == -1) {\r
- String txtKey = null;\r
- if (fHeaderState == HeaderState.SEARCH) {\r
- item.setImage(SEARCH_IMAGE);\r
- txtKey = Key.SEARCH_TXT;\r
- } else if (fHeaderState == HeaderState.FILTER) {\r
- item.setImage(FILTER_IMAGE);\r
- txtKey = Key.FILTER_TXT;\r
- }\r
- item.setForeground(fGrayColor);\r
- for (int i = 0; i < fTable.getColumns().length; i++) {\r
- TableColumn column = fTable.getColumns()[i];\r
- String filter = (String) column.getData(txtKey);\r
- if (filter == null) {\r
- if (fHeaderState == HeaderState.SEARCH) {\r
- item.setText(i, SEARCH_HINT);\r
- } else if (fHeaderState == HeaderState.FILTER) {\r
- item.setText(i, FILTER_HINT);\r
- }\r
- item.setForeground(i, fGrayColor);\r
- item.setFont(i, fTable.getFont());\r
- } else {\r
- item.setText(i, filter);\r
- item.setForeground(i, fGreenColor);\r
- item.setFont(i, fBoldFont);\r
- }\r
- }\r
- return;\r
- }\r
+ int index = event.index - 1; // -1 for the header row\r
\r
- // If available, return the cached data \r
- if ((index >= fCacheStartIndex) && (index < fCacheEndIndex)) {\r
- int i = index - fCacheStartIndex;\r
- setItemData(item, fCache[i], index);\r
+ if (event.index == 0) {\r
+ setHeaderRowItemData(item);\r
return;\r
}\r
\r
- // If filter is applied, use the filtered event cache\r
if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- setFilteredItemData(item, index);\r
- return;\r
+ if (event.index == 1 || event.index == fTable.getItemCount() - 1) {\r
+ setFilterStatusRowItemData(item);\r
+ return;\r
+ }\r
+ index = index - 1; // -1 for top filter status row\r
}\r
-\r
+ \r
+ CachedEvent cachedEvent = fCache.getEvent(index);\r
+ if (cachedEvent != null) {\r
+ setItemData(item, cachedEvent.event, cachedEvent.rank);\r
+ return;\r
+ }\r
+ \r
// Else, fill the cache asynchronously (and off the UI thread)\r
- populateCache(index);\r
event.doit = false;\r
}\r
});\r
long rank = (Long) e.data;\r
int index = (int) rank;\r
if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- index = getFilteredEventIndex(rank) + 1; // +1 for top filter status row\r
+ index = fCache.getFilteredEventIndex(rank) + 1; // +1 for top filter status row\r
}\r
fTable.setSelection(index + 1); // +1 for header row\r
fSelectedRank = rank;\r
subMenu.add(new Action(filter.getFilterName()) {\r
@Override\r
public void run() {\r
- synchronized (fFilteredEventCache) {\r
- fFilteredEventCache.clear();\r
- fFilterMatchCount = 0;\r
- fFilterCheckCount = 0;\r
- }\r
- fCacheStartIndex = 0;\r
- fCacheEndIndex = 0;\r
+ stopFilterThread();\r
+ fFilterMatchCount = 0;\r
+ fFilterCheckCount = 0;\r
+ fCache.applyFilter(filter);\r
fTable.clearAll();\r
fTable.setData(Key.FILTER_OBJ, filter);\r
fTable.setItemCount(3); // +1 for header row, +2 for top and bottom filter status rows\r
item.setImage((Image) null);\r
}\r
}\r
+\r
+ protected void setHeaderRowItemData(TableItem item) {\r
+ String txtKey = null;\r
+ if (fHeaderState == HeaderState.SEARCH) {\r
+ item.setImage(SEARCH_IMAGE);\r
+ txtKey = Key.SEARCH_TXT;\r
+ } else if (fHeaderState == HeaderState.FILTER) {\r
+ item.setImage(FILTER_IMAGE);\r
+ txtKey = Key.FILTER_TXT;\r
+ }\r
+ item.setForeground(fGrayColor);\r
+ for (int i = 0; i < fTable.getColumns().length; i++) {\r
+ TableColumn column = fTable.getColumns()[i];\r
+ String filter = (String) column.getData(txtKey);\r
+ if (filter == null) {\r
+ if (fHeaderState == HeaderState.SEARCH) {\r
+ item.setText(i, SEARCH_HINT);\r
+ } else if (fHeaderState == HeaderState.FILTER) {\r
+ item.setText(i, FILTER_HINT);\r
+ }\r
+ item.setForeground(i, fGrayColor);\r
+ item.setFont(i, fTable.getFont());\r
+ } else {\r
+ item.setText(i, filter);\r
+ item.setForeground(i, fGreenColor);\r
+ item.setFont(i, fBoldFont);\r
+ }\r
+ }\r
+ }\r
\r
- protected void setFilteredItemData(final TableItem item, int index) {\r
- synchronized (fFilteredEventCache) {\r
- if (index > 0 && --index < fFilteredEventCache.size()) { // top and bottom rows are filter status rows\r
- FilteredEvent filteredEvent = fFilteredEventCache.get(index);\r
- setItemData(item, filteredEvent.event, filteredEvent.rank);\r
- return;\r
- }\r
- for (int i = 0; i < fTable.getColumns().length; i++) {\r
- if (i == 0) {\r
- if (fFilterCheckCount == fTrace.getNbEvents()) {\r
- item.setImage(FILTER_IMAGE);\r
- } else {\r
- item.setImage(STOP_IMAGE);\r
- }\r
- item.setText(0, fFilterMatchCount + "/" + fFilterCheckCount); //$NON-NLS-1$\r
- } else {\r
- item.setText(i, ""); //$NON-NLS-1$\r
- }\r
- }\r
+ protected void setFilterStatusRowItemData(TableItem item) {\r
+ for (int i = 0; i < fTable.getColumns().length; i++) {\r
+ if (i == 0) {\r
+ if (fFilterCheckCount == fTrace.getNbEvents()) {\r
+ item.setImage(FILTER_IMAGE);\r
+ } else {\r
+ item.setImage(STOP_IMAGE);\r
+ }\r
+ item.setText(0, fFilterMatchCount + "/" + fFilterCheckCount); //$NON-NLS-1$\r
+ } else {\r
+ item.setText(i, ""); //$NON-NLS-1$\r
+ }\r
}\r
item.setData(Key.TIMESTAMP, null);\r
item.setData(Key.RANK, null);\r
item.setBackground(null);\r
}\r
\r
- protected int getFilteredEventIndex(long rank) {\r
- synchronized (fFilteredEventCache) {\r
- for (int i = 0; i < fFilteredEventCache.size(); i++) {\r
- FilteredEvent filteredEvent = fFilteredEventCache.get(i);\r
- if (filteredEvent.rank >= rank) {\r
- return i;\r
- }\r
- }\r
- }\r
- return fFilteredEventCache.size();\r
- }\r
- \r
protected void createHeaderEditor() {\r
final TableEditor tableEditor = fTable.createTableEditor();\r
tableEditor.horizontalAlignment = SWT.LEFT;\r
fireSearchApplied(null);\r
}\r
} else if (fHeaderState == HeaderState.FILTER) {\r
- synchronized (fFilteredEventCache) {\r
- fFilteredEventCache.clear();\r
- fFilterMatchCount = 0;\r
- fFilterCheckCount = 0;\r
- }\r
- fCacheStartIndex = 0;\r
- fCacheEndIndex = 0;\r
+ stopFilterThread();\r
+ fFilterMatchCount = 0;\r
+ fFilterCheckCount = 0;\r
TmfFilterAndNode filter = new TmfFilterAndNode(null);\r
for (TableColumn column : fTable.getColumns()) {\r
Object filterObj = column.getData(Key.FILTER_OBJ);\r
}\r
}\r
if (filter.getChildrenCount() > 0) {\r
+ fCache.applyFilter(filter);\r
fTable.clearAll();\r
fTable.setData(Key.FILTER_OBJ, filter);\r
fTable.setItemCount(3); // +1 for header row, +2 for top and bottom filter status rows\r
startFilterThread();\r
fireFilterApplied(filter);\r
} else {\r
+ fCache.clearFilter();\r
stopFilterThread();\r
fTable.clearAll();\r
fTable.setData(Key.FILTER_OBJ, null);\r
if (fTable.getData(Key.FILTER_OBJ) == null) {\r
return;\r
}\r
- long selectedRank = -1;\r
- synchronized (fFilteredEventCache) {\r
- int selectedIndex = fTable.getSelectionIndex() - 2; // -1 for header row, -1 for top filter status row\r
- if (selectedIndex >= 0 && selectedIndex < fFilteredEventCache.size()) {\r
- selectedRank = fFilteredEventCache.get(selectedIndex).rank;\r
- }\r
- }\r
+ fCache.clearFilter();\r
fTable.clearAll();\r
for (TableColumn column : fTable.getColumns()) {\r
column.setData(Key.FILTER_OBJ, null);\r
}\r
fTable.setData(Key.FILTER_OBJ, null);\r
fTable.setItemCount((int) fTrace.getNbEvents() + 1); // +1 for header row\r
- synchronized (fFilteredEventCache) {\r
- fFilteredEventCache.clear();\r
- fFilterMatchCount = 0;\r
- fFilterCheckCount = 0;\r
- }\r
- if (selectedRank >= 0) {\r
- fTable.setSelection((int) selectedRank + 1); // +1 for header row\r
+ fFilterMatchCount = 0;\r
+ fFilterCheckCount = 0;\r
+ if (fSelectedRank >= 0) {\r
+ fTable.setSelection((int) fSelectedRank + 1); // +1 for header row\r
} else {\r
fTable.setSelection(0);\r
}\r
\r
protected class FilterThread extends Thread {\r
private final ITmfFilterTreeNode filter;\r
- private TmfDataRequest<TmfEvent> request;\r
- private long lastRefreshTime;\r
+ private TmfEventRequest<TmfEvent> request;\r
+ private boolean refreshBusy = false;\r
+ private boolean refreshPending = false;\r
+ private Object syncObj = new Object();\r
\r
public FilterThread(ITmfFilterTreeNode filter) {\r
super("Filter Thread"); //$NON-NLS-1$\r
@SuppressWarnings("unchecked")\r
@Override\r
public void run() {\r
- final Display display = Display.getDefault();\r
- lastRefreshTime = System.currentTimeMillis();\r
-\r
- request = new TmfDataRequest<TmfEvent>(TmfEvent.class, 0, Integer.MAX_VALUE, ExecutionType.BACKGROUND) {\r
+ request = new TmfEventRequest<TmfEvent>(TmfEvent.class, TmfTimeRange.Eternity, TmfDataRequest.ALL_DATA, fTrace.getCacheSize(), ExecutionType.BACKGROUND) {\r
@Override\r
public void handleData(TmfEvent event) {\r
super.handleData(event);\r
- fFilterCheckCount++;\r
+ if (request.isCancelled()) return;\r
if (filter.matches(event)) {\r
- synchronized (fFilteredEventCache) {\r
- fFilteredEventCache.add(new FilteredEvent(event.clone(), getNbRead() - 1));\r
- fFilterMatchCount++;\r
- }\r
- display.asyncExec(new Runnable() {\r
- @Override\r
- public void run() {\r
- if (request.isCancelled()) return;\r
- if (fTable.isDisposed()) return;\r
- fTable.setItemCount(fFilteredEventCache.size() + 3); // +1 for header row, +2 for top and bottom filter status rows\r
- }\r
- });\r
- }\r
- if (fFilterCheckCount % 100 == 0) {\r
- long currentTime = System.currentTimeMillis();\r
- if (currentTime - lastRefreshTime > 1000) {\r
- lastRefreshTime = currentTime;\r
- display.asyncExec(new Runnable() {\r
- @Override\r
- public void run() {\r
- if (request.isCancelled()) return;\r
- if (fTable.isDisposed()) return;\r
- fTable.refresh();\r
- }\r
- });\r
- }\r
+ long rank = fFilterCheckCount;\r
+ int index = (int) fFilterMatchCount;\r
+ fFilterMatchCount++;\r
+ fCache.storeEvent(event.clone(), rank, index);\r
+ refreshTable();\r
+ } else if (fFilterCheckCount % 100 == 0) {\r
+ refreshTable();\r
}\r
+ fFilterCheckCount++;\r
}\r
};\r
((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
request.waitForCompletion();\r
} catch (InterruptedException e) {\r
}\r
- display.asyncExec(new Runnable() {\r
- @Override\r
- public void run() {\r
- if (fTable.isDisposed()) return;\r
- fTable.refresh();\r
- }\r
- });\r
+ refreshTable();\r
+ }\r
+ \r
+ public void refreshTable() {\r
+ synchronized (syncObj) {\r
+ if (refreshBusy) {\r
+ refreshPending = true;\r
+ return;\r
+ } else {\r
+ refreshBusy = true;\r
+ }\r
+ }\r
+ Display.getDefault().asyncExec(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ if (request.isCancelled()) return;\r
+ if (fTable.isDisposed()) return;\r
+ fTable.setItemCount((int) fFilterMatchCount + 3); // +1 for header row, +2 for top and bottom filter status rows\r
+ fTable.refresh();\r
+ synchronized (syncObj) {\r
+ refreshBusy = false;\r
+ if (refreshPending) {\r
+ refreshPending = false;\r
+ refreshTable();\r
+ }\r
+ }\r
+ }\r
+ });\r
}\r
\r
public void cancel() {\r
if (fSearchThread != null) {\r
return;\r
}\r
- final ITmfFilterTreeNode filter = (ITmfFilterTreeNode) fTable.getData(Key.SEARCH_OBJ);\r
- if (filter == null) {\r
+ final ITmfFilterTreeNode searchFilter = (ITmfFilterTreeNode) fTable.getData(Key.SEARCH_OBJ);\r
+ if (searchFilter == null) {\r
return;\r
}\r
int selectionIndex = fTable.getSelectionIndex();\r
// header row is selected, start at top event\r
startIndex = Math.max(0, fTable.getTopIndex() - 1); // -1 for header row\r
}\r
- if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- fSearchThread = new SearchFilteredThread(filter, Math.max(0, startIndex - 1), Direction.FORWARD); // -1 for top filter status row\r
- } else {\r
- fSearchThread = new SearchThread(filter, startIndex, Direction.FORWARD);\r
+ final ITmfFilterTreeNode eventFilter = (ITmfFilterTreeNode) fTable.getData(Key.FILTER_OBJ);\r
+ if (eventFilter != null) {\r
+ startIndex = Math.max(0, startIndex - 1); // -1 for top filter status row\r
}\r
+ fSearchThread = new SearchThread(searchFilter, eventFilter, startIndex, fSelectedRank, Direction.FORWARD);\r
fSearchThread.schedule();\r
}\r
}\r
if (fSearchThread != null) {\r
return;\r
}\r
- final ITmfFilterTreeNode filter = (ITmfFilterTreeNode) fTable.getData(Key.SEARCH_OBJ);\r
- if (filter == null) {\r
+ final ITmfFilterTreeNode searchFilter = (ITmfFilterTreeNode) fTable.getData(Key.SEARCH_OBJ);\r
+ if (searchFilter == null) {\r
return;\r
}\r
int selectionIndex = fTable.getSelectionIndex();\r
// header row is selected, start at precedent of top event\r
startIndex = fTable.getTopIndex() - 2; // -1 for header row, -1 for previous event\r
}\r
- if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- fSearchThread = new SearchFilteredThread(filter, startIndex - 1, Direction.BACKWARD); // -1 for top filter status row\r
- } else {\r
- fSearchThread = new SearchThread(filter, startIndex, Direction.BACKWARD);\r
+ final ITmfFilterTreeNode eventFilter = (ITmfFilterTreeNode) fTable.getData(Key.FILTER_OBJ);\r
+ if (eventFilter != null) {\r
+ startIndex = startIndex - 1; // -1 for top filter status row\r
}\r
+ fSearchThread = new SearchThread(searchFilter, eventFilter, startIndex, fSelectedRank, Direction.BACKWARD);\r
fSearchThread.schedule();\r
}\r
}\r
}\r
\r
protected class SearchThread extends Job {\r
- protected ITmfFilterTreeNode filter;\r
- protected long startRank;\r
+ protected ITmfFilterTreeNode searchFilter;\r
+ protected ITmfFilterTreeNode eventFilter;\r
+ protected int startIndex;\r
protected int direction;\r
- protected long rank = -1;\r
+ protected long rank;\r
+ protected long foundRank = -1;\r
protected TmfDataRequest<TmfEvent> request;\r
\r
- public SearchThread(ITmfFilterTreeNode filter, int startIndex, int direction) {\r
+ public SearchThread(ITmfFilterTreeNode searchFilter, ITmfFilterTreeNode eventFilter, int startIndex, long currentRank, int direction) {\r
super(Messages.TmfEventsTable_SearchingJobName);\r
- this.filter = filter;\r
- this.startRank = startIndex;\r
+ this.searchFilter = searchFilter;\r
+ this.eventFilter = eventFilter;\r
+ this.startIndex = startIndex;\r
+ this.rank = currentRank;\r
this.direction = direction;\r
}\r
\r
@Override\r
protected IStatus run(final IProgressMonitor monitor) {\r
final Display display = Display.getDefault();\r
- if (startRank < 0) {\r
- startRank = fTrace.getNbEvents() - 1;\r
- } else if (startRank > fTrace.getNbEvents() - 1) {\r
- startRank = 0;\r
+ if (startIndex < 0) {\r
+ rank = (int) fTrace.getNbEvents() - 1;\r
+ } else if (startIndex >= fTable.getItemCount() - (eventFilter == null ? 1 : 3)) { // -1 for header row, -2 for top and bottom filter status rows\r
+ rank = 0;\r
+ } else {\r
+ int idx = startIndex;\r
+ while (foundRank == -1) {\r
+ CachedEvent event = fCache.peekEvent(idx);\r
+ if (event == null) {\r
+ break;\r
+ }\r
+ rank = event.rank;\r
+ if (searchFilter.matches(event.event) && (eventFilter == null || eventFilter.matches(event.event))) {\r
+ foundRank = event.rank;\r
+ break;\r
+ }\r
+ if (direction == Direction.FORWARD) {\r
+ idx++;\r
+ } else {\r
+ idx--;\r
+ }\r
+ }\r
+ if (foundRank == -1) {\r
+ if (direction == Direction.FORWARD) {\r
+ rank++;\r
+ if (rank > fTrace.getNbEvents() - 1) {\r
+ rank = 0;\r
+ }\r
+ } else {\r
+ rank--;\r
+ if (rank < 0) {\r
+ rank = (int) fTrace.getNbEvents() - 1;\r
+ }\r
+ }\r
+ }\r
}\r
- int startIndex = (int) startRank;\r
- int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : 1);\r
- while (!monitor.isCanceled() && rank == -1) {\r
- request = new TmfDataRequest<TmfEvent>(TmfEvent.class, startIndex, nbRequested) {\r
+ int startRank = (int) rank;\r
+ boolean wrapped = false;\r
+ while (!monitor.isCanceled() && foundRank == -1) {\r
+ int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : Math.min((int) rank + 1, fTrace.getCacheSize()));\r
+ if (direction == Direction.BACKWARD) {\r
+ rank = Math.max(0, rank - fTrace.getCacheSize() + 1);\r
+ }\r
+ request = new TmfDataRequest<TmfEvent>(TmfEvent.class, (int) rank, nbRequested) {\r
+ long currentRank = rank;\r
@Override\r
public void handleData(TmfEvent event) {\r
super.handleData(event);\r
- if (filter.matches(event)) {\r
- rank = startRank + getNbRead() - 1;\r
- done();\r
+ if (searchFilter.matches(event) && (eventFilter == null || eventFilter.matches(event))) {\r
+ foundRank = currentRank;\r
+ if (direction == Direction.FORWARD) {\r
+ done();\r
+ return;\r
+ }\r
}\r
+ currentRank++;\r
}\r
};\r
((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
return Status.OK_STATUS;\r
}\r
} catch (InterruptedException e) {\r
+ synchronized (fSearchSyncObj) {\r
+ fSearchThread = null;\r
+ }\r
return Status.OK_STATUS;\r
}\r
- if (rank == -1) {\r
+ if (foundRank == -1) {\r
if (direction == Direction.FORWARD) {\r
- if (startIndex == 0) {\r
+ if (rank == 0) {\r
+ synchronized (fSearchSyncObj) {\r
+ fSearchThread = null;\r
+ }\r
return Status.OK_STATUS;\r
} else {\r
- nbRequested = startIndex;\r
- startIndex = 0;\r
+ nbRequested = (int) rank;\r
+ rank = 0;\r
+ wrapped = true;\r
}\r
} else {\r
- startIndex--;\r
- if (startIndex < 0) {\r
- startIndex = (int) fTrace.getNbEvents() - 1;\r
+ rank--;\r
+ if (rank < 0) {\r
+ rank = (int) fTrace.getNbEvents() - 1;\r
+ wrapped = true;\r
}\r
- if (startIndex == startRank) {\r
+ if (rank <= startRank && wrapped) {\r
+ synchronized (fSearchSyncObj) {\r
+ fSearchThread = null;\r
+ }\r
return Status.OK_STATUS;\r
}\r
}\r
}\r
}\r
- final int selection = (int) rank + 1; // +1 for header row\r
+ int index = (int) foundRank;\r
+ if (eventFilter != null) {\r
+ index = fCache.getFilteredEventIndex(foundRank);\r
+ }\r
+ final int selection = (int) index + 1 + (eventFilter != null ? +1 : 0); // +1 for header row, +1 for top filter status row\r
\r
display.asyncExec(new Runnable() {\r
@Override\r
if (monitor.isCanceled()) return;\r
if (fTable.isDisposed()) return;\r
fTable.setSelection(selection);\r
+ fSelectedRank = foundRank;\r
synchronized (fSearchSyncObj) {\r
fSearchThread = null;\r
}\r
@Override\r
protected void canceling() {\r
request.cancel();\r
+ synchronized (fSearchSyncObj) {\r
+ fSearchThread = null;\r
+ }\r
}\r
}\r
\r
- protected class SearchFilteredThread extends SearchThread {\r
-\r
- public SearchFilteredThread(ITmfFilterTreeNode filter, int startIndex, int direction) {\r
- super(filter, startIndex, direction);\r
- }\r
- \r
- @Override\r
- protected IStatus run(final IProgressMonitor monitor) {\r
- final Display display = Display.getDefault();\r
- if (fFilteredEventCache.size() == 0) {\r
- return Status.OK_STATUS;\r
- }\r
- if (startRank < 0) {\r
- startRank = fFilteredEventCache.size() - 1;\r
- }\r
- int index = (int) startRank;\r
- if (direction == Direction.FORWARD) {\r
- if (index >= fFilteredEventCache.size()) {\r
- index = 0;\r
- }\r
- } else {\r
- if (index < 0) {\r
- index = fFilteredEventCache.size() - 1;\r
- }\r
- }\r
- TmfEvent event = null;\r
- while (!monitor.isCanceled()) {\r
- event = fFilteredEventCache.get(index).event;\r
- if (filter.matches(event)) {\r
- break;\r
- }\r
- if (direction == Direction.FORWARD) {\r
- index++;\r
- if (index == startRank) {\r
- return Status.OK_STATUS;\r
- }\r
- if (index >= fFilteredEventCache.size()) {\r
- index = 0;\r
- }\r
- } else {\r
- index--;\r
- if (index == startRank) {\r
- return Status.OK_STATUS;\r
- }\r
- if (index < 0) {\r
- index = fFilteredEventCache.size() - 1;\r
- }\r
- }\r
- }\r
- final int selection = (int) index + 2; // +1 for header row, +1 for top filter status row\r
- \r
- display.asyncExec(new Runnable() {\r
- @Override\r
- public void run() {\r
- if (monitor.isCanceled()) return;\r
- if (fTable.isDisposed()) return;\r
- fTable.setSelection(selection);\r
- synchronized (fSearchSyncObj) {\r
- fSearchThread = null;\r
- }\r
- }\r
- });\r
- return Status.OK_STATUS;\r
- }\r
- }\r
- \r
protected void createResources() {\r
fGrayColor = fResourceManager.createColor(ColorUtil.blend(fTable.getBackground().getRGB(), fTable.getForeground().getRGB()));\r
fGreenColor = fTable.getDisplay().getSystemColor(SWT.COLOR_DARK_GREEN);\r
column.setData(Key.SEARCH_OBJ, null);\r
column.setData(Key.SEARCH_TXT, null);\r
}\r
- fCacheStartIndex = fCacheEndIndex = 0; // Clear the cache\r
+ fCache.setTrace(fTrace); // Clear the cache\r
if (fTrace != null) {\r
if (!fTable.isDisposed() && fTrace != null) {\r
fTable.setItemCount((int) fTrace.getNbEvents() + 1); // +1 for header row\r
}\r
\r
// ------------------------------------------------------------------------\r
- // Event cache population\r
+ // Event cache\r
// ------------------------------------------------------------------------\r
- \r
- // The event fetching job\r
- private Job job;\r
- private synchronized void populateCache(final int index) {\r
-\r
- /* Check if the current job will fetch the requested event:\r
- * 1. The job must exist\r
- * 2. It must be running (i.e. not completed)\r
- * 3. The requested index must be within the cache range\r
- * \r
- * If the job meets these conditions, we simply exit.\r
- * Otherwise, we create a new job but we might have to cancel\r
- * an existing job for an obsolete range.\r
- */\r
- if (job != null) {\r
- if (job.getState() != Job.NONE) {\r
- if (index >= fCacheStartIndex && index < (fCacheStartIndex + fCacheSize)) {\r
- return;\r
- }\r
- // The new index is out of the requested range\r
- // Kill the job and start a new one\r
- job.cancel();\r
- }\r
- }\r
- \r
- fCacheStartIndex = index;\r
- fCacheEndIndex = index;\r
\r
- job = new Job("Fetching Events") { //$NON-NLS-1$\r
- @Override\r
- @SuppressWarnings("unchecked")\r
- protected IStatus run(final IProgressMonitor monitor) {\r
-\r
- TmfDataRequest<TmfEvent> request = new TmfDataRequest<TmfEvent>(TmfEvent.class, index, fCacheSize) {\r
- private int count = 0;\r
- @Override\r
- public void handleData(TmfEvent event) {\r
- // If the job is canceled, cancel the request so waitForCompletion() will unlock\r
- if (monitor.isCanceled()) {\r
- cancel();\r
- return;\r
- }\r
- super.handleData(event);\r
- if (event != null) {\r
- fCache[count++] = event.clone();\r
- fCacheEndIndex++; // TODO: Need to protect this??\r
- }\r
+ public void cacheUpdated(final boolean completed) {\r
+ synchronized (fCacheUpdateSyncObj) {\r
+ if (fCacheUpdateBusy) {\r
+ fCacheUpdatePending = true;\r
+ fCacheUpdateCompleted = completed;\r
+ return;\r
+ } else {\r
+ fCacheUpdateBusy = true;\r
+ }\r
+ }\r
+ // Event cache is now updated. Perform update on the UI thread\r
+ if (!fTable.isDisposed()) {\r
+ fTable.getDisplay().asyncExec(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ if (!fTable.isDisposed()) {\r
+ fTable.refresh();\r
+ packColumns();\r
}\r
- };\r
-\r
- ((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
- try {\r
- request.waitForCompletion();\r
- } catch (InterruptedException e) {\r
- e.printStackTrace();\r
- }\r
-\r
- // Event cache is now updated. Perform update on the UI thread\r
- if (!fTable.isDisposed() && !monitor.isCanceled()) {\r
- fTable.getDisplay().asyncExec(new Runnable() {\r
- @Override\r
- public void run() {\r
- if (!fTable.isDisposed()) {\r
- fTable.refresh();\r
- packColumns();\r
- }\r
- populateCompleted();\r
- }\r
- });\r
- }\r
- \r
- // Flag the UI thread that the cache is ready\r
- if (monitor.isCanceled()) {\r
- return Status.CANCEL_STATUS;\r
- } else {\r
- return Status.OK_STATUS;\r
+ if (completed) {\r
+ populateCompleted();\r
+ }\r
+ synchronized (fCacheUpdateSyncObj) {\r
+ fCacheUpdateBusy = false;\r
+ if (fCacheUpdatePending) {\r
+ fCacheUpdatePending = false;\r
+ cacheUpdated(fCacheUpdateCompleted);\r
+ }\r
+ }\r
}\r
- }\r
- };\r
- //job.setSystem(true);\r
- job.setPriority(Job.SHORT);\r
- job.schedule();\r
+ });\r
+ }\r
}\r
-\r
+ \r
protected void populateCompleted() {\r
// Nothing by default;\r
}\r
if (rank != -1) {\r
int index = (int) rank;\r
if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- index = getFilteredEventIndex(rank) + 1; //+1 for top filter status row\r
+ index = fCache.getFilteredEventIndex(rank) + 1; //+1 for top filter status row\r
} else if (rank >= fTable.getItemCount()) {\r
fPendingGotoRank = rank;\r
}\r
int index = (int) rank;\r
if (fTable.isDisposed()) return;\r
if (fTable.getData(Key.FILTER_OBJ) != null) {\r
- index = getFilteredEventIndex(rank) + 1; //+1 for top filter status row\r
+ index = fCache.getFilteredEventIndex(rank) + 1; //+1 for top filter status row\r
}\r
fTable.setSelection(index + 1); // +1 for header row\r
fRawViewer.selectAndReveal(rank);\r
projects / deliverable / tracecompass.git / commitdiff
