From 32ccc704a1ca1c04cec86b6bda09e8b22837caea Mon Sep 17 00:00:00 2001 From: "Hyunjong.park" Date: Thu, 24 Jul 2014 16:06:42 +0900 Subject: [PATCH] network : add failed API chacker, delete fileSocket chacker Signed-off-by: Hyunjong.park Change-Id: If67f91b5a09fc3094e8aeb57238cfad32bbf0d06 --- .../ui/network/data/NetworkDataMaker.java | 80 +++------------------- .../ui/network/data/NetworkDataManager.java | 1 + 2 files changed, 12 insertions(+), 69 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java index 9a74d98..9dfd8bf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java @@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.NetworkData; import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkAPIType; import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkSeriesType; +import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedChecker; import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDetector; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; @@ -62,6 +63,8 @@ public class NetworkDataMaker { public void clear() { addressByFdHashMap.clear(); parentFDByFdHashMap.clear(); + noDestinationApiSeriesList = new ArrayList(); + destinationApiSeriesList = new ArrayList(); } public void makeData(List inputs) { @@ -80,6 +83,7 @@ public class NetworkDataMaker { } makeEventData(input); + addFailedAPIData(input); } if (destinationApiSeriesList.size() > 0) { @@ -96,6 +100,13 @@ public class NetworkDataMaker { } + private void addFailedAPIData(NetworkData logs) { + if (logs.getErrno() != 0) { + SummaryDataManager.getInstance().getFailedApiDataMaker() + .makeData(logs); + } + } + private void makeEventData(NetworkData input) { String apiName = input.getApiName(); @@ -126,10 +137,6 @@ public class NetworkDataMaker { apiAddress = parentAddress; } - if (filteringFileSocket(apiType, apiAddress)) { - return; - } - switch (apiType) { // Socket case LogCenterConstants.SOCKET_API_FD_OPEN: @@ -344,23 +351,6 @@ public class NetworkDataMaker { } } - private boolean filteringFileSocket(int apiType, String ipAddress) { - if (apiType >= LogCenterConstants.HTTP_API_SESSION_CONSTRUCT) { - return false; - } - if (null == ipAddress) { - return true; - } - String address = ipAddress.trim(); - if (address.equals(CommonConstants.EMPTY) - || address.startsWith(CommonConstants.SLASH) - || address.startsWith(CommonConstants.HEX_PREFIX)) { - return true; - } else { - return false; - } - } - private void setStartSeries(String apiAddress, String apiFD, long time, int eventType, int apiType, int apiId, int pId) { @@ -397,52 +387,4 @@ public class NetworkDataMaker { } return retStr; } - - // private String getDowonloadPayloadFilePath(String payload) { - // if (payload.contains(AnalyzerConstants.CHECK_DOWNLOAD_FILE_STRING)) { - // String[] strFile = payload - // .split(AnalyzerConstants.CHECK_DOWNLOAD_FILE_STRING); - // if (strFile.length < 1) { - // return payload; - // } - // String downloadFilePath = strFile[1]; - // - // String[] copyFilePathSplit = downloadFilePath.split(File.separator - // + AnalyzerConstants.TMP_FOLDER + File.separator); - // if (copyFilePathSplit.length < 1) { - // return payload; - // } - // String downloadFolderPath = File.separator - // + AnalyzerConstants.DOWNLOAD_FILE_FOLDER; - // - // File toDir = new File(AnalyzerManager.getProject().getSavePath() - // + downloadFolderPath); - // if (!toDir.exists() || !toDir.isDirectory()) { - // toDir.mkdirs(); - // } - // - // String saveFilePath = downloadFolderPath + File.separator - // + copyFilePathSplit[1]; - // - // if (pullPayloadFile(downloadFilePath, AnalyzerManager.getProject() - // .getSavePath() + saveFilePath)) { - // return saveFilePath; - // } else { - // return payload; - // } - // } - // return payload; - // } - // - // private boolean pullPayloadFile(String from, String to) { - // SyncResult res = CommunicatorUtils.pull(from, to); - // if (null != res && res.isOk()) { - // DALogger.getInstance().debug(from + "file copying success!!");//$NON-NLS-1$ - // } else { - // DALogger.getInstance().debug("Failed to get " + from); //$NON-NLS-1$ - // return false; - // } - // CommunicatorUtils.removeCommand(from); - // return true; - // } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java index 8f5a823..ecba809 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java @@ -107,6 +107,7 @@ public class NetworkDataManager extends PageDataManager { chartCount = 0; accessSeriesSize = 0; isStopTrace = false; + networkDataMaker.clear(); } public LinkedHashMap getCheckStatusSeries() { -- 2.7.4