[Title] Fix bugs
authorjooyoul_lee <jy.exe.lee@samsung.com>
Tue, 5 Nov 2013 02:18:27 +0000 (11:18 +0900)
committerjooyoul_lee <jy.exe.lee@samsung.com>
Tue, 5 Nov 2013 02:18:27 +0000 (11:18 +0900)
[Desc.] return value, sash margin
[Issue]

27 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProbeCommonData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDetector.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadPage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/TimelinePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIPage.java

index b9403be..b614202 100644 (file)
@@ -329,4 +329,9 @@ public class AnalyzerConstants {
        public final static int TYPE_TABLE_NORMAL = 0x0010;\r
        public final static int TYPE_TABLE_CALLTRACE = 0x0020;\r
 \r
+       public final static String CALLSTACK_KEY_PID = "pid";//$NON-NLS-1$\r
+       public final static String CALLSTACK_KEY_ADDR = "address";//$NON-NLS-1$\r
+       public final static String CALLSTACK_KEY_TIME = "time";//$NON-NLS-1$\r
+       \r
+       public final static int SASH_WIDTH = 4;\r
 }\r
index 000c5b4..7b67836 100644 (file)
@@ -364,7 +364,9 @@ public class TableTooltipListener implements Listener {
 \r
                switch (tableData.getType()) {\r
                case AnalyzerConstants.TYPE_TABLE_CALLSTACK:\r
-                       addr = (Long) tableData.getObject();\r
+                       addr = (Long) item.getData(AnalyzerConstants.CALLSTACK_KEY_ADDR);\r
+                       pid = (Integer) item.getData(AnalyzerConstants.CALLSTACK_KEY_PID);\r
+                       time = (Long) item.getData(AnalyzerConstants.CALLSTACK_KEY_TIME);\r
                        break;\r
                case AnalyzerConstants.TYPE_TABLE_FAILED:\r
                        List<String> failedData = tableData.getData();\r
@@ -390,9 +392,9 @@ public class TableTooltipListener implements Listener {
                        if (data instanceof UserFunctionData) {\r
                                addr = ((UserFunctionData) data).getCallerPcAddr();\r
                        } else if (data instanceof ProfileData) {\r
-                               addr = ((ProfileData) data).getPcAddr();\r
+//                             addr = ((ProfileData) data).getPcAddr();\r
                                // config\r
-                               // addr = ((ProfileData) data).getCallerPcAddr();\r
+                                addr = ((ProfileData) data).getCallerPcAddr();\r
                        }\r
                        pid = data.getPid();\r
                        time = data.getTime();\r
index 13fd828..0be83e7 100755 (executable)
@@ -566,7 +566,7 @@ public class SqlManager {
                                prep.setLong(8, data.getAddr());
                                prep.setLong(9, data.getCallerPc());
                                prep.setString(10, data.getParam());
-                               prep.setLong(11, data.getRet());
+                               prep.setString(11, data.getRet());
                                prep.setString(12, data.getLibName());
                                prep.setInt(13, data.getKey());
                                prep.setInt(14, data.getParentKey());
@@ -628,7 +628,7 @@ public class SqlManager {
                                prep.setLong(4, data.getTime());
                                prep.setString(5, data.getName());
                                prep.setString(6, data.getArgs());
-                               prep.setLong(7, data.getReturn());
+                               prep.setString(7, data.getReturn());
                                prep.setLong(8, data.getErrorCode());
                                prep.setLong(9, data.getCallerPc());
                                prep.setInt(10, data.getPid());
index 4701c74..d8b6c9a 100755 (executable)
@@ -36,11 +36,8 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.logparser.LogInserter;
 import org.tizen.dynamicanalyzer.model.ImageInfo;
 import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants;
-import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfo;
-import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage;
 import org.tizen.dynamicanalyzer.swap.model.data.ContextSwitchData;
 import org.tizen.dynamicanalyzer.swap.model.data.LogData;
-import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData;
 import org.tizen.dynamicanalyzer.swap.model.data.ProfileData;
 import org.tizen.dynamicanalyzer.swap.model.data.ReplayData;
 import org.tizen.dynamicanalyzer.swap.model.data.ScreenShotData;
@@ -68,9 +65,6 @@ public class SWAPLogParser implements Runnable {
        private int DEFAULT_IMG_WIDTH = 480;
        private int DEFAULT_IMG_HEIGHT = 800;
 
-       /** thread **/
-       private int pid = -1;
-
        public static LogQueue getLogQueue() {
                if (null == logQueue) {
                        logQueue = new LogQueue();
@@ -144,24 +138,6 @@ public class SWAPLogParser implements Runnable {
                        }
                        LogData log = logLumb.get(i);
                        int id = log.getId();
-
-                       // check main process!!
-                       // TODO : multi process processing
-                       if (log instanceof ProbeCommonData) {
-                               // if (-1 == pid) {
-                               // pid = ((ProbeCommonData) log).getPid();
-                               // } else {
-                               // int p = ((ProbeCommonData) log).getPid();
-                               // if (pid != p) {
-                               // continue;
-                               // }
-                               // }
-
-                               ProbeCommonData common = ((ProbeCommonData) log);
-                               System.out.println("internal call : "
-                                               + common.getInternalCall() + " api : "
-                                               + common.getApiName());
-                       }
                        int seqNum = log.getSeq();
 
                        if (log instanceof SystemData) {
@@ -207,10 +183,10 @@ public class SWAPLogParser implements Runnable {
                                                continue;
                                        }
 
-                                       ProcessInfoPackage processInfoPkg = AnalyzerManager
-                                                       .getProject().getProcessInfo(pData.getPid());
-                                       ProcessInfo processInfo = processInfoPkg
-                                                       .getProcessInfo(pData.getTime());
+//                                     ProcessInfoPackage processInfoPkg = AnalyzerManager
+//                                                     .getProject().getProcessInfo(pData.getPid());
+//                                     ProcessInfo processInfo = processInfoPkg
+//                                                     .getProcessInfo(pData.getTime());
 
                                        // for debug
                                        // System.out.println(" PROFILE LOG DEBUG = ID: "
index eddaddd..48a7bb4 100644 (file)
@@ -146,11 +146,17 @@ public class ProbeCommonData extends LogData {
                this.args = args;
        }
 
-       public String getHexReturn() {
-               return AnalyzerUtil.toHexdecimal(ret);
+       public String getReturn() {
+               String retStr = null;
+               if (ret < 0x10000000) {
+                       retStr = Long.toString(ret);
+               } else {
+                       retStr = AnalyzerUtil.toHexdecimal(ret);
+               }
+               return retStr;
        }
 
-       public long getReturn() {
+       public long getOriginalReturn() {
                return ret;
        }
 
index 0e2b86d..3d8e4cb 100644 (file)
@@ -178,14 +178,8 @@ public class FileApiListTable extends DAApiListTableComposite {
                        contentText.add(contentTemp.getArgs());
                        contentData.add(contentTemp.getArgs());
 
-                       if(contentTemp.getReturn() > 999999999){
-                               contentText.add(contentTemp.getHexReturn());
-                       }else{
-                               contentText.add(Long.toString(contentTemp.getReturn()));
-                       }
-                       contentData.add(Long.toString(contentTemp.getReturn()));
-                       
-                       
+                       contentText.add(contentTemp.getReturn());
+                       contentData.add(contentTemp.getReturn());
 
                        String errMsg = ErrorCodeManager.getInatance()
                                        .getErrorCode(contentTemp.getErrno()).name();
index 8931cd2..347e709 100644 (file)
@@ -31,6 +31,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
@@ -47,13 +48,15 @@ public class FilePage extends DAPageComposite {
        public FilePage(Composite parent, int style) {
                super(parent, style);
                name = AnalyzerLabels.COOLBAR_AREA_FILE;
-               this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_FILE_TOOLTIP);
+               this.setData(DAPageComposite.KEY_TOOLTIP,
+                               ShortCutManager.COOLBAR_AREA_FILE_TOOLTIP);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
                baseForm.setLayout(new FillLayout());
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
+
                FileChartView fileChartView = new FileChartView(leftForm, SWT.NONE);
                addView(fileChartView);
                FileApiListView fileApiListView = new FileApiListView(leftForm,
@@ -63,6 +66,7 @@ public class FilePage extends DAPageComposite {
                leftForm.setWeights(new int[] { 60, 40 });
 
                rightForm = new SashForm(baseForm, SWT.VERTICAL);
+
                DATabComposite tabView = new DATabComposite(rightForm, SWT.NONE);
                addView(tabView);
                {
@@ -84,6 +88,10 @@ public class FilePage extends DAPageComposite {
 
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
+
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
 
        @Override
index c80d54b..68635b6 100644 (file)
@@ -137,6 +137,9 @@ public class CallstackTable extends DATableComposite {
                                                        .setType(AnalyzerConstants.TYPE_TABLE_CALLSTACK);
                                        callstackTableData.setObject(address);
                                        gridItem.setData(callstackTableData);
+                                       gridItem.setData(AnalyzerConstants.CALLSTACK_KEY_ADDR, address);
+                                       gridItem.setData(AnalyzerConstants.CALLSTACK_KEY_PID, logData.getPid());
+                                       gridItem.setData(AnalyzerConstants.CALLSTACK_KEY_TIME, logData.getTime());
                                }
 
                                String addrInput = (addrs.get(i) == 0) ? "" : addr; //$NON-NLS-1$
index eab141e..3833f0f 100644 (file)
@@ -203,12 +203,8 @@ public class NetworkApiListTable extends DAApiListTableComposite {
                        contentText.add(contentTemp.getArgs());
                        contentData.add(contentTemp.getArgs());
 
-                       if(contentTemp.getReturn() > 999999999){
-                               contentText.add(contentTemp.getHexReturn());
-                       }else{
-                               contentText.add(Long.toString(contentTemp.getReturn()));
-                       }
-                       contentData.add(Long.toString(contentTemp.getReturn()));
+                       contentText.add(contentTemp.getReturn());
+                       contentData.add(contentTemp.getReturn());
 
                        int apiType = contentTemp.getFdApiType();
                        if (apiType == LogCenterConstants.SOCKET_API_SEND_END
@@ -234,8 +230,8 @@ public class NetworkApiListTable extends DAApiListTableComposite {
                        }
                        contentText.add(errMsg);
                        contentData.add(errMsg);
-                       contentText.add(Long.toString(contentTemp.getReturn()));
-                       contentData.add(Long.toString(contentTemp.getReturn()));
+                       contentText.add(contentTemp.getReturn());
+                       contentData.add(contentTemp.getReturn());
 
                        DATableDataFormat tableData = new DATableDataFormat(
                                        contentTemp.getSeq());
index 0d7ba35..cd80ac1 100644 (file)
@@ -173,7 +173,7 @@ public class NetworkDataMaker {
                case LogCenterConstants.SOCKET_API_ACCEPT_START:
                        break;
                case LogCenterConstants.SOCKET_API_ACCEPT_END: {
-                       String clientFD = Long.toString(input.getReturn());
+                       String clientFD = input.getReturn();
                        addressByFdHashMap.put(clientFD, parentAddress);
                        if (errno != 0) {
                                NetworkChartDataEvent event = new NetworkChartDataEvent(
@@ -240,7 +240,7 @@ public class NetworkDataMaker {
                        System.out.println("input.getArgs() : "+input.getArgs());
                        break;
                case LogCenterConstants.HTTP_API_TRANSACTION_OPEN: {
-                       String clientFD = Long.toString(input.getReturn());
+                       String clientFD = input.getReturn();
                        String parrentAddress = addressByFdHashMap.get(apiFD);
                        if (null != parrentAddress) {
                                apiAddress = parrentAddress;
@@ -258,7 +258,7 @@ public class NetworkDataMaker {
                        break;
                }
                case LogCenterConstants.HTTP_API_ALLOCATION: {
-                       String clientFD = Long.toString(input.getReturn());
+                       String clientFD = input.getReturn();
                        String parretnFD = parentFDByFdHashMap.get(apiFD);
                        if (null != parretnFD) {
                                apiFD = parretnFD;
@@ -295,7 +295,7 @@ public class NetworkDataMaker {
                        break;
                }
                case LogCenterConstants.HTTP_API_RESPONSE: {
-                       String clientFD = Long.toString(input.getReturn());
+                       String clientFD = input.getReturn();
                        String parretnFD = parentFDByFdHashMap.get(apiFD);
                        if (null != parretnFD) {
                                apiFD = parretnFD;
index 07c6c5b..a818d6f 100644 (file)
@@ -30,6 +30,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.network.NetworkApiListView;
@@ -48,17 +49,19 @@ public class NetworkPage extends DAPageComposite {
        public NetworkPage(Composite parent, int style) {
                super(parent, style);
                name = AnalyzerLabels.COOLBAR_AREA_NETWORK;
-               this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_NETWORK_TOOLTIP);
+               this.setData(DAPageComposite.KEY_TOOLTIP,
+                               ShortCutManager.COOLBAR_AREA_NETWORK_TOOLTIP);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
                baseForm.setLayout(new FillLayout());
 
                leftForm = new SashForm(baseForm, SWT.VERTICAL);
-               NetworkChartView networkChartView = new NetworkChartView(leftForm, SWT.NONE);
-               addView(networkChartView);
-               NetworkApiListView networkApiListView = new NetworkApiListView(leftForm,
+               NetworkChartView networkChartView = new NetworkChartView(leftForm,
                                SWT.NONE);
+               addView(networkChartView);
+               NetworkApiListView networkApiListView = new NetworkApiListView(
+                               leftForm, SWT.NONE);
                addView(networkApiListView);
 
                leftForm.setWeights(new int[] { 60, 40 });
@@ -69,7 +72,8 @@ public class NetworkPage extends DAPageComposite {
                {
                        SnapshotView snapshotView = new SnapshotView(
                                        tabView.getContentComposite(), SWT.NONE, false, name);
-                       snapshotView.setObservingViews(new String[] { NetworkApiListView.ID });
+                       snapshotView
+                                       .setObservingViews(new String[] { NetworkApiListView.ID });
                        tabView.addView(snapshotView, false);
 
                        CallstackView callstack = new CallstackView(
@@ -84,6 +88,11 @@ public class NetworkPage extends DAPageComposite {
 
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
+
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+
        }
 
        @Override
index f91df78..76f3f03 100644 (file)
@@ -42,7 +42,6 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLFPSChart;
 import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLFrameTimeChart;
 import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextTreeTable;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
-import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
 public class GLDataMaker {
        public static final String DELIMITER = "`,";
@@ -703,7 +702,7 @@ public class GLDataMaker {
                                setContextValueList(seq, GLContextDBEnum.SCISSOR_W.ordinal(), parameters[2]);
                                setContextValueList(seq, GLContextDBEnum.SCISSOR_H.ordinal(), parameters[3]);
                        } else if(apiName.equals(API_GL_SHADER_CREATE)) {
-                               String shaderID = Long.toString(logData.getReturn());
+                               String shaderID = logData.getReturn();
                                shaderIDMap.put(shaderID, shaderID);
                                shaderTypeMap.put(shaderID, GLConstantMap.getConstantString(parameter));
                                shaderSourceMap.put(shaderID, SPACE);
index e7ce2f8..94bb0bf 100644 (file)
@@ -60,7 +60,7 @@ public class GLAPIData {
                return logData.getErrno();
        }
 
-       public long getReturnValue() {
+       public String getReturnValue() {
                return logData.getReturn();
        }
 
index 55fd45e..bc090a8 100644 (file)
@@ -32,6 +32,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants;
@@ -109,6 +110,11 @@ public class GLPage extends DAPageComposite {
 
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
+               
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
 
        @Override
index 48af3e4..840499c 100644 (file)
@@ -30,6 +30,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
@@ -113,6 +114,11 @@ public class SummaryPage extends DAPageComposite {
                                warningForm, SWT.NONE);
                addView(warningDetailView);
                warningForm.setWeights(new int[] { 70, 30 });
+               
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               upperForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               warningForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
 
        @Override
index d1860df..2054513 100644 (file)
@@ -111,8 +111,8 @@ public class FailedApiTable extends DATableComposite {
                        text.add(failedData.getArgs()); // 3
                        data.add(failedData.getArgs());
                        
-                       text.add(failedData.getHexReturn()); // 4
-                       data.add(Long.toString(failedData.getReturn()));
+                       text.add(failedData.getReturn()); // 4
+                       data.add(failedData.getReturn());
 
                        try{
                        String errCode = ErrorCodeManager.getInatance()
index 4ba0cfd..eee36f1 100755 (executable)
@@ -30,7 +30,6 @@ import java.util.List;
 
 import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData;
-import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
 public class FailedData {
        public static final int ID_INDEX = 1;
@@ -52,7 +51,7 @@ public class FailedData {
        private long time = -1;
        private String apiName = null;
        private String args = null;
-       private long ret = -1;
+       private String ret = null;
        private long err = -1;
        private long callerPc = -1;
        private int pid = -1;
@@ -81,7 +80,7 @@ public class FailedData {
                        time = Long.parseLong(input.get(TIME_INDEX));
                        apiName = input.get(NAME_INDEX);
                        args = input.get(ARGS_INDEX);
-                       ret = Long.parseLong(input.get(RETURN_INDEX));
+                       ret = input.get(RETURN_INDEX);
                        err = Integer.parseInt(input.get(ERROR_INDEX));
                        callerPc = Long.parseLong(input.get(CALLER_INDEX));
                        pid = Integer.parseInt(input.get(PID_INDEX));
@@ -113,11 +112,7 @@ public class FailedData {
                return args;
        }
 
-       public String getHexReturn() {
-               return AnalyzerUtil.toHexdecimal(ret);
-       }
-
-       public long getReturn() {
+       public String getReturn() {
                return ret;
        }
 
index cce12b0..ff8aabf 100644 (file)
@@ -59,7 +59,7 @@ public class LeakData {
        private long addr = -1;
        private long callerPcAddr = -1;
        private String param = null;
-       private long retValue = -1;
+       private String retValue = null;
        private String libName = null;
        private int key = -1;
        private int parentKey = -1;
@@ -99,7 +99,7 @@ public class LeakData {
                addr = Long.parseLong(loadData.get(INDEX_ADDR));
                callerPcAddr = Long.parseLong(loadData.get(INDEX_CALLER_PCADDR));
                param = loadData.get(INDEX_PARAMETER);
-               retValue = Long.parseLong(loadData.get(INDEX_RETURN));
+               retValue = loadData.get(INDEX_RETURN);
                libName = loadData.get(INDEX_LIB_NAME);
                key = Integer.parseInt(loadData.get(INDEX_KEY));
                parentKey = Integer.parseInt(loadData.get(INDEX_PARENT_KEY));
@@ -161,15 +161,11 @@ public class LeakData {
                this.param = param;
        }
 
-       public long getRet() {
+       public String getRet() {
                return retValue;
        }
 
-       public String getHexRet() {
-               return AnalyzerUtil.toHexdecimal(retValue);
-       }
-
-       public void setRet(long ret) {
+       public void setRet(String ret) {
                this.retValue = ret;
        }
 
index 87a1574..3c7ec31 100644 (file)
@@ -35,6 +35,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData;
 import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit;
+import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
 public class LeakDetector {
        public final static int API_TYPE_OPEN = 0;
@@ -94,6 +95,9 @@ public class LeakDetector {
                        return;
                }
 
+               if (AnalyzerUtil.isInternal(log)) {
+                       return;
+               }
                // step 1 : check "open" or "close"
                // Check chk; // 0: open , 1: close
                // if (null == getLeakCheckHash().get(apiName)) {
@@ -109,18 +113,16 @@ public class LeakDetector {
                        chk = LeakCheckList.getLeakCheckList().get(apiName);
                }
 
-               if (logData.getId() == 0x3004)
-               {
-               //      System.out.println("file arrived");
-               }
                HashMap<Integer, LeakData> leaks = getLeakHash();
                if (chk.getApiType() == API_TYPE_OPEN) {
-//                     if (chk.isCheckUserCall()) {
-//                             checkUserFuncLeakData(logData, chk);
-//                     } else {
-                               LeakData newLeak = new LeakData(logData, this);
-                               leaks.put(logData.getKey(), newLeak);
-//                     }
+                       // if (chk.isCheckUserCall()) {
+                       // checkUserFuncLeakData(logData, chk);
+                       // } else {
+                       System.out.println("api : + " + log.getApiName()
+                                       + "   internal check : " + log.getInternalCall());
+                       LeakData newLeak = new LeakData(logData, this);
+                       leaks.put(logData.getKey(), newLeak);
+                       // }
                } else if (chk.getApiType() == API_TYPE_CLOSE) {
                        int key = log.getKey();
                        LeakData freeData = getChildHash().get(key);
@@ -132,12 +134,6 @@ public class LeakDetector {
                                        leaks.remove(parent.getKey());
                                }
                        } else {
-                               // List<LeakData> leakDatas = new ArrayList<LeakData>();
-                               // leakDatas.addAll(leaks.values());
-                               // for (int i = 0; i < leakDatas.size(); i++) {
-                               // System.out.println(leakDatas.get(i).getData());
-                               // }
-                               // freeData = leaks.get(key);
                                leaks.remove(key);
                        }
 
@@ -152,14 +148,14 @@ public class LeakDetector {
                        leaks.remove(rmKey);
 
                        // internal check
-                       if (chk.isCheckUserCall()) {
-                               checkUserFuncLeakData(log, chk);
-                       } else {
+//                     if (chk.isCheckUserCall()) {
+//                             checkUserFuncLeakData(log, chk);
+//                     } else {
                                // String key = input[chk.getKeyIndex()];
                                // leaks.put(key, new LeakData(key, input, this));
                                int key = log.getKey();
                                leaks.put(key, new LeakData(log, this));
-                       }
+//                     }
                }
        }
 
index c728d32..e8322ed 100644 (file)
@@ -173,8 +173,8 @@ public class LeakTable extends DATreeComposite {
                tableData.setObject(leakData.getName());
                text.add(leakData.getParam()); // 5
                data.add(leakData.getParam());
-               text.add(leakData.getHexRet()); // 6
-               data.add(Long.toString(leakData.getRet()));
+               text.add(leakData.getRet()); // 6
+               data.add(leakData.getRet());
 
                String libName = leakData.getLibName();
                if (libName == null || libName.isEmpty()) {
index b309e09..e23121f 100644 (file)
@@ -136,8 +136,8 @@ public class ThreadAPIListTable extends DAApiListTableComposite {
                        contentText.add(contentTemp.getArgs());
                        contentData.add(contentTemp.getArgs());
                        
-                       contentText.add(contentTemp.getHexReturn());
-                       contentData.add(Long.toString(contentTemp.getReturn()));
+                       contentText.add(contentTemp.getReturn());
+                       contentData.add(contentTemp.getReturn());
                        
                        String errMsg = ErrorCodeManager.getInatance()
                                        .getErrorCode(contentTemp.getErrno()).name();
index 7e3606d..6837310 100644 (file)
@@ -30,6 +30,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
@@ -47,7 +48,8 @@ public class ThreadPage extends DAPageComposite {
        public ThreadPage(Composite parent, int style) {
                super(parent, style);
                name = AnalyzerLabels.COOLBAR_AREA_THREAD;
-               this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_THREAD_TOOLTIP);
+               this.setData(DAPageComposite.KEY_TOOLTIP,
+                               ShortCutManager.COOLBAR_AREA_THREAD_TOOLTIP);
                this.setLayout(new FillLayout());
 
                baseForm = new SashForm(this, SWT.HORIZONTAL);
@@ -88,8 +90,12 @@ public class ThreadPage extends DAPageComposite {
 
                rightForm.setWeights(new int[] { 50, 50 });
                baseForm.setWeights(new int[] { 75, 25 });
+
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
-       
+
        @Override
        protected void setFormWeights() {
                baseForm.setWeights(new int[] { 100 - wRate, wRate });
index 1bf94d4..e36e7a7 100644 (file)
@@ -30,6 +30,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
@@ -48,10 +49,12 @@ public class TimelinePage extends DAPageComposite {
        public TimelinePage(Composite parent, int style) {
                super(parent, style);
                name = AnalyzerLabels.COOLBAR_AREA_TIMELINE;
-               this.setData(DAPageComposite.KEY_TOOLTIP, ShortCutManager.COOLBAR_AREA_TIMELINE_TOOLTIP);
+               this.setData(DAPageComposite.KEY_TOOLTIP,
+                               ShortCutManager.COOLBAR_AREA_TIMELINE_TOOLTIP);
                this.setLayout(new FillLayout());
 
                leftForm = new SashForm(this, SWT.HORIZONTAL);
+
                // index 0 : TIMELINE_INDEX
                TimelineView timelineComp = new TimelineView(leftForm, SWT.NONE);
                addView(timelineComp);
@@ -79,6 +82,9 @@ public class TimelinePage extends DAPageComposite {
 
                leftForm.setWeights(new int[] { 75, 25 });
                rightForm.setWeights(new int[] { 50, 50 });
+
+               leftForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               rightForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
 
        @Override
index b83c5d4..1b3d9c1 100644 (file)
@@ -105,7 +105,7 @@ public class CallTraceTable extends DATableComposite {
                                text.add(Integer.toString(data.getPid()));
                                text.add(data.getApiName());
                                text.add(data.getArgs());
-                               text.add(data.getHexReturn());
+                               text.add(data.getReturn());
                                text.add(data.getLibName());
                        } else if (logData instanceof ProfileData) {
                                ProfileData data = (ProfileData) logData;
@@ -144,7 +144,6 @@ public class CallTraceTable extends DATableComposite {
                                        tableInput.setInRange(true);
                                }
                        }
-
                }
                return input;
        }
index e768e2f..d2adba9 100755 (executable)
@@ -79,7 +79,7 @@ public class CustomLogParser {
                String apiName = log.getApiName();
 
                if (apiName.equals(API_NAME_CREATE_CHART)) {
-                       long chartHandle = log.getReturn();
+                       long chartHandle = log.getOriginalReturn();
                        String chartName = log.getName();
                        chartManager.addCustomChart(new UserCustomChart((int) chartHandle,
                                        chartName));
@@ -93,7 +93,7 @@ public class CustomLogParser {
                                return;
                        }
 
-                       long seriesHandle = log.getReturn();
+                       long seriesHandle = log.getOriginalReturn();
                        int seriesStyle = log.getType();
                        String seriesName = log.getName();
                        int colorIndex = log.getColor();
@@ -120,7 +120,7 @@ public class CustomLogParser {
                                return;
                        }
 
-                       long seriesHandle = log.getReturn();
+                       long seriesHandle = log.getOriginalReturn();
                        int colorIndex = chart.getUnusedColorIndex();
                        String seriesName = log.getName();
 
index 6a64010..30af7dc 100644 (file)
@@ -95,9 +95,11 @@ public class ConfigurationDialogValues {
                                        ConfigureLabels.FEATURE_FILE,
                                        ConfigureLabels.FEATURE_THREAD,
                                        ConfigureLabels.FEATURE_USERINTERFACE,
-                                       ConfigureLabels.FEATURE_NETWORK,
-                                       ConfigureLabels.FEATURE_OPENGL,
+                                       ConfigureLabels.FEATURE_SCREENSHOT,
+                                       ConfigureLabels.FEATURE_USER_EVENT,
                                        ConfigureLabels.FEATURE_RECORDING,
+                                       ConfigureLabels.FEATURE_OPENGL,
+                                       ConfigureLabels.FEATURE_NETWORK,
                                        ConfigureLabels.FEATURE_SYSCALL,
                                        // ConfigureLabels.FEATURE_SYSCALL_FILE,
                                        // ConfigureLabels.FEATURE_SYSCALL_IPC,
index a62ffae..d6d7da9 100644 (file)
@@ -30,6 +30,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;
@@ -86,6 +87,10 @@ public class UIPage extends DAPageComposite {
                                bottomForm, SWT.NONE);
                addView(bottomLeftFirst);
                bottomForm.setWeights(new int[] { 100 });
+               
+               baseForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               upperForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
+               bottomForm.setSashWidth(AnalyzerConstants.SASH_WIDTH);
        }
 
        @Override