From a37c4eeeb3521806ae17e86a07feff3c89fca964 Mon Sep 17 00:00:00 2001 From: "jy.exe.lee" Date: Mon, 25 Jun 2012 10:42:11 +0900 Subject: [PATCH] [Title] Column text change and bug fix [Type] bug fix [Module] DynamicAnalyzer [Priority] major [CQ#] [Redmine#] 5474, 5472 [Problem] [Cause] [Solution] [TestCase] --- .../DynamicAnalyzer/xml/image.logc | 8 +++---- .../DynamicAnalyzer/xml/lifecycle.logc | 4 ++-- .../DynamicAnalyzer/xml/memory.logc | 4 ++-- .../DynamicAnalyzer/xml/resource.logc | 8 +++---- .../DynamicAnalyzer/xml/ui_event.logc | 4 ++-- .../DynamicAnalyzer/xml/user_function.logc | 4 ++-- .../src/org/tizen/dynamicanalyzer/LogSpliter.java | 14 ------------ .../dynamicanalyzer/handlers/OpenTraceHandler.java | 2 +- .../dynamicanalyzer/tableInfo/DBTableManager.java | 4 ++-- .../summaryPage/FunctionUsageProfilingView.java | 2 +- .../tizen/dynamicanalyzer/utils/LeakDetector.java | 26 ++++++++++------------ 11 files changed, 32 insertions(+), 48 deletions(-) diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc index 0e12e08..fd244b2 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -20,7 +20,7 @@ Error InternalCall Size - ApiType + APIType Reserved INTEGER @@ -90,7 +90,7 @@ Row Id ID # - Api name + API name Time Process id @@ -102,6 +102,6 @@ Errno Internal Call Size - Api type + API type Reserved \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc index d6de690..c65ebd2 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -83,7 +83,7 @@ Row Id ID # - Api name + API name Time Process id diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc index f26487d..72ff480 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -93,7 +93,7 @@ Row Id ID # - Api name + API name Time Process id diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc index ff29090..6157651 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -23,7 +23,7 @@ FDValue FDType - FDApiType + FDAPIType FileSize FilePath Reserved @@ -109,7 +109,7 @@ Row Id ID # - Api name + API name Time Process id @@ -124,7 +124,7 @@ FD value FD type - FD Api Type + FD API Type File Size FD api type File Path diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc index 928a78e..2421cbc 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -97,7 +97,7 @@ Row Id ID # - Api name + API name Time Process id diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc index a56fd0b..4c026e9 100644 --- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc +++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc @@ -8,7 +8,7 @@ Rid ID SeqNumber - ApiName + APIName Time Pid @@ -95,7 +95,7 @@ Row Id ID # - Api name + API name Time Process id diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java index 320ca84..cf9d6ce 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java @@ -367,20 +367,6 @@ public class LogSpliter { input.get(LogCenterConstants.DEVICE_RSSI_ALPHA_INDEX), input.get(LogCenterConstants.DEVICE_VOLTAGE_INDEX)); input.set(LogCenterConstants.DEVICE_ENERGY_INDEX, power.toString()); - } else if (id == LogCenterConstants.LOG_USER_FUNCTION) { - // String apiName = input.get(LogCenterConstants.APINAME_INDEX); - // if (apiName.isEmpty()) { - // setFuncName(input); - // } - // - // String start = input - // .get(LogCenterConstants.USER_FUNCTION_BINARY_RANGE_START_INDEX); - // String end = input - // .get(LogCenterConstants.USER_FUNCTION_BINARY_RANGE_END_INDEX); - // if (!start.isEmpty() && !end.isEmpty() - // && !AnalyzerManager.isBinStartEndSet()) { - // AnalyzerManager.setBinaryStartEndAddr(start, end); - // } } logPack.setLogs(id, input); 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 80bb55d..fc531ae 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -164,7 +164,7 @@ public class OpenTraceHandler extends AbstractHandler { } private void loadCallStackApis(Project p) { - ResultSet rs = SqlManager.selectAllFromTable("CallStackApis"); + ResultSet rs = SqlManager.selectAllFromTable("CallStackAPIs"); if (null == rs) { return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java index 630d031..4ae6a01 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java @@ -11,7 +11,7 @@ public class DBTableManager { private static TableInfo profilingChildData = null; public static final String[] commonColumns = { "Rid", "Id", "SeqNumber", - "ApiNmae", "Time", "Pid", "Tid", "InputParm", "Return", "PCAddr", + "APINmae", "Time", "Pid", "Tid", "InputParm", "Return", "PCAddr", "Error", "InternalCall", "Reserved1", "Reserved2", "Reserved3", "Reserved4", "Reserved5", "Reserved6", "Reserved7", "Reserved8" }; public static final String[] commonOptions = { "", "", "", "", "", "", "", @@ -46,7 +46,7 @@ public class DBTableManager { String[] names = { "addr", "api" }; String[] options = { "primary key not null", "" }; String[] types = { "INTEGER", "TEXT" }; - callstackApis = new TableInfo("CallstackApis", names, options, + callstackApis = new TableInfo("CallstackAPIs", names, options, types); } return callstackApis; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/summaryPage/FunctionUsageProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/summaryPage/FunctionUsageProfilingView.java index 46dc027..586bc9c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/summaryPage/FunctionUsageProfilingView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/summaryPage/FunctionUsageProfilingView.java @@ -15,7 +15,7 @@ public class FunctionUsageProfilingView extends DAView { public static final String ID = FunctionUsageProfilingView.class.getName(); private DATableComposite treeComp = null; - private String[] columnNames = {"Name", "excl. cpu time", "excl. cpu rate", "incl. cpu time", "incl. cpu rate", "call count"}; + private String[] columnNames = {"Name", "Excl. Cpu Time", "Excl. Cpu Rate", "Incl. Cpu Time", "Incl. Cpu Rate", "Call Count"}; private int[] columnSizes = { 200, 90, 90, 90, 90, 90 }; private boolean[] columnVisibility = { true, true, true, true, true, true }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/LeakDetector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/LeakDetector.java index 51fe105..bdb4228 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/LeakDetector.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/LeakDetector.java @@ -12,14 +12,12 @@ import org.tizen.dynamicanalyzer.model.Check; import org.tizen.dynamicanalyzer.model.LeakCheckList; import org.tizen.dynamicanalyzer.model.LeakData; - public class LeakDetector { public final static int API_TYPE_OPEN = 0; public final static int API_TYPE_CLOSE = 1; public final static int API_TYPE_REALLOC = 2; -// public final static String USER_BIN_POS = "/opt/apps/"; private final String[] columnNames = { "Addr", "Seq", "Id", "Time", - "ApiName", "InputParam", "Return", "LeakSeq", "Parent" }; + "APIName", "InputParam", "Return", "LeakSeq", "Parent" }; HashMap leakCheckHash; HashMap leakHash; @@ -28,12 +26,14 @@ public class LeakDetector { public LeakDetector() { LeakCheckList leakCheckList = AnalyzerManager.getLeakCheckList(); - leakCheckHash = new HashMap(); + if (leakCheckList != null) { + leakCheckHash = new HashMap(); - List checks = leakCheckList.getChecks(); - int size = checks.size(); - for (int i = 0; i < size; i++) { - leakCheckHash.put(checks.get(i).getName(), checks.get(i)); + List checks = leakCheckList.getChecks(); + int size = checks.size(); + for (int i = 0; i < size; i++) { + leakCheckHash.put(checks.get(i).getName(), checks.get(i)); + } } } @@ -142,9 +142,8 @@ public class LeakDetector { String funcName = apiMap.get(addrs.get(0)); // user call -// if (funcName.contains(AnalyzerConstants.USER_BIN_POS)) { - if (LogSpliter.checkUserCall(funcName)) - { + // if (funcName.contains(AnalyzerConstants.USER_BIN_POS)) { + if (LogSpliter.checkUserCall(funcName)) { // if (!AnalyzerUtil.isInternal(input)) { HashMap leaks = getLeakHash(); LeakData newLeak = new LeakData(input[chk.getKeyIndex()], input); @@ -156,9 +155,8 @@ public class LeakDetector { if (funcName.contains("__dlog_print")) { return; } -// if (funcName.contains(AnalyzerConstants.USER_BIN_POS)) { - if (LogSpliter.checkUserCall(funcName)) - { + // if (funcName.contains(AnalyzerConstants.USER_BIN_POS)) { + if (LogSpliter.checkUserCall(funcName)) { LeakData childData = new LeakData(input[chk.getKeyIndex()], input); String addr = Long.toString(addrs.get(i - 1)); -- 2.7.4