projects / sdk / tools / dynamic-analyzer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 990219e)
[Title] Column text change and bug fix
authorjy.exe.lee <jy.exe.lee@samsung.com>
Mon, 25 Jun 2012 01:42:11 +0000 (10:42 +0900)
committerjy.exe.lee <jy.exe.lee@samsung.com>
Mon, 25 Jun 2012 01:42:11 +0000 (10:42 +0900)
[Type] bug fix
[Module] DynamicAnalyzer
[Priority] major
[CQ#]
[Redmine#] 5474, 5472
[Problem]
[Cause]
[Solution]
[TestCase]

org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc patch | blob | history
org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc patch | blob | history
org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc patch | blob | history
org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc patch | blob | history
org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc patch | blob | history
org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc patch | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/LogSpliter.java patch | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java patch | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/tableInfo/DBTableManager.java patch | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/summaryPage/FunctionUsageProfilingView.java patch | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/LeakDetector.java patch | blob | history

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc
index 0e12e08..fd244b2 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/image.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -20,7 +20,7 @@
        <ColumnName>Error</ColumnName>
        <ColumnName>InternalCall</ColumnName>
        <ColumnName>Size</ColumnName>
-       <ColumnName>ApiType</ColumnName>
+       <ColumnName>APIType</ColumnName>
        <ColumnName>Reserved</ColumnName>
 
        <type>INTEGER</type>
@@ -90,7 +90,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
@@ -102,6 +102,6 @@
        <TableColumnName>Errno</TableColumnName>
        <TableColumnName>Internal Call</TableColumnName>
        <TableColumnName>Size</TableColumnName>
-       <TableColumnName>Api type</TableColumnName>
+       <TableColumnName>API type</TableColumnName>
        <TableColumnName>Reserved</TableColumnName>
 </BaseLogCenter>
\ 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 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/lifecycle.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -83,7 +83,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc
index f26487d..72ff480 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/memory.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -93,7 +93,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc
index ff29090..6157651 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/resource.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -23,7 +23,7 @@
        <ColumnName>FDValue</ColumnName>
        <ColumnName>FDType</ColumnName>
        
-       <ColumnName>FDApiType</ColumnName>
+       <ColumnName>FDAPIType</ColumnName>
        <ColumnName>FileSize</ColumnName>
        <ColumnName>FilePath</ColumnName>
        <ColumnName>Reserved</ColumnName>
@@ -109,7 +109,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
@@ -124,7 +124,7 @@
        <TableColumnName>FD value</TableColumnName>
        <TableColumnName>FD type</TableColumnName>
        
-       <TableColumnName>FD Api Type</TableColumnName>
+       <TableColumnName>FD API Type</TableColumnName>
        <TableColumnName>File Size</TableColumnName>
        <TableColumnName>FD api type</TableColumnName>
        <TableColumnName>File Path</TableColumnName>
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 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/ui_event.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -97,7 +97,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
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 (file)
--- a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc
+++ b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/xml/user_function.logc
@@ -8,7 +8,7 @@
        <ColumnName>Rid</ColumnName>
        <ColumnName>ID</ColumnName>
        <ColumnName>SeqNumber</ColumnName>
-       <ColumnName>ApiName</ColumnName>
+       <ColumnName>APIName</ColumnName>
        <ColumnName>Time</ColumnName>
 
        <ColumnName>Pid</ColumnName>
@@ -95,7 +95,7 @@
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
        <TableColumnName>#</TableColumnName>
-       <TableColumnName>Api name</TableColumnName>
+       <TableColumnName>API name</TableColumnName>
        <TableColumnName>Time</TableColumnName>
        
        <TableColumnName>Process id</TableColumnName>
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 (file)
--- 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 (file)
--- 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 {
        }\r
 \r
        private void loadCallStackApis(Project p) {\r
-               ResultSet rs = SqlManager.selectAllFromTable("CallStackApis");\r
+               ResultSet rs = SqlManager.selectAllFromTable("CallStackAPIs");\r
                if (null == rs) {\r
                        return;\r
                }\r
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 (file)
--- 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 (file)
--- 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 (file)
--- 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<String, Check> leakCheckHash;
        HashMap<String, LeakData> leakHash;
@@ -28,12 +26,14 @@ public class LeakDetector {
 
        public LeakDetector() {
                LeakCheckList leakCheckList = AnalyzerManager.getLeakCheckList();
-               leakCheckHash = new HashMap<String, Check>();
+               if (leakCheckList != null) {
+                       leakCheckHash = new HashMap<String, Check>();
 
-               List<Check> checks = leakCheckList.getChecks();
-               int size = checks.size();
-               for (int i = 0; i < size; i++) {
-                       leakCheckHash.put(checks.get(i).getName(), checks.get(i));
+                       List<Check> 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<String, LeakData> 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));
Domain: SDK / Dynamic Analysis;