[Title] chnage network probe format

[Desc/] add message size column
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java
index be9ab4d..f7de9d5 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java
@@ -7,6 +7,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.tizen.dynamicanalyzer.common.CommonConstants;
 import org.tizen.dynamicanalyzer.swap.model.ByteUtils;
 
 public class NetworkData extends ProbeCommonData {
@@ -16,7 +17,8 @@ public class NetworkData extends ProbeCommonData {
        int fdApiType = 0;
        int destinationIPAddress = 0;
        int destinationPortAddress = 0;
-       String packetMessage = null;
+       String packetMessage = CommonConstants.EMPTY;
+       int messageSize = 0;
 
        public long getObjectAddress() {
                return objectAddress;
@@ -35,7 +37,7 @@ public class NetworkData extends ProbeCommonData {
        }
 
        public int getPacketMessageSize() {
-               return packetMessage.getBytes().length;
+               return messageSize;
        }
 
        public String getPacketMessage() {
@@ -51,7 +53,8 @@ public class NetworkData extends ProbeCommonData {
        }
 
        public String getDestinationAddress() {
-               return getdestinationIPAddress() + "\n" + getDestinationPortAddress();//$NON-NLS-1$
+               return getdestinationIPAddress() + CommonConstants.NEW_LINE
+                               + getDestinationPortAddress();
        }
 
        public void setFdApiType(int fdApiType) {
@@ -79,12 +82,18 @@ public class NetworkData extends ProbeCommonData {
                destinationPortAddress = ByteUtils.toInt(data, index);
                index += INT_SIZE;
 
-               packetMessage = LogDataUtils.getString(index, data);
+               messageSize = ByteUtils.toInt(data, index);
+               index += LONG_SIZE;
+               if (messageSize > 1) {
+                       packetMessage = LogDataUtils.getString(index, data);
+               }
        }
 
        public static String intToIp(int integerIP) {
-               return ((integerIP >> 24) & 0xFF) + "." + ((integerIP >> 16) & 0xFF)
-                               + "." + ((integerIP >> 8) & 0xFF) + "." + (integerIP & 0xFF);
+               return ((integerIP >> 24) & 0xFF) + CommonConstants.DOT
+                               + ((integerIP >> 16) & 0xFF) + CommonConstants.DOT
+                               + ((integerIP >> 8) & 0xFF) + CommonConstants.DOT
+                               + (integerIP & 0xFF);
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneData.java
index 9808590..06fb4a2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UISceneData.java
@@ -27,6 +27,7 @@
 package org.tizen.dynamicanalyzer.ui.userinterface.scene;
 
 import org.tizen.dynamicanalyzer.common.CommonConstants;
+import org.tizen.dynamicanalyzer.common.SymbolManager;
 import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.utils.Formatter;
@@ -91,6 +92,7 @@ public class UISceneData {
        }
 
        public void setSceneName(String data) {
+//             strSceneName = getDemanglingName(data);
                strSceneName = data;
        }
 
@@ -114,7 +116,7 @@ public class UISceneData {
        }
 
        public void setFormName(String data) {
-               strFormName = data;
+               strFormName = getDemanglingName(data);
        }
 
        public String getFormName() {
@@ -144,4 +146,15 @@ public class UISceneData {
        public void setPID(int strPID) {
                this.strPID = strPID;
        }
+       
+       public String getDemanglingName(String name) {
+               String demanglingName = CommonConstants.EMPTY;
+               StringBuilder childClassNameDemangling = new StringBuilder(name);
+               if(!childClassNameDemangling.toString().contains("_Z")){//$NON-NLS-1$
+                       childClassNameDemangling.insert(0, "_Z");//$NON-NLS-1$
+               }
+               demanglingName = SymbolManager
+                               .demanglingFunctionName(childClassNameDemangling.toString());
+               return demanglingName;
+       }
 }