From be719a0edba623fcd4845d7367383f035253f0f7 Mon Sep 17 00:00:00 2001
From: "seokgil.kang" <seokgil.kang@samsung.com>
Date: Wed, 24 Sep 2014 11:43:49 +0900
Subject: [PATCH] Summary : modify to skip the leak checking logic for internal
 file log.

Change-Id: I73d351e8d460bffcb92e815012484d028f6c2b8d
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
---
 .../ui/summary/leaks/LeakDataMaker.java            |  8 +++---
 .../ui/summary/leaks/NewLeakDetector.java          | 31 ++++++----------------
 2 files changed, 11 insertions(+), 28 deletions(-)

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 f26c6af..7fec994 100644
--- 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
@@ -82,10 +82,8 @@ public class LeakDataMaker {
 		int size = inputs.size();
 		for (int i = 0; i < size; i++) {
 			LogData input = (LogData) inputs.get(i);
-			if (input == null)
-				continue;
-			if (isHeapMemoryOverflow())
-				break;
+			if (input == null)	continue;
+			if (isHeapMemoryOverflow())	break;
 			switch (leakDetector.runLeakDetect(input)) {
 			case LogCenterConstants.MEMORY_API_ALLOC: // alloc, realloc
 				makeAllocData(input);
@@ -216,7 +214,7 @@ public class LeakDataMaker {
 		}
 		case DataChannelConstants.MSG_PROBE_FILE: {
 			FileData fData = (FileData) log;
-
+			
 			dbFreeData.add(Integer.valueOf(fData.getSeq()));
 			dbFreeData.add(Integer.valueOf(fData.getPid()));
 			dbFreeData.add(Integer.valueOf(fData.getId()));
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 5469ce8..87a0904 100644
--- 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
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.MemoryData;
 import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData;
 import org.tizen.dynamicanalyzer.ui.toolbar.setting.SettingDataManager;
 import org.tizen.dynamicanalyzer.ui.toolbar.setting.TargetData;
+import org.tizen.dynamicanalyzer.util.Logger;
 
 public class NewLeakDetector {
 	// TODO : understand and refactoring
@@ -88,46 +89,31 @@ public class NewLeakDetector {
 	// return leakCheckHash;
 	// }
 
+	// Feature On : false, Feature Off : true 
 	private boolean isDropLog(LogData logData) {
 		TargetData target = SettingDataManager.getInstance().getConnectedTarget();
 		int id = logData.getId();
-		// TODO : check and remove
-//		String statStr = null;
 		switch (id) {
 		case DataChannelConstants.MSG_PROBE_FILE:
-//			statStr = configureManager
-//					.getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE);
 			if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_FILE)) {
-				return true;
+				return false;
 			}
 			break;
 		case DataChannelConstants.MSG_PROBE_MEMORY:
-//			statStr = configureManager
-//					.getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY);
 			if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_MEMORY)) {
-				return true;
+				return false;
 			}
 			break;
 		case DataChannelConstants.MSG_PROBE_THREAD:
-//			statStr = configureManager
-//					.getValue(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD);
 			if (target.isSelectedFeature(ConfigureLabels.INCLUDE_INSIDE_CALL_THREAD)) {
-				return true;
+				return false;
 			}
 			break;
 		default:
 			break;
 		}
 
-		return false;
-//		long state = AnalyzerUtil.addrToLong(statStr);
-//		if (state != AnalyzerConstants.FEATURE_OFF) {
-//			// feature on
-//			return false;
-//		}
-//		return true;
-//		// feature on : false
-//		// feature off : true
+		return true;
 	}
 
 //	public int runLeakDetect(LogData logData) {
@@ -202,9 +188,7 @@ public class NewLeakDetector {
 //			return result;
 //		}
 
-		if (isDropLog(logData) && log.isInternal()) {
-			return result;
-		}
+		if (isDropLog(logData)) return result;
 		
 		HashMap<Integer, CurrentLeakData> leaks = getLeakHash();
 		if (logData instanceof MemoryData) {
@@ -239,6 +223,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) {
-- 
2.7.4