[Title]thread page update, thread probe update

[Type]thread page
[Module]
[Priority]high
[CQ#]
[Redmine#]5322,5793
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_osp.so b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_osp.so
index 10a6490..1aa0cd1 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_osp.so and b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_osp.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_tizen.so b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_tizen.so
index b86d379..bec85d4 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_tizen.so and b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/arm/da_probe_tizen.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_osp.so b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_osp.so
index ac811f9..7f926d3 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_osp.so and b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_osp.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_tizen.so b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_tizen.so
index b86d379..6b11934 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_tizen.so and b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/target/x86/da_probe_tizen.so differ

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/MessageProcess.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/MessageProcess.java
index ef5da47..24fd34d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/MessageProcess.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/MessageProcess.java
@@ -179,9 +179,8 @@ public class MessageProcess {
        private void processImage(final String from) {
                final String fileName = getImageName(from);
                final String to = AnalyzerManager.getProject().getSavePath()
-                       + File.separator
-                               + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator
-                               + fileName;
+                               + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME
+                               + File.separator + fileName;
 
                new Thread(null, new Runnable() {
                        @Override
@@ -228,7 +227,7 @@ public class MessageProcess {
                });
                System.out
                                .println("stop log process thread call by process terminated"); //$NON-NLS-1$
-//             AnalyzerManager.runStopLogProcessThread();
+               // AnalyzerManager.runStopLogProcessThread();
 
                ResourceCommunicator.setCallStop(false);
        }
@@ -305,12 +304,13 @@ public class MessageProcess {
                                @Override
                                public void run() {
                                        StateManager.getInstance().StopProcessStart(
-                                                       AnalyzerLabels.STOP_PROCESS_DLG_ERROR_3);       //socket timeout
+                                                       AnalyzerLabels.STOP_PROCESS_DLG_ERROR_3); // socket
+                                                                                                                                               // timeout
                                }
                        });
                        System.out
                                        .println("stop log process thread call by socket time out"); //$NON-NLS-1$
-//                     AnalyzerManager.runStopLogProcessThread();
+                       // AnalyzerManager.runStopLogProcessThread();
 
                } finally {
                        message = null;
@@ -332,8 +332,7 @@ public class MessageProcess {
                                                        AnalyzerLabels.STOP_PROCESS_DLG_ERROR_2);
                                }
                        });
-                       System.out
-            .println("finally part run stop log process thread"); //$NON-NLS-1$
+                       System.out.println("finally part run stop log process thread"); //$NON-NLS-1$
                        AnalyzerManager.runStopLogProcessThread();
                }
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/LogCenterConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/LogCenterConstants.java
index bf6fb14..5f138d2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/LogCenterConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/LogCenterConstants.java
@@ -57,6 +57,7 @@ public class LogCenterConstants {
 
        public static final int FD_TYPE_FILE = 0;
        public static final int FD_TYPE_SOCKET = 1;
+       public static final int FD_TYPE_THREAD = 2;
 
        public static final String FD_API_TYPE_OPEN = "0"; //$NON-NLS-1$
        public static final String FD_API_TYPE_CLOSE = "1"; //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java
index a29aeb6..2eea00d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/pageInfo/PageDataManager.java
@@ -199,19 +199,15 @@ public abstract class PageDataManager {
        public void clear() {
                if (null != rows) {
                        rows.clear();
-                       rows = null;
                }
                if (null != column) {
                        column.clear();
-                       column = null;
                }
                // if(null != warning){
                // warning.clear();
-               // warning = null;
                // }
                if (null != failed) {
                        failed.clear();
-                       failed = null;
                }
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadChartView.java
index 21833d1..b386f3f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadChartView.java
@@ -1,7 +1,6 @@
 package org.tizen.dynamicanalyzer.ui.views.threadPage;
 
 import org.eclipse.nebula.widgets.grid.Grid;
-import org.eclipse.nebula.widgets.grid.GridItem;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -47,8 +46,8 @@ public class ThreadChartView extends DAView {
                                        return;
                                }
                                PageChartItem item = threadChart.GetItems().get(chart.getSelectionIndex());
-                               System.out.println("threadChart item" + threadChart.GetItems().get(chart.getSelectionIndex())); //$NON-NLS-1$
-                               System.out.println("item select!!!!" + ((Grid)(e.widget)).getSelectionIndex()); //$NON-NLS-1$
+//                             System.out.println("threadChart item" + threadChart.GetItems().get(chart.getSelectionIndex())); //$NON-NLS-1$
+//                             System.out.println("item select!!!!" + ((Grid)(e.widget)).getSelectionIndex()); //$NON-NLS-1$
                                DASelectionData data = new DASelectionData(ID, 0, 0, item, chart);
                                AnalyzerManager.getCurrentPage().updatePage(data);
                        }
@@ -74,6 +73,7 @@ public class ThreadChartView extends DAView {
        @Override
        public void clear() {
                threadChart.clear();
+               ThreadPageDataManager.getInstance().clear();
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java
index 9220bbd..69d29cf 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/threadPage/ThreadPageDataManager.java
@@ -69,14 +69,13 @@ public class ThreadPageDataManager extends PageDataManager {
 
                for (int i = 0; i < size; i++) {
                        List<String> input = inputs.get(i);
-
                        if (AnalyzerUtil.isInternal(input, false)) {
                                continue;
                        }
                        String fdType = input.get(LogCenterConstants.RESOURCE_FDTYPE_INDEX);
 
                        int type = Integer.parseInt(fdType);
-                       if (type != 2) {
+                       if (type != LogCenterConstants.FD_TYPE_THREAD) {
                                continue;
                        }
                        ret.add(input);
@@ -129,7 +128,6 @@ public class ThreadPageDataManager extends PageDataManager {
 
        public void clear() {
                super.clear();
-               instance = null;
+//             instance = null;
        }
-
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChart.java
index 570bd44..467fbbe 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChart.java
@@ -356,6 +356,7 @@ public class DAPageChart extends Composite {
 
        public void clear() {
                chart.removeAll();
+               items.clear();
        }
 
        private long ComputeTumbTime() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChartTimelineCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChartTimelineCellRenderer.java
index 31bf43d..e7514ef 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChartTimelineCellRenderer.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAPageChart/DAPageChartTimelineCellRenderer.java
@@ -48,6 +48,7 @@ public class DAPageChartTimelineCellRenderer extends DefaultCellRenderer {
 
                PageChartGraphItem graphItem;
                int graphItemSize;
+               long startPeriodTime = 0;
                if (null != graphItems) {
                        graphItemSize = graphItems.size();
                        // draw period
@@ -56,29 +57,31 @@ public class DAPageChartTimelineCellRenderer extends DefaultCellRenderer {
                                graphItem = graphItems.get(i);
                                if((graphItem.getStyle() & PageChartGraphItem.PAGECHART_GRAPHITEM_STATUS_EVENT_PERIOD_START) != 0){
                                        bPeriodStart = true;
-                                       long startPeriodTime = graphItem.getX();
+                                       startPeriodTime = graphItem.getX();
                                        for(; i < graphItemSize; i++){
                                                graphItem = graphItems.get(i);
                                                if((graphItem.getStyle() & PageChartGraphItem.PAGECHART_GRAPHITEM_STATUS_EVENT_PERIOD_END) != 0){
                                                        long endPeriodTime = graphItem.getX();
                                                        if(endPeriodTime > startTime){
                                                                drawPeriod(gc, startPeriodTime, endPeriodTime, true);
-                                                               bPeriodStart = false;
                                                        }
+                                                       bPeriodStart = false;
                                                        break;
                                                }
                                                else{
                                                        continue;
                                                }
                                        }
-                                       if(bPeriodStart == true){
-                                               drawPeriod(gc, startPeriodTime, lastTime, false);
-                                       }
+//                                     if(bPeriodStart == true){
+//                                             drawPeriod(gc, startPeriodTime, lastTime, false);
+//                                             bPeriodStart = false;
+//                                     }
                                }
                        }
-                       if (graphItemSize > 1) {
-                               drawPeriod(gc, graphItems.get(0).getX(),
-                                               graphItems.get(graphItemSize - 1).getX(), false);
+                       if (bPeriodStart == true && graphItemSize > 1) {
+                               drawPeriod(gc, startPeriodTime, lastTime, false);
+//                             drawPeriod(gc, graphItems.get(0).getX(),
+//                                             graphItems.get(graphItemSize - 1).getX(), false);
                        }
                        
                        // draw event