From: kamuru <kamuru@kamuru-Samsung-Desktop-System.(none)>
Date: Tue, 1 Oct 2013 05:51:58 +0000 (+0900)
Subject: [Title] Fix bug on lifecycle log parser
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d8d64c2123e83e6aaba18a01bc47d1db0dd18a0;p=sdk%2Ftools%2Fdynamic-analyzer.git

[Title] Fix bug on lifecycle log parser
[Desc.]
[Issue]
---

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/ProbeCommonData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/ProbeCommonData.java
index 2856ba5..45d888e 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/ProbeCommonData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/probe2/ProbeCommonData.java
@@ -112,7 +112,7 @@ public class ProbeCommonData extends LogData {
 		return errno;
 	}
 
-	public void setErrno(long errno) {
+	public void setErrNo(long errno) {
 		this.errno = errno;
 	}
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java
index afceebf..f51a44e 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataMaker.java
@@ -100,7 +100,6 @@ public class GLDataMaker {
 	public static final String API_GL_DISABLE_VAA = "glDisableVertexAttribArray";
 	private static final String API_GL_ENABLE = "glEnable";
 	public static final String API_GL_ENABLE_VAA = "glEnableVertexAttribArray";
-	private static final String API_GL_FLUSH = "glFlush";
 	private static final String API_GL_FRONTFACE = "glFrontFace";
 	private static final String API_GL_PIXEL_STOREI = "glPixelStorei";
 	private static final String API_GL_POLY_OFFSET = "glPolygonOffset";
@@ -138,6 +137,8 @@ public class GLDataMaker {
 	private static final String API_GL_VERTEX_ATTRIB_POINTER = "glVertexAttribPointer";
 	private static final String API_GL_VIEWPORT = "glViewport";
 	
+	private static final String API_EGL_SWAPBUFFERS = "_SglSwapBuffers";
+	
 	private static GLDataMaker instance = null;
 	private static final int CONTEXT_VALUE_SIZE = GLContextDBEnum.values().length;
 
@@ -368,22 +369,16 @@ public class GLDataMaker {
 	}
 
 	public void addGLAPIData(GLES20LogData logData) {
-		// String apiName = log.get(LogCenterConstants.APINAME_INDEX);
-
-		// if (apiName.equals("_SglSwapBuffers")) {
-		// FrameData currentFrameData = frameDataList.get(currentFrameIndex);
-		// int frameNumber = currentFrameData.getFrameNumber();
-		//
-		// GLTimeChart.getInstance().addData(frameNumber,
-		// currentFrameData.getEleapsedTime());
-		//
-		// frameDataList.add(new FrameData(++currentFrameIndex));
-		// } else {
 		int apiType = logData.getApiType();
 		String seq = String.valueOf(logData.getSeq());
 		String apiName = logData.getApiName();
 		String parameter = logData.getArgs();
 		long errorNo = logData.getErrno();
+		//FIXME
+		if(apiName.equals(API_EGL_SWAPBUFFERS)) {
+			errorNo = 0;
+			logData.setErrNo(0);
+		}
 
 		if (apiType != API_TYPE_INIT) {
 			glFrameDataList.get(currentFrameIndex).addGLAPIData(
@@ -437,7 +432,7 @@ public class GLDataMaker {
 			String parameters[] = parameter.split(COMMA);
 			String contextValues[] = logData.getContextValue().split(COMMA);
 
-			if (apiName.equals(API_GL_FLUSH)) {
+			if (apiName.equals(API_EGL_SWAPBUFFERS)) {
 				GLFrameData currentFrameData = glFrameDataList.get(currentFrameIndex);
 				int frameNumber = currentFrameData.getFrameNumber();
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
index c7f99e2..4a25383 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
@@ -27,6 +27,7 @@
 package org.tizen.dynamicanalyzer.ui.opengl.data.model;
 
 import org.tizen.dynamicanalyzer.swap.model.probe2.GLES20LogData;
+import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 
 public class GLAPIData {
 	private GLES20LogData logData;
@@ -52,7 +53,7 @@ public class GLAPIData {
 	}
 
 	public long getElapsedTime() {
-		return logData.getElapsedTime();
+		return logData.getElapsedTime() / TimelineConstants.MEGA_LONG;
 	}
 
 	public long getErrorNo() {
@@ -62,7 +63,7 @@ public class GLAPIData {
 	public long getReturnValue() {
 		return logData.getReturn();
 	}
-	
+
 	public GLES20LogData getLogData() {
 		return logData;
 	}
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
index f862f83..e034fb0 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
@@ -90,7 +90,7 @@ public class GLChartView extends DAView {
 		frameChartBoard.setNameFont(FontResources.CHART_NAME_FONT);
 
 		timeChartBoard = new DAChartBoard(contents,
-				GLPageLabels.GL_CHART_TITLE_TIME);
+				GLPageLabels.GL_CHART_TITLE_TIME, DAChartBoard.BOARD_STYLE_TIME);
 		timeChartBoard.setNameFont(FontResources.CHART_NAME_FONT);
 
 		stackLayout.topControl = frameChartBoard;
@@ -191,9 +191,9 @@ public class GLChartView extends DAView {
 		timeTimeline.setTimeTickFont(FontResources.TIMELINE_TICK_FONT);
 		timeTimeline.setTimeBalloonFont(FontResources.TIMELINE_BALLOON_FONT);
 
-		LifecycleLogParser.getInstance().registerLifecycleBar(
-				frameChartBoard.getLifecycleBar());
-		LifecycleLogParser.getInstance().registerTimeline(frameTimeline);
+//		LifecycleLogParser.getInstance().registerLifecycleBar(
+//				frameChartBoard.getLifecycleBar());
+//		LifecycleLogParser.getInstance().registerTimeline(frameTimeline);
 		LifecycleLogParser.getInstance().registerLifecycleBar(
 				timeChartBoard.getLifecycleBar());
 		LifecycleLogParser.getInstance().registerTimeline(timeTimeline);
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java
index a03df14..85fb9c3 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/context/GLContextView.java
@@ -5,7 +5,6 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.common.DASelectionData;
-import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.model.DAView;
 import org.tizen.dynamicanalyzer.nl.GLPageLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java
index aa6efc9..5bb4e4f 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/LifecycleLogParser.java
@@ -45,10 +45,10 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline;
 public class LifecycleLogParser {
 	private static LifecycleLogParser instance = null;
 
-	private static final String API_NAME_INITIALIZING = "INITIALIZING";//$NON-NLS-1$
-	private static final String API_NAME_RUNNING = "RUNNING";//$NON-NLS-1$
-	private static final String API_NAME_PAUSING = "PAUSING";//$NON-NLS-1$
-	private static final String API_NAME_TERMINATING = "TERMINATING";//$NON-NLS-1$
+	private static final int API_ID_INITIALIZING = 3;
+	private static final int API_ID_RUNNING = 5;
+	private static final int API_ID_PAUSING = 4;
+	private static final int API_ID_TERMINATING = 2;
 
 	private List<LifecycleBar> lifecycleBarList = new ArrayList<LifecycleBar>();
 	private List<DATimeline> timelineList = new ArrayList<DATimeline>();
@@ -68,6 +68,7 @@ public class LifecycleLogParser {
 		if (null == logs) {
 			return;
 		}
+		
 		List<LogData> logList = logs.getLogs();
 
 		for (LogData log : logList) {
@@ -76,24 +77,26 @@ public class LifecycleLogParser {
 	}
 
 	private void parsingLog(LifeCycleData log) {
-		String apiName = log.getApiName();
+		int apiId= log.getApiId();
 		Color colorTop;
 		Color colorBottom;
 		String text;
 
-		if (apiName.equals(API_NAME_INITIALIZING)) {
+		//FIXME 
+		System.out.println("**************************api id : " + log.getApiId());
+		if (apiId == API_ID_INITIALIZING) {
 			colorTop = ColorResources.LIFECYCLE_INITIALIZING_TOP;
 			colorBottom = ColorResources.LIFECYCLE_INITIALIZING_BOTTOM;
 			text = TimelineChartLabels.LIFECYCLE_INITIALIZING;
-		} else if (apiName.equals(API_NAME_RUNNING)) {
+		} else if (apiId == API_ID_RUNNING) {
 			colorTop = ColorResources.LIFECYCLE_RUNNING_TOP;
 			colorBottom = ColorResources.LIFECYCLE_RUNNING_BOTTOM;
 			text = TimelineChartLabels.LIFECYCLE_RUNNING;
-		} else if (apiName.equals(API_NAME_PAUSING)) {
+		} else if (apiId ==API_ID_PAUSING) {
 			colorTop = ColorResources.LIFECYCLE_PAUSING_TOP;
 			colorBottom = ColorResources.LIFECYCLE_PAUSING_BOTTOM;
 			text = TimelineChartLabels.LIFECYCLE_PAUSING;
-		} else if (apiName.equals(API_NAME_TERMINATING)) {
+		} else if (apiId == API_ID_TERMINATING) {
 			colorTop = ColorResources.LIFECYCLE_TERMINATING_TOP;
 			colorBottom = ColorResources.LIFECYCLE_TERMINATING_BOTTOM;
 			text = TimelineChartLabels.LIFECYCLE_TERMINATING;
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
index 74f9f29..0fad6ac 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StopLogProcessor.java
@@ -75,7 +75,7 @@ public class StopLogProcessor implements Runnable {
 
 		int exitCount = 0;
 		while (DACommunicator.isWaitControlMessage() && exitCount < 1000) {
-			System.out.println("wait for STOP ACK message...");
+//			System.out.println("wait for STOP ACK message...");
 			try {
 				Thread.sleep(10);
 				exitCount++;