From: hyeran74.kim Date: Fri, 29 Aug 2014 05:25:33 +0000 (+0900) Subject: File : changed the way to get function name X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21f5c68e8303e287b5be90937fdfbd894ab59cd6;p=sdk%2Ftools%2Fdynamic-analyzer.git File : changed the way to get function name Change-Id: I3ec5808e8ca7819fe3aaa87e5ba1b0b8fce9ebfd Signed-off-by: hyeran74.kim --- diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java index 7d5d7af..9949007 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java @@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.model.TableInput; +import org.tizen.dynamicanalyzer.project.FunctionNameManager; import org.tizen.dynamicanalyzer.swap.model.data.FileData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; @@ -178,8 +179,8 @@ public class FileApiListTable extends DAApiListTableComposite { contentText.add(Long.toString(contentTemp.getFdValue())); contentData.add(Long.toString(contentTemp.getFdValue())); - contentText.add(contentTemp.getApiName()); - contentData.add(contentTemp.getApiName()); + contentText.add(FunctionNameManager.getFunctionName(contentTemp.getApiId())); + contentData.add(FunctionNameManager.getFunctionName(contentTemp.getApiId())); contentText.add(contentTemp.getArgs()); contentData.add(contentTemp.getArgs()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java index 1a80c72..697ce83 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/data/FileApiDB.java @@ -51,7 +51,7 @@ public class FileApiDB extends DBTable { FD(4, "fd"), API_TYPE(5, "apiType"), EVENT_TIME(6, "eventTime"), - API_NAME(7, "apiName"), + API_ID(7, "apiId"), ERRNO(8, "errNo"), IO_SIZE(9, "ioSize"), FILE_SIZE(10, "fileSize"), @@ -90,7 +90,7 @@ public class FileApiDB extends DBTable { addColumn(new DBColumn(COLUMN.FD.getName(), DBConstants.EMPTY, DBConstants.LONG)); addColumn(new DBColumn(COLUMN.API_TYPE.getName(), DBConstants.NOT_NULL, DBConstants.INTEGER)); addColumn(new DBColumn(COLUMN.EVENT_TIME.getName(), DBConstants.NOT_NULL, DBConstants.LONG)); - addColumn(new DBColumn(COLUMN.API_NAME.getName(), DBConstants.EMPTY, DBConstants.BIG_TEXT)); + addColumn(new DBColumn(COLUMN.API_ID.getName(), DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(COLUMN.ERRNO.getName(), DBConstants.EMPTY, DBConstants.LONG)); addColumn(new DBColumn(COLUMN.IO_SIZE.getName(), DBConstants.EMPTY, DBConstants.LONG)); addColumn(new DBColumn(COLUMN.FILE_SIZE.getName(), DBConstants.EMPTY, DBConstants.LONG)); @@ -292,7 +292,7 @@ public class FileApiDB extends DBTable { selectAllColumn.append(","); selectAllColumn.append(COLUMN.EVENT_TIME.getName()); selectAllColumn.append(","); - selectAllColumn.append(COLUMN.API_NAME.getName()); + selectAllColumn.append(COLUMN.API_ID.getName()); selectAllColumn.append(","); selectAllColumn.append(COLUMN.ERRNO.getName()); selectAllColumn.append(","); @@ -326,7 +326,7 @@ public class FileApiDB extends DBTable { prep.setLong(5, (Long)(rowData.get(COLUMN.FD.getValue()))); prep.setInt(6, (Integer)(rowData.get(COLUMN.API_TYPE.getValue()))); prep.setLong(7, (Long)(rowData.get(COLUMN.EVENT_TIME.getValue()))); - prep.setString(8, (String)(rowData.get(COLUMN.API_NAME.getValue()))); + prep.setInt(8, (Integer)(rowData.get(COLUMN.API_ID.getValue()))); prep.setLong(9, (Long)(rowData.get(COLUMN.ERRNO.getValue()))); prep.setLong(10, (Long)(rowData.get(COLUMN.IO_SIZE.getValue()))); prep.setLong(11, (Long)(rowData.get(COLUMN.FILE_SIZE.getValue()))); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java index c026d91..f143984 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataMaker.java @@ -170,7 +170,7 @@ public class FileDataMaker { if(sentOpenEventList.contains(fd)) { event = new FileEvent(input.getSeq(), input.getFilePath(), input.getPid(), input.getTid(), input.getFdValue(), - input.getFdApiType(), input.getApiName(), + input.getFdApiType(), input.getApiId(), input.getTime(), input.getFileSize(), input.getSize(), input.getArgs(), input.getReturn(), input.getErrno(), true); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java index 289a296..c38b0d4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/model/FileEvent.java @@ -36,7 +36,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; public class FileEvent extends FileData{ // TODO considering apiId - private String apiName = null; + private int apiId = -1; private long ioSize =-1; private boolean target = false; @@ -57,7 +57,7 @@ public class FileEvent extends FileData{ } public FileEvent(int seq, String filePath, int pid, int tid, - long fd, int apiType, String apiName, long eventTime, long fileSize, long size, + long fd, int apiType, int apiId, long eventTime, long fileSize, long size, String args, String returnVal, long errNo, boolean target){ this.seq = seq; this.filePath = filePath; @@ -65,7 +65,7 @@ public class FileEvent extends FileData{ this.tid = tid; this.fdValue = fd; this.fdApiType = apiType; - this.apiName = apiName; + this.apiId = apiId; this.time = eventTime; this.fileSize = fileSize; this.size = size; @@ -82,7 +82,7 @@ public class FileEvent extends FileData{ this.tid = (Integer)data.get(FileApiDB.COLUMN.TID.getValue()); this.fdValue = (Long)data.get(FileApiDB.COLUMN.FD.getValue()); this.fdApiType = (Integer)data.get(FileApiDB.COLUMN.API_TYPE.getValue()); - this.apiName = (String)data.get(FileApiDB.COLUMN.API_NAME.getValue()); + this.apiId = (Integer)data.get(FileApiDB.COLUMN.API_ID.getValue()); this.time = (Long)data.get(FileApiDB.COLUMN.EVENT_TIME.getValue()); this.fileSize = (Long)data.get(FileApiDB.COLUMN.FILE_SIZE.getValue()); this.size = (Long)data.get(FileApiDB.COLUMN.SIZE.getValue()); @@ -101,7 +101,7 @@ public class FileEvent extends FileData{ data.add(this.fdValue); data.add(this.fdApiType); data.add(this.time); - data.add(this.apiName); + data.add(this.apiId); data.add(this.errno); data.add(this.ioSize); data.add(this.fileSize); @@ -174,12 +174,12 @@ public class FileEvent extends FileData{ this.args = args; } - public String getApiName() { - return apiName; + public int getApiId() { + return apiId; } - public void setApiName(String apiName) { - this.apiName = apiName; + public void setApiId(int apiId) { + this.apiId = apiId; } public boolean isTarget() {