From e4a7b1583aecb43d9080bcb592b78725491ab597 Mon Sep 17 00:00:00 2001 From: greatim Date: Tue, 7 Jan 2014 10:45:22 +0900 Subject: [PATCH] [Title] fix some function name and boilerplate [Desc.] [Issue] --- .../widgets/chartBoard/DAChartBoard.java | 28 ++-- .../dynamicanalyzer/common/AnalyzerConstants.java | 2 + .../dynamicanalyzer/logparser/LogInserter.java | 4 +- .../tizen/dynamicanalyzer/nl/KernelPageLabels.java | 2 +- .../org/tizen/dynamicanalyzer/sql/SqlManager.java | 2 +- .../dynamicanalyzer/swap/logparser/LogPackage.java | 6 +- .../tizen/dynamicanalyzer/swap/logparser/Logs.java | 23 ++- .../swap/model/data/ContextSwitchData.java | 11 ++ .../dynamicanalyzer/swap/model/data/LogData.java | 13 +- .../swap/model/data/LogDataTimeComparator.java | 26 ++++ .../swap/model/data/ProbeCommonData.java | 16 +++ .../swap/model/data/ProfileData.java | 22 ++- .../dynamicanalyzer/ui/file/FileChartView.java | 4 +- .../ui/info/snapshot/SnapshotView.java | 6 +- .../dynamicanalyzer/ui/kernel/CallFlowChart.java | 2 +- .../ui/kernel/CallFlowChartRenderer.java | 2 +- .../ui/kernel/CallFlowChartView.java | 12 +- .../ui/kernel/CallFlowTabComposite.java | 2 +- .../ui/kernel/ContextSwitchingChart.java | 14 +- .../ui/kernel/ContextSwitchingChartRenderer.java | 2 +- .../ui/kernel/ContextSwitchingChartSeriesItem.java | 2 +- .../ui/kernel/ContextSwitchingChartView.java | 4 +- .../dynamicanalyzer/ui/kernel/KernelListTable.java | 160 ++++++++++++++++++--- .../dynamicanalyzer/ui/kernel/KernelListView.java | 27 ++-- .../dynamicanalyzer/ui/kernel/KernelPage.java | 4 +- .../ui/kernel/KernelStatisticInfoView.java | 2 +- .../ui/kernel/data/ContextDataDBInserter.java | 2 +- .../ui/kernel/data/FunctionDataDBInserter.java | 2 +- .../ui/kernel/data/KernelBlockingQueue.java | 2 +- .../ui/kernel/data/KernelDataMaker.java | 26 ++-- .../ui/kernel/data/KernelDataManager.java | 10 +- .../ui/kernel/data/KernelDataPerThread.java | 2 +- .../kernel/data/KernelDataPerThreadComparator.java | 2 +- .../ui/kernel/data/KernelSelectionData.java | 50 +++++++ .../ui/network/NetworkChartView.java | 4 +- .../tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java | 4 +- .../ui/opengl/ui/chart/GLFrameRateChart.java | 2 +- .../dynamicanalyzer/ui/range/RangeDataManager.java | 6 +- .../profiling/FunctionUsageProfilingView.java | 4 +- .../ui/thread/ThreadChartManager.java | 4 +- .../ui/thread/sync/ThreadPageSyncDataManager.java | 4 +- .../thread/thread/ThreadPageThreadDataManager.java | 4 +- .../ui/timeline/chart/CPUChart.java | 2 +- .../ui/timeline/chart/CPUCoreChart.java | 2 +- .../ui/timeline/chart/CPUFrequencyChart.java | 2 +- .../ui/timeline/chart/DeviceChart.java | 2 +- .../ui/timeline/chart/DiskIOChart.java | 2 +- .../ui/timeline/chart/FileChart.java | 2 +- .../ui/timeline/chart/HeapChart.java | 4 +- .../ui/timeline/chart/NetworkIOChart.java | 2 +- .../ui/timeline/chart/ProcessMemoryChart.java | 2 +- .../ui/timeline/chart/ScreenshotChart.java | 2 +- .../ui/timeline/chart/SystemMemoryChart.java | 2 +- .../ui/timeline/chart/UIEventChart.java | 2 +- .../ui/timeline/chart/UserCustomChart.java | 2 +- .../ui/timeline/common/TimelineView.java | 12 +- .../ui/timeline/logparser/CustomLogParser.java | 2 +- .../ui/timeline/logparser/DeviceLogParser.java | 4 +- .../ui/timeline/logparser/LifecycleLogParser.java | 2 +- .../ui/userinterface/UIDataManager.java | 12 +- 60 files changed, 435 insertions(+), 151 deletions(-) create mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelSelectionData.java diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java index bc81e92..c61decb 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java @@ -145,35 +145,27 @@ public class DAChartBoard extends Composite { } }); - if (boardStyle == BOARD_STYLE_TIME) { - interval = DATimelineTimeRenderer.DEFAULT_INTERVAL; - timeline = new DATimeline(this, true); - timelineTooltip = new DefaultToolTip(timeline); - timelineTooltip.deactivate(); - timeline.addMouseTrackListener(timelineMouseTrackAdapter); - - lifecycleBar = new LifecycleBar(this); - lifecycleBarTooltip = new DefaultToolTip(lifecycleBar); - lifecycleBarTooltip.deactivate(); - lifecycleBar.addMouseTrackListener(timelineMouseTrackAdapter); - } else if(boardStyle == BOARD_STYLE_FRAME) { + if (boardStyle == BOARD_STYLE_FRAME) { interval = DATimelineFrameRenderer.DEFAULT_INTERVAL; timeline = new DATimeline(this, false); timeline.setRenderer(new DATimelineFrameRenderer()); } else { - interval = DATimelineFrameRenderer.DEFAULT_INTERVAL; + interval = DATimelineTimeRenderer.DEFAULT_INTERVAL; timeline = new DATimeline(this, true); timelineTooltip = new DefaultToolTip(timeline); timelineTooltip.deactivate(); timeline.addMouseTrackListener(timelineMouseTrackAdapter); - timeline.setRenderer(new DATimelineTinyTimeRenderer()); - + lifecycleBar = new LifecycleBar(this); lifecycleBarTooltip = new DefaultToolTip(lifecycleBar); lifecycleBarTooltip.deactivate(); lifecycleBar.addMouseTrackListener(timelineMouseTrackAdapter); + + if (boardStyle == BOARD_STYLE_KERNEL) { + timeline.setRenderer(new DATimelineTinyTimeRenderer()); + } } - + this.addListener(SWT.Resize, resizeListener); scale = new DAScale(this, 4, SWT.NONE); @@ -566,7 +558,7 @@ public class DAChartBoard extends Composite { markers = null; } } - + public double getVisibleStartTime() { return boardManager.getVisibleStartTime(); } @@ -783,7 +775,7 @@ public class DAChartBoard extends Composite { protected void callBackScrollChanged() { } - + protected void callBackSizeChanged() { } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java index d687c4b..e722e15 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java @@ -343,6 +343,8 @@ public class AnalyzerConstants { public final static int TYPE_TABLE_WARNING = 0x0008; public final static int TYPE_TABLE_NORMAL = 0x0010; public final static int TYPE_TABLE_CALLTRACE = 0x0020; + public final static int TYPE_TABLE_CONTEXTSWITCH = 0x0040; + public final static int TYPE_TABLE_FUNCTIONFRAGMENT = 0x0080; public final static String CALLSTACK_KEY_PID = "pid";//$NON-NLS-1$ public final static String CALLSTACK_KEY_ADDR = "address";//$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java index 5f595dc..d79224b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java @@ -102,13 +102,13 @@ public class LogInserter implements Runnable { Logs logs = logPack.getLogs(logId); if (null != logs) { List newLogs = new ArrayList(); - newLogs.addAll(logs.getLogs()); + newLogs.addAll(logs.getRawLogs()); SqlManager.getInstance().insert(logId, newLogs); } if (null != logs && logId == DataChannelConstants.MSG_FUNCTION_EXIT) { List newLogs = new ArrayList(); - newLogs.addAll(logs.getLogs()); + newLogs.addAll(logs.getRawLogs()); SqlManager.getInstance().updateProfileTable(newLogs); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/KernelPageLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/KernelPageLabels.java index 75e26e3..b009e92 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/KernelPageLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/KernelPageLabels.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java index 14827fc..448294e 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -1204,7 +1204,7 @@ public class SqlManager { } String preQueryOption = " limit " + from + " " + to;//$NON-NLS-1$ //$NON-NLS-2$ - query = String.format("select %s %s from %s %s;",//$NON-NLS-1$ + query = String.format("select %s %s from %s where %s;",//$NON-NLS-1$ preQueryOption, columns.toString(), tableName, queryOption); semaphoreAcquire(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogPackage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogPackage.java index f5ed5f1..8fd3c4f 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogPackage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogPackage.java @@ -60,7 +60,7 @@ public class LogPackage { logs = new Logs(id); logMap.put(id, logs); } - logs.getLogs().add(input); + logs.getRawLogs().add(input); } public void setLogs(int id, Logs logs) { @@ -81,7 +81,7 @@ public class LogPackage { if (null == base) { logMap.put(id, logs); } else { - base.getLogs().addAll(logs.getLogs()); + base.getRawLogs().addAll(logs.getRawLogs()); } } } @@ -91,7 +91,7 @@ public class LogPackage { logList.addAll(logMap.values()); int count = 0; for (Logs logs : logList) { - count += logs.getLogs().size(); + count += logs.getRawLogs().size(); } return count; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/Logs.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/Logs.java index 65f61d9..81321a7 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/Logs.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/Logs.java @@ -45,7 +45,7 @@ public class Logs { } // getLogs -> getRawLogs - public List getLogs() { + public List getRawLogs() { if (null == logs) { logs = new ArrayList(); } @@ -61,14 +61,31 @@ public class Logs { } // cloneLogs -> getLogs - public List getCloneLogs() { + public List getLogs() { List newLogs = new ArrayList(); int size = logs.size(); for (int i = 0; i < size; i++) { -// LogData newLog = logs.get(i).getClone(); + // LogData newLog = logs.get(i).getClone(); LogData newLog = logs.get(i); newLogs.add(newLog); } return newLogs; } + + public List getCloneLogs() { + List newLogs = new ArrayList(); + int size = logs.size(); + for (int i = 0; i < size; i++) { + LogData newLog = null; + try { + newLog = logs.get(i).clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + newLog = logs.get(i); + } + + newLogs.add(newLog); + } + return newLogs; + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ContextSwitchData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ContextSwitchData.java index cdfc88d..28dcbf5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ContextSwitchData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ContextSwitchData.java @@ -50,6 +50,17 @@ public class ContextSwitchData extends LogData { } + public ContextSwitchData clone() throws CloneNotSupportedException { + ContextSwitchData log = (ContextSwitchData) super.clone(); + log.pcAddr = this.pcAddr; + log.pid = this.pid; + log.tid = this.tid; + log.cpuNum = this.cpuNum; + log.contextSeqSelf = this.contextSeqSelf; + + return log; + } + public void makeData(byte[] data) { super.makeData(data); index = MessageParser.MSG_HEADER_SIZE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java index 0dbb526..cefc1e6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java @@ -37,7 +37,7 @@ import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; -public abstract class LogData { +public abstract class LogData implements Cloneable { public static boolean isSWAP = false; public static int STATE_COUNT = 4; @@ -52,6 +52,17 @@ public abstract class LogData { public LogData() { } + public LogData clone() throws CloneNotSupportedException { + LogData log = (LogData) super.clone(); + log.index = this.index; + log.id = this.id; + log.seq = this.seq; + log.time = this.time; + log.libName = this.libName; + + return log; + } + public void makeData(byte[] data) { isSWAP = DACommunicator.isSWAPVersion(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataTimeComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataTimeComparator.java index 69d686d..4c7fcb0 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataTimeComparator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataTimeComparator.java @@ -1,3 +1,29 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jaewon Lim + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.swap.model.data; import java.util.Comparator; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java index e6d5ccc..435575d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java @@ -60,6 +60,22 @@ public class ProbeCommonData extends LogData { public ProbeCommonData() { } + + public ProbeCommonData clone() throws CloneNotSupportedException { + ProbeCommonData log = (ProbeCommonData) super.clone(); + log.apiId = this.apiId; + log.pid = this.pid; + log.tid = this.tid; + log.args = this.args; + log.ret = this.ret; + log.errno = this.errno; + log.internalCall = this.internalCall; + log.callerAddress = this.callerAddress; + log.reserved1 = this.reserved1; + log.reserved2 = this.reserved2; + + return log; + } @Override public void makeData(byte[] data) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java index 7373375..8282f72 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java @@ -65,6 +65,26 @@ public class ProfileData extends LogData { public ProfileData() { } + public ProfileData clone() throws CloneNotSupportedException { + ProfileData log = (ProfileData) super.clone(); + log.pcAddr = this.pcAddr; + log.callerPcAddr = this.callerPcAddr; + log.probeType = this.probeType; + log.probeSubType = this.probeSubType; + log.pid = this.pid; + log.tid = this.tid; + log.cpuNum = this.cpuNum; + log.args = this.args; + log.ret = this.ret; + log.apiName = this.apiName; + + log.buildType = this.buildType; + log.binaryPath = this.binaryPath; + log.callstack = this.callstack; + + return log; + } + public void makeData(byte[] data) { super.makeData(data); switch (id) { @@ -146,7 +166,7 @@ public class ProfileData extends LogData { } else { libName = binInfo.getTargetBinaryPath(); } -// System.out.println("plib name : " + libName); + // System.out.println("plib name : " + libName); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java index c15edc5..747a2c4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java @@ -206,10 +206,10 @@ public class FileChartView extends DAView { @Override public void updateLog(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_FILE); - if (null == logs || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs().size() == 0) { return; } - List inputs = logs.getCloneLogs(); + List inputs = logs.getLogs(); FileChartManager.getInstance().getLogListQueue().putLog(inputs); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java index 4c30319..258002e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/snapshot/SnapshotView.java @@ -413,11 +413,11 @@ public class SnapshotView extends DAView { if (currentPage.getViewName().equals(pageName) && !latestButton.isButtonEnabled()) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); - if (null == logs || null == logs.getLogs() - || logs.getLogs().isEmpty()) { + if (null == logs || null == logs.getRawLogs() + || logs.getRawLogs().isEmpty()) { return; } - List inputs = logs.getLogs(); + List inputs = logs.getRawLogs(); int lastIndex = inputs.size() - 1; SystemData input = (SystemData) inputs.get(lastIndex); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java index efb408d..2202873 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartRenderer.java index abc085a..51f4dc6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartRenderer.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java index 8d52989..e857cb1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChartView.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -40,7 +40,7 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.common.SetRangeMarkerMouseMoveListener; import org.tizen.dynamicanalyzer.ui.common.UICommonConstants; -import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataPerThread; +import org.tizen.dynamicanalyzer.ui.kernel.data.KernelSelectionData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; @@ -113,7 +113,7 @@ public class CallFlowChartView extends DAView { ImageResources.TIMELINE_DROPDOWN_PUSH, ImageResources.TIMELINE_DROPDOWN_NORMAL); callflowCombo.add(KernelPageLabels.CALL_FLOW_CHART_TITLE); - callflowCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + callflowCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); callflowCombo.select(0); callflowCombo.setEnabled(false); callflowCombo.setComboRender(new TitleComboRenderer()); @@ -173,7 +173,7 @@ public class CallFlowChartView extends DAView { Object odata = selData.getData(); long selectionStartTime, selectionEndTime; - if (!(odata instanceof KernelDataPerThread)) { + if (!(odata instanceof KernelSelectionData)) { selectionStartTime = selData.getStartTime(); selectionEndTime = selData.getEndTime(); @@ -188,8 +188,8 @@ public class CallFlowChartView extends DAView { .getMarkers().get(UICommonConstants.SELECTION_MARKER_INDEX); intervalMarker.setInterval(startTime, endTime); } else { - KernelDataPerThread sdata = (KernelDataPerThread) odata; - callflowChart.setSelectedData(sdata); + KernelSelectionData sdata = (KernelSelectionData) odata; + callflowChart.setSelectedData(sdata.getData()); callflowChart.updateChart(); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java index ecd5464..c7e4939 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowTabComposite.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java index 5fba8db..484fbbd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChart.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -47,6 +47,7 @@ import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataMaker; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataPerThread; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataPerThreadComparator; +import org.tizen.dynamicanalyzer.ui.kernel.data.KernelSelectionData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -61,6 +62,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class ContextSwitchingChart extends DAChartBoard { + public static final String KERNEL_CHART_DATA_TYPE = "kernel_data_type"; + private final KernelDataMaker dataMaker = KernelDataMaker.getInstance(); public ContextSwitchingChart(Composite parent, String title) { @@ -114,7 +117,8 @@ public class ContextSwitchingChart extends DAChartBoard { ColorResources.BLUE); coreChart.addSeries(coreSeries); - coreItem.setData(kdata); + coreItem.setData(new KernelSelectionData(kdata, + KernelSelectionData.KERNEL_DATA_TYPE_CONTEXTSWITCH)); kdata.setContextChart(coreItem); } else { // delete previous drawing items @@ -135,7 +139,8 @@ public class ContextSwitchingChart extends DAChartBoard { ColorResources.RED); functionChart.addSeries(functionSeries); - functionItem.setData(kdata); + functionItem.setData(new KernelSelectionData(kdata, + KernelSelectionData.KERNEL_DATA_TYPE_FUNCTIONCALL)); kdata.setFunctionChart(functionItem); } else if (bitem != null) { // delete previous drawing items @@ -286,7 +291,8 @@ public class ContextSwitchingChart extends DAChartBoard { for (int i = 0; i < listsize; i++) { DAChartBoardItem item = itemList.get(i); - KernelDataPerThread gdata = (KernelDataPerThread) item.getData(); + KernelDataPerThread gdata = ((KernelSelectionData) item.getData()) + .getData(); sortedmap.put(gdata, i); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartRenderer.java index 6014f3b..e33f173 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartRenderer.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartSeriesItem.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartSeriesItem.java index 1b6da1a..a59936d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartSeriesItem.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartSeriesItem.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java index 525d39a..8e756d2 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/ContextSwitchingChartView.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -102,7 +102,7 @@ public class ContextSwitchingChartView extends DAView { ImageResources.TIMELINE_DROPDOWN_NORMAL); contextCombo.add(KernelPageLabels.CONTEXT_SWITCH_CHART_TITLE); contextCombo.select(0); - contextCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_CENTER); + contextCombo.setTextAlign(DACustomCombo.TEXT_ALIGN_LEFT); contextCombo.setEnabled(false); contextCombo.setComboRender(new TitleComboRenderer()); contextCombo.setComboPopupRender(new TitleComboPopupRenderer()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java index 28540fa..bbb85d4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListTable.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -34,15 +34,18 @@ import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Composite; +import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.sql.DBTableManager; -import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataMaker; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataPerThread; +import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite; +import org.tizen.dynamicanalyzer.widgets.helper.Formatter; public class KernelListTable extends DAWindowingTableComposite { private KernelDataPerThread selectedData = null; @@ -62,12 +65,12 @@ public class KernelListTable extends DAWindowingTableComposite { return; } int size = ti.length; - LogData startData = ((DATableDataFormat) ti[0].getData()) - .getLogData(); - LogData endData = ((DATableDataFormat) ti[size - 1].getData()) - .getLogData(); - long startTime = startData.getTime(); - long endTime = endData.getTime(); + List startData = ((DATableDataFormat) ti[0].getData()) + .getData(); + List endData = ((DATableDataFormat) ti[size - 1] + .getData()).getData(); + long startTime = Long.parseLong(startData.get(timeColumnIndex)); + long endTime = Long.parseLong(endData.get(timeColumnIndex)); DASelectionData data = new DASelectionData(KernelListView.ID, startTime, endTime, ti, table); @@ -84,27 +87,121 @@ public class KernelListTable extends DAWindowingTableComposite { protected List makeTableInput() { List input = new ArrayList(); List> queriedData = getQueriedStringData(); - if (queriedData != null) - ; + if (queriedData == null) { + return null; + } int size = queriedData.size(); for (int i = 0; i < size; i++) { - + List row = queriedData.get(i); List text = new ArrayList(); + int seqnum; + long starttime, endtime, exectime; + if (isCoreSelected) { + seqnum = Integer.parseInt(row + .get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_SEQ)); + starttime = Long + .parseLong(row + .get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_STARTTIME)); + endtime = Long + .parseLong(row + .get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_ENDTIME)); + exectime = endtime - starttime; + text.add(row.get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_SEQ)); + text.add(row.get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_PID)); + text.add(row.get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_TID)); + text.add(row.get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_CPU)); + text.add(Formatter.toTimeFormat(starttime)); + text.add(Formatter.toTimeFormat(endtime)); + text.add(Formatter.toTimeFormat(exectime)); + text.add(row + .get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_STARTADDR)); + text.add(row + .get(KernelDataMaker.CONTEXT_DATA_COLUMN_INDEX_ENDADDR)); + text.add(""); + } else { + seqnum = Integer.parseInt(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_SEQ)); + starttime = Long + .parseLong(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_STARTTIME)); + endtime = Long + .parseLong(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_ENDTIME)); + exectime = endtime - starttime; + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_SEQ)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_PID)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_TID)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_CPU)); + text.add(Formatter.toTimeFormat(starttime)); + text.add(Formatter.toTimeFormat(endtime)); + text.add(Formatter.toTimeFormat(exectime)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_STARTADDR)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_ENDADDR)); + text.add(row + .get(KernelDataMaker.FUNCTION_DATA_COLUMN_INDEX_FUNCNAME)); + } + + // create DATableDataFormat + DATableDataFormat tableData = new DATableDataFormat(seqnum); + tableData.getData().addAll(row); + if (isCoreSelected) { + tableData.setType(AnalyzerConstants.TYPE_TABLE_CONTEXTSWITCH); + } else { + tableData + .setType(AnalyzerConstants.TYPE_TABLE_FUNCTIONFRAGMENT); + } + + TableInput tableInput = new TableInput(); + tableInput.setText(text); + tableInput.setData(tableData); + input.add(tableInput); + if (RangeDataManager.getInstance().isBeingAnalyzed()) { + long analysisStartTime = RangeDataManager.getInstance() + .getAnalysisStartTime(); + long analysisEndTime = RangeDataManager.getInstance() + .getAnalysisEndTime(); + if (starttime <= analysisEndTime + && endtime >= analysisStartTime) { + tableInput.setInRange(true); + } + } } - - return null; + + return input; } @Override protected int getItemCountByPid() { - return 0; + if (selectedData == null) { + return 0; + } + + int itemCount = 0; + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (selectedPid == 0 || selectedData.getPid() == selectedPid) { + if (isCoreSelected) { + itemCount = selectedData.getCoreFragmentCount(); + } else { + itemCount = selectedData.getFuncFragmentCount(); + } + } + + return itemCount; } @Override protected List getDBTableColumnNames() { - return null; + List columnName = new ArrayList(); + columnName.add("*"); + return columnName; } @Override @@ -132,24 +229,41 @@ public class KernelListTable extends DAWindowingTableComposite { @Override protected String getSelectQueryOption() { + String never_option = DBTableManager.COMMON_COLUMN_TID + " = -1"; + if (selectedData == null) { - return null; + return never_option; } - String option = "where " + DBTableManager.COMMON_COLUMN_TID + " = " - + selectedData.getTid() + " order by " - + DBTableManager.CUSTOM_COLUMN_START_TIME; - return option; + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (selectedPid == 0 || selectedData.getPid() == selectedPid) { + String option = DBTableManager.COMMON_COLUMN_TID + " = " + + selectedData.getTid() + " order by " + + DBTableManager.CUSTOM_COLUMN_START_TIME; + + return option; + } else { + return never_option; + } } @Override protected String getSelectQueryCountOption() { + String never_option = DBTableManager.COMMON_COLUMN_TID + " = -1"; + if (selectedData == null) { - return null; + return never_option; } - - return null; + int selectedPid = ToolbarArea.getInstance().getSelectedPid(); + if (selectedPid == 0 || selectedData.getPid() == selectedPid) { + String option = DBTableManager.COMMON_COLUMN_TID + " = " + + selectedData.getTid(); + + return option; + } else { + return never_option; + } } public void setSelectedData(KernelDataPerThread kdata, boolean isCore) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java index c923864..7bca362 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelListView.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,15 +35,13 @@ import org.tizen.dynamicanalyzer.common.DASelectionData; import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.KernelPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; +import org.tizen.dynamicanalyzer.ui.kernel.data.KernelSelectionData; import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer; import org.tizen.dynamicanalyzer.ui.widgets.table.WindowingTableColumnSizePackListener; public class KernelListView extends DAView { public static final String ID = KernelListView.class.getName(); - private long analysisStartTime = 0; - private long analysisEndTime = 0; - int[] innerMaxWeight = { 0, 100 }; int[] outerMaxWeight = { 100, 0 }; @@ -91,12 +89,13 @@ public class KernelListView extends DAView { contents.setBackground(ColorResources.WINDOW_BG_COLOR); contents.setLayout(new FillLayout()); tableComp = new KernelListTable(contents, SWT.NONE, SWT.MULTI - | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL); + | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL); tableComp.setSortTypes(sortTypes); tableComp.setColumnAlignment(columnAlignment); tableComp.setColumns(columnNames); tableComp.setColumnSize(columnSizes); tableComp.setColumnVisibility(columnVisibility_function); + tableComp.setTableToolTipEnable(false); contents.addControlListener(new WindowingTableColumnSizePackListener( tableComp, columnSizes)); } @@ -105,10 +104,22 @@ public class KernelListView extends DAView { public void updateView(DASelectionData selData) { long start = selData.getStartTime(); long end = selData.getEndTime(); - - updateView(); + Object data = selData.getData(); + + if (data instanceof KernelSelectionData) { + KernelSelectionData sdata = (KernelSelectionData) data; + boolean isCore = (sdata.getType() == KernelSelectionData.KERNEL_DATA_TYPE_CONTEXTSWITCH); + tableComp.setSelectedData(sdata.getData(), isCore); + if(isCore) { + tableComp.setColumnVisibility(columnVisibility_core); + } else { + tableComp.setColumnVisibility(columnVisibility_function); + } + tableComp.updateTable(); + } + ((KernelListTable) tableComp).setSelectionByTime(start, end); - updateView(); + tableComp.updateTable(); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java index 925fe2b..ae56af0 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelPage.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -53,7 +53,7 @@ public class KernelPage extends DAPageComposite { name = AnalyzerLabels.COOLBAR_AREA_KERNEL; this.setData(DAPageComposite.KEY_TOOLTIP, - ShortCutManager.COOLBAR_AREA_NETWORK_TOOLTIP); + ShortCutManager.COOLBAR_AREA_KERNEL_TOOLTIP); this.setLayout(new FillLayout()); baseForm = new SashForm(this, SWT.HORIZONTAL); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java index c120fc9..f413f05 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/KernelStatisticInfoView.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java index 0c4da34..7378e0d 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/ContextDataDBInserter.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java index b1fa624..ab79c8b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/FunctionDataDBInserter.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java index 73c86fc..085249a 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelBlockingQueue.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java index a1d4340..b4c9e4b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -111,12 +111,12 @@ public class KernelDataMaker { int size = inputs.size(); for (int i = 0; i < size; i++) { LogData input = (LogData) inputs.get(i); - + switch (input.getId()) { case DataChannelConstants.MSG_CONTEXT_SWITCH_EXIT: { ContextSwitchData csdata = (ContextSwitchData) input; int tid = csdata.getTid(); - + KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // thread id is not exist in thread id kdata = new KernelDataPerThread(csdata.getPid(), tid, @@ -150,7 +150,7 @@ public class KernelDataMaker { ContextSwitchData csdata = (ContextSwitchData) input; ContextSwitchData precore; int tid = csdata.getTid(); - + KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // thread id is not exist // TODO : error @@ -210,7 +210,13 @@ public class KernelDataMaker { break; } case DataChannelConstants.MSG_FUNCTION_ENTRY: { - ProfileData fndata = (ProfileData) input; + ProfileData fndata = null; + try { + fndata = (ProfileData) input.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + break; + } int tid = fndata.getTid(); KernelDataPerThread kdata = findKernelData(tid); @@ -302,10 +308,12 @@ public class KernelDataMaker { functionDataList.add(dbfuncdata); kdata.incFuncFragmentCount(); - prefunc.peek().setTime(fndata.getTime()); - prefunc.peek().setPcAddr(fndata.getPcAddr()); - prefunc_type.set(prefunc_type.size() - 1, - START_TYPE_RETURNED); + if (!prefunc.isEmpty() && !prefunc_type.isEmpty()) { + prefunc.peek().setTime(fndata.getTime()); + prefunc.peek().setPcAddr(fndata.getPcAddr()); + prefunc_type.set(prefunc_type.size() - 1, + START_TYPE_RETURNED); + } } } break; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java index 6821213..39f1d9d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -125,25 +125,25 @@ public class KernelDataManager implements Runnable { List contextEntryLogList = null, contextExitLogList = null, functionEntryLogList = null, functionExitLogList = null; Iterator centryiter = null, cexititer = null, fentryiter = null, fexititer = null; if (contextEntryLogs != null) { - contextEntryLogList = contextEntryLogs.getCloneLogs(); + contextEntryLogList = contextEntryLogs.getLogs(); centryiter = contextEntryLogList.iterator(); if (centryiter.hasNext()) pqueue.offer(centryiter.next()); } if (contextExitLogs != null) { - contextExitLogList = contextExitLogs.getCloneLogs(); + contextExitLogList = contextExitLogs.getLogs(); cexititer = contextExitLogList.iterator(); if (cexititer.hasNext()) pqueue.offer(cexititer.next()); } if (functionEntryLogs != null) { - functionEntryLogList = functionEntryLogs.getCloneLogs(); + functionEntryLogList = functionEntryLogs.getLogs(); fentryiter = functionEntryLogList.iterator(); if (fentryiter.hasNext()) pqueue.offer(fentryiter.next()); } if (functionExitLogs != null) { - functionExitLogList = functionExitLogs.getCloneLogs(); + functionExitLogList = functionExitLogs.getLogs(); fexititer = functionExitLogList.iterator(); if (fexititer.hasNext()) pqueue.offer(fexititer.next()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThread.java index ce30cd9..e9b3dc9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThread.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThreadComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThreadComparator.java index 0108299..360be76 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThreadComparator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataPerThreadComparator.java @@ -4,7 +4,7 @@ * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: - * Jooyoul Lee + * Jaewon Lim * Juyoung Kim * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelSelectionData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelSelectionData.java new file mode 100644 index 0000000..137eef8 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelSelectionData.java @@ -0,0 +1,50 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Hyunjong Park + * yeongtaik byeon + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + +package org.tizen.dynamicanalyzer.ui.kernel.data; + +public class KernelSelectionData { + public static final int KERNEL_DATA_TYPE_NONE = 0; + public static final int KERNEL_DATA_TYPE_CONTEXTSWITCH = 1; + public static final int KERNEL_DATA_TYPE_FUNCTIONCALL = 2; + + private KernelDataPerThread kernelData = null; + private int dataType = KERNEL_DATA_TYPE_NONE; + + public KernelSelectionData(KernelDataPerThread data, int type) { + this.kernelData = data; + this.dataType = type; + } + + public KernelDataPerThread getData() { + return kernelData; + } + + public int getType() { + return dataType; + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java index e7235df..82dae8e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartView.java @@ -213,10 +213,10 @@ public class NetworkChartView extends DAView { @Override public void updateLog(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_NETWORK); - if (null == logs || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs().size() == 0) { return; } - List inputs = logs.getCloneLogs(); + List inputs = logs.getLogs(); NetworkChartManager.getInstance().getLogListQueue().putLog(inputs); } 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 bc090a8..af7fd77 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 @@ -126,11 +126,11 @@ public class GLPage extends DAPageComposite { @Override public void updateLog(LogPackage logPack) { Logs glesLogs = logPack.getLogs(DataChannelConstants.MSG_PROBE_GLES20); - if (glesLogs == null || glesLogs.getLogs().size() == 0) { + if (glesLogs == null || glesLogs.getRawLogs().size() == 0) { return; } - List logDataList = glesLogs.getLogs(); + List logDataList = glesLogs.getRawLogs(); for (LogData logData : logDataList) { glDataMaker.addGLAPIData((GLES20LogData) logData); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java index 2a35329..1503e13 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java @@ -90,7 +90,7 @@ public class GLFrameRateChart extends TimelineChart { return; } - List logDataList = logs.getLogs(); + List logDataList = logs.getRawLogs(); for (LogData logData : logDataList) { int index = (int) (logData.getTime() / TimelineConstants.MEGA_LONG); int size = glDataMaker.getFrameCountInfoListSize(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java index 34497e1..4cec32e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java @@ -430,7 +430,7 @@ public class RangeDataManager implements Runnable { Logs logs = logPack.getLogs(DataChannelConstants.LOG_USER_FUNCTION); if (null != logs) { if (DACommunicator.isSWAPVersion()) { - List profileData = logs.getLogs(); + List profileData = logs.getRawLogs(); int size = profileData.size(); for (int i = 0; i < size; i++) { ProfileData input = (ProfileData) profileData.get(i); @@ -474,7 +474,7 @@ public class RangeDataManager implements Runnable { logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_FILE); if (null != logs) { - List resourceInputs = logs.getLogs(); + List resourceInputs = logs.getRawLogs(); /* make file failed data and warning data */ // fileDataMaker.makeData(resourceInputs); /* resource leak check */ @@ -486,7 +486,7 @@ public class RangeDataManager implements Runnable { logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_MEMORY); if (null != logs) { - List memoryInputs = logs.getLogs(); + List memoryInputs = logs.getRawLogs(); /* memory leak check */ int size = memoryInputs.size(); for (int i = 0; i < size; i++) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java index 679f370..3c7fb9d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfilingView.java @@ -155,10 +155,10 @@ public class FunctionUsageProfilingView extends DAView { @Override public void updateLog(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_DATA_SAMPLE); - if (null == logs || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs().size() == 0) { return; } - List inputs = logs.getCloneLogs(); + List inputs = logs.getLogs(); FunctionUsageProfiler.getInstance().pushSample(inputs); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java index 7340402..5f151ae 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java @@ -105,10 +105,10 @@ public class ThreadChartManager implements Runnable { private List getLogsFromLogPackage(LogPackage logPack, int logCenterConstants) { Logs logs = logPack.getLogs(logCenterConstants); - if (null == logs || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs().size() == 0) { return null; } - List ret = logs.getCloneLogs(); + List ret = logs.getLogs(); return ret; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java index 7e46310..499f141 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java @@ -282,10 +282,10 @@ public class ThreadPageSyncDataManager { public List getLogsFromLogPackage(LogPackage logPack, int logCenterConstants) { Logs logs = logPack.getLogs(logCenterConstants); - if (null == logs || null == logs.getLogs() || logs.getLogs().isEmpty()) { + if (null == logs || null == logs.getRawLogs() || logs.getRawLogs().isEmpty()) { return null; } - List ret = logs.getLogs(); + List ret = logs.getRawLogs(); return ret; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java index 23f8af5..2f132c0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java @@ -314,10 +314,10 @@ public class ThreadPageThreadDataManager { public List getLogsFromLogPackage(LogPackage logPack, int logCenterConstants) { Logs logs = logPack.getLogs(logCenterConstants); - if (null == logs || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs().size() == 0) { return null; } - List ret = logs.getLogs(); + List ret = logs.getRawLogs(); return ret; } 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 0f1a7cc..06d8b74 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 @@ -118,7 +118,7 @@ public class CPUChart extends TimelineChart { return; } - List logDataList = logs.getLogs(); + List logDataList = logs.getRawLogs(); for (LogData logData : logDataList) { parseLog((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 9921bef..b4e4491 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 @@ -141,7 +141,7 @@ public class CPUCoreChart extends TimelineChart { return; } - List logDataList = logs.getLogs(); + List logDataList = logs.getRawLogs(); for (LogData logData : logDataList) { parseLog((SystemData) logData); 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 b4ba020..c66a2ef 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 @@ -88,7 +88,7 @@ public class CPUFrequencyChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData)logData); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java index 997ffa5..2323a2f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DeviceChart.java @@ -107,7 +107,7 @@ public class DeviceChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData) logData); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java index c11f2de..4e926bf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java @@ -101,7 +101,7 @@ public class DiskIOChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData) logData); 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 0e882d8..6951a63 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 @@ -164,7 +164,7 @@ public class FileChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); 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 8e11930..6f82921 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 @@ -105,9 +105,9 @@ public class HeapChart extends TimelineChart { Logs deviceLogs = logPack.getLogs(probeType); List memoryLogList = memoryLogs == null ? null : memoryLogs - .getLogs(); + .getRawLogs(); List deviceLogList = deviceLogs == null ? null : deviceLogs - .getLogs(); + .getRawLogs(); parseLog(memoryLogList, deviceLogList); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java index c32fd13..ff9caac 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java @@ -99,7 +99,7 @@ public class NetworkIOChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData) logData); 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 31bff6d..7c421cc 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 @@ -102,7 +102,7 @@ public class ProcessMemoryChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData)logData); 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 6cab103..52b6cef 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 @@ -99,7 +99,7 @@ public class ScreenshotChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((ScreenShotData)logData); 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 1a3b0ce..30b05bf 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 @@ -103,7 +103,7 @@ public class SystemMemoryChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((SystemData)logData); 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 b67f366..28ee145 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 @@ -146,7 +146,7 @@ public class UIEventChart extends TimelineChart { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData logData : logList) { parseLog((UIEventData)logData); 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 86ab293..83a57e5 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 @@ -79,7 +79,7 @@ public class UserCustomChart extends TimelineChart { return; } - List logDataList = logs.getLogs(); + List logDataList = logs.getRawLogs(); if (logDataList.size() <= 0) { return; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java index 89edc88..197e950 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java @@ -219,37 +219,37 @@ public class TimelineView extends DAView { } Logs deviceLogs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); - if (deviceLogs != null && !deviceLogs.getLogs().isEmpty()) { + if (deviceLogs != null && !deviceLogs.getRawLogs().isEmpty()) { deviceLogParser.parseLogPackage(logPack); } Logs memoryLogs = logPack .getLogs(DataChannelConstants.MSG_PROBE_MEMORY); - if (memoryLogs != null && !memoryLogs.getLogs().isEmpty()) { + if (memoryLogs != null && !memoryLogs.getRawLogs().isEmpty()) { HeapChart.getInstance().parseLogPackage(logPack); } Logs recorderLogs = logPack .getLogs(DataChannelConstants.MSG_PROBE_UIEVENT); - if (recorderLogs != null && !recorderLogs.getLogs().isEmpty()) { + if (recorderLogs != null && !recorderLogs.getRawLogs().isEmpty()) { UIEventChart.getInstance().parseLogPackage(logPack); } Logs customLogs = logPack .getLogs(DataChannelConstants.MSG_PROBE_CUSTOM); - if (customLogs != null && !customLogs.getLogs().isEmpty()) { + if (customLogs != null && !customLogs.getRawLogs().isEmpty()) { customLogParser.parseLogPackage(logPack); } Logs lifecycleLogs = logPack .getLogs(DataChannelConstants.MSG_PROBE_LIFECYCLE); - if (lifecycleLogs != null && !lifecycleLogs.getLogs().isEmpty()) { + if (lifecycleLogs != null && !lifecycleLogs.getRawLogs().isEmpty()) { lifecycleLogParser.parseLogPackage(logPack); } Logs screenShotLogs = logPack .getLogs(DataChannelConstants.MSG_PROBE_SCREENSHOT); - if (screenShotLogs != null && !screenShotLogs.getLogs().isEmpty()) { + if (screenShotLogs != null && !screenShotLogs.getRawLogs().isEmpty()) { ScreenshotChart.getInstance().parseLogPackage(logPack); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java index baf6db0..431a329 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java @@ -68,7 +68,7 @@ public class CustomLogParser { public void parseLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_CUSTOM); - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData log : logList) { parseLog((CustomData) log); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java index 85474a5..c6b60b3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/DeviceLogParser.java @@ -16,8 +16,8 @@ public class DeviceLogParser { public void parseLogPackage(LogPackage logPack) { Logs deviceLogs = logPack.getLogs(DataChannelConstants.MSG_DATA_SYSTEM); - if (deviceLogs != null && deviceLogs.getLogs() != null - && deviceLogs.getLogs().size() > 0) { + if (deviceLogs != null && deviceLogs.getRawLogs() != null + && deviceLogs.getRawLogs().size() > 0) { List chartList = timelineChartManager.getChartList(); for (TimelineChart chart : chartList) { if (chart.getProbeType() == DataChannelConstants.MSG_DATA_SYSTEM) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java index f597885..6274275 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java @@ -69,7 +69,7 @@ public class LifecycleLogParser { return; } - List logList = logs.getLogs(); + List logList = logs.getRawLogs(); for (LogData log : logList) { parseLog((LifeCycleData) log); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java index a521e17..f4d6da3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java @@ -133,21 +133,21 @@ public class UIDataManager implements Runnable { public void setControlDataTFromLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_UICONTROL); - if (null == logs || logs.getLogs() == null - || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs() == null + || logs.getRawLogs().size() == 0) { return; } - List inputs = logs.getCloneLogs(); + List inputs = logs.getLogs(); getLogListQueue().putLog(inputs); } public void setSceneTransformDataTFromLogPackage(LogPackage logPack) { Logs logs = logPack.getLogs(DataChannelConstants.MSG_PROBE_SCENE); - if (null == logs || logs.getLogs() == null - || logs.getLogs().size() == 0) { + if (null == logs || logs.getRawLogs() == null + || logs.getRawLogs().size() == 0) { return; } - List inputs = logs.getCloneLogs(); + List inputs = logs.getLogs(); getLogListQueue().putLog(inputs); } -- 2.7.4