From e6aa52def06f174085c1a93097b30f234aca00e4 Mon Sep 17 00:00:00 2001 From: jooyoul_lee Date: Thu, 22 Aug 2013 16:17:44 +0900 Subject: [PATCH] [Title] da swap version source update [Desc.] [Issue] --- .../dynamicanalyzer/swap/logparser/SWAPLogParser.java | 17 ++++++++++------- .../dynamicanalyzer/swap/model/probe2/DataFactory.java | 10 ++++------ .../dynamicanalyzer/swap/model/probe2/FileData.java | 8 ++++---- .../tizen/dynamicanalyzer/ui/file/FileChartData.java | 8 ++++---- .../dynamicanalyzer/ui/file/FileChartDataEvent.java | 8 ++++---- .../tizen/dynamicanalyzer/ui/file/FileDataMaker.java | 10 +++++----- .../ui/summary/failed/FailedChecker.java | 2 +- 7 files changed, 32 insertions(+), 31 deletions(-) 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 aec338c..3220f37 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, @@ -218,6 +218,15 @@ public class SWAPLogParser implements Runnable { int rotate = ((ScreenShotData) log).getOrientation(); // TODO : fix processImage(remoteImgPath, rotate); + ImageInfo imgInfo = new ImageInfo(); + imgInfo.setSeq(Integer.toString(log.getSeq())); + imgInfo.setTime(Long.toString(log.getTime())); + + String[] path = remoteImgPath.split(CommonConstants.SLASH); + imgInfo.setFileName(new String(path[path.length - 1])); + + AnalyzerManager.getImageSet() + .put(imgInfo.getSeq(), imgInfo); } pushLog(log, msg, logPack); AnalyzerManager.getCallstackManager() @@ -336,12 +345,6 @@ public class SWAPLogParser implements Runnable { private void pushLog(LogData logData, BasicDataMessage msg, LogPackage logPack) { - if (logData instanceof ScreenShotData) { - ImageInfo imgInfo = new ImageInfo(); - imgInfo.setSeq(Integer.toString(logData.getSeq())); - imgInfo.setTime(Long.toString(logData.getTime())); - AnalyzerManager.getImageSet().put(imgInfo.getSeq(), imgInfo); - } logPack.setLogs(logData.getId(), logData); logPack.setMessages(msg.getId(), msg); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/DataFactory.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/DataFactory.java index 952ae47..3496d08 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/DataFactory.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/DataFactory.java @@ -95,8 +95,6 @@ public class DataFactory { } private static void createCommonData(LogData data, byte[] payload) { - // System.out.println("Create common data method - log seq " + - // data.getSeq()); ProbeCommonData probeData = ((ProbeCommonData) data); int apiId = ByteUtils.toInt(payload, index); index += INT_SIZE; @@ -111,8 +109,8 @@ public class DataFactory { index += LONG_SIZE; // long errno = ByteUtils.toLong(payload, index); // index += LONG_SIZE; - int errno = ByteUtils.toInt(payload, index); - index += INT_SIZE; + long errno = ByteUtils.toLong(payload, index); + index += LONG_SIZE; int internalCall = ByteUtils.toInt(payload, index); index += INT_SIZE; long callerAddress = ByteUtils.toLong(payload, index); @@ -223,8 +221,8 @@ public class DataFactory { long size = ByteUtils.toLong(payload, index); index += LONG_SIZE; - int fdValue = ByteUtils.toInt(payload, index); - index += INT_SIZE; + long fdValue = ByteUtils.toLong(payload, index); + index += LONG_SIZE; int fdType = ByteUtils.toInt(payload, index); index += INT_SIZE; int fdApiType = ByteUtils.toInt(payload, index); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/FileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/FileData.java index 423f8f8..43e1485 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/FileData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/FileData.java @@ -5,7 +5,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.BasicDataMessage; public class FileData extends ProbeCommonData { long size = 0; - int fdValue = 0; + long fdValue = 0; int fdType = 0; // TODO: short int fdApiType = 0; // TODO: short long fileSize = 0; @@ -19,11 +19,11 @@ public class FileData extends ProbeCommonData { this.size = size; } - public int getFdValue() { + public long getFdValue() { return fdValue; } - public void setFdValue(int fdValue) { + public void setFdValue(long fdValue) { this.fdValue = fdValue; } @@ -65,7 +65,7 @@ public class FileData extends ProbeCommonData { @Override public int getKey() { - Integer key = getFdValue(); + Long key = getFdValue(); return key.hashCode(); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java index 37660ba..de90bbc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java @@ -49,7 +49,7 @@ public class FileChartData { private DAChartSeries accessSeries; private DAChartSeries statueSeries; - private int fd = -1; + private long fd = -1; private String filePath = AnalyzerLabels.EMPTY_STRING; private boolean isClosedFile = true; private boolean isFailedAPI = false; @@ -72,7 +72,7 @@ public class FileChartData { private int lastAccessIndexForParent = 0; - public FileChartData(String filePath, int Fd, boolean isRoot) { + public FileChartData(String filePath, long Fd, boolean isRoot) { setFilePath(filePath); setFd(Fd); } @@ -143,11 +143,11 @@ public class FileChartData { return children; } - public int getFD() { + public long getFD() { return fd; } - public void setFd(int data) { + public void setFd(long data) { this.fd = data; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartDataEvent.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartDataEvent.java index cd5564a..f8d9add 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartDataEvent.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartDataEvent.java @@ -37,7 +37,7 @@ public class FileChartDataEvent { private FileData contents; private FailedData2 failedData = null; - private int fd = -1; + private long fd = -1; private String filePath = AnalyzerLabels.EMPTY_STRING; private int apiType = -1; @@ -51,7 +51,7 @@ public class FileChartDataEvent { private String tooltip = null; - public FileChartDataEvent(String filePath, int fd, long time, + public FileChartDataEvent(String filePath, long fd, long time, String tooltip, FileData contents) { setFilePath(filePath); setFd(fd); @@ -72,11 +72,11 @@ public class FileChartDataEvent { this.contents = contents; } - public int getFd() { + public long getFd() { return fd; } - public void setFd(int fd) { + public void setFd(long fd) { this.fd = fd; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java index e4fb321..9d2e8f8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java @@ -72,7 +72,7 @@ public class FileDataMaker { private List rows = new ArrayList(); private List fileEventQueue = new ArrayList(); private List fileEventWarningQueue = new ArrayList(); - private HashMap findPathHashMap = new HashMap(); + private HashMap findPathHashMap = new HashMap(); private int timeLineFileChartFDCount = 0; private FailedChecker failedChecker = null; private WarningChecker warningChecker = null; @@ -139,14 +139,14 @@ public class FileDataMaker { // String fdType = // input.get(LogCenterConstants.RESOURCE_FDTYPE_INDEX); // socket - int type = input.getFdType(); + int type = input.getFdApiType(); if (type == 1 || type == 2) { continue; } int fdApiType = input.getFdApiType(); String path = input.getFilePath(); - int fd = input.getFdValue(); + long fd = input.getFdValue(); long errno = input.getErrno(); @@ -361,7 +361,7 @@ public class FileDataMaker { initFileChart(chart, true); } else { DAChartBoardItem parentItem = parent.getItem(); - item = new DAChartBoardItem(parentItem, Integer.toString(sync + item = new DAChartBoardItem(parentItem, Long.toString(sync .getFD())); chart = item.getChart(); initFileChart(chart, false); @@ -373,7 +373,7 @@ public class FileDataMaker { return true; } - private FileChartData findParent(String filePath, int fd) { + private FileChartData findParent(String filePath, long fd) { filePath = findPathHashMap.get(fd); int size = rows.size(); FileChartData returnData = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java index 3416c21..63e9a15 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedChecker.java @@ -60,7 +60,7 @@ public class FailedChecker { if (AnalyzerUtil.isInternal(fileData)) { return; } - int fdType = fileData.getFdType(); + int fdType = fileData.getFdApiType(); long errno = fileData.getErrno(); if (fdType == 0 || errno == 0) { return; -- 2.7.4