opengl : add the return column in the API table view 35/25335/1
authorHyunjong.park <phjwithyou.park@samsung.com>
Mon, 4 Aug 2014 06:09:30 +0000 (15:09 +0900)
committerHyunjong.park <phjwithyou.park@samsung.com>
Mon, 4 Aug 2014 06:09:30 +0000 (15:09 +0900)
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: If55794c2d4af7bf57997eb079a14bd84fe466bb7

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLAPIDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPIData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLAPINameDefine.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLCurrentFrameDataManger.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java

index 7cba071..f3ed337 100644 (file)
@@ -36,6 +36,7 @@ public class DALimit {
        public static final int FILEPATH_LENGTH = 1024;
        public static final int FUNCTION_ARGUMENTS_FORMAT_LENGTH = 100;
        public static final int FUNCTION_ARGUMENTS_VALUE_LENGTH = 1024;
+       public static final int FUNCTION_RETURN_VALUE_LENGTH = 1024;
        // OpenGL Analysis
        public static final int SHADER_SOURCE_LENGTH = 4096;
        public static final int SHADER_VARIABLE_LENGTH = 1024;
index 4c9368b..0e5ad50 100644 (file)
@@ -44,6 +44,7 @@ public class GLPageLabels extends NLS {
        public static String GL_API_LIST_VIEW_TIME;
        public static String GL_API_LIST_VIEW_NAME;
        public static String GL_API_LIST_VIEW_PARAMETER;
+       public static String GL_API_LIST_VIEW_RETURN;
        public static String GL_API_LIST_VIEW_ELAPSED_TIME;
        public static String GL_API_LIST_VIEW_ERROR;
        public static String GL_API_LIST_VIEW_PID;
index 5416ac3..22be4b9 100644 (file)
@@ -7,6 +7,7 @@ GL_API_LIST_VIEW_FRAME=Frame
 GL_API_LIST_VIEW_TIME=Time
 GL_API_LIST_VIEW_NAME=API
 GL_API_LIST_VIEW_PARAMETER=Parameter
+GL_API_LIST_VIEW_RETURN=Return
 GL_API_LIST_VIEW_ELAPSED_TIME=Elapsed time
 GL_API_LIST_VIEW_ERROR=Error
 GL_API_LIST_VIEW_PID=PID
index cfac5b2..47eebe3 100644 (file)
@@ -30,6 +30,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.tizen.dynamicanalyzer.common.DALimit;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.database.DBColumn;
 import org.tizen.dynamicanalyzer.database.DBConstants;
@@ -46,6 +47,7 @@ public class GLAPIDBTableManager extends DBTable {
        private static final String TIME = DBConstants.COMMON_COLUMN_TIME;
        private static final String API_ID = DBConstants.COMMON_COLUMN_ID;
        private static final String ARGUMENT = DBConstants.COMMON_COLUMN_ARG;
+       private static final String RET = DBConstants.COMMON_COLUMN_RET;
        private static final String ELAPSED_TIME = "ELAPSED_TIME";//$NON-NLS-1$
        private static final String ERROR = DBConstants.COMMON_COLUMN_ERROR;
        private static final String PID = DBConstants.COMMON_COLUMN_PID;
@@ -59,63 +61,40 @@ public class GLAPIDBTableManager extends DBTable {
        public final static int TABLE_TIME_INDEX = 3;
        public final static int TABLE_API_ID_INDEX = 4;
        public final static int TABLE_ARGUMENT_INDEX = 5;
-       public final static int TABLE_ELAPSED_TIMEQ_INDEX = 6;
-       public final static int TABLE_ERROR_INDEX = 7;
-       public final static int TABLE_PID_INDEX = 8;
-       public final static int TABLE_TID_INDEX = 9;
-       public final static int TABLE_CALLER_PC_ADDRESS_INDEX = 10;
-       public final static int TABLE_LIB_NAME_INDEX = 11;
+       public final static int TABLE_RET_INDEX = 6;
+       public final static int TABLE_ELAPSED_TIMEQ_INDEX = 7;
+       public final static int TABLE_ERROR_INDEX = 8;
+       public final static int TABLE_PID_INDEX = 9;
+       public final static int TABLE_TID_INDEX = 10;
+       public final static int TABLE_CALLER_PC_ADDRESS_INDEX = 11;
+       public final static int TABLE_LIB_NAME_INDEX = 12;
 
        private static final String SELECT_API_TABLE_QUERY_FROM_FRAME_TIME_CHART = "select "//$NON-NLS-1$
-                       + SEQ
-                       + CommonConstants.COMMA
-                       + FRAME_INDEX
-                       + CommonConstants.COMMA
+                       + SEQ + CommonConstants.COMMA + FRAME_INDEX + CommonConstants.COMMA
                        + CONTEXT_ID
+                       + CommonConstants.COMMA + TIME + CommonConstants.COMMA + API_ID
                        + CommonConstants.COMMA
-                       + TIME
-                       + CommonConstants.COMMA
-                       + API_ID
-                       + CommonConstants.COMMA
-                       + ARGUMENT
-                       + CommonConstants.COMMA
+                       + ARGUMENT + CommonConstants.COMMA + RET + CommonConstants.COMMA
                        + ELAPSED_TIME
+                       + CommonConstants.COMMA + ERROR + CommonConstants.COMMA + PID
                        + CommonConstants.COMMA
-                       + ERROR
-                       + CommonConstants.COMMA
-                       + PID
-                       + CommonConstants.COMMA
-                       + TID
-                       + CommonConstants.COMMA
-                       + CALLER_PC_ADDRESS
-                       + CommonConstants.COMMA
-                       + LIB_NAME + " from "//$NON-NLS-1$
+                       + TID + CommonConstants.COMMA + CALLER_PC_ADDRESS + CommonConstants.COMMA
+                       + LIB_NAME
+                       + " from "//$NON-NLS-1$
                        + TABLENAME + " where " + FRAME_INDEX + " = '%s'";
 
        private static final String SELECT_API_TABLE_QUERY_FROM_FRAME_RATE_CHART = "select "//$NON-NLS-1$
-                       + SEQ
-                       + CommonConstants.COMMA
-                       + FRAME_INDEX
-                       + CommonConstants.COMMA
+                       + SEQ + CommonConstants.COMMA + FRAME_INDEX + CommonConstants.COMMA
                        + CONTEXT_ID
+                       + CommonConstants.COMMA + TIME + CommonConstants.COMMA + API_ID
                        + CommonConstants.COMMA
-                       + TIME
-                       + CommonConstants.COMMA
-                       + API_ID
-                       + CommonConstants.COMMA
-                       + ARGUMENT
-                       + CommonConstants.COMMA
+                       + ARGUMENT + CommonConstants.COMMA + RET + CommonConstants.COMMA
                        + ELAPSED_TIME
+                       + CommonConstants.COMMA + ERROR + CommonConstants.COMMA + PID
                        + CommonConstants.COMMA
-                       + ERROR
-                       + CommonConstants.COMMA
-                       + PID
-                       + CommonConstants.COMMA
-                       + TID
-                       + CommonConstants.COMMA
-                       + CALLER_PC_ADDRESS
-                       + CommonConstants.COMMA
-                       + LIB_NAME + " from "//$NON-NLS-1$
+                       + TID + CommonConstants.COMMA + CALLER_PC_ADDRESS + CommonConstants.COMMA
+                       + LIB_NAME
+                       + " from "//$NON-NLS-1$
                        + TABLENAME + " where '%s' <= "//$NON-NLS-1$
                        + FRAME_INDEX + " and " + FRAME_INDEX + " <= '%s'";//$NON-NLS-1$
 
@@ -125,25 +104,21 @@ public class GLAPIDBTableManager extends DBTable {
        }
 
        public GLAPIDBTableManager() {
-               addColumn(new DBColumn(SEQ, DBConstants.PRIMARY_KEY,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(CONTEXT_ID, DBConstants.NOT_NULL,
-                               DBConstants.LONG));
-               addColumn(new DBColumn(FRAME_INDEX, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
+               addColumn(new DBColumn(SEQ, DBConstants.PRIMARY_KEY, DBConstants.INTEGER));
+               addColumn(new DBColumn(CONTEXT_ID, DBConstants.NOT_NULL, DBConstants.LONG));
+               addColumn(new DBColumn(FRAME_INDEX, DBConstants.NOT_NULL, DBConstants.INTEGER));
                addColumn(new DBColumn(TIME, DBConstants.NOT_NULL, DBConstants.LONG));
-               addColumn(new DBColumn(API_ID, DBConstants.NOT_NULL,
-                               DBConstants.INTEGER));
-               addColumn(new DBColumn(ARGUMENT, DBConstants.NOT_NULL, DBConstants.TEXT));
-               addColumn(new DBColumn(ELAPSED_TIME, DBConstants.NOT_NULL,
-                               DBConstants.LONG));
+               addColumn(new DBColumn(API_ID, DBConstants.NOT_NULL, DBConstants.INTEGER));
+               addColumn(new DBColumn(ARGUMENT, DBConstants.NOT_NULL, "VARCHAR("
+                               + DALimit.FUNCTION_ARGUMENTS_VALUE_LENGTH + ")"));
+               addColumn(new DBColumn(RET, DBConstants.NOT_NULL, "VARCHAR("
+                               + DALimit.FUNCTION_RETURN_VALUE_LENGTH + ")"));
+               addColumn(new DBColumn(ELAPSED_TIME, DBConstants.NOT_NULL, DBConstants.LONG));
                addColumn(new DBColumn(ERROR, DBConstants.NOT_NULL, DBConstants.LONG));
                addColumn(new DBColumn(PID, DBConstants.NOT_NULL, DBConstants.INTEGER));
                addColumn(new DBColumn(TID, DBConstants.NOT_NULL, DBConstants.INTEGER));
-               addColumn(new DBColumn(CALLER_PC_ADDRESS, DBConstants.NOT_NULL,
-                               DBConstants.LONG));
-               addColumn(new DBColumn(LIB_NAME, DBConstants.NOT_NULL,
-                               DBConstants.TEXT_LIB_NAME));
+               addColumn(new DBColumn(CALLER_PC_ADDRESS, DBConstants.NOT_NULL, DBConstants.LONG));
+               addColumn(new DBColumn(LIB_NAME, DBConstants.NOT_NULL, DBConstants.TEXT_LIB_NAME));
        }
 
        public void insert(List<GLAPIData> apiData) {
@@ -155,8 +130,7 @@ public class GLAPIDBTableManager extends DBTable {
        }
 
        public GLCurrentFrameDataManger selectOpenGLAPIData(int frameIndex) {
-               String query = String.format(
-                               SELECT_API_TABLE_QUERY_FROM_FRAME_TIME_CHART, frameIndex);
+               String query = String.format(SELECT_API_TABLE_QUERY_FROM_FRAME_TIME_CHART, frameIndex);
                List<List<Object>> result = SqlConnectionManager.executeQuery(query);
                if (null == result || result.size() == 0 || result.get(0).size() == 0) {
                        return null;
@@ -168,10 +142,8 @@ public class GLAPIDBTableManager extends DBTable {
                return frameData;
        }
 
-       public List<List<Object>> selectOpenGLAPIData(int frameStartIndex,
-                       int frameEndIndex) {
-               String query = String.format(
-                               SELECT_API_TABLE_QUERY_FROM_FRAME_RATE_CHART, frameStartIndex,
+       public List<List<Object>> selectOpenGLAPIData(int frameStartIndex, int frameEndIndex) {
+               String query = String.format(SELECT_API_TABLE_QUERY_FROM_FRAME_RATE_CHART, frameStartIndex,
                                frameEndIndex);
                List<List<Object>> result = SqlConnectionManager.executeQuery(query);
                if (null == result || result.size() == 0 || result.get(0).size() == 0) {
@@ -189,26 +161,21 @@ public class GLAPIDBTableManager extends DBTable {
                        isPrepared = false;
                } else {
                        try {
-                               prep.setInt(TABLE_SEQ_INDEX + 1,
-                                               (Integer) (rowData.get(TABLE_SEQ_INDEX)));
+                               prep.setInt(TABLE_SEQ_INDEX + 1, (Integer) (rowData.get(TABLE_SEQ_INDEX)));
                                prep.setLong(TABLE_FRAME_INDEX_INDEX + 1,
                                                (Long) (rowData.get(TABLE_FRAME_INDEX_INDEX)));
                                prep.setInt(TABLE_CONTEXT_ID_INDEX + 1,
                                                (Integer) (rowData.get(TABLE_CONTEXT_ID_INDEX)));
-                               prep.setLong(TABLE_TIME_INDEX + 1,
-                                               (Long) (rowData.get(TABLE_TIME_INDEX)));
-                               prep.setInt(TABLE_API_ID_INDEX + 1,
-                                               (Integer) (rowData.get(TABLE_API_ID_INDEX)));
+                               prep.setLong(TABLE_TIME_INDEX + 1, (Long) (rowData.get(TABLE_TIME_INDEX)));
+                               prep.setInt(TABLE_API_ID_INDEX + 1, (Integer) (rowData.get(TABLE_API_ID_INDEX)));
                                prep.setString(TABLE_ARGUMENT_INDEX + 1,
                                                (String) (rowData.get(TABLE_ARGUMENT_INDEX)));
+                               prep.setString(TABLE_RET_INDEX + 1, (String) (rowData.get(TABLE_RET_INDEX)));
                                prep.setLong(TABLE_ELAPSED_TIMEQ_INDEX + 1,
                                                (Long) (rowData.get(TABLE_ELAPSED_TIMEQ_INDEX)));
-                               prep.setLong(TABLE_ERROR_INDEX + 1,
-                                               (Long) (rowData.get(TABLE_ERROR_INDEX)));
-                               prep.setInt(TABLE_PID_INDEX + 1,
-                                               (Integer) (rowData.get(TABLE_PID_INDEX)));
-                               prep.setInt(TABLE_TID_INDEX + 1,
-                                               (Integer) (rowData.get(TABLE_TID_INDEX)));
+                               prep.setLong(TABLE_ERROR_INDEX + 1, (Long) (rowData.get(TABLE_ERROR_INDEX)));
+                               prep.setInt(TABLE_PID_INDEX + 1, (Integer) (rowData.get(TABLE_PID_INDEX)));
+                               prep.setInt(TABLE_TID_INDEX + 1, (Integer) (rowData.get(TABLE_TID_INDEX)));
                                prep.setLong(TABLE_CALLER_PC_ADDRESS_INDEX + 1,
                                                (Long) (rowData.get(TABLE_CALLER_PC_ADDRESS_INDEX)));
                                prep.setString(TABLE_LIB_NAME_INDEX + 1,
index 18b82c9..5da66fa 100644 (file)
@@ -32,58 +32,40 @@ import java.util.List;
 
 import org.tizen.dynamicanalyzer.swap.model.data.GLES20LogData;
 import org.tizen.dynamicanalyzer.ui.opengl.data.DB.GLAPIDBTableManager;
-import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 
 public class GLAPIData extends GLES20LogData {
-
-       private GLES20LogData logData = null;
        private int frameIndex = 0;
-       private long elapsedTime = 0;
 
        public GLAPIData(List<Object> data) {
                setSeq((Integer) data.get(GLAPIDBTableManager.TABLE_SEQ_INDEX));
-               setFrameIndex((Integer) data
-                               .get(GLAPIDBTableManager.TABLE_FRAME_INDEX_INDEX));
-               setContextID((Long) data
-                               .get(GLAPIDBTableManager.TABLE_CONTEXT_ID_INDEX));
+               setFrameIndex((Integer) data.get(GLAPIDBTableManager.TABLE_FRAME_INDEX_INDEX));
+               setContextID((Long) data.get(GLAPIDBTableManager.TABLE_CONTEXT_ID_INDEX));
                setTime((Long) data.get(GLAPIDBTableManager.TABLE_TIME_INDEX));
                setApiId((Integer) data.get(GLAPIDBTableManager.TABLE_API_ID_INDEX));
                setArgs((String) data.get(GLAPIDBTableManager.TABLE_ARGUMENT_INDEX));
-               setElapsedTime((Long) data
-                               .get(GLAPIDBTableManager.TABLE_ELAPSED_TIMEQ_INDEX));
+               setReturn((String) data.get(GLAPIDBTableManager.TABLE_RET_INDEX));
+               setElapsedTime((Long) data.get(GLAPIDBTableManager.TABLE_ELAPSED_TIMEQ_INDEX));
                setErrNo((Long) data.get(GLAPIDBTableManager.TABLE_ERROR_INDEX));
                setPid((Integer) data.get(GLAPIDBTableManager.TABLE_PID_INDEX));
                setTid((Integer) data.get(GLAPIDBTableManager.TABLE_TID_INDEX));
-               setCallerAddress((Long) data
-                               .get(GLAPIDBTableManager.TABLE_CALLER_PC_ADDRESS_INDEX));
+               setCallerAddress((Long) data.get(GLAPIDBTableManager.TABLE_CALLER_PC_ADDRESS_INDEX));
                setLibName((String) data.get(GLAPIDBTableManager.TABLE_LIB_NAME_INDEX));
        }
 
        public GLAPIData(GLES20LogData logData, int currentFrameIndex) {
                setSeq(logData.getSeq());
                setContextID(logData.getCurrentContextID());
+               setFrameIndex(currentFrameIndex);
+               setTime(logData.getTime());
                setApiId(logData.getApiId());
                setArgs(logData.getArgs());
-               setTime(logData.getTime());
+               setReturn(logData.getReturn());
+               setElapsedTime(logData.getElapsedTime());
                setErrNo(logData.getErrno());
                setPid(logData.getPid());
                setTid(logData.getTid());
                setCallerAddress(logData.getCallerPcAddr());
                setLibName(logData.getLibName());
-               this.logData = logData;
-               setFrameIndex(currentFrameIndex);
-       }
-
-       public int getSeq() {
-               if (null != this.logData) {
-                       return logData.getSeq();
-               } else {
-                       return seq;
-               }
-       }
-
-       public void setSeq(int sequenceNumber) {
-               this.seq = sequenceNumber;
        }
 
        public void setContextID(long id) {
@@ -94,18 +76,6 @@ public class GLAPIData extends GLES20LogData {
                return glCurrentContextName;
        }
 
-       public int getApiId() {
-               if (null != this.logData) {
-                       return logData.getApiId();
-               } else {
-                       return this.apiId;
-               }
-       }
-
-       public void setApiId(int apiId) {
-               this.apiId = apiId;
-       }
-
        public int getFrameIndex() {
                return frameIndex;
        }
@@ -114,107 +84,6 @@ public class GLAPIData extends GLES20LogData {
                this.frameIndex = frameIndex;
        }
 
-       public String getArgs() {
-               if (null != this.logData) {
-                       return logData.getArgs();
-               } else {
-                       return this.args;
-               }
-       }
-
-       public void setArgs(String argument) {
-               this.args = argument;
-       }
-
-       public long getTime() {
-               if (null != this.logData) {
-                       return logData.getTime();
-               } else {
-                       return this.time;
-               }
-       }
-
-       public void setTime(long apiTime) {
-               this.time = apiTime;
-       }
-
-       public long getElapsedTime() {
-               if (null != this.logData) {
-                       return logData.getElapsedTime() / TimelineConstants.KILO_LONG;
-               } else {
-                       return this.elapsedTime;
-               }
-       }
-
-       public void setElapsedTime(long elapsedTime) {
-               this.elapsedTime = elapsedTime;
-       }
-
-       public long getErrno() {
-               if (null != this.logData) {
-                       return logData.getErrno();
-               } else {
-                       return this.errno;
-               }
-       }
-
-       public void setErrNo(long errno) {
-               this.errno = errno;
-       }
-
-       public String getReturn() {
-               if (null != this.logData) {
-                       return logData.getReturn();
-               } else {
-                       return this.ret;
-               }
-       }
-
-       public void setReturn(String ret) {
-               this.ret = ret;
-       }
-
-       public int getPid() {
-               if (null != this.logData) {
-                       return logData.getPid();
-               } else {
-                       return this.pid;
-               }
-       }
-
-       public void setPid(int pid) {
-               this.pid = pid;
-       }
-
-       public int getTid() {
-               if (null != this.logData) {
-                       return logData.getTid();
-               } else {
-                       return this.tid;
-               }
-       }
-
-       public void setTid(int tid) {
-               this.tid = tid;
-       }
-
-       public GLES20LogData getLogData() {
-               if (null != this.logData) {
-                       return logData;
-               } else {
-                       GLES20LogData glLogData = new GLES20LogData();
-                       glLogData.setSeq(getSeq());
-                       glLogData.setApiId(getApiId());
-                       glLogData.setArgs(getArgs());
-                       glLogData.setTime(getTime());
-                       glLogData.setElapsedTime(getElapsedTime());
-                       glLogData.setErrNo(getErrno());
-                       glLogData.setPid(getPid());
-                       glLogData.setTid(getTid());
-                       return glLogData;
-               }
-       }
-
        public List<Object> getDBInsertData() {
                List<Object> data = new ArrayList<Object>();
                data.add(getSeq());
@@ -223,6 +92,7 @@ public class GLAPIData extends GLES20LogData {
                data.add(getTime());
                data.add(getApiId());
                data.add(getArgs());
+               data.add(getReturn());
                data.add(getElapsedTime());
                data.add(getErrno());
                data.add(getPid());
index c69169e..eb6d2aa 100644 (file)
@@ -126,12 +126,20 @@ public class GLAPINameDefine {
        public static final String API_EGL_SWAPBUFFERS = "eglSwapBuffers";//$NON-NLS-1$
        public static final String API_SGL_SWAPBUFFERS = "_SglSwapBuffers";//$NON-NLS-1$
 
+       public static final String API_GL_DRAWARRAYS = "glDrawArrays";//$NON-NLS-1$
+       public static final String API_GL_FINISH = "glFinish";//$NON-NLS-1$
+       public static final String API_GL_FLUSH = "glFlush";//$NON-NLS-1$
+
        // EGL
-               public static final String API_EGL_CREATE_CONTEXT = "_SglCreateContext";//$NON-NLS-1$
+       public static final String API_EGL_CREATE_CONTEXT = "_SglCreateContext";//$NON-NLS-1$
+
+       // Evas GL
+       public static final String API_EVAS_GL_CREATE_CONTEXT = "evas_gl_context_create";//$NON-NLS-1$
+
        // uniform
        public static final String API_UNIFORM = "glUniform";//$NON-NLS-1$
        public static final String API_UNIFORM_MATRIX = "glUniformMatrix";//$NON-NLS-1$
-       
+
        public static final String API_UNIFORM_1I = "glUniform1i";//$NON-NLS-1$
        public static final String API_UNIFORM_2I = "glUniform2i";//$NON-NLS-1$
        public static final String API_UNIFORM_3I = "glUniform3i";//$NON-NLS-1$
@@ -152,6 +160,4 @@ public class GLAPINameDefine {
        public static final String API_UNIFORM_MATRIX_3FV = "glUniformMatrix3fv";//$NON-NLS-1$
        public static final String API_UNIFORM_MATRIX_4FV = "glUniformMatrix4fv";//$NON-NLS-1$
 
-       
-
 }
index de021d7..976093a 100644 (file)
@@ -54,11 +54,9 @@ public class GLCurrentFrameDataManger {
        }
 
        public long getFrametime() {
-               long frametime = 0;
-               for (GLAPIData glAPIData : glAPIDataList) {
-                       frametime += glAPIData.getElapsedTime();
-               }
-               return frametime;
+               long frameFirstAPITime = glAPIDataList.get(0).getTime();
+               long frameLastAPITime = glAPIDataList.get(glAPIDataList.size() - 1).getTime();
+               return frameLastAPITime - frameFirstAPITime;
        }
 
        public boolean hasError() {
index 2bd0d61..498f5c5 100644 (file)
@@ -48,29 +48,25 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
 public class GLAPIListView extends DAViewComposite {
        GLAPITable glAPIListTable;
 
-       private String[] columnNames = {
-                       GLPageLabels.GL_API_LIST_VIEW_SEQ,
-                       GLPageLabels.GL_API_LIST_VIEW_FRAME,
-                       GLPageLabels.GL_API_LIST_VIEW_TIME,
+       private String[] columnNames = { GLPageLabels.GL_API_LIST_VIEW_SEQ,
+                       GLPageLabels.GL_API_LIST_VIEW_FRAME, GLPageLabels.GL_API_LIST_VIEW_TIME,
                        GLPageLabels.GL_API_LIST_VIEW_NAME,
                        GLPageLabels.GL_API_LIST_VIEW_PARAMETER,
+                       GLPageLabels.GL_API_LIST_VIEW_RETURN,
                        GLPageLabels.GL_API_LIST_VIEW_ELAPSED_TIME + "(μs)", //$NON-NLS-1$
-                       GLPageLabels.GL_API_LIST_VIEW_ERROR,
-                       GLPageLabels.GL_API_LIST_VIEW_PID,
+                       GLPageLabels.GL_API_LIST_VIEW_ERROR, GLPageLabels.GL_API_LIST_VIEW_PID,
                        GLPageLabels.GL_API_LIST_VIEW_TID };
 
-       private int[] columnSizes = { 40, 0, 70, 120, 250, 105, 95, 60, 60 };
-       private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
-                       SWT.LEFT, SWT.RIGHT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT };
+       private int[] columnSizes = { 40, 0, 70, 120, 250, 70, 105, 95, 60, 60 };
+       private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
+                       SWT.RIGHT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT };
 
        private int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
-                       AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_NUM,
-                       AnalyzerConstants.SORT_TYPE_STRING,
-                       AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_NUM, };
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING,
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING,
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_NUM, };
 
        public GLAPIListView(Composite parent, int style) {
                super(parent, style, true);
@@ -82,8 +78,8 @@ public class GLAPIListView extends DAViewComposite {
                contents.setBackground(ColorResources.WINDOW_BG_COLOR);
                contents.setLayout(new FillLayout());
 
-               glAPIListTable = new GLAPITable(contents, SWT.NONE, SWT.SINGLE
-                               | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+               glAPIListTable = new GLAPITable(contents, SWT.NONE, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL
+                               | SWT.V_SCROLL);
 
                glAPIListTable.setTableName(GLPageLabels.GL_API_LIST_VIEW_TITLE);
                glAPIListTable.setSortTypes(sortTypes);
@@ -107,38 +103,31 @@ public class GLAPIListView extends DAViewComposite {
                                int endFrameIndex = data.getSecondFrameIndex();
 
                                if (startFrameIndex == endFrameIndex) {
-                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE
-                                                       + CommonConstants.OPEN_BRACKET + startFrameIndex
-                                                       + GLPageLabels.GL_FRAME
+                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE + CommonConstants.OPEN_BRACKET
+                                                       + startFrameIndex + GLPageLabels.GL_FRAME
                                                        + CommonConstants.CLOSE_BRACKET;
                                } else {
-                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE
-                                                       + CommonConstants.OPEN_BRACKET + startFrameIndex
-                                                       + CommonConstants.DASH + endFrameIndex
-                                                       + GLPageLabels.GL_FRAME
-                                                       + CommonConstants.CLOSE_BRACKET;
+                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE + CommonConstants.OPEN_BRACKET
+                                                       + startFrameIndex + CommonConstants.DASH + endFrameIndex
+                                                       + GLPageLabels.GL_FRAME + CommonConstants.CLOSE_BRACKET;
                                }
                                setTitle(title);
-                               glAPIListTable.updateTableFromChart(startFrameIndex,
-                                               endFrameIndex);
+                               glAPIListTable.updateTableFromChart(startFrameIndex, endFrameIndex);
                        } else if (id.equals(GLPage.contextHistoryID)) {
                                if (GLDataManager.getInstance().isSelectFrameRateChart()) {
 
                                        int frameRateIndex = data.getFrameRateIndex();
                                        if (frameRateIndex == 1) {
-                                               frameRateIndex = GLDataManager.getInstance()
-                                                               .getStartFrameRateTime();
+                                               frameRateIndex = GLDataManager.getInstance().getStartFrameRateTime();
                                        }
                                        setSelectedAPI(frameRateIndex, data.getSeq());
                                } else {
                                        int frameIndex = data.getFrameTimeIndex();
-                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE
-                                                       + CommonConstants.OPEN_BRACKET
+                                       title = GLPageLabels.GL_API_LIST_VIEW_TITLE + CommonConstants.OPEN_BRACKET
                                                        + data.getFrameTimeIndex() + GLPageLabels.GL_FRAME
                                                        + CommonConstants.CLOSE_BRACKET;
                                        setTitle(title);
-                                       glAPIListTable.updateTableFromContext(frameIndex,
-                                                       frameIndex, data.getSeq());
+                                       glAPIListTable.updateTableFromContext(frameIndex, frameIndex, data.getSeq());
                                }
                        }
                } else if (vdata instanceof DASelectionData) {
@@ -148,11 +137,9 @@ public class GLAPIListView extends DAViewComposite {
                        long dataTime = ldata.getTime();
                        double selectionTime = dataTime / TimelineConstants.MEGA_DOUBLE;
                        if (selectionTime <= 1) {
-                               selectionTime = GLDataManager.getInstance()
-                                               .getStartFrameRateTime();
+                               selectionTime = GLDataManager.getInstance().getStartFrameRateTime();
                        }
-                       setSelectedAPI((int) selectionTime,
-                                       Integer.toString(ldata.getSeq()));
+                       setSelectedAPI((int) selectionTime, Integer.toString(ldata.getSeq()));
                }
        }
 
@@ -165,14 +152,12 @@ public class GLAPIListView extends DAViewComposite {
                int startFrameIndex = selectionFrameCountInfo.getStartFrameIndex();
 
                int endFrameIdnex = selectionFrameCountInfo.getEndFrameIndex();
-               title = GLPageLabels.GL_API_LIST_VIEW_TITLE
-                               + CommonConstants.OPEN_BRACKET + startFrameIndex
-                               + CommonConstants.DASH + endFrameIdnex + GLPageLabels.GL_FRAME
+               title = GLPageLabels.GL_API_LIST_VIEW_TITLE + CommonConstants.OPEN_BRACKET
+                               + startFrameIndex + CommonConstants.DASH + endFrameIdnex + GLPageLabels.GL_FRAME
                                + CommonConstants.CLOSE_BRACKET;
 
                setTitle(title);
-               glAPIListTable.updateTableFromContext(startFrameIndex, endFrameIdnex,
-                               seq);
+               glAPIListTable.updateTableFromContext(startFrameIndex, endFrameIdnex, seq);
        }
 
        @Override
index 45f3998..05c2261 100644 (file)
@@ -63,17 +63,15 @@ public class GLAPITable extends DATableComposite {
                                if (items == null || items.length == 0) {
                                        return;
                                }
-                               DATableDataFormat dataFormat = (DATableDataFormat) items[0]
-                                               .getData();
+                               DATableDataFormat dataFormat = (DATableDataFormat) items[0].getData();
                                if (dataFormat.getLogData() instanceof GLAPIData) {
                                        GLAPIData glAPIType = (GLAPIData) dataFormat.getLogData();
                                        long time = glAPIType.getTime();
                                        int frameIndex = glAPIType.getFrameIndex();
                                        long contextId = glAPIType.getContextID();
 
-                                       GLSelectionData selData = new GLSelectionData(
-                                                       GLPage.apiListViewID, time, time, items, table,
-                                                       frameIndex, contextId);
+                                       GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID, time, time,
+                                                       items, table, frameIndex, contextId);
                                        AnalyzerManager.getCurrentPage().updateView(selData);
                                }
                        }
@@ -88,8 +86,7 @@ public class GLAPITable extends DATableComposite {
 
                List<TableInput> input = new ArrayList<TableInput>();
 
-               List<List<Object>> apiList = GLDataManager.getInstance()
-                               .getAPIDataMagerInstance()
+               List<List<Object>> apiList = GLDataManager.getInstance().getAPIDataMagerInstance()
                                .selectOpenGLAPIData(startFrameIndex, endFrameIndex);
                if (null == apiList) {
                        return null;
@@ -104,15 +101,15 @@ public class GLAPITable extends DATableComposite {
                        GLAPIData glApiType = new GLAPIData(apiList.get(i));
 
                        String seq = Integer.toString(glApiType.getSeq());
-                       DATableDataFormat tableData = new DATableDataFormat(
-                                       Long.parseLong(seq));
+                       DATableDataFormat tableData = new DATableDataFormat(Long.parseLong(seq));
                        tableData.setLogData(glApiType);
                        text.add(seq);
                        text.add(Integer.toString(glApiType.getFrameIndex()));
                        text.add(String.valueOf(Formatter.toTimeFormat(glApiType.getTime())));
                        text.add(glApiType.getApiName());
-                       text.add(GLConstantDefine.convertEnumValue(glApiType.getArgs(),
-                                       CommonConstants.COMMA, null));
+                       text.add(GLConstantDefine.convertEnumValue(glApiType.getArgs(), CommonConstants.COMMA,
+                                       null));
+                       text.add(glApiType.getReturn());
                        text.add(String.valueOf(glApiType.getElapsedTime()));
                        text.add(GLES20ErrorDefine.getError(glApiType.getErrno()));
                        text.add(String.valueOf(glApiType.getPid()));
@@ -122,6 +119,9 @@ public class GLAPITable extends DATableComposite {
                        tableInput.setText(text);
                        tableInput.setData(glApiType);
                        tableInput.setData(tableData);
+                       if (!GLES20ErrorDefine.getError(glApiType.getErrno()).contains("SUCCESS")) {//$NON-NLS-1$
+                               tableInput.setFailed(true);
+                       }
                        input.add(tableInput);
 
                }
@@ -153,14 +153,13 @@ public class GLAPITable extends DATableComposite {
                        int frameIndex = glAPIType.getFrameIndex();
                        long contextId = glAPIType.getContextID();
 
-                       GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID,
-                                       time, time, items, table, frameIndex, contextId);
+                       GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID, time, time, items,
+                                       table, frameIndex, contextId);
                        AnalyzerManager.getCurrentPage().updateView(selData);
                }
        }
 
-       public void updateTableFromContext(int startFrameIndex, int endFrameIndex,
-                       String seq) {
+       public void updateTableFromContext(int startFrameIndex, int endFrameIndex, String seq) {
                if (startFrameIndex >= 0) {
                        this.startFrameIndex = startFrameIndex;
                }
@@ -170,8 +169,7 @@ public class GLAPITable extends DATableComposite {
                for (int ii = 0; ii < nSize; ii++) {
                        if (table.getItem(ii).getText(0).equals(seq)) {
                                table.setSelection(ii);
-                               table.getVerticalBar().setSelection(
-                                               getScrollSelectionIndex(table, ii));
+                               table.getVerticalBar().setSelection(getScrollSelectionIndex(table, ii));
                                updateTable();
                        }
                }
@@ -187,8 +185,8 @@ public class GLAPITable extends DATableComposite {
                        int frameIndex = glAPIType.getFrameIndex();
                        long contextId = glAPIType.getContextID();
 
-                       GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID,
-                                       time, time, items, table, frameIndex, contextId);
+                       GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID, time, time, items,
+                                       table, frameIndex, contextId);
                        AnalyzerManager.getCurrentPage().updateView(selData);
                }
        }