[Title] swap source update
authorjooyoul_lee <jy.exe.lee@samsung.com>
Fri, 9 Aug 2013 09:17:06 +0000 (18:17 +0900)
committerjooyoul_lee <jy.exe.lee@samsung.com>
Fri, 9 Aug 2013 09:17:06 +0000 (18:17 +0900)
[Desc.]
[Issue]
blocked source

1. FileChart parsing
2. DATableComposite Collections.sort()
3. WarningListView updateView()
4. FailedApiListView  updateView()

13 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/control/RunTimeConfiguration.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ApiNameManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/BasicDataMessage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java

index 335b9f6..0f8c8b3 100644 (file)
@@ -100,7 +100,7 @@ public class LogInserter implements Runnable {
                int size = logIds.size();
                InsertLogQueue logQueue = getInsertLogQueue();
                while (!AnalyzerManager.isExit()) {
-                       try {
+//                     try {
                                LogPackage logPack = logQueue.getFirstLog();
                                if (null == logPack) {
                                        break;
@@ -119,14 +119,14 @@ public class LogInserter implements Runnable {
                                        int logId = logIds.get(i);
                                        List<BasicDataMessage> msgs = getLogPackage().getMessages(logId);
                                        if (null != msgs) {
-                                               SqlManager.getInstance().insert(logId, msgs);
+//                                             SqlManager.getInstance().insert(logId, msgs);
                                        }
                                }
                                initLogPackage();
-                       } catch (InterruptedException e) {
-                               System.out.println("insert log thread interrupted"); //$NON-NLS-1$
-                               break;
-                       }
+//                     } catch (InterruptedException e) {
+//                             System.out.println("insert log thread interrupted"); //$NON-NLS-1$
+//                             break;
+//                     }
                }
                isCompleted = true;
                System.out.println("insert log thread end"); //$NON-NLS-1$ 
index d9b0e97..8cef711 100755 (executable)
@@ -201,11 +201,11 @@ public class Communicator30 extends BaseCommunicator {
                }
 
                // TODO: app inst , replay info added!!
-//             byte[] rear = ByteUtils.getByte(appInfo.getByteValue(),
-//                             rt.getByteValue(), getUserSpaceInst().getByteValue(),
-//                             replayEvent);
                byte[] rear = ByteUtils.getByte(appInfo.getByteValue(),
-                               rt.getByteValue(), 0,0);
+                               rt.getByteValue(), getUserSpaceInst().getByteValue(),
+                               replayEvent);
+//             byte[] rear = ByteUtils.getByte(appInfo.getByteValue(),
+//                             rt.getByteValue(), 0,0);
                int length = rear.length;
 
                byte[] ret = ByteUtils.getByte(AnalyzerConstants.MSG_START_SWAP,
index eb8563f..6bb9fcd 100755 (executable)
@@ -184,7 +184,7 @@ public class MessageParser {
                }
 
                pInfo.setPid(pid);
-               pInfo.setStartTime(startTime);
+//             pInfo.setStartTime(startTime);
                pInfo.setLowestAddress(lowAddr);
                pInfo.setHighestAddress(highAddr);
                pInfo.setAppType(appType);
@@ -260,7 +260,7 @@ public class MessageParser {
                                if (readSize <= 0) {
                                        continue;
                                } else {
-//                                     System.out.println("read size : " + readSize);
+                                       System.out.println("read size : " + readSize);
                                        readBuf = new byte[readSize];
                                        System.arraycopy(buf, 0, readBuf, 0, readSize);
                                }
index 9c0aaad..aec338c 100755 (executable)
@@ -203,7 +203,7 @@ public class SWAPLogParser implements Runnable {
                                                pData)) {
                                        continue;
                                }
-                               pushLog(log, msg, logPack);
+//                             pushLog(log, msg, logPack);
                                /* user callstack create by entry and exit */
                                AnalyzerManager.getCallstackManager().makeUserCallstack(
                                                pData,
index d107514..7d36daf 100755 (executable)
@@ -43,7 +43,15 @@ public class RunTimeConfiguration implements SWAPModel {
 
        @Override
        public byte[] getByteValue() {
-               return ByteUtils.getByte(preFeatures, features, systemTraceInterval,
+               features |= 0x100000;
+               features |= 0x200000;
+               features |= 0x400000;
+               features |= 0x800000;
+               features |= 0x1000000;
+               features |= 0x2000000;
+               features |= 0x4000000;
+               features |= 0x8000000;
+               return ByteUtils.getByte(features, preFeatures, systemTraceInterval,
                                dataMessageInterval);
        }
 
index 91f6e0f..5e10de5 100644 (file)
@@ -7,7 +7,13 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 public class ApiNameManager {
 
        public static String getApiName(int apiId) {
-               return getApiList().get(apiId);
+               String name = null;
+               try {
+                       return getApiList().get(apiId);
+               } catch (IndexOutOfBoundsException e) {
+                       name = "unknown Api";
+                       return name;
+               }
        }
 
        public static int getApiId(String name) {
index ef72828..8da666c 100644 (file)
@@ -64,11 +64,25 @@ public class BasicDataMessage {
                        long nano = ByteUtils.toInt(headerBuffer, ID_SIZE + SEQ_SIZE
                                        + INT_SIZE);
 
+                       // long startSec = AnalyzerManager.getProject().getStartTime()
+                       // .getSec();
+                       // long startNano = AnalyzerManager.getProject().getStartTime()
+                       // .getNano();
+
+                       DATime startTime = AnalyzerManager.getProject().getStartTime();
                        long startSec = AnalyzerManager.getProject().getStartTime()
                                        .getSec();
                        long startNano = AnalyzerManager.getProject().getStartTime()
                                        .getNano();
 
+                       if (0 == startSec && 0 == startNano) {
+                               startTime.setSec(sec);
+                               startTime.setNano(nano);
+                               AnalyzerManager.getProject().setStartTime(startTime);
+                               startSec = sec;
+                               startNano = nano;
+                       }
+
                        long resultSec = sec - startSec;
                        long resultNano = nano - startNano;
 
@@ -80,10 +94,10 @@ public class BasicDataMessage {
                        System.arraycopy(emptyHeaderBuffer, 0, headerBuffer, 0, HEADER_SIZE);
                        // input - headerBuffer = buffer
                        payload = new byte[payloadSize];
-//                     System.out.println("DEBUG -  id :" + String.format("%4x", id)
-//                                     + "   seq :" + seq + "  time :" + time
-//                                     + "   payload size : " + payloadSize + "   request size :"
-//                                     + reqSize + " input length :" + input.length);
+                       // System.out.println("DEBUG -  id :" + String.format("%4x", id)
+                       // + "   seq :" + seq + "  time :" + time
+                       // + "   payload size : " + payloadSize + "   request size :"
+                       // + reqSize + " input length :" + input.length);
                }
 
                reqSize = (0 == reqSize) ? payloadSize : reqSize;
index 4b3ec49..75498d3 100644 (file)
@@ -97,7 +97,7 @@ public class FailedApiListView extends DAView {
 
        @Override
        public void updateView() {
-               tableComp.updateTable();
+//             tableComp.updateTable();
        }
 
        @Override
index eb0d398..6d3b6f2 100644 (file)
@@ -231,6 +231,9 @@ public class ProfileDataMaker {
        public void makeFunctionUsageProfileData(ProfileData sampleLog) {
                totalSampleCount++;
                String callstack = sampleLog.getCallstack();
+               if (null == callstack) {
+                       return;
+               }
                String[] splitCallstack = callstack
                                .split(AnalyzerConstants.DATA_PARSING_TOKEN);
 
index d4d202e..45974ff 100644 (file)
@@ -86,51 +86,52 @@ public class WarningTable extends DATableComposite {
        }
 
        protected List<TableInput> makeTableInput() {
-               List<WarningData> warningList = null;
-               if (isRange) {
-                       warningList = RangeDataManager.getInstance().getWarningChecker()
-                                       .getWarningData();
-               } else {
-                       warningList = AnalyzerManager.getWarningChecker().getWarningData();
-               }
-               List<TableInput> input = new ArrayList<TableInput>();
-               int size = warningList.size();
-               for (int i = 0; i < size; i++) {
-                       // create text
-                       List<String> text = new ArrayList<String>();
-                       WarningData warningData = warningList.get(i);
-                       List<String> warningInput = warningData.getData();
-
-                       text.add(warningInput.get(LogCenterConstants.SEQUENCE_NUMBER_INDEX));
-                       {
-                               if (AnalyzerConstants.MSG_PROBE_FILE == warningData
-                                               .getCategory()) {
-                                       String fdType = warningInput
-                                                       .get(LogCenterConstants.RESOURCE_FDTYPE_INDEX);
-                                       int type = Integer.parseInt(fdType);
-                                       if (type == LogCenterConstants.FD_TYPE_FILE) {
-                                               text.add(SummaryLabels.WARNING_TABLE_FILE);
-                                       } else {
-                                               text.add(SummaryLabels.WARNING_TABLE_SOCKET);
-                                       }
-                               } else {
-                                       text.add(LogCenterConstants
-                                                       .getLogCenterNameFromId(warningData.getCategory()));
-                               }
-                       }
-                       String message = WarningChecker.messageMaker(warningData, true);
-                       text.add(message);
-                       // create images
-
-                       // create DATableDataFormat
-                       DATableDataFormat tableData = new DATableDataFormat(
-                                       warningData.getSeq());
-                       tableData.getData().addAll(warningData.getData());
-                       TableInput tableInput = new TableInput();
-                       tableInput.setText(text);
-                       tableInput.setData(tableData);
-                       input.add(tableInput);
-               }
-               return input;
+//             List<WarningData> warningList = null;
+//             if (isRange) {
+//                     warningList = RangeDataManager.getInstance().getWarningChecker()
+//                                     .getWarningData();
+//             } else {
+//                     warningList = AnalyzerManager.getWarningChecker().getWarningData();
+//             }
+//             List<TableInput> input = new ArrayList<TableInput>();
+//             int size = warningList.size();
+//             for (int i = 0; i < size; i++) {
+//                     // create text
+//                     List<String> text = new ArrayList<String>();
+//                     WarningData warningData = warningList.get(i);
+//                     List<String> warningInput = warningData.getData();
+//
+//                     text.add(warningInput.get(LogCenterConstants.SEQUENCE_NUMBER_INDEX));
+//                     {
+//                             if (AnalyzerConstants.MSG_PROBE_FILE == warningData
+//                                             .getCategory()) {
+//                                     String fdType = warningInput
+//                                                     .get(LogCenterConstants.RESOURCE_FDTYPE_INDEX);
+//                                     int type = Integer.parseInt(fdType);
+//                                     if (type == LogCenterConstants.FD_TYPE_FILE) {
+//                                             text.add(SummaryLabels.WARNING_TABLE_FILE);
+//                                     } else {
+//                                             text.add(SummaryLabels.WARNING_TABLE_SOCKET);
+//                                     }
+//                             } else {
+//                                     text.add(LogCenterConstants
+//                                                     .getLogCenterNameFromId(warningData.getCategory()));
+//                             }
+//                     }
+//                     String message = WarningChecker.messageMaker(warningData, true);
+//                     text.add(message);
+//                     // create images
+//
+//                     // create DATableDataFormat
+//                     DATableDataFormat tableData = new DATableDataFormat(
+//                                     warningData.getSeq());
+//                     tableData.getData().addAll(warningData.getData());
+//                     TableInput tableInput = new TableInput();
+//                     tableInput.setText(text);
+//                     tableInput.setData(tableData);
+//                     input.add(tableInput);
+//             }
+//             return input;
+               return null;
        }
 }
index ce43598..29b4720 100644 (file)
@@ -151,23 +151,23 @@ public class FileChart extends TimelineChart {
 
        @Override
        public void parseLogPackage(LogPackage logPack) {
-               Logs logs = logPack.getLogs(probeType);
-               List<LogData> logList = logs.getLogs();
-               for (LogData log : logList) {
-                       double time = Double.parseDouble(Long.toString(log.getTime()));
-
-                       int size = deviceLogTimeList.size();
-                       int index = (int) (time / TimelineConstants.MEGA);
-
-                       if (size <= index) {
-                               for (int i = size; i <= index; i++) {
-                                       deviceLogTimeList.add(Double.NaN);
-                               }
-                       }
-                       deviceLogTimeList.set(index, time);
-
-                       updateRW(time);
-               }
+//             Logs logs = logPack.getLogs(probeType);
+//             List<LogData> logList = logs.getLogs();
+//             for (LogData log : logList) {
+//                     double time = Double.parseDouble(Long.toString(log.getTime()));
+//
+//                     int size = deviceLogTimeList.size();
+//                     int index = (int) (time / TimelineConstants.MEGA);
+//
+//                     if (size <= index) {
+//                             for (int i = size; i <= index; i++) {
+//                                     deviceLogTimeList.add(Double.NaN);
+//                             }
+//                     }
+//                     deviceLogTimeList.set(index, time);
+//
+//                     updateRW(time);
+//             }
        }
 
        private void updateRW(double time) {
index 39a49d9..1d28c01 100644 (file)
@@ -41,7 +41,7 @@ public class UIControlListDataChecker {
        private int preSeq = -1;
 
        public void parserLog(ControlData input) {
-
+               System.out.println("phj " + input.getApiName());
                String stClassName = getClassName(input.getApiName()).trim();
                if (stClassName.contains("AddFrame") || stClassName.contains("AddControl")) {//$NON-NLS-1$ //$NON-NLS-2$
                        if (isExistData(input.getParentClassName(),
index b7c5c3b..f0dc5e2 100644 (file)
@@ -352,7 +352,7 @@ public abstract class DATableComposite extends Composite {
                        return;
                }
                if (null != comparator) {
-                       Collections.sort(input, comparator);
+//                     Collections.sort(input, comparator);
                }
                int[] sels = new int[selSeqs.size()];
                int iii = 0;