[Title] CPU graph and Call Trace View selectoin bug fixed

[Type] bug fix
[Module] Dynamic Analyzer
[Priority] major
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic_analyzer/xml/user_function.logc b/org.tizen.dynamicanalyzer.workbench/dynamic_analyzer/xml/user_function.logc
index 4c026e9..8917f0a 100644 (file)
--- a/org.tizen.dynamicanalyzer.workbench/dynamic_analyzer/xml/user_function.logc
+++ b/org.tizen.dynamicanalyzer.workbench/dynamic_analyzer/xml/user_function.logc
@@ -2,7 +2,7 @@
 <BaseLogCenter xmlns="org.tizen.dynamicanalyzer">
        <id>4</id>
        <name>user_function</name>
-       <totalColumnCount>16</totalColumnCount>
+       <totalColumnCount>18</totalColumnCount>
        <customColumn>false</customColumn>
        
        <ColumnName>Rid</ColumnName>
@@ -22,7 +22,9 @@
        <ColumnName>CallerPCAddr</ColumnName>
        <ColumnName>BinaryRangeStart</ColumnName>
        <ColumnName>BinaryRangeEnd</ColumnName>
-
+       
+       <ColumnName>Type</ColumnName>
+       <ColumnName>ElapsedTime</ColumnName>
        <ColumnName>Reserved</ColumnName>
 
        <type>INTEGER</type>
@@ -43,6 +45,8 @@
        <type>INTEGER</type>
        <type>INTEGER</type>
        
+    <type>TEXT</type>
+    <type>INTEGER</type>
        <type>TEXT</type>
 
        <ColumnSize>100</ColumnSize>
@@ -69,6 +73,8 @@
        <ColumnOrder>13</ColumnOrder>
        <ColumnOrder>14</ColumnOrder>
        
+       <ColumnOrder>13</ColumnOrder>
+    <ColumnOrder>14</ColumnOrder>
        <ColumnOrder>15</ColumnOrder>
        
        
@@ -91,6 +97,8 @@
        <ColumnVisibility>true</ColumnVisibility>
        
        <ColumnVisibility>true</ColumnVisibility>
+    <ColumnVisibility>true</ColumnVisibility>
+       <ColumnVisibility>true</ColumnVisibility>
        
        <TableColumnName>Row Id</TableColumnName>
        <TableColumnName>ID</TableColumnName>
@@ -110,6 +118,8 @@
        <TableColumnName>Binary Range Start</TableColumnName>
        <TableColumnName>Binary Range End</TableColumnName>
        
+       <TableColumnName>Type</TableColumnName>
+       <TableColumnName>ElapsedTime</TableColumnName>
        <TableColumnName>Reserved</TableColumnName>
        
 </BaseLogCenter>
\ No newline at end of file

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
index 0f0372b..c9e0d19 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
@@ -310,7 +310,7 @@ public class SnapshotView extends DAView {
                                LogCenterConstants.DEVICE_SYSTEM_CPU_USAGE_INDEX + 1)
                                .split(",");
                cpuUsage.clear();
-               for (int i = 0; i < cpuRates.length; i++) {
+               for (int i = 0; i < cpuRates.length - 1; i++) {
                        String cpu = cpuRates[i].trim();
                        long value = (long) Float.parseFloat(cpu);
                        cpuUsage.add(value);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/timelinePage/CallTraceView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/timelinePage/CallTraceView.java
index cde3096..2518403 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/timelinePage/CallTraceView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/timelinePage/CallTraceView.java
@@ -87,17 +87,17 @@ public class CallTraceView extends DAView {
                long end = selData.getEndTime();
 
                String query = "select count(time) from user_function where time < " //$NON-NLS-1$
-                               + start + ";"; //$NON-NLS-1$
+                               + start + " and type = " + LogCenterConstants.USER_FUNCTION_EVENT_TYPE_ENTER + ";"; //$NON-NLS-1$
                int selectionIndex = SqlManager.executeSelectOperation(query);
 
                String countQuery = "select count(time) from user_function where time >" //$NON-NLS-1$
-                               + start + " and time <= " + end + ";"; //$NON-NLS-1$ //$NON-NLS-2$
+                               + start + " and time <= " + end + " and type = " + LogCenterConstants.USER_FUNCTION_EVENT_TYPE_ENTER + ";"; //$NON-NLS-1$
                int selectionCount = SqlManager.executeSelectOperation(countQuery);
 
                selectionIndex = (selectionIndex < 0 && selectionCount > 0) ? 0
                                : selectionIndex;
                tableComp.getTable().getVerticalBar().setSelection(selectionIndex);
-               updateView();
+//             updateView();
 
                Grid table = tableComp.getTable();
                if (selectionIndex >= 0) {