network : add failed API chacker, delete fileSocket chacker

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: If67f91b5a09fc3094e8aeb57238cfad32bbf0d06

Conflicts:

	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java

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 469193d..336af62 100644 (file)
--- 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.toolbar.configuration.ConfigurationDialogDataManager;
 import org.tizen.dynamicanalyzer.util.DALogger;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
@@ -58,6 +59,8 @@ public class NetworkDataMaker {
        public void clear() {
                addressByFdHashMap.clear();
                parentFDByFdHashMap.clear();
+               noDestinationApiSeriesList = new ArrayList<NetworkAPIType>();
+               destinationApiSeriesList = new ArrayList<NetworkAPIType>();
        }
 
        public void makeData(List<LogData> inputs) {
@@ -76,6 +79,7 @@ public class NetworkDataMaker {
                        }
 
                        makeEventData(input);
+                       addFailedAPIData(input);
                }
 
                if (destinationApiSeriesList.size() > 0) {
@@ -92,6 +96,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();
@@ -122,10 +133,6 @@ public class NetworkDataMaker {
                        apiAddress = parentAddress;
                }
 
-               if (filteringFileSocket(apiType, apiAddress)) {
-                       return;
-               }
-
                switch (apiType) {
                // Socket
                case LogCenterConstants.SOCKET_API_FD_OPEN:
@@ -340,23 +347,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) {
 
@@ -393,52 +383,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 f0ea6cc..728dc53 100644 (file)
--- 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
@@ -101,6 +101,7 @@ public class NetworkDataManager extends PageDataManager {
                chartCount = 0;
                accessSeriesSize = 0;
                isStopTrace = false;
+               networkDataMaker.clear();
        }
 
        public LinkedHashMap<String, String> getCheckStatusSeries() {