SRADA-1110: removed Live column in AllocationTraceTable

Also changed tab header for MemoryAllocationTraceTableView:
 'Allocation Trace' -> 'Persistent Allocations'

Change-Id: I1f9c3d95a477b09732cbea56e0b5c501101f6fd9

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MemoryPageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MemoryPageLabels.properties
index 4f9a071..0130c55 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MemoryPageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/MemoryPageLabels.properties
@@ -3,7 +3,7 @@ MEMORY_MAP_VIEW_TITLE=Memory Map
 MEMORY_CALLSTACK_VIEW_TITLE=CallStack\r
 MEMORY_DETAILS_VIEW_TITLE=Details\r
 MEMORY_STATISTICS_VIEW_TITLE=Statistics\r
-MEMORY_ALLOCATION_TRACE_VIEW_TITLE=Allocation Trace\r
+MEMORY_ALLOCATION_TRACE_VIEW_TITLE=Persistent Allocations\r
 MEMORY_MAIN_EXCUTABLE=Main Executable\r
 \r
 MEMORY_DETAILS_VIEW_ITEM\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryAllocationTraceTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryAllocationTraceTableView.java
index e5d8d9b..d47c72d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryAllocationTraceTableView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/MemoryAllocationTraceTableView.java
@@ -54,8 +54,8 @@ public class MemoryAllocationTraceTableView extends DAViewComposite {
        private boolean firstUpdate;
        private boolean tableVisible;
        
-       private boolean[] columnVisibilityEnable = { false, true, true, true, true, true, true, true, true, true, false };
-       private boolean[] columnVisibilityDisable = { false, false, false, false, false, false, false, false, false, false, true };
+       private boolean[] columnVisibilityEnable = { false, true, true, true, true, true, true, true, true, false };
+       private boolean[] columnVisibilityDisable = { false, false, false, false, false, false, false, false, false, true };
        
        public MemoryAllocationTraceTableView(Composite parent, int style) {
                super(parent, style, false);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/data/HeapDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/data/HeapDataManager.java
index b87bcda..94dd15e 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/data/HeapDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/data/HeapDataManager.java
@@ -559,25 +559,22 @@ public class HeapDataManager extends PageDataManager {
                int tid = (Integer) allocData.get(MemAllocDBTable.COLUMN.TID.index);
                text.add(Integer.toString(tid));
                data.add(tid);
-               // 4 : live
-               text.add("O");
-               data.add("O");
-               // 5 : address
+               // 4 : address
                Long address = (Long) allocData.get(MemAllocDBTable.COLUMN.ALLOCATED_ADDRESS.index); 
                text.add("0x" + Long.toHexString(address));
                data.add(address);
-               // 6 : size
+               // 5 : size
                Long size = (Long) allocData.get(MemAllocDBTable.COLUMN.ALLOCATED_MEMORY_SIZE.index); 
                text.add(Long.toString(size));
                data.add(size);
-               // 7 : library name
+               // 6 : library name
                String libName = Global.getLibraryName((Integer)allocData.get(MemAllocDBTable.COLUMN.CALLER_LIBRARY_ID.index));
                if (libName == null || libName.isEmpty()) {
                        libName = AnalyzerConstants.UNKNOWN_LIB;
                }
                text.add(libName);
                data.add(libName);
-               // 8 : api type
+               // 7 : api type
                int apiId = (Integer) allocData.get(MemAllocDBTable.COLUMN.API_ID.index);
                String apiName = Global.getFunctionName(apiId);
                text.add(apiName);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java
index 0cd68b6..a7469b3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/memory/table/MemoryAllocationTraceTable.java
@@ -60,13 +60,12 @@ public class MemoryAllocationTraceTable extends DATableComposite {
                TIMESTAMP(1),
                PID(2),
                TID(3),
-               LIVE(4),
-               ALLOCATED_ADDRESS(5),
-               SIZE(6),
-               LIBRARY(7),
-               CALLED(8),
-               EMPTY(9),
-               RUNTIME_STUB(10);
+               ALLOCATED_ADDRESS(4),
+               SIZE(5),
+               LIBRARY(6),
+               CALLED(7),
+               EMPTY(8),
+               RUNTIME_STUB(9);
 
                private int index;
                private MemoryAllocationTraceTableIndex(int index){
@@ -81,19 +80,18 @@ public class MemoryAllocationTraceTable extends DATableComposite {
        private int COLUMN_SIZE__TIMESTAMP = 105;
        private int COLUMN_SIZE__PID = 40;
        private int COLUMN_SIZE__TID = 40;
-       private int COLUMN_SIZE__LIVE = 45;
        private int COLUMN_SIZE__ALLOCATED_ADDRESS = 90;
        private int COLUMN_SIZE__SIZE = 45;
        private int COLUMN_SIZE__LIBRARY = 205;
        private int COLUMN_SIZE__CALLED = 115;
 
        private int[] columnSizes = { COLUMN_SIZE__SEQ, COLUMN_SIZE__TIMESTAMP,
-                       COLUMN_SIZE__PID, COLUMN_SIZE__TID, COLUMN_SIZE__LIVE,
+                       COLUMN_SIZE__PID, COLUMN_SIZE__TID,
                        COLUMN_SIZE__ALLOCATED_ADDRESS, COLUMN_SIZE__SIZE, COLUMN_SIZE__LIBRARY,
                        COLUMN_SIZE__CALLED, 15, 800 };
 
        private int[] columnAlignment = { SWT.RIGHT, SWT.CENTER, SWT.RIGHT,
-                       SWT.RIGHT, SWT.CENTER, SWT.RIGHT, SWT.RIGHT, SWT.LEFT, SWT.CENTER,
+                       SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.LEFT, SWT.CENTER,
                        SWT.LEFT, SWT.CENTER };
        
        private Long StartTime;
@@ -104,7 +102,6 @@ public class MemoryAllocationTraceTable extends DATableComposite {
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_TIMESTAMP,
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_PID,
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_TID,
-                       MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_LIVE,
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_ALLOCATED_ADDRESS,
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_SIZE,
                        MemoryPageLabels.MEMORY_ALLOCATION_TRACE_VIEW_LIBRARY,
@@ -113,13 +110,13 @@ public class MemoryAllocationTraceTable extends DATableComposite {
                        "Streaming is not supported. Please select range or stop Tracing"
        };
        
-       int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
+       int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM,
-                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NONE, 
-                       AnalyzerConstants.SORT_TYPE_STRING
-       };
+                       AnalyzerConstants.SORT_TYPE_STRING,
+                       AnalyzerConstants.SORT_TYPE_NONE,
+                       AnalyzerConstants.SORT_TYPE_STRING };
 
        public MemoryAllocationTraceTable(Composite parent, int style, int tableStyle) {
                super(parent, style, tableStyle);