INTERNAL: change type of sequence number

change type of sequence number: int -> long

Change-Id: Ibf4ac6c3cfb6433b2828cf05ee87380d87f1792d
Signed-off-by: woojin <woojin2.jung@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java
index ccb3945..a646dd6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java
@@ -85,11 +85,11 @@ public abstract class BaseCallstackManager {
        }
 
        protected ConcurrentHashMap<Integer, ConcurrentHashMap<Long, CallStackUnit>> callstackApiAddrByPidMap = new ConcurrentHashMap<Integer, ConcurrentHashMap<Long, CallStackUnit>>();
-       protected ConcurrentHashMap<Integer, CallStackData> callstackDataBySeqMap = new ConcurrentHashMap<Integer, CallStackData>();
+       protected ConcurrentHashMap<Long, CallStackData> callstackDataBySeqMap = new ConcurrentHashMap<Long, CallStackData>();
        protected String userFunctionBin = null;
        protected HashMap<Integer, List<CallStackItem>> userCallstackByTidMap = new HashMap<Integer, List<CallStackItem>>();
        protected HashMap<Integer, DuplicateUserCall> dupUserCallByTidMap = new HashMap<Integer, DuplicateUserCall>();
-       protected ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Integer>> seqTimeByTidMap = new ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Integer>>();
+       protected ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Long>> seqTimeByTidMap = new ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Long>>();
 
        protected CallStackInserter callstackInserter = null;
 
@@ -134,9 +134,9 @@ public abstract class BaseCallstackManager {
                return callstackApiByAddrMap;
        }
 
-       public Map<Integer, CallStackData> getCallStackDataBySeqMap() {
+       public Map<Long, CallStackData> getCallStackDataBySeqMap() {
                if (null == callstackDataBySeqMap) {
-                       callstackDataBySeqMap = new ConcurrentHashMap<Integer, CallStackData>();
+                       callstackDataBySeqMap = new ConcurrentHashMap<Long, CallStackData>();
                }
                return callstackDataBySeqMap;
        }
@@ -148,13 +148,13 @@ public abstract class BaseCallstackManager {
                return dupUserCallByTidMap;
        }
 
-       public NavigableMap<Long, Integer> getSeqTimeByTidMap(int tid) {
+       public NavigableMap<Long, Long> getSeqTimeByTidMap(int tid) {
                if (null == seqTimeByTidMap) {
-                       seqTimeByTidMap = new ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Integer>>();
+                       seqTimeByTidMap = new ConcurrentHashMap<Integer, ConcurrentSkipListMap<Long, Long>>();
                }
-               ConcurrentSkipListMap<Long, Integer> seqByTimeMap = seqTimeByTidMap.get(tid);
+               ConcurrentSkipListMap<Long, Long> seqByTimeMap = seqTimeByTidMap.get(tid);
                if (null == seqByTimeMap) {
-                       seqByTimeMap = new ConcurrentSkipListMap<Long, Integer>();
+                       seqByTimeMap = new ConcurrentSkipListMap<Long, Long>();
                        seqTimeByTidMap.put(tid, seqByTimeMap);
                }
                return seqByTimeMap;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java
index b6ded8c..e920416 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java
@@ -72,7 +72,7 @@ public class SWAPCallStackManager extends BaseCallstackManager {
 
                Map<Long, CallStackUnit> addrMap = getCallStackApiAddrByPidMap(pid);
 
-               int seq = log.getSeq();
+               long seq = log.getSeq();
                int tid = log.getTid();
 
                long selfAddr = log.getPcAddr();
@@ -97,7 +97,7 @@ public class SWAPCallStackManager extends BaseCallstackManager {
 
                List<CallStackItem> userCallstack = getUserCallstack(tid);
                int size = userCallstack.size();
-               NavigableMap<Long, Integer> seqByTimeMap = getSeqTimeByTidMap(tid);
+               NavigableMap<Long, Long> seqByTimeMap = getSeqTimeByTidMap(tid);
 
                CallStackUnit callerCallstackUnit = addrMap.get(callerAddr);
                if (null == callerCallstackUnit) {
@@ -291,7 +291,7 @@ public class SWAPCallStackManager extends BaseCallstackManager {
 
                Map<Long, CallStackUnit> addrMap = getCallStackApiAddrByPidMap(pid);
 
-               int seq = log.getSeq();
+               long seq = log.getSeq();
                int tid = log.getTid();
                long callerAddr = log.getCallerPcAddr();
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
index 04ca3bf..e4a47d3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
@@ -64,6 +64,20 @@ public class ProfileData extends LogData {
        public ProfileData() {
        }
 
+       /** make function entry/exit from Database **/
+       public ProfileData(int id, long seq, int pid, int tid, int apiId,
+                       int binaryId, long time, long callerPcAddr, long pcAddr) {
+               this.id = id;
+               this.seq = seq;
+               this.pid = pid;
+               this.tid = tid;
+               this.apiId = apiId;
+               this.binaryId = binaryId;
+               this.time = time;
+               this.callerPcAddr = callerPcAddr;
+               this.pcAddr = pcAddr;
+       }
+
        /** make function sample from Database **/
        public ProfileData(long time, int pid, int tid, long pcAddr) {
                this.id = MSG_DATA_SAMPLE;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackData.java
index 2a34e20..dc3f74e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackData.java
@@ -30,14 +30,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CallStackData {
-       protected int seq;
+       protected long seq;
        protected List<Long> addrs;
 
-       public CallStackData(int seqNum) {
+       public CallStackData(long seqNum) {
                seq = seqNum;
        }
 
-       public int getSeq() {
+       public long getSeq() {
                return seq;
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackDataDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackDataDBTable.java
index 22d0c80..c210b77 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackDataDBTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackDataDBTable.java
@@ -66,7 +66,7 @@ public class CallStackDataDBTable extends DBTable {
                addColumn(new DBColumn(COLUMN.PCADDR.name, DBConstants.NOT_NULL, DBConstants.DBTYPE_LONG));             
        }
 
-       public List<List<Object>> getCallStackAddrsFromDB(int seq) {
+       public List<List<Object>> getCallStackAddrsFromDB(long seq) {
                String where = String.format(queryto_withSeq, 
                                COLUMN.SEQ.name, seq);
                

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java
index ce1b078..6e5a9a2 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java
@@ -111,22 +111,22 @@ public class CallstackTable extends DATableComposite {
                        DATableDataFormat tableData = (DATableDataFormat) items[0]
                                        .getData();
 
-                       int seqNum = -1;
+                       long seqNum = -1;
                        int pid = -1;
                        long time = -1;
                        if (tableData.getType() == AnalyzerConstants.TYPE_TABLE_FAILED) {
                                List<Object> failedData = tableData.getData();
-                               seqNum = (Integer) failedData.get(0);
+                               seqNum = (Long) failedData.get(0);
                                pid = (Integer) failedData.get(7);
                                time = (Long) failedData.get(1);
                        } else if (tableData.getType() == AnalyzerConstants.TYPE_TABLE_LEAK) {
                                List<Object> leakData = tableData.getData();
-                               seqNum = (Integer) leakData.get(0);
+                               seqNum = (Long) leakData.get(0);
                                pid = (Integer) leakData.get(2);
                                time = (Long) leakData.get(4);
                        } else if (tableData.getType() == AnalyzerConstants.TYPE_TABLE_CALLTRACE) {
                                List<Object> calltraceData = tableData.getData();
-                               seqNum = ((Long) calltraceData.get(FunctionEntryDBTable.COLUMN.SEQ.index)).intValue();
+                               seqNum = (Long) calltraceData.get(FunctionEntryDBTable.COLUMN.SEQ.index);
                                pid = (Integer) calltraceData.get(FunctionEntryDBTable.COLUMN.PID.index);
                                time = (Long) calltraceData.get(FunctionEntryDBTable.COLUMN.STARTTIME.index);
                        } else { // in case table has LogData
@@ -136,7 +136,7 @@ public class CallstackTable extends DATableComposite {
                                time = logData.getTime();
                        }
 
-                       Map<Integer, CallStackData> cdMap = AnalyzerManager
+                       Map<Long, CallStackData> cdMap = AnalyzerManager
                                        .getCallstackManager().getCallStackDataBySeqMap();
                        Map<Long, CallStackUnit> addrMap = AnalyzerManager
                                        .getCallstackManager().getCallStackApiAddrByPidMap(pid);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java
index 321baff..454f0bf 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/range/RangeDataManager.java
@@ -382,7 +382,7 @@ public class RangeDataManager implements Runnable {
        private ProfileData makeFunctionProfileData(int id, ResultSet rs) {
                ProfileData profileData = null;
                try {
-                       int seq = rs.getInt(Function.SEQ.index);
+                       long seq = rs.getLong(Function.SEQ.index);
                        int pid = rs.getInt(Function.PID.index);
                        int tid = rs.getInt(Function.TID.index);
                        int functionId = rs.getInt(Function.FUNCTIONID.index);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
index a6031e3..48c6923 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
@@ -261,11 +261,11 @@ public class FunctionUsageProfiler extends PageDataManager {
                                        getInstance().getProfileDataMakerByPid(
                                                        sample.get(i).getPid())
                                                        .makeFunctionUsageProfileData(sampleLog);
-                                       Map<Integer, CallStackData> callstackDataMap = AnalyzerManager.getCallstackManager()
+                                       Map<Long, CallStackData> callstackDataMap = AnalyzerManager.getCallstackManager()
                                                        .getCallStackDataBySeqMap();
                                        if (callstackDataMap.size() > CALLSTACKDATA_MAX) {
                                                // remove unnecessary callstackdata from memory
-                                               NavigableMap<Long, Integer> seqByTimeMap = 
+                                               NavigableMap<Long, Long> seqByTimeMap = 
                                                                AnalyzerManager.getCallstackManager()
                                                                .getSeqTimeByTidMap(sampleLog.getTid());
                                                // find the time of callstackdata which was made 
@@ -274,12 +274,12 @@ public class FunctionUsageProfiler extends PageDataManager {
                                                Long lastTime = seqByTimeMap
                                                                .floorKey(sampleLog.getTime());
                                                if (null != lastTime) {
-                                                       SortedMap<Long, Integer> headMap = 
+                                                       SortedMap<Long, Long> headMap = 
                                                                        seqByTimeMap.headMap(lastTime);
-                                                       Iterator<Map.Entry<Long, Integer>> itr = headMap
+                                                       Iterator<Map.Entry<Long, Long>> itr = headMap
                                                                        .entrySet().iterator();
                                                        while (itr.hasNext()) {
-                                                               Map.Entry<Long, Integer> entry = itr.next();
+                                                               Map.Entry<Long, Long> entry = itr.next();
                                                                callstackDataMap.remove(entry.getValue());
                                                                itr.remove();
                                                        }
@@ -305,7 +305,7 @@ public class FunctionUsageProfiler extends PageDataManager {
                        }
                } else { // sampling is off, callstackdata is not needed in memory
                        // need to maintain callstackdata until insertion to DB is finished
-                       Map<Integer, CallStackData> callstackDataMap = AnalyzerManager.getCallstackManager()
+                       Map<Long, CallStackData> callstackDataMap = AnalyzerManager.getCallstackManager()
                                        .getCallStackDataBySeqMap();
                        if (callstackDataMap.size() > CALLSTACKDATA_MAX) {
                                callstackDataMap.clear();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
index 5b118a5..93c2b51 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
@@ -268,13 +268,13 @@ public class ProfileDataMaker {
                int pid = sampleLog.getPid();
                
                if(DACommunicator.isSWAPVersion()) {
-                       int seq;
+                       long seq;
                        int tid = sampleLog.getTid();
                        long sampleTime = sampleLog.getTime();  
                        long callstackTime;
                        Long longTime = null;
                        CallStackData callstackData;
-                       NavigableMap<Long, Integer> seqByTimeMap = callstackManager.getSeqTimeByTidMap(tid);
+                       NavigableMap<Long, Long> seqByTimeMap = callstackManager.getSeqTimeByTidMap(tid);
                        Map<Long, CallStackUnit> addrMap = callstackManager
                                        .getCallStackApiAddrByPidMap(pid);
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
index e8f7bd9..537f284 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningTable.java
@@ -174,7 +174,7 @@ public class WarningTable extends DATableComposite {
                        // create images
 
                        // create DATableDataFormat
-                       int seq = (Integer)idata.get(WarningDataDBTable.COLUMN_INDEX_SEQUENCE_NUMBER);
+                       long seq = (Long)idata.get(WarningDataDBTable.COLUMN_INDEX_SEQUENCE_NUMBER);
                        DATableDataFormat tableData = new DATableDataFormat(seq);
                        
                        ProbeCommonData probeData = new ProbeCommonData();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
index 7cb3627..4ab9e87 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
@@ -247,7 +247,7 @@ public class ThreadAPIListTable extends DAApiListTableComposite {
        private ProbeCommonData makeProbeCommonData(ResultSet rs) {
                ProbeCommonData pData = null;
                try {
-                       int seq = rs.getInt(API.SEQ.index);
+                       long seq = rs.getLong(API.SEQ.index);
                        long time = rs.getLong(API.APICALLTIME.index);
                        int apiID = rs.getInt(API.APIID.index);
                        int pid = rs.getInt(API.PID.index);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
index 854216f..1517d08 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.DASelectionData;
-import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.TimelinePageLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView;