From c93bc5f4e71de27bbe65b66bb6c9545fb21225c5 Mon Sep 17 00:00:00 2001 From: jooyoul_lee Date: Fri, 9 Aug 2013 18:17:06 +0900 Subject: [PATCH] [Title] swap source update [Desc.] [Issue] blocked source 1. FileChart parsing 2. DATableComposite Collections.sort() 3. WarningListView updateView() 4. FailedApiListView updateView() --- .../dynamicanalyzer/logparser/LogInserter.java | 12 +-- .../swap/communicator/Communicator30.java | 8 +- .../swap/logparser/MessageParser.java | 4 +- .../swap/logparser/SWAPLogParser.java | 2 +- .../swap/model/control/RunTimeConfiguration.java | 10 ++- .../swap/model/data/ApiNameManager.java | 8 +- .../swap/model/data/BasicDataMessage.java | 22 ++++- .../ui/summary/failed/FailedApiListView.java | 2 +- .../ui/summary/profiling/ProfileDataMaker.java | 3 + .../ui/summary/warning/WarningTable.java | 93 +++++++++++----------- .../ui/timeline/chart/FileChart.java | 34 ++++---- .../control/UIControlListDataChecker.java | 2 +- .../ui/widgets/table/DATableComposite.java | 2 +- 13 files changed, 117 insertions(+), 85 deletions(-) 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 335b9f6..0f8c8b3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java @@ -100,7 +100,7 @@ public class LogInserter implements Runnable { int size = logIds.size(); InsertLogQueue logQueue = getInsertLogQueue(); while (!AnalyzerManager.isExit()) { - try { +// try { LogPackage logPack = logQueue.getFirstLog(); if (null == logPack) { break; @@ -119,14 +119,14 @@ public class LogInserter implements Runnable { int logId = logIds.get(i); List msgs = getLogPackage().getMessages(logId); if (null != msgs) { - SqlManager.getInstance().insert(logId, msgs); +// SqlManager.getInstance().insert(logId, msgs); } } initLogPackage(); - } catch (InterruptedException e) { - System.out.println("insert log thread interrupted"); //$NON-NLS-1$ - break; - } +// } catch (InterruptedException e) { +// System.out.println("insert log thread interrupted"); //$NON-NLS-1$ +// break; +// } } isCompleted = true; System.out.println("insert log thread end"); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index d9b0e97..8cef711 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -201,11 +201,11 @@ public class Communicator30 extends BaseCommunicator { } // TODO: app inst , replay info added!! -// byte[] rear = ByteUtils.getByte(appInfo.getByteValue(), -// rt.getByteValue(), getUserSpaceInst().getByteValue(), -// replayEvent); byte[] rear = ByteUtils.getByte(appInfo.getByteValue(), - rt.getByteValue(), 0,0); + rt.getByteValue(), getUserSpaceInst().getByteValue(), + replayEvent); +// byte[] rear = ByteUtils.getByte(appInfo.getByteValue(), +// rt.getByteValue(), 0,0); int length = rear.length; byte[] ret = ByteUtils.getByte(AnalyzerConstants.MSG_START_SWAP, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java index eb8563f..6bb9fcd 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java @@ -184,7 +184,7 @@ public class MessageParser { } pInfo.setPid(pid); - pInfo.setStartTime(startTime); +// pInfo.setStartTime(startTime); pInfo.setLowestAddress(lowAddr); pInfo.setHighestAddress(highAddr); pInfo.setAppType(appType); @@ -260,7 +260,7 @@ public class MessageParser { if (readSize <= 0) { continue; } else { -// System.out.println("read size : " + readSize); + System.out.println("read size : " + readSize); readBuf = new byte[readSize]; System.arraycopy(buf, 0, readBuf, 0, readSize); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index 9c0aaad..aec338c 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -203,7 +203,7 @@ public class SWAPLogParser implements Runnable { pData)) { continue; } - pushLog(log, msg, logPack); +// pushLog(log, msg, logPack); /* user callstack create by entry and exit */ AnalyzerManager.getCallstackManager().makeUserCallstack( pData, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/control/RunTimeConfiguration.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/control/RunTimeConfiguration.java index d107514..7d36daf 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/control/RunTimeConfiguration.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/control/RunTimeConfiguration.java @@ -43,7 +43,15 @@ public class RunTimeConfiguration implements SWAPModel { @Override public byte[] getByteValue() { - return ByteUtils.getByte(preFeatures, features, systemTraceInterval, + features |= 0x100000; + features |= 0x200000; + features |= 0x400000; + features |= 0x800000; + features |= 0x1000000; + features |= 0x2000000; + features |= 0x4000000; + features |= 0x8000000; + return ByteUtils.getByte(features, preFeatures, systemTraceInterval, dataMessageInterval); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ApiNameManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ApiNameManager.java index 91f6e0f..5e10de5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ApiNameManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ApiNameManager.java @@ -7,7 +7,13 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; public class ApiNameManager { public static String getApiName(int apiId) { - return getApiList().get(apiId); + String name = null; + try { + return getApiList().get(apiId); + } catch (IndexOutOfBoundsException e) { + name = "unknown Api"; + return name; + } } public static int getApiId(String 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 ef72828..8da666c 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 @@ -64,11 +64,25 @@ public class BasicDataMessage { long nano = ByteUtils.toInt(headerBuffer, ID_SIZE + SEQ_SIZE + INT_SIZE); + // long startSec = AnalyzerManager.getProject().getStartTime() + // .getSec(); + // long startNano = AnalyzerManager.getProject().getStartTime() + // .getNano(); + + DATime startTime = AnalyzerManager.getProject().getStartTime(); long startSec = AnalyzerManager.getProject().getStartTime() .getSec(); long startNano = AnalyzerManager.getProject().getStartTime() .getNano(); + if (0 == startSec && 0 == startNano) { + startTime.setSec(sec); + startTime.setNano(nano); + AnalyzerManager.getProject().setStartTime(startTime); + startSec = sec; + startNano = nano; + } + long resultSec = sec - startSec; long resultNano = nano - startNano; @@ -80,10 +94,10 @@ public class BasicDataMessage { System.arraycopy(emptyHeaderBuffer, 0, headerBuffer, 0, HEADER_SIZE); // input - headerBuffer = buffer payload = new byte[payloadSize]; -// System.out.println("DEBUG - id :" + String.format("%4x", id) -// + " seq :" + seq + " time :" + time -// + " payload size : " + payloadSize + " request size :" -// + reqSize + " input length :" + input.length); + // System.out.println("DEBUG - id :" + String.format("%4x", id) + // + " seq :" + seq + " time :" + time + // + " payload size : " + payloadSize + " request size :" + // + reqSize + " input length :" + input.length); } reqSize = (0 == reqSize) ? payloadSize : reqSize; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java index 4b3ec49..75498d3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java @@ -97,7 +97,7 @@ public class FailedApiListView extends DAView { @Override public void updateView() { - tableComp.updateTable(); +// tableComp.updateTable(); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java index eb0d398..6d3b6f2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java @@ -231,6 +231,9 @@ public class ProfileDataMaker { public void makeFunctionUsageProfileData(ProfileData sampleLog) { totalSampleCount++; String callstack = sampleLog.getCallstack(); + if (null == callstack) { + return; + } String[] splitCallstack = callstack .split(AnalyzerConstants.DATA_PARSING_TOKEN); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java index d4d202e..45974ff 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java @@ -86,51 +86,52 @@ public class WarningTable extends DATableComposite { } protected List makeTableInput() { - List warningList = null; - if (isRange) { - warningList = RangeDataManager.getInstance().getWarningChecker() - .getWarningData(); - } else { - warningList = AnalyzerManager.getWarningChecker().getWarningData(); - } - List input = new ArrayList(); - int size = warningList.size(); - for (int i = 0; i < size; i++) { - // create text - List text = new ArrayList(); - WarningData warningData = warningList.get(i); - List warningInput = warningData.getData(); - - text.add(warningInput.get(LogCenterConstants.SEQUENCE_NUMBER_INDEX)); - { - if (AnalyzerConstants.MSG_PROBE_FILE == warningData - .getCategory()) { - String fdType = warningInput - .get(LogCenterConstants.RESOURCE_FDTYPE_INDEX); - int type = Integer.parseInt(fdType); - if (type == LogCenterConstants.FD_TYPE_FILE) { - text.add(SummaryLabels.WARNING_TABLE_FILE); - } else { - text.add(SummaryLabels.WARNING_TABLE_SOCKET); - } - } else { - text.add(LogCenterConstants - .getLogCenterNameFromId(warningData.getCategory())); - } - } - String message = WarningChecker.messageMaker(warningData, true); - text.add(message); - // create images - - // create DATableDataFormat - DATableDataFormat tableData = new DATableDataFormat( - warningData.getSeq()); - tableData.getData().addAll(warningData.getData()); - TableInput tableInput = new TableInput(); - tableInput.setText(text); - tableInput.setData(tableData); - input.add(tableInput); - } - return input; +// List warningList = null; +// if (isRange) { +// warningList = RangeDataManager.getInstance().getWarningChecker() +// .getWarningData(); +// } else { +// warningList = AnalyzerManager.getWarningChecker().getWarningData(); +// } +// List input = new ArrayList(); +// int size = warningList.size(); +// for (int i = 0; i < size; i++) { +// // create text +// List text = new ArrayList(); +// WarningData warningData = warningList.get(i); +// List warningInput = warningData.getData(); +// +// text.add(warningInput.get(LogCenterConstants.SEQUENCE_NUMBER_INDEX)); +// { +// if (AnalyzerConstants.MSG_PROBE_FILE == warningData +// .getCategory()) { +// String fdType = warningInput +// .get(LogCenterConstants.RESOURCE_FDTYPE_INDEX); +// int type = Integer.parseInt(fdType); +// if (type == LogCenterConstants.FD_TYPE_FILE) { +// text.add(SummaryLabels.WARNING_TABLE_FILE); +// } else { +// text.add(SummaryLabels.WARNING_TABLE_SOCKET); +// } +// } else { +// text.add(LogCenterConstants +// .getLogCenterNameFromId(warningData.getCategory())); +// } +// } +// String message = WarningChecker.messageMaker(warningData, true); +// text.add(message); +// // create images +// +// // create DATableDataFormat +// DATableDataFormat tableData = new DATableDataFormat( +// warningData.getSeq()); +// tableData.getData().addAll(warningData.getData()); +// TableInput tableInput = new TableInput(); +// tableInput.setText(text); +// tableInput.setData(tableData); +// input.add(tableInput); +// } +// return input; + return null; } } 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 ce43598..29b4720 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 @@ -151,23 +151,23 @@ public class FileChart extends TimelineChart { @Override public void parseLogPackage(LogPackage logPack) { - Logs logs = logPack.getLogs(probeType); - List logList = logs.getLogs(); - for (LogData log : logList) { - double time = Double.parseDouble(Long.toString(log.getTime())); - - int size = deviceLogTimeList.size(); - int index = (int) (time / TimelineConstants.MEGA); - - if (size <= index) { - for (int i = size; i <= index; i++) { - deviceLogTimeList.add(Double.NaN); - } - } - deviceLogTimeList.set(index, time); - - updateRW(time); - } +// Logs logs = logPack.getLogs(probeType); +// List logList = logs.getLogs(); +// for (LogData log : logList) { +// double time = Double.parseDouble(Long.toString(log.getTime())); +// +// int size = deviceLogTimeList.size(); +// int index = (int) (time / TimelineConstants.MEGA); +// +// if (size <= index) { +// for (int i = size; i <= index; i++) { +// deviceLogTimeList.add(Double.NaN); +// } +// } +// deviceLogTimeList.set(index, time); +// +// updateRW(time); +// } } private void updateRW(double time) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java index 39a49d9..1d28c01 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java @@ -41,7 +41,7 @@ public class UIControlListDataChecker { private int preSeq = -1; public void parserLog(ControlData input) { - + System.out.println("phj " + input.getApiName()); String stClassName = getClassName(input.getApiName()).trim(); if (stClassName.contains("AddFrame") || stClassName.contains("AddControl")) {//$NON-NLS-1$ //$NON-NLS-2$ if (isExistData(input.getParentClassName(), diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java index b7c5c3b..f0dc5e2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java @@ -352,7 +352,7 @@ public abstract class DATableComposite extends Composite { return; } if (null != comparator) { - Collections.sort(input, comparator); +// Collections.sort(input, comparator); } int[] sels = new int[selSeqs.size()]; int iii = 0; -- 2.7.4