From 3d1911f3a01d186b8d9e72863a669c19ca3d44e4 Mon Sep 17 00:00:00 2001 From: "Hyunjong,park" Date: Mon, 6 Jan 2014 18:49:03 +0900 Subject: [PATCH] [Title] fix. network chart [Desc.] set destination address [Issue] - --- .../dynamicanalyzer/handlers/OpenTraceHandler.java | 2 -- .../src/org/tizen/dynamicanalyzer/project/Project.java | 1 - .../dynamicanalyzer/ui/network/NetworkDataMaker.java | 18 +++++++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java index fbe7dea..1698dca 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -92,9 +92,7 @@ public class OpenTraceHandler extends AbstractHandler { AnalyzerUtil.executeCommand(ClearHandler.ID); return null; } - String savedDBPath = project.getSavePath(); //FIXME WRONG SAVEPATH of PROJECT DB project.loadSaveFormat(pInfo); - project.setSavePath(savedDBPath); //FIXME WRONG SAVEPATH of PROJECT DB OpenTraceProgressManager.getInstance().openTracePrgressStart( AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 39f26af..5856436 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -388,7 +388,6 @@ public class Project { .get(AnalyzerConstants.PROJECT_SYSTEM_COUNT_INDEX))); setProfileLogCount(Long.parseLong(data .get(AnalyzerConstants.PROJECT_PROFILE_COUNT_INDEX))); - setSavePath(data.get(AnalyzerConstants.PROJECT_SAVE_PATH_INDEX)); setMainPid(Integer.parseInt(data .get(AnalyzerConstants.PROJECT_MAIN_PID_INDEX))); } 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 e776fb4..f1cecc2 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 @@ -148,7 +148,11 @@ public class NetworkDataMaker { setTrafficData(event); checkClosedFDForFailedFD(event); - networkEventQueue.add(event); + if(event.getAddress().equals("")){ + unConnectedEventQueue.add(event); + }else{ + networkEventQueue.add(event); + } } } @@ -173,6 +177,12 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_FD_OPEN: break; case LogCenterConstants.SOCKET_API_CONNECT: { + String[] strInput = input.getArgs() + .split(CommonConstants.COMMA); + if (strInput.length <= 0) { + return null; + } + apiAddress = strInput[1]; connectedType = NetworkChartDataEvent.NETWORK_CHART_CLIENT_NAME; updatePreviousEventData(apiFD, apiAddress, connectedType); break; @@ -203,6 +213,12 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_EVENT_END: break; case LogCenterConstants.SOCKET_API_BIND: { + String[] strInput = input.getArgs() + .split(CommonConstants.COMMA); + if (strInput.length <= 0) { + return null; + } + apiAddress = strInput[1]; connectedType = NetworkChartDataEvent.NETWORK_CHART_SERVER_NAME; updatePreviousEventData(apiFD, apiAddress, connectedType); break; -- 2.7.4