[Title] fix network page, uiinteface page

[Desc.] not closed status when failed api, update ui function table
[Issue] -

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config
index d4d563e..fd56116 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config
+++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config
@@ -1,5 +1,5 @@
 Internal call=off
-Platform=tizen2.1
+Platform=tizen2.2
 Build time=09/05/2012 10:30 AM (GMT)
 Snapshot=0
 Selected chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,File,Screenshot,UI event,Disk IO,Network IO

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/user_interface_api_list b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/user_interface_api_list
index 27f257d..fe12f69 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/user_interface_api_list
+++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/user_interface_api_list
@@ -1,2 +1,2 @@
 file :: + Ui`, -Web ;
-api :: -operator`, -GetItemCount`,-Reserved;
\ No newline at end of file
+api :: -operator`, -GetItemCount`,-Reserved`,-Initialize;
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
index 088d376..3529740 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
@@ -131,7 +131,7 @@ public class FileApiListTable extends DAApiListTableComposite {
                        contentData.add(contentTemp.getArgs());
                        contentText.add(Integer.toString(contentTemp.getTid()));
                        contentData.add(Integer.toString(contentTemp.getTid()));
-                       contentText.add(contentTemp.getHexReturn());
+                       contentText.add(Long.toString(contentTemp.getReturn()));
                        contentData.add(Long.toString(contentTemp.getReturn()));
                        String errMsg = ErrorCodeManager.getInatance()
                                        .getErrorCode(contentTemp.getErrno()).name();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
index d72e5ca..79c66b0 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
@@ -206,8 +206,8 @@ public class NetworkApiListTable extends DAApiListTableComposite {
                        contentData.add(contentTemp.getArgs());
                        contentText.add(Integer.toString(contentTemp.getTid()));
                        contentData.add(Integer.toString(contentTemp.getTid()));
-                       contentText.add(contentTemp.getHexReturn());
-                       contentData.add(contentTemp.getHexReturn());
+                       contentText.add(Long.toString(contentTemp.getReturn()));
+                       contentData.add(Long.toString(contentTemp.getReturn()));
 
                        int apiType = contentTemp.getFdApiType();
                        if (apiType == LogCenterConstants.SOCKET_API_SEND_END
@@ -233,7 +233,7 @@ public class NetworkApiListTable extends DAApiListTableComposite {
                        }
                        contentText.add(errMsg);
                        contentData.add(errMsg);
-                       contentText.add(contentTemp.getHexReturn());
+                       contentText.add(Long.toString(contentTemp.getReturn()));
                        contentData.add(Long.toString(contentTemp.getReturn()));
 
                        DATableDataFormat tableData = new DATableDataFormat(

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
index 325aa86..7e98371 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java
@@ -384,10 +384,10 @@ public class NetworkChartData {
                        break;
                }
                case LogCenterConstants.SOCKET_API_CONNECT: {
-                       if (event.isFailedAPI()) {
-                               setFDCloseStatusManager(event);
-                               return;
-                       }
+//                     if (event.isFailedAPI()) {
+//                             setFDCloseStatusManager(event);
+//                             return;
+//                     }
                        if (isParent()) {
                                setConnectedParentStatus(event);
                        } else {
@@ -398,10 +398,10 @@ public class NetworkChartData {
                case LogCenterConstants.SOCKET_API_ACCEPT_START:
                        break;
                case LogCenterConstants.SOCKET_API_ACCEPT_END: {
-                       if (event.isFailedAPI()) {
-                               setFDCloseStatusManager(event);
-                               return;
-                       }
+//                     if (event.isFailedAPI()) {
+//                             setFDCloseStatusManager(event);
+//                             return;
+//                     }
                        if (isParent()) {
                                setConnectedParentStatus(event);
                        } else {
@@ -441,15 +441,15 @@ public class NetworkChartData {
                case LogCenterConstants.SOCKET_API_EVENT_END:
                        break;
                case LogCenterConstants.SOCKET_API_BIND: {
-                       if (event.isFailedAPI() == true) {
-                               setFDCloseStatusManager(event);
-                       }
+//                     if (event.isFailedAPI() == true) {
+//                             setFDCloseStatusManager(event);
+//                     }
                        break;
                }
                case LogCenterConstants.SOCKET_API_LISTEN: {
-                       if (event.isFailedAPI() == true) {
-                               setFDCloseStatusManager(event);
-                       }
+//                     if (event.isFailedAPI() == true) {
+//                             setFDCloseStatusManager(event);
+//                     }
                        break;
                }
                case LogCenterConstants.SOCKET_API_OTHER:

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
index 1565e52..56fc95f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
@@ -80,6 +80,7 @@ public class NetworkDataMaker {
        private HashMap<String, String> parentFDByFdHashMap = new HashMap<String, String>();
 
        private DAChartBoardItem networkTrafficItem;
+       private DAChartBoardItem networkIOItem;
 
        private WarningChecker warningChecker = null;
        private FailedChecker failedChecker = null;
@@ -101,6 +102,7 @@ public class NetworkDataMaker {
                addressByFdHashMap.clear();
                parentFDByFdHashMap.clear();
                networkTrafficItem = null;
+               networkIOItem = null;
                NetworkTrafficChart.getInstance().clear();
 
        }
@@ -146,6 +148,11 @@ public class NetworkDataMaker {
                double time = input.getTime();
                long errno = input.getErrno();
                
+               if(input.getApiName().contains("accept")){
+                       System.out.println(input.getApiName()+" "+apiFD);       
+               }
+               
+               
                int connectedType = 5;
                String parentAddress = addressByFdHashMap.get(apiFD);
                if (null != parentAddress) { // get Address by FD
@@ -164,7 +171,7 @@ public class NetworkDataMaker {
                case LogCenterConstants.SOCKET_API_ACCEPT_START:
                        break;
                case LogCenterConstants.SOCKET_API_ACCEPT_END: {
-                       String clientFD = input.getHexReturn();
+                       String clientFD = Long.toString(input.getReturn());
                        addressByFdHashMap.put(clientFD, parentAddress);
                        if (errno != 0) {
                                NetworkChartDataEvent event = new NetworkChartDataEvent(
@@ -225,7 +232,7 @@ public class NetworkDataMaker {
                        connectedType = NetworkChartDataEvent.NETWORK_CHART_SESSION_NAME;
                        break;
                case LogCenterConstants.HTTP_API_TRANSACTION_OPEN: {
-                       String clientFD = input.getHexReturn();
+                       String clientFD = Long.toString(input.getReturn());
                        String parrentAddress = addressByFdHashMap.get(apiFD);
                        if (null != parrentAddress) {
                                apiAddress = parrentAddress;
@@ -243,7 +250,7 @@ public class NetworkDataMaker {
                        break;
                }
                case LogCenterConstants.HTTP_API_ALLOCATION: {
-                       String clientFD = input.getHexReturn();
+                       String clientFD = Long.toString(input.getReturn());
                        String parretnFD = parentFDByFdHashMap.get(apiFD);
                        if (null != parretnFD) {
                                apiFD = parretnFD;
@@ -280,7 +287,7 @@ public class NetworkDataMaker {
                        break;
                }
                case LogCenterConstants.HTTP_API_RESPONSE: {
-                       String clientFD = input.getHexReturn();
+                       String clientFD = Long.toString(input.getReturn());
                        String parretnFD = parentFDByFdHashMap.get(apiFD);
                        if (null != parretnFD) {
                                apiFD = parretnFD;
@@ -479,6 +486,7 @@ public class NetworkDataMaker {
                                objectName = NetworkPageLabels.NETWORK_CHART_TRANSACTION_NAME;
                        }
 
+                       System.out.println("objectName : "+objectName+" sync.getFD() : "+sync.getFD());
                        item = new DAChartBoardItem(parentItem, objectName + sync.getFD());
 
                        chart = item.getChart();
@@ -516,9 +524,24 @@ public class NetworkDataMaker {
                                return false;
                        }
                        DAChart chart;
-                       networkTrafficItem = NetworkIOChart.getInstance()
+                       networkTrafficItem = NetworkTrafficChart.getInstance()
                                        .createBoardItem(board);
+                       
                        chart = networkTrafficItem.getChart();
+                       initNetworkChart(chart, true);
+               }
+               return true;
+       }
+       
+       private boolean createNetworkIOBoardItem() {
+               if (null == networkIOItem) {
+                       if (null == board) {
+                               return false;
+                       }
+                       DAChart chart;
+                       networkIOItem = NetworkIOChart.getInstance()
+                                       .createBoardItem(board);
+                       chart = networkIOItem.getChart();
                        
                        
                        DAChartPlot plot = chart.getPlot();
@@ -590,6 +613,7 @@ public class NetworkDataMaker {
 
        public void checkUpdate() {
 
+               createNetworkIOBoardItem();
                createNetworkTrafficBoardItem();
 
                if (!AnalyzerManager.isRunning()) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
index ccb64fb..578378a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java
@@ -152,7 +152,7 @@ public class UIFunctionProfilingDataChecker {
                                .get(0).getChildList();
                int size = children.size();
                if (nUserProfilingDataCount == size) {
-                       return;
+       //              return;
                }
                nUserProfilingDataCount = size;
                getUIApiListFile();