SRADA-815: Fixed GLDataManager to be initialized properly in CLI mode.

Also enlarged TRACING_PROCESS_STOP_TIMEOUT twice which is enough to stop
tracing for OpenGL template, measured on Tizen_2.4 mobile emulator.

Change-Id: Ic76ff5ae7e8a12603cf6e71277e00d8c528c46fe

diff --git a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManager.java b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManager.java
index 986f214..b8707d8 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManager.java
+++ b/org.tizen.dynamicanalyzer.cli/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManager.java
@@ -20,7 +20,7 @@ public class ProcessManager implements ProcessManagerMBean {
        /**
         * Timeout for stop tracing command.
         */
-       static int TRACING_PROCESS_STOP_TIMEOUT = 8000; // TODO measure this timeout more accurate later
+       static int TRACING_PROCESS_STOP_TIMEOUT = 16000; // TODO measure this timeout more accurate later
 
        /**
         * Map between device and last trace manager used for that device.

diff --git a/org.tizen.dynamicanalyzer.cli/test/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManagerTest.java b/org.tizen.dynamicanalyzer.cli/test/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManagerTest.java
index cc4a436..9481c8c 100644 (file)
--- a/org.tizen.dynamicanalyzer.cli/test/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManagerTest.java
+++ b/org.tizen.dynamicanalyzer.cli/test/src/org/tizen/dynamicanalyzer/cli/manager/ProcessManagerTest.java
@@ -57,7 +57,7 @@ public class ProcessManagerTest {
        /**
         * Whitebox constant from {@link ProcessManager#TRACING_PROCESS_STOP_TIMEOUT}.
         */
-       private final static long BASE_TIMEOUT_MS = 8000;
+       private final static long BASE_TIMEOUT_MS = 16000;
 
        @Before
        public void setUp() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
index 2967e60..dac8155 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
@@ -101,6 +101,7 @@ public class GLDataManager extends PageDataManager {
                statisticsDataManger = new GLStatisticsDataManager();
                setRedundantDBTable(new GLRedundantDBTableManager());
                setBufferSizeDBTable(new GLBufferSizeDBTableManager());
+               clear();
        }
 
        public void clear() {