[Title] seperate osp/tizen probe

[Type] Feature
[Module] Dynamic Analyzer, da manager, da probe
[Priority] Major
[CQ#]
[Redmine#] 5281
[Problem] need to seperate osp/tizen probe
[Cause] release engineering
[Solution] seperate osp/tizen probe
[TestCase]

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_manager b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_manager
index be9a266..5843d7a 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_manager and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_manager differ

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_osp.so b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_osp.so
new file mode 100644 (file)
index 0000000..871a36c
Binary files /dev/null and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_osp.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_tizen.so b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_tizen.so
new file mode 100644 (file)
index 0000000..871a36c
Binary files /dev/null and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/arm/da_probe_tizen.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_manager b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_manager
index 0cf1445..feee5d4 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_manager and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_manager differ

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_osp.so b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_osp.so
new file mode 100644 (file)
index 0000000..d7de16a
Binary files /dev/null and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_osp.so differ

diff --git a/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_tizen.so b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_tizen.so
new file mode 100644 (file)
index 0000000..d7de16a
Binary files /dev/null and b/org.tizen.dynamicanalyzer.workbench/DynamicAnalyzer/target/x86/da_probe_tizen.so differ

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/DACommunicator.java
index c72e484..2f2fac9 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/DACommunicator.java
@@ -474,15 +474,23 @@ public class DACommunicator {
                } else {
                        target += AnalyzerConstants.X86_ARCH;
                }
-               target += File.separator + AnalyzerConstants.PROBE_SO_NAME;
-
+               String target_osp = target + File.separator + AnalyzerConstants.PROBE_SO_OSP_NAME;
+               target += File.separator + AnalyzerConstants.PROBE_SO_TIZEN_NAME;
+               
                SyncResult result = push(target, "/opt/developer/sdk_tools/da/" // AnalyzerConstants.DA_REMOTE_PATH
-                               + AnalyzerConstants.PROBE_SO_NAME);
-               if (null != result && SyncService.RESULT_OK == result.getCode()) {
-                       return true;
-               }
-               System.out.println("upload is failed : " + target); //$NON-NLS-1$
-               return false;
+                               + AnalyzerConstants.PROBE_SO_TIZEN_NAME);
+               if (null == result || SyncService.RESULT_OK != result.getCode()) {
+                       System.out.println("upload is failed : " + target); //$NON-NLS-1$
+                       return false;
+               } 
+               
+               result = push(target_osp, "/opt/developer/sdk_tools/da/" // AnalyzerConstants.DA_REMOTE_PATH
+                               + AnalyzerConstants.PROBE_SO_OSP_NAME);
+               if (null == result || SyncService.RESULT_OK != result.getCode()) {
+                       System.out.println("upload is failed : " + target_osp); //$NON-NLS-1$
+                       return false;
+               }               
+               return true;
        }
 
        public static boolean uploadVersion() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java
index e13fccd..80e1795 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/AnalyzerConstants.java
@@ -191,7 +191,8 @@ public class AnalyzerConstants {
        public static final String APPLICATION_LIST_PATH = "/opt/share/applications/"; //$NON-NLS-1$\r
        public static final String APPLICATION_INFO_FILE = ".desktop"; //$NON-NLS-1$\r
        public static final String LISTEN_CHECK = "LISTEN"; //$NON-NLS-1$\r
-       public static final String PROBE_SO_NAME = "da_probe.so"; //$NON-NLS-1$\r
+       public static final String PROBE_SO_TIZEN_NAME = "da_probe_tizen.so"; //$NON-NLS-1$\r
+       public static final String PROBE_SO_OSP_NAME = "da_probe_osp.so"; //$NON-NLS-1$\r
        public static final String VERSION_NAME = "version"; //$NON-NLS-1$\r
 \r
        /* Commands */\r
@@ -254,8 +255,13 @@ public class AnalyzerConstants {
        public static final int APP_INFO_START_TIME = 16;\r
        public static final int APP_INFO_PIE_BUILD = 17;\r
        public static final int APP_INFO_BASE_ADDRESS = 18;\r
-       public static final int APP_INFO_BINARY_PATH = 19;\r
-       public static final int APP_INFO_SIZE = 20;\r
+       public static final int APP_INFO_APP_TYPE = 19;\r
+       public static final int APP_INFO_BINARY_PATH = 20;\r
+       public static final int APP_INFO_SIZE = 21;\r
+       \r
+       /* app type */\r
+       public static final int APP_TYPE_TIZEN = 0;\r
+       public static final int APP_TYPE_OSP = 1;\r
 \r
        /* Real Time Tab ID */\r
        public static final int REALTIME_TAB_RESOURCE_LIFECYCLE = 0;\r
@@ -312,8 +318,9 @@ public class AnalyzerConstants {
        public final static int USER_CALL = 1;\r
        public final static int INTERNAL_CALL = 2;\r
        public final static int USER_CALL_CHECK_ERROR = -1;\r
-       public final static String PROBE_LIB = "da_probe.so";\r
-\r
+       public final static String PROBE_LIB_TIZEN = "da_probe_tizen.so";\r
+       public final static String PROBE_LIB_OSP = "da_probe_osp.so";\r
+       \r
        // comparator type\r
        public final static int SORT_TYPE_NUM = 1;\r
        public final static int SORT_TYPE_STRING = 2;\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/Project.java
index dc53960..870724b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/Project.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/model/Project.java
@@ -255,6 +255,15 @@ public class Project {
                return null;
        }
 
+       public int getApplicationType() {
+                       if (!getAppInfo().isEmpty()) {
+                               String appType = appInfo
+                                               .get(AnalyzerConstants.APP_INFO_APP_TYPE);
+                               return Integer.parseInt(appType);
+                       }
+               return AnalyzerConstants.APP_TYPE_TIZEN;
+       }
+               
        public void setTotalProfilingSampleCount(int count) {
                AnalyzerManager.getFunctionUserProfiler().setTotalSampleCount(count);
        }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/tables/CallstackTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/tables/CallstackTable.java
index 20185ef..2653488 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/tables/CallstackTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/tables/CallstackTable.java
@@ -106,7 +106,7 @@ public class CallstackTable extends DATableComposite {
                                                        .toHexString(addrs.get(i).toString());
                                        String path = new String(apiData[0]);
                                        // if path has "da_probe.so" then reject
-                                       if (path.contains(AnalyzerConstants.PROBE_LIB)) {
+                                       if (path.contains(AnalyzerConstants.PROBE_LIB_TIZEN) || path.contains(AnalyzerConstants.PROBE_LIB_OSP)) {
                                                return;
                                        }
                                        GridItem gridItem = new GridItem(table, SWT.NONE);