From 3a997a608f982b43aa9bcdd32dcd47c54a643c2e Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Fri, 11 Jun 2021 14:22:39 -0400
Subject: [PATCH] GP-931: Converted Thread Timeline to a fancy table column.
---
Ghidra/Debug/Debugger/certification.manifest | 1 -
.../DebuggerThreadsPlugin.html | 13 +-
.../images/DebuggerThreadsPlugin.png | Bin 22293 -> 20520 bytes
.../gui/thread/DebuggerThreadsProvider.java | 111 ++++-----
.../thread/DebuggerThreadsTimelinePanel.java | 185 --------------
.../debug/gui/thread/ThreadTableColumns.java | 27 ++-
.../thread/DebuggerThreadsProviderTest.java | 66 +----
.../docking/widgets/RangeCursorPanel.java | 227 ------------------
.../widgets/RangeCursorValueListener.java | 20 --
.../table/RangeCursorTableHeaderRenderer.java | 131 ++++++++++
.../widgets/table/RangeTableCellRenderer.java | 104 ++++++++
.../table/DemoRangeCellRendererTest.java | 152 ++++++++++++
12 files changed, 468 insertions(+), 569 deletions(-)
delete mode 100644 Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsTimelinePanel.java
delete mode 100644 Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/RangeCursorPanel.java
delete mode 100644 Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/RangeCursorValueListener.java
create mode 100644 Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java
create mode 100644 Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeTableCellRenderer.java
create mode 100644 Ghidra/Debug/ProposedUtils/src/test/java/docking/widgets/table/DemoRangeCellRendererTest.java
diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest
index 6ece02c2da..3ac7ff87b8 100644
--- a/Ghidra/Debug/Debugger/certification.manifest
+++ b/Ghidra/Debug/Debugger/certification.manifest
@@ -117,7 +117,6 @@ src/main/help/help/topics/DebuggerTraceManagerServicePlugin/DebuggerTraceManager
src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html||GHIDRA||||END|
src/main/help/help/topics/DebuggerWatchesPlugin/images/DebuggerWatchesPlugin.png||GHIDRA||||END|
src/main/resources/defaultTools/Debugger.tool||GHIDRA||||END|
-src/main/resources/define_info_proc_mappings||GHIDRA||||END|
src/main/resources/images/add.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
src/main/resources/images/attach.png||GHIDRA||||END|
src/main/resources/images/autoread.png||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html
index 3382768817..92e6c1f23b 100644
--- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html
+++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html
@@ -26,7 +26,7 @@
each thread carries its own execution context, so this window provides a means of navigating
those contexts. Furthermore, this window provides a means of navigating and managing open
traces, much like the static listing provides a means of navigating open programs. The window
- also provides a timeline showing thread lifespans, and displays a caret which can be used to
+ also plots a timeline showing thread lifespans, and displays a caret which can be used to
navigate the current point in time. This window, the Stack window, and the Dynamic Listing window
@@ -50,13 +50,13 @@
Navigating Threads
- Selecting a thread in the timeline or the table will navigate to (or "activate" or "focus")
+
Selecting a thread in the table will navigate to (or "activate" or "focus")
that thread. Windows which are sensitive to the current thread will update. Notably, the Registers window
will display the activated thread's register values. Listing windows with
configured location tracking will re-compute that location with the thread's context and
- navigate to it. The thread timeline displays all recorded threads. Threads which are alive will
+ navigate to it. The thread timeline plots all recorded threads. Threads which are alive will
appear to extend "to the end of time." The threads table displays more detailed information in
the following columns:
@@ -77,12 +77,15 @@
The state always reflects the present, or latest known, state.
Comment - a user-modifiable comment about the thread.
+
+ Plot - a graphical representation of the thread's lifespan. Unlike other column headers, clicking and dragging
+ in this one will navigate through time. To rearrange this column, hold SHIFT while dragging.
Navigating Time
- The user can navigate through time within the current trace by using the caret above the
- threads timeline. There are also actions for "stepping the trace" forward and backward. See the
+
The user can navigate through time within the current trace by using the caret in the plot
+ column header. There are also actions for "stepping the trace" forward and backward. See the
Time window for a way to
display and navigate to specific events in the trace's timeline. Note that stepping away from
the present will prevent most windows from interacting with the live target. While some
diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/images/DebuggerThreadsPlugin.png b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/images/DebuggerThreadsPlugin.png
index 2ad4a4bb743e00a729303096c87a149096bceb97..3810e81bffc034b1d8b968d1a7678415b3f3c2e8 100644
GIT binary patch
literal 20520
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
HP6wWq7Gz$IQR$C?F?bRAi8qGKYz-8
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
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsProvider.java
index e05468951e..8bb047e2f1 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsProvider.java
@@ -23,22 +23,22 @@ import java.util.List;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+
+import com.google.common.collect.Range;
import docking.ActionContext;
import docking.WindowPosition;
import docking.action.*;
-import docking.widgets.EventTrigger;
import docking.widgets.HorizontalTabPanel;
import docking.widgets.HorizontalTabPanel.TabListCellRenderer;
-import docking.widgets.table.GTable;
-import docking.widgets.table.RowWrappedEnumeratedColumnTableModel;
-import docking.widgets.timeline.TimelineListener;
+import docking.widgets.table.*;
import ghidra.app.plugin.core.debug.DebuggerCoordinates;
import ghidra.app.plugin.core.debug.DebuggerPluginPackage;
import ghidra.app.plugin.core.debug.gui.DebuggerResources;
import ghidra.app.plugin.core.debug.gui.DebuggerResources.*;
import ghidra.app.plugin.core.debug.gui.DebuggerSnapActionContext;
-import ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsTimelinePanel.VetoableSnapRequestListener;
import ghidra.app.services.*;
import ghidra.app.services.DebuggerTraceManagerService.BooleanChangeAdapter;
import ghidra.dbg.DebugModelConventions;
@@ -333,30 +333,24 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
private final SuppressableCallback cbCoordinateActivation = new SuppressableCallback<>();
private final ThreadsListener threadsListener = new ThreadsListener();
- private final VetoableSnapRequestListener snapListener = this::snapRequested;
private final CollectionChangeListener recordersListener =
new RecordersChangeListener();
+ /* package access for testing */
+ final RangeTableCellRenderer rangeRenderer = new RangeTableCellRenderer<>();
+ final RangeCursorTableHeaderRenderer headerRenderer =
+ new RangeCursorTableHeaderRenderer<>();
protected final ThreadTableModel threadTableModel = new ThreadTableModel(this);
private JPanel mainPanel;
- private JSplitPane splitPane;
HorizontalTabPanel traceTabs;
GTable threadTable;
GhidraTableFilterPanel threadFilterPanel;
- DebuggerThreadsTimelinePanel threadTimeline;
JPopupMenu traceTabPopupMenu;
private ActionContext myActionContext;
- private final TimelineListener timelineListener = new TimelineListener() {
- @Override
- public void itemActivated(int index) {
- timelineItemActivated(index);
- }
- };
-
DockingAction actionSaveTrace;
StepSnapBackwardAction actionStepSnapBackward;
StepTickBackwardAction actionStepTickBackward;
@@ -464,10 +458,8 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
}
private void doSetSnap(long snap) {
- if (threadTimeline.getSnap() == snap) {
- return;
- }
- threadTimeline.setSnap(snap);
+ headerRenderer.setCursorPosition(snap);
+ threadTable.getTableHeader().repaint();
}
public void traceOpened(Trace trace) {
@@ -508,7 +500,11 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
}
protected void updateTimelineMax() {
- threadTimeline.setMaxSnapAtLeast(orZero(current.getTrace().getTimeManager().getMaxSnap()));
+ long max = orZero(current.getTrace().getTimeManager().getMaxSnap());
+ Range fullRange = Range.closed(0L, max + 1);
+ rangeRenderer.setFullRange(fullRange);
+ headerRenderer.setFullRange(fullRange);
+ threadTable.getTableHeader().repaint();
}
@Override
@@ -524,35 +520,6 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
return myActionContext;
}
- private void snapRequested(long req, EventTrigger trigger) {
- long snap = req;
- if (snap < 0) {
- snap = 0;
- }
- if (current.getTrace() == null) {
- snap = 0;
- }
- /*else {
- Long maxSnap = currentTrace.getTimeManager().getMaxSnap();
- if (maxSnap == null) {
- maxSnap = 0L;
- }
- if (snap > maxSnap) {
- snap = maxSnap;
- }
- }*/
- if (trigger == EventTrigger.GUI_ACTION) {
- traceManager.activateSnap(snap);
- }
- myActionContext = new DebuggerSnapActionContext(snap);
- contextChanged();
- }
-
- private void timelineItemActivated(int index) {
- ThreadRow row = threadTableModel.getRowObject(index);
- rowActivated(row);
- }
-
private void rowActivated(ThreadRow row) {
TraceThread thread = row.getThread();
Trace trace = thread.getTrace();
@@ -569,27 +536,15 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
traceTabPopupMenu = new JPopupMenu("Trace");
mainPanel = new JPanel(new BorderLayout());
- splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
- splitPane.setContinuousLayout(true);
- JPanel tablePanel = new JPanel(new BorderLayout());
threadTable = new GhidraTable(threadTableModel);
threadTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- tablePanel.add(new JScrollPane(threadTable));
+ mainPanel.add(new JScrollPane(threadTable));
+
threadFilterPanel = new GhidraTableFilterPanel<>(threadTable, threadTableModel);
- tablePanel.add(threadFilterPanel, BorderLayout.SOUTH);
- splitPane.setLeftComponent(tablePanel);
-
- threadTimeline = new DebuggerThreadsTimelinePanel(threadFilterPanel.getTableFilterModel());
- splitPane.setRightComponent(threadTimeline);
-
- splitPane.setResizeWeight(0.4);
+ mainPanel.add(threadFilterPanel, BorderLayout.SOUTH);
threadTable.getSelectionModel().addListSelectionListener(this::threadRowSelected);
- threadTimeline.setSelectionModel(threadTable.getSelectionModel());
- threadTimeline.addSnapRequestedListener(snapListener);
- threadTimeline.addTimelineListener(timelineListener);
-
threadTable.addMouseListener(new MouseAdapter() {
@Override
public void mouseReleased(MouseEvent e) {
@@ -599,8 +554,6 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
}
});
- mainPanel.add(splitPane, BorderLayout.CENTER);
-
traceTabs = new HorizontalTabPanel<>();
traceTabs.getList().setCellRenderer(new TabListCellRenderer<>() {
protected String getText(Trace value) {
@@ -633,6 +586,32 @@ public class DebuggerThreadsProvider extends ComponentProviderAdapter {
});
// TODO: The popup key? Only seems to have rawCode=0x93 (147) in Swing
mainPanel.add(traceTabs, BorderLayout.NORTH);
+
+ TableColumnModel columnModel = threadTable.getColumnModel();
+ TableColumn colName = columnModel.getColumn(ThreadTableColumns.NAME.ordinal());
+ colName.setPreferredWidth(100);
+ TableColumn colCreated = columnModel.getColumn(ThreadTableColumns.CREATED.ordinal());
+ colCreated.setPreferredWidth(10);
+ TableColumn colDestroyed = columnModel.getColumn(ThreadTableColumns.DESTROYED.ordinal());
+ colDestroyed.setPreferredWidth(10);
+ TableColumn colState = columnModel.getColumn(ThreadTableColumns.STATE.ordinal());
+ colState.setPreferredWidth(20);
+ TableColumn colComment = columnModel.getColumn(ThreadTableColumns.COMMENT.ordinal());
+ colComment.setPreferredWidth(100);
+ TableColumn colPlot = columnModel.getColumn(ThreadTableColumns.PLOT.ordinal());
+ colPlot.setPreferredWidth(200);
+ colPlot.setCellRenderer(rangeRenderer);
+ colPlot.setHeaderRenderer(headerRenderer);
+
+ headerRenderer.addSeekListener(threadTable, ThreadTableColumns.PLOT.ordinal(), pos -> {
+ long snap = Math.round(pos);
+ if (current.getTrace() == null || snap < 0) {
+ snap = 0;
+ }
+ traceManager.activateSnap(snap);
+ myActionContext = new DebuggerSnapActionContext(snap);
+ contextChanged();
+ });
}
private void checkTraceTabPopupViaMouse(MouseEvent e) {
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsTimelinePanel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsTimelinePanel.java
deleted file mode 100644
index dacb0ada5c..0000000000
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/DebuggerThreadsTimelinePanel.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/* ###
- * IP: GHIDRA
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package ghidra.app.plugin.core.debug.gui.thread;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.util.List;
-
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-
-import com.google.common.collect.Range;
-
-import docking.widgets.*;
-import docking.widgets.RangeCursorPanel.Direction;
-import docking.widgets.table.RowObjectTableModel;
-import docking.widgets.timeline.TimelineListener;
-import docking.widgets.timeline.TimelinePanel;
-import ghidra.app.services.DebuggerModelService;
-import ghidra.trace.model.thread.TraceThread;
-import ghidra.util.datastruct.ListenerSet;
-
-public class DebuggerThreadsTimelinePanel extends JScrollPane {
- static class SnapRequestVetoedException extends Exception {
- private final long requestedSnap;
- private final long newSnap;
-
- public SnapRequestVetoedException(long requestedSnap, long newSnap) {
- this.requestedSnap = requestedSnap;
- this.newSnap = newSnap;
- }
-
- public long getRequestedSnap() {
- return requestedSnap;
- }
-
- public long getNewSnap() {
- return newSnap;
- }
- }
-
- public interface VetoableSnapRequestListener {
- void snapRequested(long snap, EventTrigger trigger) throws SnapRequestVetoedException;
- }
-
- protected class ThreadTimelinePanel extends TimelinePanel {
- protected final RowObjectTableModel model;
-
- public ThreadTimelinePanel(RowObjectTableModel model) {
- super(model, ThreadRow::getLifespan);
- this.model = model;
- }
- }
-
- protected class ThreadRangeCursorPanel extends RangeCursorPanel {
- public ThreadRangeCursorPanel(Direction direction) {
- super(direction);
- }
-
- @Override
- protected double adjustRequestedValue(double requested) {
- double rounded = Math.round(requested);
- // TODO: Also remove 1-snap view buffer?
- // Until I figure out the event processing order, leaving the buffer
- // prevents some stepping glitches.
- if (range.hasLowerBound() && rounded < range.lowerEndpoint() /*+1*/) {
- return range.lowerEndpoint(); // +1
- }
- if (range.hasUpperBound() && rounded > range.upperEndpoint() /*-1*/) {
- return range.upperEndpoint(); // -1
- }
- return rounded;
- }
- }
-
- protected final ThreadTimelinePanel timeline;
- protected final RangeCursorPanel topCursor = new ThreadRangeCursorPanel(Direction.SOUTH) {
- Dimension preferredSize = new Dimension(super.getPreferredSize());
-
- @Override
- public Dimension getPreferredSize() {
- preferredSize.width = timeline.getPreferredSize().width;
- return preferredSize;
- }
- };
- protected final ListenerSet listeners =
- new ListenerSet<>(VetoableSnapRequestListener.class);
- protected final RangeCursorValueListener valueListener = this::cursorValueChanged;
- protected final TimelineListener timelineListener = new TimelineListener() {
- @Override
- public void viewRangeChanged(Range range) {
- timelineViewRangeChanged(range);
- }
- };
- private DebuggerModelService modelService;
- private RowObjectTableModel model;
-
- public DebuggerThreadsTimelinePanel(RowObjectTableModel model) {
- this.model = model;
- setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-
- timeline = new ThreadTimelinePanel(model);
- setViewportView(timeline);
- setColumnHeaderView(topCursor);
-
- topCursor.addValueListener(valueListener);
- timeline.addTimelineListener(timelineListener);
- }
-
- public void addSnapRequestedListener(VetoableSnapRequestListener listener) {
- listeners.add(listener);
- }
-
- private void cursorValueChanged(double value, EventTrigger trigger) {
- try {
- listeners.fire.snapRequested(Math.round(value), trigger);
- }
- catch (SnapRequestVetoedException e) {
- value = e.getNewSnap();
- }
- }
-
- private void timelineViewRangeChanged(Range range) {
- topCursor.setRange(range);
- }
-
- public void setSelectionModel(ListSelectionModel selectionModel) {
- timeline.setSelectionModel(selectionModel);
- }
-
- public void setSnap(long snap) {
- topCursor.requestValue(snap);
- }
-
- public long getSnap() {
- // TODO: If there are enough snaps, we may not have the required precision
- // Consider BigDecimal in cursor? Eww.
- return (long) topCursor.getValue();
- }
-
- public void setMaxSnapAtLeast(long maxSnapAtLeast) {
- timeline.setMaxAtLeast(maxSnapAtLeast);
- }
-
- public long getMaxSnapAtLeast() {
- return (long) timeline.getMaxAtLeast();
- }
-
- public ThreadRow findRow(TraceThread thread) {
- RowObjectTableModel model = timeline.getTableModel();
- List data = model.getModelData();
- for (ThreadRow row : data) {
- if (row.getThread() == thread) {
- return row;
- }
- }
- return null;
- }
-
- public Rectangle getCellBounds(TraceThread thread) {
- ThreadRow row = findRow(thread);
- if (row == null) {
- return null;
- }
- return timeline.getCellBounds(row);
- }
-
- public void addTimelineListener(TimelineListener listener) {
- timeline.addTimelineListener(listener);
- }
-}
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/ThreadTableColumns.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/ThreadTableColumns.java
index 4c4c7d08d5..ba42286dec 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/ThreadTableColumns.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/thread/ThreadTableColumns.java
@@ -18,31 +18,37 @@ package ghidra.app.plugin.core.debug.gui.thread;
import java.util.function.BiConsumer;
import java.util.function.Function;
+import com.google.common.collect.Range;
+
import docking.widgets.table.DefaultEnumeratedColumnTableModel.EnumeratedTableColumn;
public enum ThreadTableColumns implements EnumeratedTableColumn {
- NAME("Name", String.class, ThreadRow::getName, ThreadRow::setName),
- CREATED("Created", Long.class, ThreadRow::getCreationSnap),
- DESTROYED("Destroyed", String.class, ThreadRow::getDestructionSnap),
- STATE("State", ThreadState.class, ThreadRow::getState),
- COMMENT("Comment", String.class, ThreadRow::getComment, ThreadRow::setComment);
+ NAME("Name", String.class, ThreadRow::getName, ThreadRow::setName, true),
+ CREATED("Created", Long.class, ThreadRow::getCreationSnap, true),
+ DESTROYED("Destroyed", String.class, ThreadRow::getDestructionSnap, true),
+ STATE("State", ThreadState.class, ThreadRow::getState, true),
+ COMMENT("Comment", String.class, ThreadRow::getComment, ThreadRow::setComment, true),
+ PLOT("Plot", Range.class, ThreadRow::getLifespan, false);
private final String header;
private final Function getter;
private final BiConsumer setter;
+ private final boolean sortable;
private final Class cls;
- ThreadTableColumns(String header, Class