From: Hyunjong,park Date: Wed, 30 Oct 2013 11:23:57 +0000 (+0900) Subject: [Title] change traffic chart to network io chart X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3303e212cda58efd7d013011f0e416e922f0fb7;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] change traffic chart to network io chart [Desc.] network page [Issue] - --- 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 881833b..79c66b0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java @@ -46,6 +46,7 @@ import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; @@ -198,8 +199,8 @@ public class NetworkApiListTable extends DAApiListTableComposite { contentText.add(contentTemp.getApiName()); contentData.add(contentTemp.getApiName()); - contentText.add(Long.toString(contentTemp.getObjectAddress())); - contentData.add(Long.toString(contentTemp.getObjectAddress())); + contentText.add(AnalyzerUtil.toHexdecimal(contentTemp.getObjectAddress())); + contentData.add(AnalyzerUtil.toHexdecimal(contentTemp.getObjectAddress())); contentText.add(contentTemp.getArgs()); contentData.add(contentTemp.getArgs()); 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 8a51334..d8b1783 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java @@ -33,7 +33,6 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; -import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; @@ -56,6 +55,7 @@ import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDetector; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningCase; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; +import org.tizen.dynamicanalyzer.ui.timeline.chart.NetworkIOChart; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -84,8 +84,6 @@ public class NetworkDataMaker { private WarningChecker warningChecker = null; private FailedChecker failedChecker = null; - private final String E_SUCCESS = "E_SUCCESS"; //$NON-NLS-1$ - public NetworkDataMaker(FailedChecker failedChecker, LeakDetector leakDetector, WarningChecker warningChecker) { this.failedChecker = failedChecker; @@ -146,10 +144,9 @@ public class NetworkDataMaker { String apiName = input.getApiName(); int apiType = input.getFdApiType(); double time = input.getTime(); - String errMsg = ErrorCodeManager.getInatance().getErrorCode( - Long.toString(input.getErrno())); + long errno = input.getErrno(); + int connectedType = 5; - String parentAddress = addressByFdHashMap.get(apiFD); if (null != parentAddress) { // get Address by FD apiAddress = parentAddress; @@ -169,7 +166,7 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_ACCEPT_END: { String clientFD = Long.toString(input.getReturn()); addressByFdHashMap.put(clientFD, parentAddress); - if (!errMsg.contains(E_SUCCESS)) { + if (errno != 0) { NetworkChartDataEvent event = new NetworkChartDataEvent( apiAddress, apiFD, apiThread, time, apiName, apiType, NetworkChartDataEvent.NETWORK_CHART_SERVER_NAME, input); @@ -180,7 +177,7 @@ public class NetworkDataMaker { break; } case LogCenterConstants.SOCKET_API_FD_CLOSE: { - if (!errMsg.contains(E_SUCCESS)) { + if (errno != 0) { addressByFdHashMap.remove(apiFD); } break; @@ -213,7 +210,7 @@ public class NetworkDataMaker { } String clientFD = strInput[0]; addressByFdHashMap.put(clientFD, parentAddress); - if (!errMsg.contains(E_SUCCESS)) { + if (errno != 0) { } apiFD = clientFD; connectedType = NetworkChartDataEvent.NETWORK_CHART_SERVER_NAME; @@ -309,7 +306,7 @@ public class NetworkDataMaker { break; } case LogCenterConstants.HTTP_API_CLOSE: { - if (!errMsg.contains(E_SUCCESS)) { + if (errno != 0) { addressByFdHashMap.remove(apiFD); } @@ -324,7 +321,7 @@ public class NetworkDataMaker { NetworkChartDataEvent event = new NetworkChartDataEvent(apiAddress, apiFD, apiThread, time, apiName, apiType, connectedType, input); - if (!errMsg.contains(E_SUCCESS)) { + if (errno != 0) { event.setFailedAPI(); } return event; @@ -519,10 +516,57 @@ public class NetworkDataMaker { return false; } DAChart chart; - networkTrafficItem = NetworkTrafficChart.getInstance() + networkTrafficItem = NetworkIOChart.getInstance() .createBoardItem(board); chart = networkTrafficItem.getChart(); - initNetworkChart(chart, true); + + + DAChartPlot plot = chart.getPlot(); + DAChartPlotTooltip tooltip = new DAChartPlotTooltip(-1); + tooltip.setFont(FontResources.CHART_TOOLTIP_FONT); + plot.setTooltip(tooltip); + + DAPopupMenu popupMenu = new DAPopupMenu(chart); + popupMenu.setFont(FontResources.CONTEXT_MENU_ITEM_FONT); + DAPopupMenuItem startItem = new DAPopupMenuItem(popupMenu, + DAPopupMenuItem.NONE); + startItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_START); + startItem.addListener(new PopupStartMenuItemClickListener(startItem, + board)); + + DAPopupMenuItem endItem = new DAPopupMenuItem(popupMenu, + DAPopupMenuItem.NONE); + endItem.setText(TimelineChartLabels.RANGE_CONTEXT_SET_END); + endItem.addListener(new PopupEndMenuItemClickListener(endItem, board)); + + DAPopupMenuItem fromSelectionItem = new DAPopupMenuItem(popupMenu, + DAPopupMenuItem.NONE); + fromSelectionItem + .setText(TimelineChartLabels.RANGE_CONTEXT_SET_FROM_SELECTION); + fromSelectionItem + .addListener(new PopupFromSelectionMenuItemClickListener( + fromSelectionItem, board)); + + DAPopupMenuItem analysisItem = new DAPopupMenuItem(popupMenu, + DAPopupMenuItem.NONE); + analysisItem.setText(TimelineChartLabels.RANGE_CONTEXT_ANALYSIS); + analysisItem.addListener(new PopupAnalysisMenuItemClickListener()); + + DAPopupMenuItem clearItem = new DAPopupMenuItem(popupMenu, + DAPopupMenuItem.NONE); + clearItem.setText(TimelineChartLabels.RANGE_CONTEXT_CLEAR); + clearItem.addListener(new PopupClearMenuItemClickListener()); + + TimelineChartMouseEventListener timelineChartMouseEventListener = new TimelineChartMouseEventListener( + popupMenu, board.getTimeline()); + chart.addMouseListener(timelineChartMouseEventListener); + chart.addMouseMoveListener(timelineChartMouseEventListener); + chart.addMouseTrackListener(new TimelineChartMouseTrackAdapter(board + .getTimeline())); + plot.setMarkers(board.getMarkers()); + + + } return true;