From 96e9aea98364959c83f4c47c77e908d40e4fe890 Mon Sep 17 00:00:00 2001 From: kamuru Date: Mon, 30 Sep 2013 14:03:44 +0900 Subject: [PATCH] [Title] swap 3 [Desc.] [Issue] --- .../tizen/dynamicanalyzer/sql/DBTableManager.java | 2 +- .../swap/model/data/BasicDataMessage.java | 2 ++ .../tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java | 23 +++++++++-------- .../ui/timeline/chart/CPUChart.java | 5 ++++ .../ui/timeline/chart/CPUCoreChart.java | 4 +++ .../ui/timeline/chart/CPUFrequencyChart.java | 4 +++ .../ui/timeline/chart/FileChart.java | 4 +++ .../ui/timeline/chart/HeapChart.java | 30 ++++++++++++---------- .../ui/timeline/chart/ProcessMemoryChart.java | 4 +++ .../ui/timeline/chart/ScreenshotChart.java | 4 +++ .../ui/timeline/chart/SystemMemoryChart.java | 4 +++ .../ui/timeline/chart/UIEventChart.java | 4 +++ .../ui/timeline/chart/UserCustomChart.java | 8 ++++-- .../tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 12 ++++++++- 14 files changed, 81 insertions(+), 29 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java index c1e452b..07af819 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java @@ -134,7 +134,7 @@ public class DBTableManager { public static final String APINAME_NAME = "name"; - public static int TABLE_COUNT = 10; + public static int TABLE_COUNT = 11; public static final String[] commonColumns = { COMMON_COLUMN_RID, COMMON_COLUMN_ID, COMMON_COLUMN_SEQ_NUMBER, COMMON_COLUMN_API_NAME, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/BasicDataMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/BasicDataMessage.java index 3796a2b..3b0d349 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/BasicDataMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/BasicDataMessage.java @@ -129,6 +129,8 @@ public class BasicDataMessage { case LogCenterConstants.LOG_NETWORK: newId = AnalyzerConstants.MSG_PROBE_NETWORK; break; + case LogCenterConstants.LOG_GLES20: + newId = AnalyzerConstants.MSG_PROBE_GLES20; case LogCenterConstants.LOG_LIFECYCLE: newId = AnalyzerConstants.MSG_PROBE_LIFECYCLE; break; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java index c4562e6..2959ce5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java @@ -120,20 +120,21 @@ public class GLPage extends DAPageComposite { @Override public void updateLog(LogPackage logPack) { super.updateLog(logPack); - - Logs glesLogs = logPack.getLogs(LogCenterConstants.LOG_GLES20); - if (glesLogs != null && glesLogs.getLogs() != null - && glesLogs.getLogs().size() > 0) { - List logDataList = glesLogs.getLogs(); - for (LogData logData : logDataList) { - glDataMaker.addGLAPIData((GLES20LogData)logData); - } + Logs glesLogs = logPack.getLogs(LogCenterConstants.LOG_GLES20); + if (glesLogs == null || glesLogs.getLogs().size() == 0) { + return; + } + + List logDataList = glesLogs.getLogs(); - GLContextDataInserter.getContextDataQueue().push( - glDataMaker.getContextValueDAInputListAndClear()); - GLContextDataInserter.startinserterThread(); + for (LogData logData : logDataList) { + glDataMaker.addGLAPIData((GLES20LogData) logData); } + + GLContextDataInserter.getContextDataQueue().push( + glDataMaker.getContextValueDAInputListAndClear()); + GLContextDataInserter.startinserterThread(); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java index a42d96d..6f44d61 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java @@ -93,7 +93,12 @@ public class CPUChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logDataList = logs.getLogs(); + for (LogData logData : logDataList) { parsingLog((SystemData)logData); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java index 3741eac..b949ab7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java @@ -138,6 +138,10 @@ public class CPUCoreChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logDataList = logs.getLogs(); for (LogData logData : logDataList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java index e4431f9..64580fc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java @@ -83,6 +83,10 @@ public class CPUFrequencyChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData logData : logList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java index 291f8cb..6e17d25 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java @@ -160,6 +160,10 @@ public class FileChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData log : logList) { double time = log.getTime(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java index 3adad3b..f051552 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java @@ -145,20 +145,22 @@ public class HeapChart extends TimelineChart { /* total alloc */ try { - int size = deviceLogList.size(); - for (int i = 0; i < size; i++) { - SystemData log = (SystemData) deviceLogList.get(i); - - double time = log.getTime() / TimelineConstants.MEGA_DOUBLE; - double value = log.getTotalAllocSize() - allocByte; - totalAllocationSeries.addSeriesItem(new DAChartSeriesItem(time, - value, Formatter.toByteFormat(value))); - - if (!isUserAllocUpdated) { - userAllocationSeries - .addSeriesItem(new DAChartSeriesItem(time, - allocByte, Formatter - .toByteFormat(allocByte))); + if (deviceLogList != null) { + int size = deviceLogList.size(); + for (int i = 0; i < size; i++) { + SystemData log = (SystemData) deviceLogList.get(i); + + double time = log.getTime() / TimelineConstants.MEGA_DOUBLE; + double value = log.getTotalAllocSize() - allocByte; + totalAllocationSeries.addSeriesItem(new DAChartSeriesItem( + time, value, Formatter.toByteFormat(value))); + + if (!isUserAllocUpdated) { + userAllocationSeries + .addSeriesItem(new DAChartSeriesItem(time, + allocByte, Formatter + .toByteFormat(allocByte))); + } } } } catch (NumberFormatException ne) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java index 9ff5e77..166a618 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java @@ -98,6 +98,10 @@ public class ProcessMemoryChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData logData : logList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java index 7af5052..5f9f0a3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java @@ -93,6 +93,10 @@ public class ScreenshotChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData logData : logList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java index e996a29..6cc8a23 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java @@ -99,6 +99,10 @@ public class SystemMemoryChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData logData : logList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java index a5b03ea..58a3d7a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java @@ -142,6 +142,10 @@ public class UIEventChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(probeType); + if(logs == null) { + return; + } + List logList = logs.getLogs(); for (LogData logData : logList) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UserCustomChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UserCustomChart.java index dea4db7..57e4ca2 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UserCustomChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UserCustomChart.java @@ -74,8 +74,12 @@ public class UserCustomChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { - Logs logList = logPack.getLogs(LogCenterConstants.LOG_DEVICE); - List logDataList = logList.getLogs(); + Logs logs = logPack.getLogs(LogCenterConstants.LOG_DEVICE); + if(logs == null) { + return; + } + + List logDataList = logs.getLogs(); if (logDataList.size() <= 0) { return; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index f06e2f8..a0e151c 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -71,6 +71,7 @@ import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.handlers.RealtimePerspectiveHandler; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.model.LogCenter; import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.data.ApiNameManager; import org.tizen.dynamicanalyzer.swap.model.probe2.LogDataFactory; @@ -771,6 +772,15 @@ public class AnalyzerUtil { case AnalyzerConstants.MSG_PROBE_NETWORK: System.out.println("case AnalyzerConstants.MSG_PROBE_NETWORK"); break; + case AnalyzerConstants.MSG_PROBE_GLES20: + apiType = Integer + .parseInt(input[LogCenterConstants.GL_API_TYPE_INDEX]); + long elapsedTime = Long + .parseLong(input[LogCenterConstants.GL_ELAPSED_TIME_INDEX]); + String contextValue = input[LogCenterConstants.GL_CONTEXT_VALUE_INDEX]; + rear = ByteUtils.getByte(apiType, elapsedTime, contextValue); + result = ByteUtils.concatByteArray(front, rear); + break; case AnalyzerConstants.MSG_PROBE_LIFECYCLE: result = front; break; @@ -849,7 +859,7 @@ public class AnalyzerUtil { .parseLong(input[LogCenterConstants.USER_FUNCTION_BINARY_RANGE_END_INDEX]); int ufType = Integer .parseInt(input[LogCenterConstants.USER_FUNCTION_TYPE_INDEX]); - long elapsedTime = Long + elapsedTime = Long .parseLong(input[LogCenterConstants.USER_FUNCTION_ELAPSED_TIME_INDEX]); long pcAddr = Long .parseLong(input[LogCenterConstants.PCADDR_INDEX]); -- 2.7.4