Summary : remove File leak check in the Leak view

Change-Id: I07389b650551b7660ad5c8e891f23aecfeb84d25
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java
index 706d896..daff1c1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java
@@ -126,13 +126,6 @@ public class SummaryDataManager extends PageDataManager {
 
                        leakDataMaker.makeData(inputs);
                }
-
-               Logs fileLogs = pack.getLogs(DataChannelConstants.MSG_PROBE_FILE);
-               if (null != fileLogs && fileLogs.getRawLogs().size() != 0) {
-                       List<LogData> inputs = fileLogs.getLogs();
-
-                       leakDataMaker.makeData(inputs);
-               }
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
index b5d184a..5b68ceb 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java
@@ -152,24 +152,6 @@ public class LeakDataMaker {
                        dbAllocData.add(Long.valueOf(mData.getSize()));
                        break;
                }
-               case DataChannelConstants.MSG_PROBE_FILE: {
-                       FileData fData = (FileData) log;
-
-                       dbAllocData.add(Long.valueOf(fData.getSeq()));
-                       dbAllocData.add(Integer.valueOf(fData.getPid()));
-                       dbAllocData.add(Integer.valueOf(fData.getApiId()));
-                       dbAllocData.add(Integer.valueOf(fData.getFdApiType()));
-                       dbAllocData.add(Long.valueOf(-1)); // default value
-                       dbAllocData.add(Long.valueOf(fData.getTime()));
-                       dbAllocData.add(Long.valueOf(fData.getCallerPcAddr()));
-                       dbAllocData.add(String.valueOf(fData.getArgs()));
-                       dbAllocData.add(String.valueOf(fData.getReturn()));
-                       dbAllocData.add(String.valueOf(fData.getLibName()));
-                       dbAllocData.add(Integer.valueOf(fData.getId()));
-                       dbAllocData.add(Integer.valueOf(fData.getTid()));
-                       dbAllocData.add(Long.valueOf(fData.getSize()));
-                       break;
-               }
                default:
                        break;
                }
@@ -191,16 +173,6 @@ public class LeakDataMaker {
                        dbFreeData.add(Long.valueOf(mData.getAddress()));
                        break;
                }
-               case DataChannelConstants.MSG_PROBE_FILE: {
-                       FileData fData = (FileData) log;
-                       
-                       dbFreeData.add(Long.valueOf(fData.getSeq()));
-                       dbFreeData.add(Integer.valueOf(fData.getPid()));
-                       dbFreeData.add(Integer.valueOf(fData.getId()));
-                       dbFreeData.add(Long.valueOf(fData.getTime()));
-                       dbFreeData.add(Long.valueOf(-1));
-                       break;
-               }
                default:
                        break;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
index a350e18..fea9f30 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java
@@ -94,24 +94,8 @@ public class NewLeakDetector {
                TargetData target = SettingDataManager.getInstance().getConnectedTarget();
                ProbeCommonData pData = (ProbeCommonData) logData;
                if (!pData.isInternal())        return false;
-               switch (pData.getId()) {
-               case DataChannelConstants.MSG_PROBE_FILE:
-                       if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE)) {
-                               return false;
-                       }
-                       break;
-               case DataChannelConstants.MSG_PROBE_MEMORY:
-                       if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY)) {
-                               return false;
-                       }
-                       break;
-               case DataChannelConstants.MSG_PROBE_THREAD:
-                       if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD)) {
-                               return false;
-                       }
-                       break;
-               default:
-                       break;
+               if (target.isSelectedFeature(ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY)) {
+                       return false;
                }
 
                return true;
@@ -195,6 +179,8 @@ public class NewLeakDetector {
                if (logData instanceof MemoryData) {
                        MemoryData mlog = (MemoryData) logData;
                        if (mlog.getMemoryApiType() == LogCenterConstants.MEMORY_API_ALLOC) {
+                               if (mlog.getReturn().equalsIgnoreCase(String.valueOf("0x0")))
+                                       return result;
                                if (log.getApiName().contains("realloc")) {
                                        String inputParam = log.getArgs();
                                        String[] splitInputParam = inputParam.split("\\,"); //$NON-NLS-1$
@@ -222,21 +208,7 @@ public class NewLeakDetector {
                        }
                        
                        result = mlog.getMemoryApiType(); 
-               } else if (logData instanceof FileData) {
-                       FileData flog = (FileData) logData;
-                       if (flog.isInternal())  return result;
-                       if (flog.getFdApiType() == LogCenterConstants.FD_API_TYPE_OPEN) {
-                               addCurrentLeakData(leaks, logData);
-                       } else if (flog.getFdApiType() == LogCenterConstants.FD_API_TYPE_CLOSE) {
-                               int key = findAllocatedKey(leaks, flog.getFdValue(), log.getPid());
-                               if (key != -1) {
-                                       leaks.remove(key);
-                               }
-//                             leaks.remove((long)log.getKey());
-                       }
-                       
-                       result = flog.getFdApiType(); 
-               }
+               } 
                
                return result;
        }