From b1b156f3f206909779f2bc2464dcd0206bdaaf2b Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Mon, 22 Jul 2013 18:16:13 -0400 Subject: [PATCH] tmf: Improved toString methods for debugging Change-Id: Idbc64d3d9e2d4870618978122e35d0acd6b8be9d Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/14761 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann --- .../kernel/ui/views/controlflow/ControlFlowEntry.java | 4 ++++ .../core/tests/request/TmfCoalescedDataRequestTest.java | 8 ++++---- .../core/tests/request/TmfCoalescedEventRequestTest.java | 8 ++++---- .../tmf/core/tests/request/TmfDataRequestTest.java | 8 ++++---- .../tmf/core/tests/request/TmfEventRequestTest.java | 8 ++++---- .../tmf/core/request/TmfCoalescedDataRequest.java | 5 +++-- .../tmf/core/request/TmfCoalescedEventRequest.java | 5 +++-- .../linuxtools/tmf/core/request/TmfDataRequest.java | 9 +++++++-- .../linuxtools/tmf/core/request/TmfEventRequest.java | 9 +++++++-- .../tmf/ui/widgets/timegraph/model/TimeEvent.java | 2 +- .../tmf/ui/widgets/timegraph/model/TimeGraphEntry.java | 5 +++++ 11 files changed, 46 insertions(+), 25 deletions(-) diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java index d12a863091..60a752243e 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowEntry.java @@ -82,4 +82,8 @@ public class ControlFlowEntry extends TimeGraphEntry { return fThreadQuark; } + @Override + public String toString() { + return getClass().getSimpleName() + '(' + getName() + '[' + fThreadId + "])"; //$NON-NLS-1$ + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java index c0771e0412..5479df307c 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java @@ -219,10 +219,10 @@ public class TmfCoalescedDataRequestTest { @Test public void testToString() { - String expected1 = "[TmfCoalescedDataRequest(0,ITmfEvent,10,100,200)]"; - String expected2 = "[TmfCoalescedDataRequest(1,ITmfEvent,20,100,200)]"; - String expected3 = "[TmfCoalescedDataRequest(2,ITmfEvent,20,200,200)]"; - String expected4 = "[TmfCoalescedDataRequest(3,ITmfEvent,20,200,300)]"; + String expected1 = "[TmfCoalescedDataRequest(0,ITmfEvent,FOREGROUND,10,100,200, [])]"; + String expected2 = "[TmfCoalescedDataRequest(1,ITmfEvent,FOREGROUND,20,100,200, [])]"; + String expected3 = "[TmfCoalescedDataRequest(2,ITmfEvent,FOREGROUND,20,200,200, [])]"; + String expected4 = "[TmfCoalescedDataRequest(3,ITmfEvent,FOREGROUND,20,200,300, [])]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java index 61f427fad2..55b457f9a7 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java @@ -256,10 +256,10 @@ public class TmfCoalescedEventRequestTest { @Test public void testToString() { - String expected1 = "[TmfCoalescedEventRequest(0,ITmfEvent," + range1 + ",0,100,200)]"; - String expected2 = "[TmfCoalescedEventRequest(1,ITmfEvent," + range2 + ",0,100,200)]"; - String expected3 = "[TmfCoalescedEventRequest(2,ITmfEvent," + range2 + ",0,200,200)]"; - String expected4 = "[TmfCoalescedEventRequest(3,ITmfEvent," + range2 + ",0,200,300)]"; + String expected1 = "[TmfCoalescedEventRequest(0,ITmfEvent,FOREGROUND," + range1 + ",0,100,200, [])]"; + String expected2 = "[TmfCoalescedEventRequest(1,ITmfEvent,FOREGROUND," + range2 + ",0,100,200, [])]"; + String expected3 = "[TmfCoalescedEventRequest(2,ITmfEvent,FOREGROUND," + range2 + ",0,200,200, [])]"; + String expected4 = "[TmfCoalescedEventRequest(3,ITmfEvent,FOREGROUND," + range2 + ",0,200,300, [])]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java index bd0ad315c0..520649a1df 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java @@ -214,10 +214,10 @@ public class TmfDataRequestTest { @Test public void testToString() { - String expected1 = "[TmfDataRequest(0,ITmfEvent,10,100,200)]"; - String expected2 = "[TmfDataRequest(1,ITmfEvent,20,100,200)]"; - String expected3 = "[TmfDataRequest(2,ITmfEvent,20,200,200)]"; - String expected4 = "[TmfDataRequest(3,ITmfEvent,20,200,300)]"; + String expected1 = "[TmfDataRequestStub(0,ITmfEvent,FOREGROUND,10,100,200)]"; + String expected2 = "[TmfDataRequestStub(1,ITmfEvent,FOREGROUND,20,100,200)]"; + String expected3 = "[TmfDataRequestStub(2,ITmfEvent,FOREGROUND,20,200,200)]"; + String expected4 = "[TmfDataRequestStub(3,ITmfEvent,FOREGROUND,20,200,300)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java index e1b0ce369e..ff66f6d8c0 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java @@ -235,10 +235,10 @@ public class TmfEventRequestTest { @Test public void testToString() { - String expected1 = "[TmfEventRequest(0,ITmfEvent," + range1 + ",0,100,200)]"; - String expected2 = "[TmfEventRequest(1,ITmfEvent," + range2 + ",0,100,200)]"; - String expected3 = "[TmfEventRequest(2,ITmfEvent," + range2 + ",0,200,200)]"; - String expected4 = "[TmfEventRequest(3,ITmfEvent," + range2 + ",0,200,300)]"; + String expected1 = "[TmfEventRequestStub(0,ITmfEvent,FOREGROUND," + range1 + ",0,100,200)]"; + String expected2 = "[TmfEventRequestStub(1,ITmfEvent,FOREGROUND," + range2 + ",0,100,200)]"; + String expected3 = "[TmfEventRequestStub(2,ITmfEvent,FOREGROUND," + range2 + ",0,200,200)]"; + String expected4 = "[TmfEventRequestStub(3,ITmfEvent,FOREGROUND," + range2 + ",0,200,300)]"; assertEquals("toString", expected1, fRequest1.toString()); assertEquals("toString", expected2, fRequest2.toString()); diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java index 0b29fad6d3..7968a2a910 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java @@ -344,7 +344,8 @@ public class TmfCoalescedDataRequest extends TmfDataRequest { @Override @SuppressWarnings("nls") public String toString() { - return "[TmfCoalescedDataRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + return "[TmfCoalescedDataRequest(" + getRequestId() + "," + getDataType().getSimpleName() + + "," + getExecType() + "," + getIndex() + "," + getNbRequested() + "," + + getBlockSize() + ", " + fRequests.toString() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java index b75cd1d547..d7eac1d019 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java @@ -280,8 +280,9 @@ public class TmfCoalescedEventRequest extends TmfCoalescedDataRequest implements @Override @SuppressWarnings("nls") public String toString() { - return "[TmfCoalescedEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getRange() + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + return "[TmfCoalescedEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() + + "," + getExecType() + "," + getRange() + "," + getIndex() + "," + getNbRequested() + + "," + getBlockSize() + ", " + fRequests.toString() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java index 6741bb08bd..763138013b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfDataRequest.java @@ -544,7 +544,12 @@ public abstract class TmfDataRequest implements ITmfDataRequest { @Override @SuppressWarnings("nls") public String toString() { - return "[TmfDataRequest(" + fRequestId + "," + fDataType.getSimpleName() + "," + fIndex + "," + fNbRequested - + "," + getBlockSize() + ")]"; + String name = getClass().getName(); + int dot = name.lastIndexOf('.'); + if (dot >= 0) { + name = name.substring(dot + 1); + } + return "[" + name + "(" + fRequestId + "," + fDataType.getSimpleName()+ "," + getExecType() + + "," + fIndex + "," + fNbRequested + "," + getBlockSize() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java index 4b97e97658..11f966f359 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/request/TmfEventRequest.java @@ -222,8 +222,13 @@ public abstract class TmfEventRequest extends TmfDataRequest implements ITmfEven @Override @SuppressWarnings("nls") public String toString() { - return "[TmfEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() - + "," + getRange() + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; + String name = getClass().getName(); + int dot = name.lastIndexOf('.'); + if (dot >= 0) { + name = name.substring(dot + 1); + } + return "[" + name + "(" + getRequestId() + "," + getDataType().getSimpleName() + "," + getExecType() + + "," + getRange() + "," + getIndex() + "," + getNbRequested() + "," + getBlockSize() + ")]"; } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeEvent.java index 8b1db841ce..8aeade9f37 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeEvent.java @@ -110,6 +110,6 @@ public class TimeEvent implements ITimeEvent { @Override public String toString() { - return "TimeEvent start=" + fTime + " end=" + (fTime + fDuration) + " duration=" + fDuration + " value=" + (hasValue() ? fValue : "N/A"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + return getClass().getSimpleName() + " start=" + fTime + " end=" + (fTime + fDuration) + " duration=" + fDuration + (hasValue() ? (" value=" + fValue) : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeGraphEntry.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeGraphEntry.java index f338cdbcee..dafb900f7a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeGraphEntry.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/model/TimeGraphEntry.java @@ -224,4 +224,9 @@ public class TimeGraphEntry implements ITimeGraphEntry { fChildren.add(child); } + @Override + public String toString() { + return getClass().getSimpleName() + '(' + fName + ')'; + } + } -- 2.34.1