[Title] fix. opengl log format

[Desc.] add "F" type
[Issue] TIDS-7657

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
index 127d7af..3898e9f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/GLES20LogData.java
@@ -8,26 +8,33 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.swap.model.ByteUtils;
 
 public class GLES20LogData extends ProbeCommonData {
+       long glCurrentContextName = 0;
        int apiType = 0;
        long elapsedTime = 0;
        String contextValue = "";
-       
+
        @Override
        public void makeData(byte[] data) {
                super.makeData(data);
-               
+               glCurrentContextName = ByteUtils.toLong(data, index);
+               index += CommonConstants.LONG_SIZE;
+
                apiType = ByteUtils.toInt(data, index);
                index += CommonConstants.INT_SIZE;
-               
+
                elapsedTime = ByteUtils.toLong(data, index);
                index += CommonConstants.LONG_SIZE;
-               
+
                int length = LogDataUtils.getStringLength(index, data);
                byte[] temp = new byte[length];
                System.arraycopy(data, index, temp, 0, length);
                contextValue = new String(temp);
        }
 
+       public long getCurrentContextName() {
+               return glCurrentContextName;
+       }
+
        public int getApiType() {
                return apiType;
        }
@@ -51,7 +58,7 @@ public class GLES20LogData extends ProbeCommonData {
        public void setContextValue(String contextValue) {
                this.contextValue = contextValue;
        }
-       
+
        @Override
        public void makePreparedStatement(PreparedStatement prep)
                        throws SQLException {
@@ -62,7 +69,7 @@ public class GLES20LogData extends ProbeCommonData {
                prep.setLong(index++, elapsedTime);
                prep.setString(index++, contextValue);
        }
-       
+
        @Override
        public void loadData(ResultSet rs) throws SQLException {
                super.loadData(rs);
@@ -72,3 +79,6 @@ public class GLES20LogData extends ProbeCommonData {
                contextValue = rs.getString(index++);
        }
 }
+
+
+

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
index a1f4d1c..0641d76 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataUtils.java
@@ -45,36 +45,47 @@ public class LogDataUtils {
                        char c = (char) payload[index];
                        index += 1;
                        switch (c) {
-                       case 'c':
+                       case 'c': {
                                buffer.append((payload[index]));
                                index += 1;
                                break;
-                       case 'd':
+                       }
+
+                       case 'd': {
                                int iValue = ByteUtils.toInt(payload, index);
                                buffer.append(iValue);
                                index += Integer.SIZE / Byte.SIZE;
                                break;
-                       case 'x':
+                       }
+
+                       case 'x': {
                                long lValue = ByteUtils.toLong(payload, index);
                                buffer.append(lValue);
                                index += LONG_SIZE;
                                break;
-                       case 'p':
+                       }
+
+                       case 'p': {
                                long pValue = ByteUtils.toLong(payload, index);
                                buffer.append(AnalyzerUtil.toHexdecimal(pValue));
                                index += LONG_SIZE;
                                break;
-                       case 'f':
+                       }
+
+                       case 'f': {
                                float fValue = ByteUtils.toFloat(payload, index);
                                buffer.append(fValue);
                                index += FLOAT_SIZE;
                                break;
-                       case 'w':
+                       }
+                       case 'w': {
                                double dValue = ByteUtils.toDouble(payload, index);
                                buffer.append(dValue);
                                index += DOUBLE_SIZE;
                                break;
-                       case 'b':
+                       }
+
+                       case 'b': {
                                byte b = payload[index++];
                                if (b == 0) {
                                        buffer.append("false");
@@ -82,7 +93,9 @@ public class LogDataUtils {
                                        buffer.append("true");
                                }
                                break;
-                       case 's':
+                       }
+
+                       case 's': {
                                // System.out.println("args payload size : " + payload.length);
                                for (int iii = index; iii < payload.length; iii++) {
                                        if (payload[iii] != 0) {
@@ -93,6 +106,25 @@ public class LogDataUtils {
                                        }
                                }
                                break;
+                       }
+                       case 'F': {
+                               long object = ByteUtils.toLong(payload, index);
+                               buffer.append(AnalyzerUtil.toHexdecimal(object));
+                               index += LONG_SIZE;
+                               int arrarySize = ByteUtils.toInt(payload, index);
+                               index += INT_SIZE;
+                               buffer.append(CommonConstants.OPEN_SQUARE_BRACKET);
+                               for (int i = 0; i < arrarySize; i++) {
+                                       float fValue = ByteUtils.toFloat(payload, index);
+                                       buffer.append(fValue);
+                                       index += FLOAT_SIZE;
+                                       if (i != arrarySize - 1) {
+                                               buffer.append(CommonConstants.COMMA);
+                                       }
+                               }
+                               buffer.append(CommonConstants.CLOSE_SQUARE_BRACKET);
+                       }
+
                        default:
                                break;
                        }
@@ -113,66 +145,66 @@ public class LogDataUtils {
        public static ArgsInfo parseReturn(byte[] payload, int index) {
                ArgsInfo args = new ArgsInfo();
                StringBuffer buffer = new StringBuffer();
-                       char c = (char) payload[index];
+               char c = (char) payload[index];
+               index += 1;
+               switch (c) {
+               case 'c':
+                       buffer.append((payload[index]));
                        index += 1;
-                       switch (c) {
-                       case 'c':
-                               buffer.append((payload[index]));
-                               index += 1;
-                               break;
-                       case 'd':
-                               int iValue = ByteUtils.toInt(payload, index);
-                               buffer.append(iValue);
-                               index += Integer.SIZE / Byte.SIZE;
-                               break;
-                       case 'x':
-                               long lValue = ByteUtils.toLong(payload, index);
-                               buffer.append(lValue);
-                               index += LONG_SIZE;
-                               break;
-                       case 'p':
-                               long pValue = ByteUtils.toLong(payload, index);
-                               buffer.append(AnalyzerUtil.toHexdecimal(pValue));
-                               index += LONG_SIZE;
-                               break;
-                       case 'f':
-                               float fValue = ByteUtils.toFloat(payload, index);
-                               buffer.append(fValue);
-                               index += FLOAT_SIZE;
-                               break;
-                       case 'w':
-                               double dValue = ByteUtils.toDouble(payload, index);
-                               buffer.append(dValue);
-                               index += DOUBLE_SIZE;
-                               break;
-                       case 'b':
-                               byte b = payload[index++];
-                               if (b == 0) {
-                                       buffer.append("false");
+                       break;
+               case 'd':
+                       int iValue = ByteUtils.toInt(payload, index);
+                       buffer.append(iValue);
+                       index += Integer.SIZE / Byte.SIZE;
+                       break;
+               case 'x':
+                       long lValue = ByteUtils.toLong(payload, index);
+                       buffer.append(lValue);
+                       index += LONG_SIZE;
+                       break;
+               case 'p':
+                       long pValue = ByteUtils.toLong(payload, index);
+                       buffer.append(AnalyzerUtil.toHexdecimal(pValue));
+                       index += LONG_SIZE;
+                       break;
+               case 'f':
+                       float fValue = ByteUtils.toFloat(payload, index);
+                       buffer.append(fValue);
+                       index += FLOAT_SIZE;
+                       break;
+               case 'w':
+                       double dValue = ByteUtils.toDouble(payload, index);
+                       buffer.append(dValue);
+                       index += DOUBLE_SIZE;
+                       break;
+               case 'b':
+                       byte b = payload[index++];
+                       if (b == 0) {
+                               buffer.append("false");
+                       } else {
+                               buffer.append("true");
+                       }
+                       break;
+               case 's':
+                       // System.out.println("args payload size : " + payload.length);
+                       for (int iii = index; iii < payload.length; iii++) {
+                               if (payload[iii] != 0) {
+                                       buffer.append((char) payload[iii]);
                                } else {
-                                       buffer.append("true");
-                               }
-                               break;
-                       case 's':
-                               // System.out.println("args payload size : " + payload.length);
-                               for (int iii = index; iii < payload.length; iii++) {
-                                       if (payload[iii] != 0) {
-                                               buffer.append((char) payload[iii]);
-                                       } else {
-                                               index = iii + 1;
-                                               break;
-                                       }
+                                       index = iii + 1;
+                                       break;
                                }
-                               break;
-                       default:
-                               break;
                        }
+                       break;
+               default:
+                       break;
+               }
 
                args.setArgs(buffer.toString());
                args.setLastIndex(index);
                return args;
        }
-       
+
        public static int getStringLength(int start, byte[] payload) {
                int length = 0;
                for (int i = start; i < payload.length; i++, length++) {

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 63a6d59..dd88eec 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java
@@ -71,7 +71,7 @@ public class FileChartData {
        protected DAChart chart;
        protected boolean hasUpdate = false;
 
-//     private int lastAccessIndexForParent = 0;
+       // private int lastAccessIndexForParent = 0;
 
        public FileChartData(String filePath, long Fd, boolean isRoot) {
                setFilePath(filePath);
@@ -479,15 +479,7 @@ public class FileChartData {
                if (lastIndex < 0) {
                        return;
                }
-//             if (isParent()) {
-//                     for (int i = lastAccessIndexForParent; i < lastIndex; i++) {
-//                             accessSeries.getSeriesItemList().get(i).setY(endTime);
-//
-//                     }
-//                     lastAccessIndexForParent = lastIndex;
-//             } else {
-                       accessSeries.getSeriesItemList().get(lastIndex).setY(endTime);
-//             }
+               accessSeries.getSeriesItemList().get(lastIndex).setY(endTime);
        }
 
        public void setFileOpendTime(double data) {
@@ -588,29 +580,20 @@ public class FileChartData {
                }
                return fileTotalUsedTime;
        }
-//     public double getFileTotalUseTime() {
-//             if (isParent()) {
-//                     return parentTotalUsedTime();
-//             }
-//             if (isClosed(null) == true) {
-//                     return this.fileLastUsedTime - this.fileOpendTime;
-//             } else {
-//                     return this.fileTotalUsedTime;
-//             }
-//     }
+
        public double getFileTotalUseTime() {
-               
+
                if (isParent()) {
                        double fistOpenTime = 1000000;
                        FileChartData fileData;
                        boolean isAllClosed = true;
                        for (int i = 0; i < children.size(); i++) {
                                fileData = children.get(i);
-                               if(fileData.getFileOpendTime() < fistOpenTime){
-                                       fistOpenTime = fileData.getFileOpendTime(); 
+                               if (fileData.getFileOpendTime() < fistOpenTime) {
+                                       fistOpenTime = fileData.getFileOpendTime();
                                }
                                if (fileData.isClosed(null) != true) {
-                                       if(isAllClosed){
+                                       if (isAllClosed) {
                                                isAllClosed = false;
                                        }
                                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
index 6d25306..6b42297 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java
@@ -495,6 +495,8 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite {
                                detailSettingCheckBox.setChecked(false);
                        }
                        updateDetails();
+                       ConfigurationDialogDataManager.getInstance()
+                       .updateSaveButtonStatus(null);
                }
        };