From: seokgil.kang Date: Tue, 15 Apr 2014 09:53:07 +0000 (+0900) Subject: [COMMON] : Apply DALogger X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a6ad1f217f78409b8850b91e609dd6daea18853;p=sdk%2Ftools%2Fdynamic-analyzer.git [COMMON] : Apply DALogger Add DALogger to the dynamicanalyzer common pkg and change System.out.println() to the DA_LOG.xxx() format. Add AutoTestManager for auto testing. (necessary to supplement.) Change-Id: Id84239dcb56db4338691eb398f3ec9e05ac26507 Signed-off-by: seokgil.kang --- diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java index 9990cc0..d616485 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java @@ -49,10 +49,13 @@ import org.eclipse.swt.widgets.Listener; import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; public class DATabComposite extends DABaseComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final int LONG_TAB_WIDTH = 70; public static final int SHORT_TAB_WIDTH = 70; @@ -458,7 +461,7 @@ public class DATabComposite extends DABaseComposite { int index = children.indexOf(tab); DATabButton button = buttons.get(index); if (null == tab || null == button) { - System.out.println("tab create bug!!"); // for log //$NON-NLS-1$ + DA_LOG.debug("tab create bug!!"); // for log //$NON-NLS-1$ return; } diff --git a/org.tizen.dynamicanalyzer.common/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer.common/META-INF/MANIFEST.MF index 8b3ce22..8eeec01 100644 --- a/org.tizen.dynamicanalyzer.common/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer.common/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.tizen.dynamicanalyzer.callback, org.tizen.dynamicanalyzer.constant, org.tizen.dynamicanalyzer.util +Import-Package: org.tizen.common.core.application diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java index 9274837..5e37570 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/ExecutionCallbackManager.java @@ -47,4 +47,15 @@ public class ExecutionCallbackManager { } } } + + public static void executeCallback(String key, String[] msg) { + List clist = callbackMap.get(key); + if(clist != null) { + int size = clist.size(); + for(int i = 0; i < size; i++) { + IExecutionCallback cb = clist.get(i); + cb.execute(msg); + } + } + } } diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/IExecutionCallback.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/IExecutionCallback.java index 92bddac..baea29b 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/IExecutionCallback.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/callback/IExecutionCallback.java @@ -5,4 +5,6 @@ public interface IExecutionCallback { // main execute function public void execute(); + public void execute(String[] msg); + } diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java new file mode 100644 index 0000000..0cac3b0 --- /dev/null +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java @@ -0,0 +1,500 @@ +package org.tizen.dynamicanalyzer.util; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; + +import org.tizen.common.core.application.InstallPathConfig; +import org.tizen.dynamicanalyzer.util.CommonUtil; + +public class DALogger { + public enum testState { + START, END + }; + + private static DALogger instance; + + public final static int ERROR = 0; + public final static int WARNING = 1; + public final static int INFO = 2; + public final static int CHECK = 3; + public final static int DEBUG = 4; + public final static int PERFORMANCE = 5; + + private final static String separator = " | "; + private final static int PERFORMANCE_TEST_COUNT = 20; + + private int logLevel; // INFO(release), DEBUG(develop), PERFORMANCE(test) + private SimpleDateFormat dateFormat; + + private File outputFile = null; + private FileWriter fileWriter = null; + private BufferedWriter bufWriter = null; + private PrintWriter printWriter = null; + + private String performanceSaveFilename = "DA_Autotest_Result.xsd"; + + // for performance test + private HashMap> startTimeMap; + private HashMap testCountMap; + private HashMap testTotalCountMap; + private HashMap totalSpentTimeMap; + private HashMap> subThreadStartTimeMap; + private HashMap subThreadStartCountMap; + + public DALogger() { + init(); + } + + public synchronized static DALogger getInstance() { + if(instance == null) { + instance = new DALogger(); + } + return instance; + } + + private void init() { + // TODO : logLevel setting (temporary hard coding) + logLevel = DEBUG; +// logLevel = PERFORMANCE; +// logLevel = ConfigureManager.getInstance().getValueInt( +// ConfigureLabels.INTERNAL_LOG_LEVEL); + dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS"); + } + + private boolean checkLevel(int logType) { + if (logLevel >= logType) { + return true; + } else { + return false; + } + } + + private boolean openWriter() { + if (InstallPathConfig.getUserDataPath() == null) { + System.out.println("user data path is null !!"); + return false; + } + + StringBuilder savePath = new StringBuilder(); + savePath.append(InstallPathConfig.getUserDataPath()); + savePath.append(File.separator); + savePath.append("test"); //$NON-NLS-1$ + savePath.append(File.separator); + savePath.append("dynamic-analyzer"); //$NON-NLS-1$ + + File testFolderPath = new File(savePath.toString()); + if (!testFolderPath.exists()) { + if (!testFolderPath.mkdir()) { + System.out.println("test folder create failed..."); + return false; + } + } + + savePath.append(File.separator); + savePath.append(performanceSaveFilename); + + outputFile = new File(savePath.toString()); + + try { + fileWriter = new FileWriter(outputFile); + bufWriter = new BufferedWriter(fileWriter); + printWriter = new PrintWriter(bufWriter); + } catch (IOException e) { + e.printStackTrace(); + } + + return true; + } + + private void closeWriter() { + CommonUtil.tryClose(outputFile, fileWriter, bufWriter, printWriter); + outputFile = null; + fileWriter = null; + bufWriter = null; + printWriter = null; + } + + private void printLog(int logType, Object msg) { + if (logType == PERFORMANCE) { + if (printWriter == null) { + return; + } + + printWriter.println(msg); + printWriter.checkError(); + // for test +// System.out.println(msg); + } else { + StringBuilder logMsg = new StringBuilder(); + switch (logType) { + case ERROR: + logMsg.append("[ERROR] "); + break; + case WARNING: + logMsg.append("[WARNING] "); + break; + case CHECK: + logMsg.append("[CHECK] "); + break; + case INFO: + logMsg.append("[INFO] "); + break; + case DEBUG: + logMsg.append("[DEBUG] "); + break; + default: + break; + } + + logMsg.append(dateFormat.format(new Date())); + logMsg.append(separator); + logMsg.append(getCallerInfo()); + logMsg.append(String.valueOf(msg)); + + if (logType == ERROR) { + System.err.println(logMsg); + } else { + System.out.println(logMsg); + } + } + } + + private String getCallerInfo() { + String msg = null; + StackTraceElement[] trace = new Throwable().getStackTrace(); + if (trace.length >= 1) { + msg = new String(trace[3].getFileName() + ":" + + trace[3].getLineNumber() + " - "); + + // for test +// for (int i = 0; i < trace.length; i++) { +// StackTraceElement elt = trace[i]; +// msg = new String(elt.getFileName() + ", " +// + elt.getLineNumber() + " : "); +// System.out.println("i : " + i + ", file : " + elt.getFileName() + ", method : " +// + elt.getMethodName() + ", line : " + elt.getLineNumber()); +// } + } + + return msg; + } + + public void error(Object logMessage) { + if (checkLevel(ERROR)) { + printLog(ERROR, logMessage); + } else { + return; + } + } + + public void error() { + if (checkLevel(ERROR)) { + System.out.println(); + } else { + return; + } + } + + public void warning(Object logMessage) { + if (checkLevel(WARNING)) { + printLog(WARNING, logMessage); + } else { + return; + } + } + + public void warning() { + if (checkLevel(WARNING)) { + System.out.println(); + } else { + return; + } + } + + public void info(Object logMessage) { + if (checkLevel(INFO)) { + printLog(INFO, logMessage); + } else { + return; + } + } + + public void info() { + if (checkLevel(INFO)) { + System.out.println(); + } else { + return; + } + } + + public void check(Object logMessage) { + if (checkLevel(CHECK)) { + printLog(CHECK, logMessage); + } else { + return; + } + } + + public void check() { + if (checkLevel(CHECK)) { + System.out.println(); + } else { + return; + } + } + + public void debug(Object logMessage) { + if (checkLevel(DEBUG)) { + printLog(DEBUG, logMessage); + } else { + return; + } + } + + public void debug() { + if (checkLevel(DEBUG)) { + System.out.println(); + } else { + return; + } + } + + public void performance(String key, testState state) { + if (checkLevel(PERFORMANCE)) { + switch (state) { + case START: + performanceStart(key); + break; + case END: + performanceEnd(key); + break; + default: + break; + } + } else { + return; + } + } + + public void performance(String key, String testStep, String description) { + if (checkLevel(PERFORMANCE)) { + String msg = performanceNormal(key, description); + if (msg != null) { + printLog(PERFORMANCE, makeTestLog(testStep, msg)); + } + } else { + return; + } + } + + public void performance(String key, String testStep, String description, testState state) { + if (checkLevel(PERFORMANCE)) { + switch (state) { + case START: + performanceSubThreadStart(description); + break; + case END: + String msg = performanceSubThreadEnd(key, testStep, description); + if (msg != null) { + printLog(PERFORMANCE, makeTestLog(testStep, msg)); + } + break; + default: + break; + } + } else { + return; + } + } + + private void performanceStart(String key) { + if (printWriter == null) { + if (!openWriter()) { + // failed to init() + return; + } + } + + startTimeMap = new HashMap>(); + testCountMap = new HashMap(); + testTotalCountMap = new HashMap(); + totalSpentTimeMap = new HashMap(); + subThreadStartTimeMap = new HashMap>(); + subThreadStartCountMap = new HashMap(); + + Integer count = testCountMap.get(key); + List startTimes; + if (count == null) { + count = (int) 1; + testCountMap.put(key, count); + startTimes = new ArrayList(); + startTimeMap.put(key, startTimes); + testTotalCountMap.put(key, (int) 0); + totalSpentTimeMap.put(key, (long) 0); + } else { + testCountMap.put(key, count + 1); + startTimes = startTimeMap.get(key); + } + + long nanoTime = System.nanoTime(); + startTimes.add(nanoTime); + + StringBuilder msg = new StringBuilder(); +// msg.append(""); + msg.append(""); + + printLog(PERFORMANCE, msg); + } + + private String performanceNormal(String key, String description) { + String msg = null; + long nanoTime = System.nanoTime(); + + Integer count = testCountMap.get(key); + List startTimes; + + if (count == null || count == 0) { + printLog(PERFORMANCE, "Can't find starting log about \"" + key + "\" key value !!"); + } else { + startTimes = startTimeMap.get(key); + long startTime = startTimes.remove(startTimes.size() - 1); + long spendTime = nanoTime - startTime; + int totalCount = testTotalCountMap.get(key) + 1; + long totalTime = totalSpentTimeMap.get(key) + spendTime; + + startTimes.add(nanoTime); + testTotalCountMap.put(key, totalCount); + totalSpentTimeMap.put(key, totalTime); + + double time = spendTime / 1000000000.0; + msg = new String("name=\"" + description + + "\" time=\"" + String.format("%.3f", time) + + "\""); + } + + return msg; + } + + private void performanceEnd(String key) { + long nanoTime = System.nanoTime(); + + Integer count = testCountMap.get(key); + List startTimes; + if (count == null || count == 0) { + printLog(PERFORMANCE, "Can't find starting log about \"" + key + "\" key value !!"); + } else { + startTimes = startTimeMap.get(key); + long startTime = startTimes.remove(startTimes.size() - 1); + long spendTime = nanoTime - startTime; + long totalTime = totalSpentTimeMap.get(key) + spendTime; +// int totalCount = testTotalCountMap.get(key) + 1; +// testTotalCountMap.put(key, totalCount); + testCountMap.put(key, count -1); + totalSpentTimeMap.put(key, totalTime); + + StringBuilder msg = new StringBuilder(); + msg.append(""); + + printLog(PERFORMANCE, msg); + + closeWriter(); + } + } + + private void performanceSubThreadStart(String description) { + long nanoTime = System.nanoTime(); + + Integer count = subThreadStartCountMap.get(description); + List startTimes; + if (count == null || count == 0) { + count = (int) 1; + subThreadStartCountMap.put(description, count); + startTimes = new ArrayList(); + subThreadStartTimeMap.put(description, startTimes); + startTimes.add(nanoTime); + } + } + + private String performanceSubThreadEnd(String key, String testStep, String description) { + String msg = null; + long nanoTime = System.nanoTime(); + + Integer count = subThreadStartCountMap.get(description); + List startTimes; + + if (count == null || count == 0) { + printLog(PERFORMANCE, "Can't find sub thread starting log about \"" + description + "\" key value !!"); + } else { + startTimes = subThreadStartTimeMap.get(description); + long startTime = startTimes.remove(startTimes.size() - 1); + long spendTime = nanoTime - startTime; + + subThreadStartCountMap.put(description, count -1); + + double time = spendTime / 1000000000.0; + msg = new String("name=\"" + description + + "\" time=\"" + String.format("%.3f", time) + + "\""); + } + + return msg; + } + + private CharSequence makeCommonLog(int logType, String logMessage) { + StringBuilder msg = new StringBuilder(); + switch (logType) { + case ERROR: + msg.append("[ERROR] "); + break; + case WARNING: + msg.append("[WARNING] "); + break; + case CHECK: + msg.append("[CHECK] "); + break; + case INFO: + msg.append("[INFO] "); + break; + case DEBUG: + msg.append("[DEBUG] "); + break; + default: + break; + } + + msg.append(dateFormat.format(new Date())); + msg.append(separator); + msg.append(getCallerInfo()); + msg.append(logMessage); + + return msg; + } + + private CharSequence makeTestLog(String testStep, String message) { + StringBuilder msg = new StringBuilder(); + msg.append("\n"); + return msg; + } + + public void setPerformanceSaveFilename(String filename) { + performanceSaveFilename = filename; + } + + public void setLogLevel(int logLevel) { + this.logLevel = logLevel; + } +} diff --git a/org.tizen.dynamicanalyzer.widgets/META-INF/MANIFEST.MF b/org.tizen.dynamicanalyzer.widgets/META-INF/MANIFEST.MF index 8b7c9ea..9ebedec 100644 --- a/org.tizen.dynamicanalyzer.widgets/META-INF/MANIFEST.MF +++ b/org.tizen.dynamicanalyzer.widgets/META-INF/MANIFEST.MF @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.tizen.dynamicanalyzer.widgets;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.tizen.dynamicanalyzer.widgets.Activator Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime + org.eclipse.core.runtime, + org.tizen.dynamicanalyzer.common;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.tizen.dynamicanalyzer.widgets, diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java index d858a24..8c60366 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChart.java @@ -42,9 +42,12 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; public class DAChart extends Canvas { + private static final DALogger DA_LOG = DALogger.getInstance(); + Composite parent = null; private List seriesList = new ArrayList(); private DAChartPlot plot = null; @@ -244,14 +247,14 @@ public class DAChart extends Canvas { } break; case SWT.MouseEnter: - System.out.println("MouseEnter"); + DA_LOG.debug("MouseEnter"); if (null != plot) { Shell shell = parent.getShell(); DAChartTooltip.getInstance().open(shell, plot); } break; case SWT.MouseExit: - System.out.println("MouseExit"); + DA_LOG.debug("MouseExit"); DAChartTooltip.getInstance().close(); diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java index e3c8c6d..47ff285 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java @@ -37,6 +37,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Display; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; @@ -44,6 +45,8 @@ import org.tizen.dynamicanalyzer.widgets.helper.Formatter; import org.tizen.dynamicanalyzer.widgets.helper.ImageResources; public class DAChartRenderer { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final int MARGIN = 3; private static final int ARROW_MARGIN = 2; private static final int EVENT_WIDTH = 2; @@ -213,7 +216,7 @@ public class DAChartRenderer { drawStepSeries(gc, series, false); break; default: - System.out.println("Undefined series style"); + DA_LOG.debug("Undefined series style"); break; } } diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java index 1fa75dc..5c84e38 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java @@ -51,12 +51,15 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.IDACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; public class DACustomCombo extends Canvas { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final int MAX_SIZE = 10; public static final int STATE_NORMAL = 0; public static final int STATE_HOVER = 1; @@ -156,7 +159,7 @@ public class DACustomCombo extends Canvas { @Override public void selectionEvent(DACustomCombo combo) { - System.out.println("default selection" + combo.getText()); //$NON-NLS-1$ + DA_LOG.debug("default selection" + combo.getText()); //$NON-NLS-1$ } }; @@ -374,7 +377,7 @@ public class DACustomCombo extends Canvas { } getRects().clear(); - System.out.println("rects clear and add new rects. count is :" + DA_LOG.debug("rects clear and add new rects. count is :" + boundSize); for (int i = 0; i < boundSize; i++) { Rectangle r = new Rectangle(2, 2 + i * height, shellWidth - 2, @@ -431,7 +434,7 @@ public class DACustomCombo extends Canvas { itemIndex *= MAX_SIZE; index %= MAX_SIZE; } else if (index < 0) { - System.out.println("Combo indexing bug!"); + DA_LOG.debug("Combo indexing bug!"); return false; } selection = index; @@ -850,8 +853,7 @@ public class DACustomCombo extends Canvas { childShell.close(); childShell = null; } else { - System.out - .println("combo timer bug : try close child shell "); + DA_LOG.debug("combo timer bug : try close child shell "); } } }); diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/progress/Progress.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/progress/Progress.java index 8128f0d..00a9d1d 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/progress/Progress.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/progress/Progress.java @@ -40,6 +40,7 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.animation.DAAnimationIcon; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -49,6 +50,7 @@ import org.tizen.dynamicanalyzer.widgets.helper.FontResources; import org.tizen.dynamicanalyzer.widgets.helper.ImageResources; public class Progress extends Canvas { + private static final DALogger DA_LOG = DALogger.getInstance(); public static final int PROGRESS_STYLE_BAR_ALONE = 0; public static final int PROGRESS_STYLE_DEFAULT = 1; @@ -353,7 +355,7 @@ public class Progress extends Canvas { e.gc.setForeground(barOutlineColor); e.gc.drawRectangle(barRect); } else { - System.out.println("invalid progress style..."); //$NON-NLS-1$ + DA_LOG.debug("invalid progress style..."); //$NON-NLS-1$ } } }; diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java index 57fc55a..8c5446a 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timer/TimerClock.java @@ -42,10 +42,12 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; public class TimerClock extends Canvas { + private static final DALogger DA_LOG = DALogger.getInstance(); private static class TimeString { public String hour; @@ -218,7 +220,7 @@ public class TimerClock extends Canvas { if (null != timer) { timer.cancel(); timer = null; - System.out.println("timer canceled!! "); //$NON-NLS-1$ + DA_LOG.debug("timer canceled!! "); //$NON-NLS-1$ } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java index 66b6647..6b59ae2 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/Application.java @@ -28,6 +28,8 @@ package org.tizen.dynamicanalyzer.workbench; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.io.PrintStream; import java.net.MalformedURLException; import java.net.URL; @@ -53,10 +55,56 @@ import org.tizen.dynamicanalyzer.nl.WorkbenchLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.util.FileUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; +import org.tizen.dynamicanalyzer.util.DALogger; public class Application implements IApplication { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String LOG_PREFIX = "da_log_"; private static final int MAX_LOG_COUNT = 3; + + private static class MultiOutput extends OutputStream { + OutputStream[] outputStreams; + + public MultiOutput(OutputStream... outputStreams) { + this.outputStreams = outputStreams; + } + + @Override + public void write(int b) throws IOException { + for (OutputStream out : outputStreams) { + out.write(b); + } + } + + @Override + public void write(byte[] b) throws IOException { + for (OutputStream out : outputStreams) { + out.write(b); + } + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + for (OutputStream out : outputStreams) { + out.write(b, off, len); + } + } + + @Override + public void flush() throws IOException { + for (OutputStream out : outputStreams) { + out.flush(); + } + } + + @Override + public void close() throws IOException { + for (OutputStream out : outputStreams) { + out.close(); + } + } + } @Override public Object start(IApplicationContext context) throws Exception { @@ -83,6 +131,8 @@ public class Application implements IApplication { e.printStackTrace(); } + DA_LOG.performance("TEST", DALogger.testState.START); + // set log postfix SimpleDateFormat format = new SimpleDateFormat( "yyyy_MM_dd_HH-mm-ss", Locale.KOREA); //$NON-NLS-1$ @@ -91,37 +141,78 @@ public class Application implements IApplication { PathManager.setLogPostFix(logPostFix); // check for log to file - String logtofile = PathManager.DA_DATA_PATH + File.separator - + PathConstants.DA_STDOUT_TO_FILE; - File ltofile = new File(logtofile); - if (ltofile != null && ltofile.exists()) { +// String logtofile = PathManager.DA_DATA_PATH + File.separator +// + PathConstants.DA_STDOUT_TO_FILE; +// File ltofile = new File(logtofile); +// if (ltofile != null && ltofile.exists()) { String logPath = PathManager.DA_LOG_PATH; File logs = new File(logPath); if (!logs.exists() && !logs.mkdirs()) { - System.out - .println("Log directory create failed.. log file create failed..."); + DA_LOG.debug("Log directory create failed.. log file create failed..."); } else { String logFileName = LOG_PREFIX + logPostFix;//$NON-NLS-1$ logPath += File.separator + logFileName; - + File logfile = new File(logPath); FileOutputStream fos = new FileOutputStream(logfile); - PrintStream ps = new PrintStream(fos); - System.setOut(ps); - System.setErr(ps); + + MultiOutput multiSysOut = new MultiOutput(System.out, fos); + MultiOutput multiSysErr = new MultiOutput(System.err, fos); + + PrintStream out = new PrintStream(multiSysOut); + PrintStream err = new PrintStream(multiSysErr); + + System.setOut(out); + System.setErr(err); checkLogs(logs.getPath()); } - } - +// } + // check for multiple instance of dynamic analyzer if (SingletonFocusManager.acquireSingleton()) { - System.out.println("The First DA Running"); + DA_LOG.info("The First DA Running"); } else { - System.out.println("Already DA Running"); + DA_LOG.info("Already DA Running"); SingletonFocusManager.setFocusToDA(); System.exit(-1); } + + // for performance test + String[] argv = (String[]) context.getArguments().get( + "application.args");//$NON-NLS-1$ + + for(int i = 0; i < argv.length; i++) + { + if(argv[i].startsWith("isAutoStart")) + { + ApplicationWorkbenchWindowAdvisor.setAutoStart(true); + } + else if(argv[i].equals("--autoclose")) + { + ApplicationWorkbenchWindowAdvisor.setAutoClose(true); + } + else if(argv[i].equals("--device")) + { + ApplicationWorkbenchWindowAdvisor.setAutoStart_Device(argv[i+1]); + i++; + } + else if(argv[i].equals("--appid")) + { + ApplicationWorkbenchWindowAdvisor.setAutoStart_Appid(argv[i+1]); + i++; + } + else if(argv[i].equals("--appname")) + { + ApplicationWorkbenchWindowAdvisor.setAutoStart_Appname(argv[i+1]); + i++; + } + else if(argv[i].equals("--savepath")) + { + ApplicationWorkbenchWindowAdvisor.setAutoStart_Resultpath(argv[i+1]); + i++; + } + } int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor()); diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java index 49e39c7..db18ac2 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/ApplicationWorkbenchWindowAdvisor.java @@ -49,6 +49,13 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { private static final int MIN_HEIGHT = 600; private int width = DEFAULT_WIDTH; private int height = DEFAULT_HEIGHT; + + static String autostart_device = ""; + static String autostart_appid = ""; + static String autostart_appname = ""; + static String autostart_resultpath = ""; + static boolean isAutoStart = false; + static boolean isAutoClose = false; public ApplicationWorkbenchWindowAdvisor( IWorkbenchWindowConfigurer configurer) { @@ -94,9 +101,28 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { } public void postWindowOpen() { - // call the registered callback functions - ExecutionCallbackManager - .executeCallback(ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN); + String[] msg = null; + if(!autostart_device.isEmpty() && !autostart_appid.isEmpty() + && !autostart_appname.isEmpty() && !autostart_resultpath.isEmpty()) { + msg = new String[5]; + if(isAutoClose) + msg[0] = "AUTOCLOSE"; + else + msg[0] = "AUTOTEST"; + msg[1] = autostart_device; + msg[2] = autostart_appid; + msg[3] = autostart_appname; + msg[4] = autostart_resultpath; + + // call the registered callback functions + ExecutionCallbackManager + .executeCallback(ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN, msg); + } else { + // call the registered callback functions + ExecutionCallbackManager + .executeCallback(ExecutionCallbackManager.WINDOWADVISOR_POSTWINDOWOPEN); + } + } public boolean preWindowShellClose() { @@ -106,4 +132,28 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { return true; } + + public static void setAutoStart(boolean status) { + isAutoStart = status; + } + + public static void setAutoClose(boolean status) { + isAutoClose = status; + } + + public static void setAutoStart_Device(String device) { + autostart_device = device; + } + + public static void setAutoStart_Appid(String appid) { + autostart_appid = appid; + } + + public static void setAutoStart_Appname(String appname) { + autostart_appname = appname; + } + + public static void setAutoStart_Resultpath(String path) { + autostart_resultpath = path; + } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java index de27e8e..12afffb 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java @@ -41,8 +41,11 @@ import java.nio.channels.FileLock; import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class SingletonFocusManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static FileChannel singletonChannel = null; private static FileLock singletonLock = null; @@ -55,7 +58,7 @@ public class SingletonFocusManager { if (activator != null) { returnStr = new String[] { activator, strPid }; } else { - System.out.println("Failed - not Support OS"); + DA_LOG.error("Failed - not Support OS"); } } @@ -68,7 +71,7 @@ public class SingletonFocusManager { + PathConstants.SINGLETON_PID_FILE); if (!singletonFile.isFile()) { - System.out.println("Failed get pid - exist config file"); + DA_LOG.debug("Failed get pid - exist config file"); } else { BufferedReader in = null; try { @@ -121,7 +124,7 @@ public class SingletonFocusManager { File daSaveFile = new File(saveFolderPath); if (!daSaveFile.isDirectory() && !daSaveFile.mkdirs()) { - System.out.println("da save file create failed..."); + DA_LOG.debug("da save file create failed..."); } else { String activeFilePath = saveFolderPath + File.separator + PathConstants.SINGLETON_LOCK_FILE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java index 36ad442..d2ac1fe 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -57,10 +57,13 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.ImageListSortComparator; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class AnalyzerManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static Project project = null; private static boolean isRunning = false; private static boolean isLogParsingComplete = false; @@ -164,9 +167,9 @@ public class AnalyzerManager { AnalyzerManager.removeFromProjectList(sourcePath); if (success) { // logs for debug - System.out.println("invalid project deleted!"); //$NON-NLS-1$ + DA_LOG.debug("invalid project deleted!"); //$NON-NLS-1$ } else { - System.out.println("invalid project delete fail..."); //$NON-NLS-1$ + DA_LOG.debug("invalid project delete fail..."); //$NON-NLS-1$ } } } @@ -313,10 +316,12 @@ public class AnalyzerManager { if (!AnalyzerManager.isExit()) { Project project = new Project(); project.init(); + DA_LOG.performance("TEST", "Start Trace", "Create and Initialize Project data"); } if (!AnalyzerManager.isExit()) { AnalyzerUtil.executeCommand(StartHandler.ID); + DA_LOG.performance("TEST", "Start Trace", "Execute command - StartHandler"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java index f1c0def..7ef2edb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -42,9 +42,11 @@ import org.tizen.dynamicanalyzer.listeners.AnalyzerPartListener; import org.tizen.dynamicanalyzer.listeners.AnalyzerPerspectiveListener; import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class AnalyzerPlugin extends AbstractUIPlugin { - + private static final DALogger DA_LOG = DALogger.getInstance(); + private static AnalyzerPlugin plugin; public static AnalyzerPlugin getDefault() { @@ -87,9 +89,9 @@ public class AnalyzerPlugin extends AbstractUIPlugin { File tempDir = new File(PathManager.DA_TEMP_FOLDER_PATH); if (tempDir.isDirectory() && tempDir.exists()) { if (AnalyzerUtil.deleteFile(tempDir)) { - System.out.println("Delete temp folder!"); //$NON-NLS-1$ + DA_LOG.debug("Delete temp folder!"); //$NON-NLS-1$ } else { - System.out.println("Delete temp folder fail..."); //$NON-NLS-1$ + DA_LOG.debug("Delete temp folder fail..."); //$NON-NLS-1$ } } } @@ -108,15 +110,14 @@ public class AnalyzerPlugin extends AbstractUIPlugin { File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH); if (saveFolder.exists()) { if (AnalyzerUtil.deleteFile(saveFolder)) { - System.out.println("delete temp folder"); + DA_LOG.debug("delete temp folder"); } else { - System.out - .println("BUG: temp folder is already exists but failed to delete"); + DA_LOG.debug("BUG: temp folder is already exists but failed to delete"); } } if (!saveFolder.isDirectory()) { if (!saveFolder.mkdirs()) { - System.out.println("save folder create failed..."); + DA_LOG.debug("save folder create failed..."); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java new file mode 100644 index 0000000..dc95f44 --- /dev/null +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java @@ -0,0 +1,163 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + +package org.tizen.dynamicanalyzer.common; + +import java.util.List; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.tizen.dynamicanalyzer.communicator.DACommunicator; +import org.tizen.dynamicanalyzer.model.DeviceInfo; +import org.tizen.dynamicanalyzer.project.AppInfo; +import org.tizen.dynamicanalyzer.resources.ImageResources; +import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.utils.InternalLogManager; +import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; +import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager; + +public class AutoStartManager implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + + // private final int MSG_INDEX_CMD = 0; + private static final int MSG_INDEX_DEVICE = 1; + private static final int MSG_INDEX_APPID = 2; + private static final int MSG_INDEX_APPNAME = 3; + private static final int MSG_INDEX_RESULTPATH = 4; + private static final int MSG_LENGTH = 5; + private static final int APPNAME_LENGTH = 20; + + private static boolean openWelcomeDlg = false; + private static Boolean waitingWelcomeDlg = false; + public static boolean isAutoClose = false; + + private static String[] strMsg = null; + + // trace Application + public static void autoStartApplication(String[] message) { + strMsg = message; + Thread thread = new Thread(new AutoStartManager()); + thread.start(); + } + + public static boolean isOpenWelcomeDlg() { + return openWelcomeDlg; + } + + public static void setOpenWelcomeDlg(boolean data) { + openWelcomeDlg = data; + } + + public static Boolean getWaitingWelcomeDlg() { + return waitingWelcomeDlg; + } + + @Override + public void run() { + if (strMsg.length < MSG_LENGTH) { + DA_LOG.debug("wrong message format!!"); + return; + } + + if (strMsg[0].equals("AUTOCLOSE")) { + isAutoClose = true; + } + + ToolbarArea.getInstance().setToolbarStartStopState(false); + final String deviceName = new String(strMsg[MSG_INDEX_DEVICE].trim()); + final String appid = new String(strMsg[MSG_INDEX_APPID].trim()); + final String appName = new String(strMsg[MSG_INDEX_APPNAME].trim()); + final String resultPath = new String( + strMsg[MSG_INDEX_RESULTPATH].trim()); + + if (!resultPath.isEmpty()) { + DA_LOG.setPerformanceSaveFilename(resultPath); + } + + if (isOpenWelcomeDlg()) { + DA_LOG.debug("Start -AutoRun Waiting..."); + synchronized (getWaitingWelcomeDlg()) { + try { + getWaitingWelcomeDlg().wait(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + DA_LOG.debug("End - AutoRun Waiting"); + } + + DA_LOG.debug("auto start : " + appid); + DeviceInfo device = DACommunicator.getDeviceByName(deviceName); + DACommunicator.setSelectedDevice(device); + + List appList = DACommunicator.getSelectedDevice().getAppInfoList(); + + AppInfo appInfo = null; + for (int i = 0; i < appList.size(); i++) { + if (appid.equals(appList.get(i).getInfo(AppInfo.PACKAGE_INDEX))) { + appInfo = appList.get(i); + break; + } + } + + if (null == appInfo) { + Display.getDefault().syncExec(new Runnable() { + public void run() { + Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); + DADialog warning = new DADialog(shell, SWT.NONE); + String name = appName; + if (name.length() > APPNAME_LENGTH) { + name = appName.substring(0, APPNAME_LENGTH - 1) + "...";//$NON-NLS-1$ + } + warning.setMessage(name + " is not supported application"); + warning.setIcon(ImageResources.DIALOG_WARNING_ICON); + warning.open(); + + ToolbarArea.getInstance().setToolbarStartStopState(true); + } + }); + DA_LOG.debug("invalid application name :" + appid); + return; + } + final String appLabel = appInfo.getInfo(AppInfo.LABEL_INDEX); + DA_LOG.debug("IDE recv - deviceName: " + deviceName + + " appName : " + appLabel); + + ToolbarArea.getInstance().setDeviceComboText(deviceName); + ToolbarArea.getInstance().setAppComboText(appLabel); + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + ToolbarArea.getInstance().startTrace(); + } + }); + + SingletonFocusManager.setFocusToDA(); + } +} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java index 6f0fd50..62c4281 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java @@ -25,6 +25,8 @@ */ package org.tizen.dynamicanalyzer.common; +import org.tizen.dynamicanalyzer.util.DALogger; + public enum HostResult { SUCCESS(0, "Success!"), @@ -74,6 +76,8 @@ public enum HostResult { ERR_UNDEFINED(-999, "Unknown error"); + private static final DALogger DA_LOG = DALogger.getInstance(); + private String message; private String method; private final String errMsg; @@ -206,7 +210,7 @@ public enum HostResult { public static HostResult printAndReturn(HostResult result) { result.setMethod(getMethodName(2) + "()"); - System.out.println(result.getMethod()); + DA_LOG.debug(result.getMethod()); return result; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java index 6eea9b2..47ede59 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java @@ -4,17 +4,28 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.callback.IExecutionCallback; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.WelcomeDialog; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; public class PostWindowOpenCallback implements IExecutionCallback { + private final static DALogger DA_LOG = DALogger.getInstance(); @Override public void execute() { if (!ConfigurationDialogDataManager.getInstance().isShowInital()) { final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); WelcomeDialog dialog = new WelcomeDialog(shell); // FIXME + DA_LOG.performance("TEST", "DA Start", "Welcome Dialog"); dialog.open(); } } + + public void execute(String[] msg) { + execute(); + + if (msg != null) { + AutoStartManager.autoStartApplication(msg); + } + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java index 1b64cce..f309f66 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java @@ -13,7 +13,11 @@ public class PreWindowShellCloseCallback implements IExecutionCallback { DACommunicator.stopTrace(); } - AnalyzerUtil.executeCommand(ExitHandler.ID); + AnalyzerUtil.executeCommand(ExitHandler.ID); + } + + public void execute(String[] msg) { + execute(); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java index 929745e..74036b5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java @@ -52,8 +52,11 @@ import org.eclipse.cdt.utils.elf.Elf.Symbol; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; +import org.tizen.dynamicanalyzer.util.DALogger; public class SymbolManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static Map> readerCache = new HashMap>(); private static Map> elfCache = new HashMap>(); @@ -309,7 +312,7 @@ public class SymbolManager { int length = mangled.trim().length(); length = (length > 128) ? 128 : length; demangled = mangled.trim().substring(0, length - 1); - System.out.println("demangling failed :" + mangled); //$NON-NLS-1$ + DA_LOG.debug("demangling failed :" + mangled); //$NON-NLS-1$ } return demangled; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java index 36f1ec1..e57e642 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java @@ -51,8 +51,10 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class Communicator22 extends BaseCommunicator { + private static final DALogger DA_LOG = DALogger.getInstance(); protected int remotePort = -1; private Socket controlSock = null; @@ -79,7 +81,7 @@ public class Communicator22 extends BaseCommunicator { public HostResult startTrace() { HostResult result = connectionProcess(); if (!result.equals(HostResult.SUCCESS)) { - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); Display.getDefault().syncExec(new Runnable() { @Override public void run() { @@ -104,8 +106,7 @@ public class Communicator22 extends BaseCommunicator { /* Timeline */ UpdateViewTimer.start(); - System.out - .println("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); + DA_LOG.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); result = HostResult.SUCCESS; result.setMessage("start trace"); } else { @@ -125,7 +126,7 @@ public class Communicator22 extends BaseCommunicator { HostResult result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - System.out.println("screenshot message ack :" + result.getMessage()); + DA_LOG.debug("screenshot message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -180,11 +181,11 @@ public class Communicator22 extends BaseCommunicator { String message = AnalyzerConstants.MSG_START + CommonConstants.CMD_SPLIT + rearMessage.length() + CommonConstants.CMD_SPLIT + rearMessage; - System.out.println("Send message :" + message); //$NON-NLS-1$ + DA_LOG.debug("Send message :" + message); //$NON-NLS-1$ HostResult result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - System.out.println("start message ack :" + result.getMessage()); + DA_LOG.debug("start message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -203,11 +204,11 @@ public class Communicator22 extends BaseCommunicator { if (DACommunicator.isRunning()) { String message = AnalyzerConstants.MSG_STOP + CommonConstants.CMD_SPLIT + 0 + CommonConstants.CMD_SPLIT; - System.out.println("stop send message :" + message); + DA_LOG.debug("stop send message :" + message); result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - System.out.println("stop message ack :" + result.getMessage()); + DA_LOG.debug("stop message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -232,8 +233,7 @@ public class Communicator22 extends BaseCommunicator { controlWriter.flush(); } - System.out.println("wait for ack... [send message : " + message - + " ]"); + DA_LOG.debug("wait for ack... [send message : " + message+ " ]"); while (DACommunicator.isRunning()) { char cbuf[] = new char[64]; blocked = true; @@ -273,9 +273,9 @@ public class Communicator22 extends BaseCommunicator { HostResult result = null; // step 1. check readelf and upload if (CommunicatorUtils.getReadelfSize() < 0) { - System.out.println("upload readelf"); + DA_LOG.debug("upload readelf"); result = CommunicatorUtils.uploadReadElf(); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); if (!result.isSuccess()) { return result; } @@ -295,7 +295,7 @@ public class Communicator22 extends BaseCommunicator { // step 4. port foward result = CommunicatorUtils.foward(CommunicatorUtils.LOCAL_PORT, remotePort); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); if (!HostResult.SUCCESS.equals(result)) { return result; } @@ -308,14 +308,14 @@ public class Communicator22 extends BaseCommunicator { result = createControlSocket(CommunicatorUtils.LOCAL_PORT); if (!result.equals(HostResult.SUCCESS)) { DACommunicator.setRunning(false); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return result; } result = createDataSocket(CommunicatorUtils.LOCAL_PORT); if (!result.equals(HostResult.SUCCESS)) { DACommunicator.setRunning(false); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return result; } @@ -328,7 +328,7 @@ public class Communicator22 extends BaseCommunicator { controlSock = new Socket(CommonConstants.LOCAL_HOST, port); if (null == controlSock) { result = HostResult.ERR_CONTROL_SOCKET_CREATION_FAIL; - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return result; } @@ -343,7 +343,7 @@ public class Communicator22 extends BaseCommunicator { } catch (SocketTimeoutException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; result.setMessage(e.getMessage()); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); e.printStackTrace(); } catch (UnknownHostException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; @@ -363,7 +363,7 @@ public class Communicator22 extends BaseCommunicator { dataSock = new Socket(CommonConstants.LOCAL_HOST, port); if (null == dataSock) { result = HostResult.ERR_DATA_SOCKET_CREATION_FAIL; - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return result; } @@ -378,11 +378,11 @@ public class Communicator22 extends BaseCommunicator { new Thread(null, new ReceiveCommunicator(), AnalyzerConstants.COMMUNICATOR_RECEIVE_THREAD).start(); - System.out.println("Receive Thread start"); + DA_LOG.debug("Receive Thread start"); } catch (SocketTimeoutException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; result.setMessage(e.getMessage()); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); e.printStackTrace(); } catch (UnknownHostException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java index d2a4249..e037c52 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java @@ -46,6 +46,7 @@ import org.tizen.dynamicanalyzer.common.path.PathConstants; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.DeviceInfo; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IShellOutputReceiver; import org.tizen.sdblib.exception.SdbCommandRejectedException; @@ -59,6 +60,8 @@ import org.tizen.sdblib.service.SyncResult; import org.tizen.sdblib.service.SyncService; public class CommunicatorUtils { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static List uploadDataResult = new ArrayList(); private static boolean isArch = false; private static final int PORT_WAIT_TIME = 5 * 1000 * 2; // ms @@ -106,7 +109,7 @@ public class CommunicatorUtils { if (file.exists()) { readelfSize = file.length(); } else { - System.out.println("upload error! file is not exist : " + source); //$NON-NLS-1$ + DA_LOG.debug("upload error! file is not exist : " + source); //$NON-NLS-1$ return HostResult.ERR_FILE_IS_NOT_EXISTS; } @@ -123,7 +126,7 @@ public class CommunicatorUtils { return HostResult.ERR_READELF_SIZE_GET_FAILED; } if (readelfSize != uploadSize) { - System.out.println("readelf file size is different!! "); //$NON-NLS-1$ + DA_LOG.debug("readelf file size is different!! "); //$NON-NLS-1$ return HostResult.ERR_READELF_UPLOAD_FAILED; } return HostResult.printAndReturn(result); @@ -197,14 +200,14 @@ public class CommunicatorUtils { HostResult ret = HostResult.SUCCESS; SyncResult result = push(device, source, targetPath); if (null == result || !result.isOk()) { - System.out.println("upload to" + targetPath + " is failed! "); //$NON-NLS-1$ //$NON-NLS-2$ + DA_LOG.debug("upload to" + targetPath + " is failed! "); //$NON-NLS-1$ //$NON-NLS-2$ if (null != result) { ret = HostResult.ERR_UPLOAD_FILE_FAILED; ret.setMessage(result.getMessage()); - System.out.println(ret.toString() + " : " + ret.getMessage()); //$NON-NLS-1$ + DA_LOG.debug(ret.toString() + " : " + ret.getMessage()); //$NON-NLS-1$ } else { ret = HostResult.ERR_SDB_PUSH_FAILED; - System.out.println(ret.toString()); + DA_LOG.debug(ret.toString()); } return ret; } @@ -322,7 +325,7 @@ public class CommunicatorUtils { String line = portLines.get(0); try { remotePort = Integer.parseInt(line); - System.out.println(" !! \nport get success!! : " + DA_LOG.debug(" !! \nport get success!! : " + remotePort); break; } catch (NumberFormatException e) { @@ -333,7 +336,7 @@ public class CommunicatorUtils { Thread.sleep(10); } catch (InterruptedException e) { // e.printStackTrace(); - System.out.println("Interrupt occurred - Getting port number"); + DA_LOG.debug("Interrupt occurred - Getting port number"); break; } } @@ -392,7 +395,7 @@ public class CommunicatorUtils { public static void unfoward(IDevice device, int local, int remote) { if (null != device && isOnline(device)) { try { - System.out.println("unfoward!!"); + DA_LOG.debug("unfoward!!"); device.removeForward(local, remote); Thread.sleep(AnalyzerConstants.SOCKET_FORWARD_INTERVAL); } catch (TimeoutException e) { @@ -489,9 +492,9 @@ public class CommunicatorUtils { SyncResult res = CommunicatorUtils.pull(device, PathConstants.DA_API_MAP_PATH, apiFilePath); if (null != res && res.isOk()) { - System.out.println("api map copying success!!");//$NON-NLS-1$ + DA_LOG.debug("api map copying success!!");//$NON-NLS-1$ } else { - System.out.println("Failed to get " + apiFilePath); //$NON-NLS-1$ + DA_LOG.debug("Failed to get " + apiFilePath); //$NON-NLS-1$ return null; } @@ -500,7 +503,7 @@ public class CommunicatorUtils { File file = new File(apiFilePath); if (!file.exists()) { - System.out.println("file open failed..."); + DA_LOG.debug("file open failed..."); return null; } try { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java index 519fc89..1682c35 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java @@ -53,6 +53,7 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IDeviceChangeListener; import org.tizen.sdblib.SmartDevelopmentBridge; @@ -60,6 +61,8 @@ import org.tizen.sdblib.receiver.MultiLineReceiver; import org.tizen.sdblib.service.SyncResult; public class DACommunicator { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static int MSG_TYPE_CONFIG = 0; public static int MSG_TYPE_SWAP_INST = 1; public static int READ_BUFFER_SIZE = 1024; @@ -85,7 +88,7 @@ public class DACommunicator { for (DeviceInfo device : devices) { HostResult result = device.initCommunicator(); if (!result.isSuccess()) { - System.out.println("init failed : " + DA_LOG.debug("init failed : " + device.getIDevice().getSerialNumber()); } } @@ -201,7 +204,7 @@ public class DACommunicator { } } } else { - System.out.println("sdbbridge is null!"); + DA_LOG.debug("sdbbridge is null!"); } } @@ -231,7 +234,7 @@ public class DACommunicator { return HostResult.ERR_INVALID_VERSION; } else { version = checkVersionResult.get(0); - System.out.println("version :" + version); + DA_LOG.debug("version :" + version); if (version.contains(DA_VERSION_SWAP)) { info.setTargetVersion(version); result = HostResult.SUCCESS; @@ -508,7 +511,7 @@ public class DACommunicator { @Override public void onDisconnected(IDevice device) { // called : each device disconnected time - System.out.println("device disconnected : " + DA_LOG.debug("device disconnected : " + device.getSerialNumber()); DeviceInfo deviceInfo = getDeviceByName(device.getSerialNumber()); DeviceInfo selectedDevice = getSelectedDevice(); @@ -520,7 +523,7 @@ public class DACommunicator { if (isRunning()) { if (selectedDevice.getIDevice().getSerialNumber() .equals(deviceInfo.getIDevice().getSerialNumber())) { - System.out.println("Disconnected while DA is running."); //$NON-NLS-1$ + DA_LOG.debug("Disconnected while DA is running."); //$NON-NLS-1$ UIRecorderTool.getInstance().stop(); DACommunicator.setRunning(false); } @@ -531,8 +534,7 @@ public class DACommunicator { @Override public void onConnected(IDevice device) { // It called when dynamic-analyzer start, only one time - System.out - .println("device connected : " + device.getSerialNumber()); + DA_LOG.debug("device connected : " + device.getSerialNumber()); // addDevice(device); if (!AnalyzerManager.isRunning()) { DeviceInfo devInfo = new DeviceInfo(device); @@ -557,7 +559,7 @@ public class DACommunicator { public void onChanged(IDevice device, int changeMask) { // called : device added - already dynamic-analyzer running (not // tracing) - System.out.println("device changed : " + device.getSerialNumber() + DA_LOG.debug("device changed : " + device.getSerialNumber() + " " + changeMask); if (1 == changeMask) { if (!AnalyzerManager.isRunning()) { @@ -578,7 +580,7 @@ public class DACommunicator { }); } } else { - System.out.println("device changed type :" + changeMask); + DA_LOG.debug("device changed type :" + changeMask); } } }; @@ -640,9 +642,9 @@ public class DACommunicator { + DAEMONLOG_PREFIX + PathManager.getLogPostFix();//$NON-NLS-1$ SyncResult res = CommunicatorUtils.pull(from, to); if (null != res && res.isOk()) { - System.out.println("daemon log copying success!!");//$NON-NLS-1$ + DA_LOG.debug("daemon log copying success!!");//$NON-NLS-1$ } else { - System.out.println("Failed to get " + from); //$NON-NLS-1$ + DA_LOG.debug("Failed to get " + from); //$NON-NLS-1$ } AnalyzerUtil.checkLogs(PathManager.DA_LOG_PATH, DAEMONLOG_PREFIX, diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java index 8a5c7af..d147533 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java @@ -54,10 +54,13 @@ import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager; public class IDECommunicator implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final int MAXBUFSIZE = 1024; private static final String IDE_DA_COMMUNICATION_TYPE_1 = "STATUS";//$NON-NLS-1$ @@ -90,24 +93,24 @@ public class IDECommunicator implements Runnable { daServerSocket = setServePort(); // Server Bind if (daServerSocket != null) { if (savePortToFile() != true) { // Save Server port - System.out.println("failed Save Server port"); + DA_LOG.debug("failed Save Server port"); errorMessageBox(); return; } if (setCheckFileLock() != true) { - System.out.println("failed socket File Lock"); + DA_LOG.debug("failed socket File Lock"); errorMessageBox(); return; } while (true) { try { - System.out.println("Waiting IDE Client : " + DA_LOG.debug("Waiting IDE Client : " + ideClientSocketArray.size()); lastCommunicationIdeSocket = daServerSocket.accept(); ideClientSocketArray.add(lastCommunicationIdeSocket); - System.out.println("Connected IDE : " + DA_LOG.debug("Connected IDE : " + ideClientSocketArray.size()); } catch (IOException e) { e.printStackTrace(); @@ -125,7 +128,7 @@ public class IDECommunicator implements Runnable { while (true) { try { in = clientSocket.getInputStream(); - System.out.println("IDE recvMessage Wait : " + DA_LOG.debug("IDE recvMessage Wait : " + ideClientSocketArray.size()); readSize = in.read(receiveBuffer); if (readSize > 0) { @@ -133,7 +136,7 @@ public class IDECommunicator implements Runnable { parsingReceiveMessage(new String( receiveBuffer)); } else { - System.out.println("Disconnected IDE : " + DA_LOG.debug("Disconnected IDE : " + ideClientSocketArray.size()); clientSocket.close(); ideClientSocketArray.remove(clientSocket); @@ -147,7 +150,7 @@ public class IDECommunicator implements Runnable { } }; acceptThread.start(); - System.out.println("Start IDE AcceptThread"); + DA_LOG.debug("Start IDE AcceptThread"); } } } @@ -212,7 +215,7 @@ public class IDECommunicator implements Runnable { autoStartApplication(strMsg); } } else { - System.out.println(" wrong receive message ");//$NON-NLS-1$ + DA_LOG.debug(" wrong receive message ");//$NON-NLS-1$ } } @@ -256,7 +259,7 @@ public class IDECommunicator implements Runnable { // trace Application private void autoStartApplication(String[] strMsg) { if (strMsg.length < MSG_LENGTH) { - System.out.println("wrong message format!!"); + DA_LOG.debug("wrong message format!!"); return; } ToolbarArea.getInstance().setToolbarStartStopState(false); @@ -265,7 +268,7 @@ public class IDECommunicator implements Runnable { final String appName = new String(strMsg[MSG_INDEX_APPNAME].trim()); if (isOpenWelcomeDlg()) { - System.out.println("Start -AutoRun Waiting..."); + DA_LOG.debug("Start -AutoRun Waiting..."); synchronized (getWaitingWelcomeDlg()) { try { getWaitingWelcomeDlg().wait((long)configurationWaitingTimeMs); @@ -273,10 +276,10 @@ public class IDECommunicator implements Runnable { e.printStackTrace(); } } - System.out.println("End - AutoRun Waiting"); + DA_LOG.debug("End - AutoRun Waiting"); } - System.out.println("auto start : " + appid); + DA_LOG.debug("auto start : " + appid); DeviceInfo device = DACommunicator.getDeviceByName(deviceName); DACommunicator.setSelectedDevice(device); @@ -298,11 +301,11 @@ public class IDECommunicator implements Runnable { ToolbarArea.getInstance().setToolbarStartStopState(true); } }); - System.out.println("invalid application name :" + appid); + DA_LOG.debug("invalid application name :" + appid); return; } final String appLabel = appInfo.getInfo(AppInfo.LABEL_INDEX); - System.out.println("IDE recv - deviceName: " + deviceName + DA_LOG.debug("IDE recv - deviceName: " + deviceName + " appName : " + appLabel); Display.getDefault().syncExec(new Runnable() { @@ -346,11 +349,11 @@ public class IDECommunicator implements Runnable { serverSocket = getServerSocket(0); if (serverSocket != null) { serverPort = serverSocket.getLocalPort(); - System.out.println("IDE-DA Server port " + serverPort); //$NON-NLS-1$ + DA_LOG.debug("IDE-DA Server port " + serverPort); //$NON-NLS-1$ return serverSocket; } else { - System.out.println("failed Set Serve Socket"); //$NON-NLS-1$ + DA_LOG.debug("failed Set Serve Socket"); //$NON-NLS-1$ } return serverSocket; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java index b5e4f2d..a8a341c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java @@ -12,8 +12,10 @@ import java.util.ArrayList; import java.util.List; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class SqlConnectionManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private static Connection connection = null; @@ -29,11 +31,11 @@ public class SqlConnectionManager { connection = DriverManager.getConnection(dbUrl, "SA", ""); SQLWarning warning = connection.getWarnings(); while (warning != null) { - System.out.println("[DB] Message: " + DA_LOG.debug("[DB] Message: " + warning.getMessage()); - System.out.println("[DB] SQL state: " + DA_LOG.debug("[DB] SQL state: " + warning.getSQLState()); - System.out.println("[DB] Vendor code: " + DA_LOG.debug("[DB] Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } @@ -63,7 +65,7 @@ public class SqlConnectionManager { connection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { - System.out.println("DB did not shutdown normally"); + DA_LOG.debug("DB did not shutdown normally"); } } connection = null; @@ -123,8 +125,7 @@ public class SqlConnectionManager { int datasize = data.size(); int columnsize = columnType.size(); if (columnsize != questionCount) { - System.out - .println("[ERR] column count of columnType is not matches!!"); + DA_LOG.error("column count of columnType is not matches!!"); return; } @@ -151,8 +152,7 @@ public class SqlConnectionManager { } else if (columnType.get(i).equals( DBConstants.INTEGER)) { if (col == null) { - System.out - .println("[ERR] Integer column data is null !!"); + DA_LOG.error("Integer column data is null !!"); isPrepared = false; break; } else { @@ -161,16 +161,14 @@ public class SqlConnectionManager { } else if (columnType.get(i).equals( DBConstants.LONG)) { if (col == null) { - System.out - .println("[ERR] Long column data is null !!"); + DA_LOG.error("Long column data is null !!"); isPrepared = false; break; } else { prep.setLong(i + 1, (Long) col); } } else { - System.out - .println("[ERR] not supported DB column type!!"); + DA_LOG.error("not supported DB column type!!"); isPrepared = false; break; } @@ -188,8 +186,7 @@ public class SqlConnectionManager { e.printStackTrace(); } } else { // column count is not equal - System.out - .println("[ERR] column count is not equal !!"); + DA_LOG.error("column count is not equal !!"); } } @@ -231,7 +228,7 @@ public class SqlConnectionManager { .contains(DBConstants.VARCHAR)) { rowData.add(rs.getString(i)); } else { - System.out.println("[ERR] undefined type : " + DA_LOG.error("undefined type : " + rsMetaData.getColumnTypeName(i)); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java index 3dc6811..09052cc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -33,9 +33,12 @@ import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class OpenTraceCompleteHandler extends AbstractHandler { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static String ID = OpenTraceCompleteHandler.class.getName(); @Override @@ -62,7 +65,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { page.updateView(); } }); - System.out.println("open trace complete!!"); //$NON-NLS-1$ + DA_LOG.debug("open trace complete!!"); //$NON-NLS-1$ return null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java index 440f6bf..6f38100 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -70,12 +70,14 @@ import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class OpenTraceHandler extends AbstractHandler { - + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final String ID = OpenTraceHandler.class.getName(); Project project = null; @@ -88,7 +90,7 @@ public class OpenTraceHandler extends AbstractHandler { project.getSavePath()); if (null == pInfo || pInfo.isEmpty()) { - System.out.println("The trace file is invalid."); //$NON-NLS-1$ + DA_LOG.debug("The trace file is invalid."); //$NON-NLS-1$ createWarningDialog(AnalyzerLabels.OPEN_TRACE_PROGRESS_VERSION_INVALID_REMOVE); AnalyzerUtil.executeCommand(ClearHandler.ID); return null; @@ -186,7 +188,7 @@ public class OpenTraceHandler extends AbstractHandler { List> dbInfo = SqlManager.getInstance() .getCallStackDataFromTable(); if (null == dbInfo) { - System.out.println("failed - loadCallStackData"); + DA_LOG.debug("failed - loadCallStackData"); isSuccess = false; } else { for (int i = 0; i < dbInfo.size(); i++) { @@ -216,7 +218,7 @@ public class OpenTraceHandler extends AbstractHandler { List> dbInfo = SqlManager.getInstance() .setloadCallStackApis(); if (null == dbInfo) { - System.out.println("failed - loadCallStackApis"); + DA_LOG.debug("failed - loadCallStackApis"); isSuccess = false; } else { BaseCallstackManager callstackManager = AnalyzerManager @@ -240,7 +242,7 @@ public class OpenTraceHandler extends AbstractHandler { boolean isSuccess = true; List> dbInfo = SqlManager.getInstance().loadTargetInfo(); if (null == dbInfo) { - System.out.println("failed - loadTargetInfo"); + DA_LOG.debug("failed - loadTargetInfo"); isSuccess = false; } else { List info = dbInfo.get(0); @@ -259,7 +261,7 @@ public class OpenTraceHandler extends AbstractHandler { String option = " where pid = " + pids.get(h); dbInfo = SqlManager.getInstance().loadProcessInfo(option); if (null == dbInfo) { - System.out.println("failed - load Process Info"); + DA_LOG.debug("failed - load Process Info"); isSuccess = false; continue; } else { @@ -281,7 +283,7 @@ public class OpenTraceHandler extends AbstractHandler { List> objInfo = SqlManager.getInstance() .loadLibObj(subOption); if (null == objInfo) { - System.out.println("failed - load Lib Object"); + DA_LOG.debug("failed - load Lib Object"); isSuccess = false; continue; } else { @@ -305,7 +307,7 @@ public class OpenTraceHandler extends AbstractHandler { } dbInfo = SqlManager.getInstance().loadApiNames(); if (null == dbInfo) { - System.out.println("failed - load Api names"); + DA_LOG.debug("failed - load Api names"); isSuccess = false; } else { List apiList = ApiNameManager.getApiList(); @@ -344,7 +346,7 @@ public class OpenTraceHandler extends AbstractHandler { boolean isSuccess = true; List> dbInfo = SqlManager.getInstance().setloadLeakData(); if (null == dbInfo) { - System.out.println("leak data loading failed.."); + DA_LOG.debug("leak data loading failed.."); isSuccess = false; } else { LeakDetector leakDectector = AnalyzerManager.getLeakDetector(); @@ -373,7 +375,7 @@ public class OpenTraceHandler extends AbstractHandler { List> dbInfo = SqlManager.getInstance() .setloadFailedData(); if (null == dbInfo) { - System.out.println("failed - loadFailedData"); + DA_LOG.debug("failed - loadFailedData"); isSuccess = false; } else { FailedChecker failedChecker = AnalyzerManager.getFailedChecker(); @@ -402,7 +404,7 @@ public class OpenTraceHandler extends AbstractHandler { List> dbInfo = SqlManager.getInstance() .setloadProfilingData(); if (null == dbInfo) { - System.out.println("failed - loadProfilingData"); + DA_LOG.debug("failed - loadProfilingData"); isSuccess = false; } else { for (int i = 0; i < dbInfo.size(); i++) { @@ -445,7 +447,7 @@ public class OpenTraceHandler extends AbstractHandler { List> dbInfo = SqlManager.getInstance() .setloadProfilingChildData(); if (null == dbInfo) { - System.out.println("failed - loadProfilingChildData"); + DA_LOG.debug("failed - loadProfilingChildData"); isSuccess = false; } else { for (int i = 0; i < dbInfo.size(); i++) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java index f79cf6a..5abf778 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java @@ -37,9 +37,12 @@ import org.tizen.dynamicanalyzer.communicator.IDECommunicator; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager; public class AnalyzerPerspectiveListener extends PerspectiveAdapter { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static boolean init = false; @Override @@ -48,14 +51,18 @@ public class AnalyzerPerspectiveListener extends PerspectiveAdapter { if (!init) { ToolbarArea.getInstance().initToolbarEnablement(); + DA_LOG.performance("TEST", "DA Start", "Init Toolbar Enablement - Host launch"); DACommunicator.reload(); DACommunicator.addDeviceListener(); DACommunicator.loadDevices(); DACommunicator.updateToolbarDevice(); + DA_LOG.performance("TEST", "DA Start", "Device Connection"); BinarySettingManager.getInstance().initBinarySettings(); + DA_LOG.performance("TEST", "DA Start", "Target Binary Setting"); SingletonFocusManager.saveSingletonPid(); IDECommunicator.startIDECommunicatorThread(); + DA_LOG.performance("TEST", "DA Start", "Start IDE Communicator"); ConfigurationDialogDataManager.getInstance() .updateFeaturesValueFromConfigureManager(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java index d99869f..7e2a81d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java @@ -31,10 +31,13 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; +import org.tizen.dynamicanalyzer.util.DALogger; ; public class InsertLogQueue { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final int FULL_COUNT = 10000; public boolean isWait = false; List logs = null; @@ -54,7 +57,7 @@ public class InsertLogQueue { try { wait(); } catch (InterruptedException e) { - System.out.println("insert log queue interrupt called!!"); //$NON-NLS-1$ + DA_LOG.debug("insert log queue interrupt called!!"); //$NON-NLS-1$ continue; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java index d79224b..22425cf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java @@ -38,10 +38,12 @@ import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; +import org.tizen.dynamicanalyzer.util.DALogger; /** log insert into database **/ public class LogInserter implements Runnable { - + private static final DALogger DA_LOG = DALogger.getInstance(); + private static Thread insertLogThread = null; private static InsertLogQueue insertLogQueue = null; private static boolean isCompleted = false; @@ -60,7 +62,7 @@ public class LogInserter implements Runnable { try { sendNotify(); insertLogThread.join(AnalyzerManager.INSERT_JOIN_WAIT_TIME); - System.out.println("insert thread join complete!!"); //$NON-NLS-1$ + DA_LOG.debug("insert thread join complete!!"); //$NON-NLS-1$ } catch (InterruptedException e) { e.printStackTrace(); } @@ -116,7 +118,7 @@ public class LogInserter implements Runnable { logPackage.clear(); } catch (InterruptedException e) { - System.out.println("insert log thread interrupted"); //$NON-NLS-1$ + DA_LOG.debug("insert log thread interrupted"); //$NON-NLS-1$ break; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java index bc90d25..7140d62 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java @@ -49,10 +49,13 @@ import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.ImageUtil; import org.tizen.sdblib.service.SyncResult; public class LogParser implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private final String OSP_MAIN = "OspMain"; //$NON-NLS-1$ private static Thread logParser = null; private static boolean dropCallTraceLog = false; @@ -105,7 +108,7 @@ public class LogParser implements Runnable { logQueue.notifyAll(); } try { - System.out.println("wait for log parser join");//$NON-NLS-1$ + DA_LOG.debug("wait for log parser join");//$NON-NLS-1$ logParser.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); } catch (InterruptedException e) { e.printStackTrace(); @@ -127,7 +130,7 @@ public class LogParser implements Runnable { } /* log for debug */ - System.out.println("log parsing thread end!!"); //$NON-NLS-1$ + DA_LOG.debug("log parsing thread end!!"); //$NON-NLS-1$ AnalyzerManager.setLogParsingComplete(true); if (!AnalyzerManager.isExit()) { @@ -407,7 +410,7 @@ public class LogParser implements Runnable { front = ByteUtils.getByte(pid, pcAddr, tid, cpuNum); } else { if (id == DataChannelConstants.MSG_PROBE_SCREENSHOT) { - System.out.println("debug "); + DA_LOG.debug("debug "); } newLog = new String[10]; // api id @@ -432,7 +435,7 @@ public class LogParser implements Runnable { newLog[9] = CommonConstants.EMPTY; if (id == DataChannelConstants.MSG_PROBE_LIFECYCLE) { - System.out.println("life cycle"); + DA_LOG.debug("life cycle"); } int apiId = ApiNameManager.getApiId(newLog[0]); int pid = initIntPayload(newLog[1]); @@ -504,7 +507,7 @@ public class LogParser implements Runnable { result = ByteUtils.concatByteArray(front, rear); break; case DataChannelConstants.MSG_PROBE_NETWORK: - System.out.println("case AnalyzerConstants.MSG_PROBE_NETWORK"); + DA_LOG.debug("case AnalyzerConstants.MSG_PROBE_NETWORK"); break; case DataChannelConstants.MSG_PROBE_GLES20: apiType = Integer diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java index 38c8f3c..4e384fb 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java @@ -30,9 +30,12 @@ import java.util.ArrayList; import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.util.DALogger; /** log queue model **/ public class LogQueue { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final int FULL_COUNT = 10000; private List> data = null; @@ -48,7 +51,7 @@ public class LogQueue { } wait(); } catch (InterruptedException e) { - System.out.println("log queue interrupt!!"); //$NON-NLS-1$ + DA_LOG.debug("log queue interrupt!!"); //$NON-NLS-1$ continue; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java index 2174c61..66244c8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java @@ -47,8 +47,10 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.uirecorder.RecordingQueue; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderRecordThread; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class MessageProcess { + private static final DALogger DA_LOG = DALogger.getInstance(); final int MSG_ID_INDEX = 0; final int MSG_LENGTH_INDEX = 1; @@ -323,7 +325,7 @@ public class MessageProcess { } } } // end while() - System.out.println("Receive thread end!!"); + DA_LOG.debug("Receive thread end!!"); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { @@ -334,8 +336,7 @@ public class MessageProcess { }); endingSteps(); } catch (IOException e) { - System.out - .println("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ + DA_LOG.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ Display.getDefault().asyncExec(new Runnable() { @Override @@ -352,7 +353,7 @@ public class MessageProcess { } private void endingSteps() { - System.out.println("Ending steps!"); + DA_LOG.debug("Ending steps!"); message = null; DACommunicator.setRunning(false); // AnalyzerUtil.setRecordState(RecordStateSourceProvider.RECORD_READY); @@ -366,7 +367,7 @@ public class MessageProcess { }); stopTimer(); addBufferToList(); - System.out.println("stop log process start");//$NON-NLS-1$ + DA_LOG.debug("stop log process start");//$NON-NLS-1$ StopLogProcessor.runStopLogProcessThread(); DACommunicator.closeAll(); AnalyzerUtil.executeCommand(StopHandler.ID); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java index 4c56651..7f7e95f 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -58,9 +58,11 @@ import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class Project { // public static final String TABLE_NAME = "project"; + private static final DALogger DA_LOG = DALogger.getInstance(); private static final String VERSION = "version"; private static final String PROTOCOL_VERSION = "protocolVersion"; @@ -297,15 +299,14 @@ public class Project { + AnalyzerConstants.IMAGE_FOLDER_NAME); if (!imgFolder.isDirectory()) { if (!imgFolder.mkdirs()) { - System.out.println("image directory create failed..."); + DA_LOG.debug("image directory create failed..."); } else { File smallImage = new File(getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + AnalyzerConstants.SMALL_IMAGE_FOLDER_NAME); if (!smallImage.isDirectory()) { if (!smallImage.mkdirs()) { - System.out - .println("small image directory create failed..."); + DA_LOG.debug("small image directory create failed..."); } } } @@ -420,7 +421,7 @@ public class Project { String projectInfoFilePath = ""; Project project = AnalyzerManager.getProject(); if (null == project || !project.isValid()) { - System.out.println("project not saved"); + DA_LOG.debug("project not saved"); } else { projectInfoFilePath = PathManager.getProjectInfoPath(project .getSavePath()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java index ac7c983..a900fa9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java @@ -53,10 +53,13 @@ import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton; public class ShortCutKeyBindingHandler extends AbstractHandler { + private static final DALogger DA_LOG = DALogger.getInstance(); + private int CTRL_STATE_MASK = SWT.CTRL; private static int KEY_1 = 49; @@ -83,68 +86,68 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } if (e.keyCode == SWT.F1) { - System.out.println("about"); + DA_LOG.debug("about"); Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); AboutDialog dialog = new AboutDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F2) { - System.out.println("configuration"); + DA_LOG.debug("configuration"); Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ConfigurationDialog dialog = new ConfigurationDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F3) { - System.out.println("view source toggle"); + DA_LOG.debug("view source toggle"); DACustomToggleButton button = (DACustomToggleButton) ToolbarArea .getInstance().getButton(ToolbarArea.SOURCE_BUTTON); button.setToggled(!button.isToggled()); } // ctrl + number 1 ~ 6 page else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_1) { - System.out.println("timeline page"); + DA_LOG.debug("timeline page"); AnalyzerUtil.changePage(TimelinePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_4) { - System.out.println("file page"); + DA_LOG.debug("file page"); AnalyzerUtil.changePage(FilePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_3) { - System.out.println("NetworkPage page"); + DA_LOG.debug("NetworkPage page"); AnalyzerUtil.changePage(NetworkPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_2) { - System.out.println("thread page"); + DA_LOG.debug("thread page"); AnalyzerUtil.changePage(ThreadPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { - System.out.println("ui page"); + DA_LOG.debug("ui page"); AnalyzerUtil.changePage(UIPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_5) { - System.out.println("Graphics page"); + DA_LOG.debug("Graphics page"); AnalyzerUtil.changePage(GLPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_7) { - System.out.println("Kernel page"); + DA_LOG.debug("Kernel page"); AnalyzerUtil.changePage(KernelPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_8) { - System.out.println("summary page"); + DA_LOG.debug("summary page"); AnalyzerUtil.changePage(SummaryPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_9) { - System.out.println("range page"); + DA_LOG.debug("range page"); AnalyzerUtil.changePage(RangePage.pageID); } // ctrl + t = 116 // 103 -> g else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 103) { if (!AnalyzerManager.isRunning()) { - System.out.println("start trace"); + DA_LOG.debug("start trace"); enabled = false; - System.out.println("start trace start"); + DA_LOG.debug("start trace start"); ToolbarArea.getInstance().startTrace(); - System.out.println("start trace end"); + DA_LOG.debug("start trace end"); } else { - System.out.println("stop trace"); + DA_LOG.debug("stop trace"); enabled = false; ToolbarArea.getInstance().stopTrace(); } } // o else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 111) { - System.out.println("open trace"); + DA_LOG.debug("open trace"); if (!AnalyzerManager.isRunning()) { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); OpenTraceDialog dialog = new OpenTraceDialog(shell); @@ -153,7 +156,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // s else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 115) { - System.out.println("save trace"); + DA_LOG.debug("save trace"); if (ToolbarArea.getInstance().getButton(ToolbarArea.SAVE_BUTTON) .isButtonEnabled()) { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); @@ -168,7 +171,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // p else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 112) { - System.out.println("replay "); + DA_LOG.debug("replay "); if (!AnalyzerManager.isRunning()) { DACustomButton button = (DACustomButton) ToolbarArea .getInstance().getButton(ToolbarArea.REPLAY_BUTTON); @@ -181,7 +184,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // r else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 114) { - System.out.println("range "); + DA_LOG.debug("range "); if (RangeDataManager.getInstance().isBeingAnalyzed()) { RangeDataManager.getInstance().initRange(); } else { @@ -192,7 +195,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // e else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 101) { - System.out.println("replay Edit"); + DA_LOG.debug("replay Edit"); if (!AnalyzerManager.isRunning()) { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ReplayEditDialog dialog = new ReplayEditDialog(shell); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java index 99ae6e7..708ad8d 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -71,10 +71,13 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingChildData; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class SqlManager { // private static final int PERMIT = 1; // private Semaphore semaphore = new Semaphore(PERMIT); + private static final DALogger DA_LOG = DALogger.getInstance(); + private static SqlManager instance = null; private Connection connection = null; @@ -104,9 +107,9 @@ public class SqlManager { replayConnection = DriverManager.getConnection(dbUrl, "SA", ""); SQLWarning warning = replayConnection.getWarnings(); while (warning != null) { - System.out.println("Message: " + warning.getMessage()); - System.out.println("SQL state: " + warning.getSQLState()); - System.out.println("Vendor code: " + warning.getErrorCode()); + DA_LOG.debug("Message: " + warning.getMessage()); + DA_LOG.debug("SQL state: " + warning.getSQLState()); + DA_LOG.debug("Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } } catch (ClassNotFoundException e) { @@ -131,9 +134,9 @@ public class SqlManager { connection = DriverManager.getConnection(dbUrl, "SA", ""); SQLWarning warning = connection.getWarnings(); while (warning != null) { - System.out.println("Message: " + warning.getMessage()); - System.out.println("SQL state: " + warning.getSQLState()); - System.out.println("Vendor code: " + warning.getErrorCode()); + DA_LOG.debug("Message: " + warning.getMessage()); + DA_LOG.debug("SQL state: " + warning.getSQLState()); + DA_LOG.debug("Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } } catch (ClassNotFoundException e) { @@ -173,7 +176,7 @@ public class SqlManager { replayConnection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { - System.out.println("DB did not shutdown normally"); + DA_LOG.debug("DB did not shutdown normally"); } } replayConnection = null; @@ -191,7 +194,7 @@ public class SqlManager { connection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { - System.out.println("DB did not shutdown normally"); + DA_LOG.debug("DB did not shutdown normally"); } } connection = null; @@ -231,13 +234,13 @@ public class SqlManager { String tableName = lf.getName(); String dropTableQuery = createDropTableQuery(tableName); if (isQueryPrint) { - System.out.println("query : " + dropTableQuery); + DA_LOG.debug("query : " + dropTableQuery); } stat.executeUpdate(dropTableQuery); String createTableQuery = createTableQuery(lf); if (isQueryPrint) { - System.out.println("query : " + createTableQuery); + DA_LOG.debug("query : " + createTableQuery); } stat.executeUpdate(createTableQuery); executeCreateIndexTable(stat, tableName, "time");//$NON-NLS-1$//$NON-NLS-2$ @@ -295,7 +298,7 @@ public class SqlManager { executeUpdateCreateTable(stat, createIndexTable); } catch (SQLException e) { e.printStackTrace(); - System.out.println("table name : " + tableName); + DA_LOG.debug("table name : " + tableName); } } @@ -321,7 +324,7 @@ public class SqlManager { List tableInfos = dbManager.getTableInfos(); for (DBTableInfo info : tableInfos) { if (!executeUpdateCreateTable(stat, info.createQuery())) { - System.out.println("table create failed..." + DA_LOG.debug("table create failed..." + info.getTableName()); } } @@ -337,7 +340,7 @@ public class SqlManager { throws SQLException { if (!AnalyzerManager.isExit()) { if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } stat.executeUpdate(query); return true; @@ -362,7 +365,7 @@ public class SqlManager { // semaphoreAcquire(); Connection conn = getConnection(); if (null == conn || null == query || null == input) { - System.out.println("failed sql inset : " + input); + DA_LOG.debug("failed sql inset : " + input); return false; } prep = conn.prepareStatement(query); @@ -425,7 +428,7 @@ public class SqlManager { insertQuery(insertQuery, insetData); } else { - System.out.println("[ERR] insert project info failed!!"); + DA_LOG.error("insert project info failed!!"); } } @@ -457,7 +460,7 @@ public class SqlManager { insertQuery(insertQuery, insetData); } else { - System.out.println("[ERR] insert target info failed!!"); + DA_LOG.error("insert target info failed!!"); } } @@ -486,7 +489,7 @@ public class SqlManager { } } } else { - System.out.println("[ERR] insert process info failed!!"); + DA_LOG.error("insert process info failed!!"); } } @@ -511,7 +514,7 @@ public class SqlManager { insertQuery(insertQuery, insetData); } else { - System.out.println("[ERR] insert library object failed!!"); + DA_LOG.error("insert library object failed!!"); } } @@ -520,7 +523,7 @@ public class SqlManager { try { Connection conn = getConnection(); if (null == conn || null == query || null == input) { - System.out.println("failed sql inset : " + input); + DA_LOG.debug("failed sql inset : " + input); return false; } semaphoreAcquire(); @@ -641,7 +644,7 @@ public class SqlManager { try { Connection conn = getConnection(); if (null == conn || null == query || null == input) { - System.out.println("insert leak data failed.. : " + input); + DA_LOG.debug("insert leak data failed.. : " + input); return false; } semaphoreAcquire(); @@ -709,7 +712,7 @@ public class SqlManager { try { Connection conn = getConnection(); if (null == conn || null == query || null == input) { - System.out.println("failed sql inset : " + input); + DA_LOG.debug("failed sql inset : " + input); return false; } semaphoreAcquire(); @@ -756,12 +759,12 @@ public class SqlManager { Connection conn = getConnection(); if (null == conn || null == query || null == input || input.isEmpty()) { - System.out.println("failed sql inset : " + input); + DA_LOG.debug("failed sql inset : " + input); return false; } semaphoreAcquire(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } prep = conn.prepareStatement(query); int dataRowSize = input.size(); @@ -943,13 +946,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -969,7 +972,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -1005,13 +1008,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -1029,7 +1032,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -1039,7 +1042,7 @@ public class SqlManager { } } } catch (SQLException e) { - System.out.println("SQLException - selecte : " + query); + DA_LOG.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { semaphoreRelease(); @@ -1065,13 +1068,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -1091,7 +1094,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -1111,7 +1114,7 @@ public class SqlManager { rowData.add(rs.getString(rsMetaData .getColumnName(i))); } else { - System.out.println("Error undefine Type : " + DA_LOG.debug("Error undefine Type : " + rsMetaData.getColumnTypeName(i)); } @@ -1120,7 +1123,7 @@ public class SqlManager { } } } catch (SQLException e) { - System.out.println("SQLException - selecte : " + query); + DA_LOG.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -1149,7 +1152,7 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } @@ -1165,7 +1168,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -1176,7 +1179,7 @@ public class SqlManager { } } } catch (SQLException e) { - System.out.println("SQLException - selecte : " + query); + DA_LOG.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -1200,13 +1203,13 @@ public class SqlManager { conn = getConnection(dbFilePath); } if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.size() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return null; } else { int csize = columnName.size(); @@ -1229,7 +1232,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -1249,7 +1252,7 @@ public class SqlManager { rowData.add(rs.getString(rsMetaData .getColumnName(i))); } else { - System.out.println("Error undefine Type : " + DA_LOG.error("Error undefine Type : " + rsMetaData.getColumnTypeName(i)); } @@ -1258,7 +1261,7 @@ public class SqlManager { } } } catch (SQLException e) { - System.out.println("SQLException - selecte : " + query); + DA_LOG.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -1569,7 +1572,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return 0; } @@ -1580,7 +1583,7 @@ public class SqlManager { } stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -1591,10 +1594,10 @@ public class SqlManager { } } catch (SQLException e) { do { - System.out.println("query: " + query); - System.out.println("Message: " + e.getMessage()); - System.out.println("SQL state: " + e.getSQLState()); - System.out.println("Vendor code: " + e.getErrorCode()); + DA_LOG.debug("query: " + query); + DA_LOG.debug("Message: " + e.getMessage()); + DA_LOG.debug("SQL state: " + e.getSQLState()); + DA_LOG.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { @@ -1619,7 +1622,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return 0; } @@ -1631,7 +1634,7 @@ public class SqlManager { stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -1642,10 +1645,10 @@ public class SqlManager { } } catch (SQLException e) { do { - System.out.println("query: " + query); - System.out.println("Message: " + e.getMessage()); - System.out.println("SQL state: " + e.getSQLState()); - System.out.println("Vendor code: " + e.getErrorCode()); + DA_LOG.debug("query: " + query); + DA_LOG.debug("Message: " + e.getMessage()); + DA_LOG.debug("SQL state: " + e.getSQLState()); + DA_LOG.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { @@ -1669,7 +1672,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); return 0; } String optionQuery = CommonConstants.EMPTY; @@ -1681,7 +1684,7 @@ public class SqlManager { tableName, optionQuery); stat = conn.createStatement(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -1693,10 +1696,10 @@ public class SqlManager { } } catch (SQLException e) { do { - System.out.println("query: " + query); - System.out.println("Message: " + e.getMessage()); - System.out.println("SQL state: " + e.getSQLState()); - System.out.println("Vendor code: " + e.getErrorCode()); + DA_LOG.debug("query: " + query); + DA_LOG.debug("Message: " + e.getMessage()); + DA_LOG.debug("SQL state: " + e.getSQLState()); + DA_LOG.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { @@ -1738,7 +1741,7 @@ public class SqlManager { stat = conn.createStatement(); query = "select * from replay order by time, rid"; if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -1754,7 +1757,7 @@ public class SqlManager { output.setObjectCount(eventObjs.size()); } catch (SQLException e) { - System.out.println("SQLException - select : " + query); + DA_LOG.debug("SQLException - select : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -1794,7 +1797,7 @@ public class SqlManager { // } // } if (isQueryPrint) { - System.out.println("query : " + queryBuffer.toString()); + DA_LOG.debug("query : " + queryBuffer.toString()); } stat.executeUpdate(queryBuffer.toString()); } catch (SQLException e) { @@ -1843,12 +1846,12 @@ public class SqlManager { conn = getConnection(); } if (null == conn || null == query || null == input) { - System.out.println("failed sql inset : " + input); + DA_LOG.debug("failed sql inset : " + input); return false; } semaphoreAcquire(); if (isQueryPrint) { - System.out.println("query : " + query); + DA_LOG.debug("query : " + query); } prep = conn.prepareStatement(query); int dataRowSize = input.size(); @@ -1870,7 +1873,7 @@ public class SqlManager { prep.executeBatch(); conn.setAutoCommit(true); } catch (SQLException e) { - System.out.println("[Error insert] query = " + query); + DA_LOG.error("[Error insert] query = " + query); e.printStackTrace(); } finally { if (null != prep) { 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 eb1057b..a72133d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java @@ -50,9 +50,11 @@ import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackItem; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class SWAPCallStackManager extends BaseCallstackManager { + private static final DALogger DA_LOG = DALogger.getInstance(); public void makeUserCallstack(LogData input, ProfileDataMaker profiler) { ProfileData log = (ProfileData) input; @@ -231,8 +233,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { getCallStackDataBySeqMap().put(seq, callstackData); seqByTimeMap.put(time, seq); } else { - System.out - .println("makeUserCallstack : EXIT self is not the same as top of user callstack"); + DA_LOG.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); } if (AnalyzerManager.isOsp()) { String apiName = log.getApiName(); @@ -353,8 +354,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { probeCallstack.set(size - 1, new CallStackItem( callerCallstackUnit)); } else { - System.out - .println("bug : probe caller is not the same as top of user callstack"); //$NON-NLS-1$ + DA_LOG.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ } } @@ -419,8 +419,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { selfCallstackUnit)) { dupUserCall.increaseDupCallCount(); } else { - System.out - .println("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ + DA_LOG.debug("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ } } return true; @@ -435,8 +434,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { dupUserCallMap.remove(tid); } } else { - System.out - .println("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ + DA_LOG.debug("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ } return true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java index 1a86f72..ccb86dc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/BasicDataMessage.java @@ -31,8 +31,11 @@ import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; +import org.tizen.dynamicanalyzer.util.DALogger; public class BasicDataMessage { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final int INT_SIZE = CommonConstants.INT_SIZE; public static final int ID_SIZE = INT_SIZE; public static final int SEQ_SIZE = INT_SIZE; @@ -113,8 +116,7 @@ public class BasicDataMessage { .getNano(); if (0 == startSec && 0 == startNano) { - System.out - .println("BUG!!! - if show this log then process info is not comming or late!!"); + DA_LOG.debug("if show this log then process info is not comming or late!!"); startTime.setSec(sec); startTime.setNano(nano); AnalyzerManager.getProject().setProfileStartTime(startTime); @@ -201,7 +203,7 @@ public class BasicDataMessage { public void printMessage() { if (PRINT_DATA) { String strId = String.format("%4x", id); - System.out.println("Message [id : " + strId + "] [seq :" + seq + DA_LOG.debug("Message [id : " + strId + "] [seq :" + seq + "] [ Time : " + time + " ms]"); ByteUtils.printByteArray(payload); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java index e66bc72..8186378 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java @@ -92,13 +92,15 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; import org.tizen.sdblib.exception.SdbCommandRejectedException; import org.tizen.sdblib.exception.TimeoutException; import org.tizen.sdblib.service.SyncResult; public class Communicator30 extends BaseCommunicator { - + private static final DALogger DA_LOG = DALogger.getInstance(); + static final boolean PRINT_CONTROL_LOG_TOFILE = true; private PrintWriter printWriter = null; @@ -107,7 +109,7 @@ public class Communicator30 extends BaseCommunicator { // connect ecs server if (devInfo.isEmulator()) { if (!SocketClient.getInstance().connect()) { - System.out.println("[warn] Connect to ecs server is failed"); + DA_LOG.warning("Connect to ecs server is failed"); } devInfo.emulatorScreenshot = new EmulatorScreenshot(); } @@ -115,12 +117,12 @@ public class Communicator30 extends BaseCommunicator { // daemon start Process ps = CommunicatorUtils.execCommand(devInfo.getIDevice(), AnalyzerShellCommands.DACOMMAND_RUN_MANAGER); - System.out.println(ps.toString()); + DA_LOG.debug(ps.toString()); // get port int remotePort = CommunicatorUtils.getRemotePort(devInfo.getIDevice()); if (remotePort < 0) { - System.out.println(devInfo.getIDevice().getSerialNumber() + DA_LOG.debug(devInfo.getIDevice().getSerialNumber() + " remote port get failed and remove this device : " + devInfo.getIDevice().getSerialNumber()); return HostResult.ERR_REMOTE_PORT_GET_FAILED; @@ -129,9 +131,9 @@ public class Communicator30 extends BaseCommunicator { // step 4. port foward HostResult result = CommunicatorUtils.foward(devInfo.getIDevice(), CommunicatorUtils.LOCAL_PORT, remotePort); - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); if (!HostResult.SUCCESS.equals(result)) { - System.out.println(devInfo.getIDevice().getSerialNumber() + DA_LOG.debug(devInfo.getIDevice().getSerialNumber() + " port fowarding failed and remove this device"); return HostResult.ERR_REMOTE_PORT_GET_FAILED; } @@ -140,19 +142,19 @@ public class Communicator30 extends BaseCommunicator { // create control socket HostResult result = createControlSocket(devInfo); if (!result.isSuccess()) { - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return HostResult.ERR_CONTROL_SOCKET_CREATION_FAIL; } else { result = createDataSocket(devInfo); if (!result.isSuccess()) { - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return HostResult.ERR_DATA_SOCKET_CREATION_FAIL; } } // target info get result = getTargetInfo(devInfo); if (!result.isSuccess()) { - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); return HostResult.ERR_TARGET_INFO_GET_FAIL; } @@ -175,6 +177,7 @@ public class Communicator30 extends BaseCommunicator { public HostResult startTrace() { DACommunicator.setRunning(true); UserSpaceInst userSpaceInst = getUserSpaceInst(); + DA_LOG.performance("TEST", "Start Trace", "Set application inst"); byte[] replayData = AnalyzerManager.getProject().getReplayEvent(); byte[] rear = ByteUtils.getByte(userSpaceInst.getByteValue(), replayData); @@ -183,7 +186,7 @@ public class Communicator30 extends BaseCommunicator { byte[] ret = ByteUtils.getByte(AnalyzerConstants.MSG_START_SWAP, length, rear); - System.out.println("print start message"); + DA_LOG.debug("print start message"); // ByteUtils.printByteArrayForStart(ret); if(PRINT_CONTROL_LOG_TOFILE) { @@ -206,6 +209,7 @@ public class Communicator30 extends BaseCommunicator { // start message send HostResult result = handleControlMessage( DACommunicator.getSelectedDevice(), ret); + DA_LOG.performance("TEST", "Start Trace", "Make and Send start message"); // FIX if (!StartProcessManager.getInstance().isCancelled()) { @@ -229,6 +233,7 @@ public class Communicator30 extends BaseCommunicator { } dataThread.start(); + DA_LOG.performance("TEST", "Start Trace", "Start data receiving thread"); // success start trace!! byte[] payload = getMessagePayload(result.getRet()); @@ -242,15 +247,19 @@ public class Communicator30 extends BaseCommunicator { profilingStartTime.setNano(nano); UIRecorderTool.getInstance().startRecorder(); + DA_LOG.performance("TEST", "Start Trace", "Start recoding thread"); ToolbarArea.getInstance().startTimer(); + DA_LOG.performance("TEST", "Start Trace", "Start Timer"); SWAPLogParser.startLogParser(); + DA_LOG.performance("TEST", "Start Trace", "Start SWAP log parser thread"); // start registered data manager thread DataManagerRegistry.startThreads(); + DA_LOG.performance("TEST", "Start Trace", "Start DataManager threads"); /* Timeline */ UpdateViewTimer.start(); - System.out - .println("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); + DA_LOG.performance("TEST", "Start Trace", "Start Update view timer"); + DA_LOG.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); return result; } @@ -281,7 +290,7 @@ public class Communicator30 extends BaseCommunicator { appInst.setApplicationId(app.getAppId()); appInst.setExecutablePath(app.getExecPath()); - System.out.println("Set execute path : " + app.getExecPath()); + DA_LOG.debug("Set execute path : " + app.getExecPath()); BinaryInfo binInfo = app.getMainBinaryInfo(); List symbols = app.getSymbols(binInfo .getTempBinaryPath()); @@ -422,7 +431,7 @@ public class Communicator30 extends BaseCommunicator { String line = reader.readLine(); String errorStr = error.readLine(); if (null == line) { - System.out.println("host md5sum get failed : " + errorStr); + DA_LOG.debug("host md5sum get failed : " + errorStr); result = HostResult.ERR_BIN_INFO_GET_FAIL; continue; } @@ -473,9 +482,9 @@ public class Communicator30 extends BaseCommunicator { SyncResult res = CommunicatorUtils.pull(from, to); if (null != res && res.isOk()) { - System.out.println("binary copy success!!");//$NON-NLS-1$ + DA_LOG.debug("binary copy success!!");//$NON-NLS-1$ } else { - System.out.println("Failed to get " + from); //$NON-NLS-1$ + DA_LOG.debug("Failed to get " + from); //$NON-NLS-1$ return HostResult.ERR_BIN_INFO_GET_FAIL; } // binInfo.setLocalBinaryPath(localBinaryPath); @@ -581,14 +590,14 @@ public class Communicator30 extends BaseCommunicator { } int msgId = ByteUtils.toInt(message); - System.out.println("wait for ack... [send message : " + msgId + DA_LOG.debug("wait for ack... [send message : " + msgId + " ]"); int readsize = -1; // read buffer size is sufficient?? byte[] cbuf = new byte[DACommunicator.READ_BUFFER_SIZE * 2]; blocked = true; - System.out.println("blocked"); + DA_LOG.debug("blocked"); readsize = controlSock.getInputStream().read(cbuf); blocked = false; if(PRINT_CONTROL_LOG_TOFILE && printWriter != null) { @@ -598,7 +607,7 @@ public class Communicator30 extends BaseCommunicator { printWriter.printf("\n"); } - System.out.println("unblocked"); + DA_LOG.debug("unblocked"); if (readsize > 0) { byte[] buf = new byte[readsize]; System.arraycopy(cbuf, 0, buf, 0, readsize); @@ -608,7 +617,7 @@ public class Communicator30 extends BaseCommunicator { // for debug System.out.print("ack id : "); AnalyzerUtil.printHexdecimal(ackId); - System.out.println(); + DA_LOG.debug(); result.setRet(buf); } else { @@ -700,7 +709,7 @@ public class Communicator30 extends BaseCommunicator { } public HostResult getTargetInfo(DeviceInfo device) { - System.out.println("Send target info : " + DA_LOG.debug("Send target info : " + ByteUtils.getByte(AnalyzerConstants.MSG_TARGET_INFO, 0)); HostResult result = handleControlMessage(device, ByteUtils.getByte(AnalyzerConstants.MSG_TARGET_INFO, 0)); @@ -720,13 +729,12 @@ public class Communicator30 extends BaseCommunicator { @Override public HostResult sendKeepAliveMessage(DeviceInfo device) { - System.out.println("Send keep alive message : " + DA_LOG.debug("Send keep alive message : " + ByteUtils.getByte(AnalyzerConstants.MSG_KEEP_ALIVE, 0)); HostResult result = handleControlMessage(device, ByteUtils.getByte(AnalyzerConstants.MSG_KEEP_ALIVE, 0)); if (result.isSuccess()) { - System.out - .println("keep alive message ack :" + result.getMessage()); + DA_LOG.debug("keep alive message ack :" + result.getMessage()); if (isCorrectAck(MSG_KEEP_ALIVE_ACK, result)) { return result; @@ -893,7 +901,7 @@ public class Communicator30 extends BaseCommunicator { public void setSelectedApp(AppInfo app) { HostResult hr = sendBinaryInfoMessage(app); if (!hr.isSuccess()) { - System.out.println("binary info get failed :" + hr.getMessage()); + DA_LOG.debug("binary info get failed :" + hr.getMessage()); } } @@ -907,7 +915,7 @@ public class Communicator30 extends BaseCommunicator { if (null != controlSock && !controlSock.isClosed()) { controlSock.getOutputStream().write(msg); } else { - System.out.println("control socket is closed"); + DA_LOG.debug("control socket is closed"); result = HostResult.ERR_CONTROL_SOCKET_CONNECTION_CLOSED; } } catch (SocketException e) { @@ -1048,7 +1056,7 @@ public class Communicator30 extends BaseCommunicator { index += INT_SIZE; String localBinaryPath = null; if (binCount != count) { - System.out.println("BinInfo ack is not valid"); + DA_LOG.debug("BinInfo ack is not valid"); return null; } for (int i = 0; i < binCount; i++) { @@ -1107,7 +1115,7 @@ public class Communicator30 extends BaseCommunicator { String line = reader.readLine(); String errorStr = error.readLine(); if (null == line) { - System.out.println("host md5sum get failed : " + errorStr); + DA_LOG.error("host md5sum get failed : " + errorStr); continue; } String[] splitResult = line.trim().split(CommonConstants.SPACE); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/HeartBeatThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/HeartBeatThread.java index c91c7ad..0ccc2e3 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/HeartBeatThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/HeartBeatThread.java @@ -31,8 +31,11 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.HostResult; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.model.DeviceInfo; +import org.tizen.dynamicanalyzer.util.DALogger; public class HeartBeatThread implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static int interval = 1000; @Override @@ -46,7 +49,7 @@ public class HeartBeatThread implements Runnable { // System.out.println("Heart Beat!!"); HostResult result = DACommunicator.sendKeepAliveMessage(device); if (!result.isSuccess()) { - System.out.println(result.toString()); + DA_LOG.debug(result.toString()); } if (AnalyzerManager.isExit()) { break; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogQueue.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogQueue.java index 16cd4bf..d1382bc 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogQueue.java @@ -31,9 +31,12 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; +import org.tizen.dynamicanalyzer.util.DALogger; /** log queue model **/ public class LogQueue { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final int FULL_COUNT = 10000; private static final int HALF_COUNT = 5000; private List> data = null; @@ -51,7 +54,7 @@ public class LogQueue { } wait(); } catch (InterruptedException e) { - System.out.println("log queue interrupt!!"); //$NON-NLS-1$ + DA_LOG.debug("log queue interrupt!!"); //$NON-NLS-1$ continue; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java index 182fee8..bee3dff 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java @@ -70,9 +70,12 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; public class MessageParser { + private static final DALogger DA_LOG = DALogger.getInstance(); + static final boolean PRINT_DATA_LOG_TOFILE = true; static final int MSG_ID_INDEX = 0; @@ -243,7 +246,7 @@ public class MessageParser { pInfo.setPid(pid); pInfo.setPpid(ppid); - System.out.println("process info start time : " + startTime.getSec() + DA_LOG.debug("process info start time : " + startTime.getSec() + " " + startTime.getNano() + " startTime : " + pInfo.getStartTime().getSec() + " " + pInfo.getStartTime().getNano()); @@ -312,7 +315,7 @@ public class MessageParser { ProcessInfoPackage pInfoPack = processPkgMap.get(pid); if (null == pInfoPack) { // bug!!! - System.out.println("bug occurred!!"); + DA_LOG.debug("bug occurred!!"); } ProcessInfo lastProcessInfo = pInfoPack.getLastProcessInfo(); ProcessInfo pInfo = new ProcessInfo(); @@ -493,13 +496,15 @@ public class MessageParser { processMessage(buffer); if (id == DataChannelConstants.MSG_DATA_TERMINATE) { - System.out.println("message data terminate arrived!!!"); + DA_LOG.debug("message data terminate arrived!!!"); + DA_LOG.performance("TEST", "While tracing", "Terminate Application"); if (AnalyzerManager.getProcessCount() == 0) { break; } } } // end while() - System.out.println("Receive thread end!!"); + DA_LOG.debug("Receive thread end!!"); + DA_LOG.performance("TEST", "DA end", "End receive thread"); if (!StartProcessManager.getInstance().isCancelled()){ Display.getDefault().asyncExec(new Runnable() { @Override @@ -512,8 +517,7 @@ public class MessageParser { } endingSteps(); } catch (IOException e) { - System.out - .println("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ + DA_LOG.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ Display.getDefault().asyncExec(new Runnable() { @Override @@ -530,7 +534,7 @@ public class MessageParser { } private void endingSteps() { - System.out.println("Ending steps!"); + DA_LOG.debug("Ending steps!"); DACommunicator.setRunning(false); AnalyzerManager.setRunningState(false); Display.getDefault().syncExec(new Runnable() { @@ -541,13 +545,16 @@ public class MessageParser { } }); stopTimer(); + DA_LOG.performance("TEST", "DA end", "Stop timer"); addBufferToList(); + DA_LOG.performance("TEST", "DA end", "Add buffer to list"); if (!StartProcessManager.getInstance().isCancelled()) { - System.out.println("start!! : stop log process");//$NON-NLS-1$ + DA_LOG.debug("start!! : stop log process");//$NON-NLS-1$ StopLogProcessor.runStopLogProcessThread(); } AnalyzerUtil.executeCommand(StopHandler.ID); + DA_LOG.performance("TEST", "DA end", "Execute command - StopHandler"); AnalyzerManager.setProcessInfoArrived(false); ReplayTraceHandler.isReplay = false; ReplayTraceHandler.startTime = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java index e759e3d..f953945 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java @@ -5,8 +5,11 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.database.DBTable; +import org.tizen.dynamicanalyzer.util.DALogger; public abstract class PageDataManager implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private String name = null; private Thread thread = null; private ReadBlockingQueue logPackQueue = new ReadBlockingQueue(); @@ -48,7 +51,7 @@ public abstract class PageDataManager implements Runnable { sendNotify(); thread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); thread = null; - System.out.println(getName() + " thread joined!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread joined!"); //$NON-NLS-1$ } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index f47ccdd..032890d 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -55,11 +55,14 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.ImageUtil; import org.tizen.dynamicanalyzer.utils.ImageUtilSWT; import org.tizen.sdblib.service.SyncResult; public class SWAPLogParser implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String OSP_MAIN = "OspMain"; //$NON-NLS-1$ private static Thread logParser = null; // default false, turn on when Tizen C++ app @@ -98,7 +101,7 @@ public class SWAPLogParser implements Runnable { logQueue.notifyAll(); } try { - System.out.println("wait for log parser join");//$NON-NLS-1$ + DA_LOG.debug("wait for log parser join");//$NON-NLS-1$ logParser.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); } catch (InterruptedException e) { e.printStackTrace(); @@ -122,7 +125,7 @@ public class SWAPLogParser implements Runnable { } /* log for debug */ - System.out.println("log parsing thread end!!"); //$NON-NLS-1$ + DA_LOG.debug("log parsing thread end!!"); //$NON-NLS-1$ AnalyzerManager.setLogParsingComplete(true); if (!AnalyzerManager.isExit()) { @@ -285,7 +288,7 @@ public class SWAPLogParser implements Runnable { + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + fileName; if (angle != 0) { - System.out.println("[ image rotate : " + angle + " ]"); + DA_LOG.debug("[ image rotate : " + angle + " ]"); } new Thread(null, new Runnable() { @@ -317,7 +320,7 @@ public class SWAPLogParser implements Runnable { break; } else { - System.out.println("Failed to get '" + from + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ + DA_LOG.debug("Failed to get '" + from + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ try { Thread.sleep(1000); count++; @@ -335,7 +338,7 @@ public class SWAPLogParser implements Runnable { final String fileName = getImageName(path); if (angle != 0) { - System.out.println("[ image rotate : " + angle + " ]"); + DA_LOG.debug("[ image rotate : " + angle + " ]"); } new Thread(null, new Runnable() { @@ -366,7 +369,7 @@ public class SWAPLogParser implements Runnable { break; } else { - System.out.println("Failed to get '" + path + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ + DA_LOG.debug("Failed to get '" + path + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ try { Thread.sleep(1000); count++; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/ByteUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/ByteUtils.java index d97c581..72f9721 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/ByteUtils.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/ByteUtils.java @@ -29,8 +29,11 @@ import java.nio.ByteBuffer; import java.util.List; import org.tizen.dynamicanalyzer.utils.ByteSwapper; +import org.tizen.dynamicanalyzer.util.DALogger; public class ByteUtils { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static byte EOS = '\0'; /** @@ -415,7 +418,7 @@ public class ByteUtils { } public static void printByteArrayForStart(byte[] input) { - System.out.println(" ====---- print byte array start----===="); + DA_LOG.debug(" ====---- print byte array start----===="); int line = 0; for (int i = 0; i < input.length; i++, line++) { String b = String.format("%2x", input[i]); @@ -424,10 +427,10 @@ public class ByteUtils { System.out.print(" "); } if (line == 19) { - System.out.println(); + DA_LOG.debug(); line = -1; } } - System.out.println(" ====---- print byte array end----===="); + DA_LOG.debug(" ====---- print byte array end----===="); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ArgsInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ArgsInfo.java index f6c8145..9175a6e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ArgsInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ArgsInfo.java @@ -26,8 +26,11 @@ package org.tizen.dynamicanalyzer.swap.model.data; import org.tizen.dynamicanalyzer.constant.CommonConstants; +import org.tizen.dynamicanalyzer.util.DALogger; public class ArgsInfo { + private static final DALogger DA_LOG = DALogger.getInstance(); + int lastIndex = 0; String args = null; @@ -50,7 +53,7 @@ public class ArgsInfo { } String ret = args.substring(index + 2, args.length()); if (ret.equals("a")) { - System.out.println("debug"); + DA_LOG.debug("debug"); } return ret; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java index f10a226..afa5a11 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogData.java @@ -36,8 +36,11 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.ByteUtils; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public abstract class LogData implements Cloneable { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static boolean isSWAP = false; public static int STATE_COUNT = 4; @@ -85,9 +88,9 @@ public abstract class LogData implements Cloneable { time = resultSec * 1000000 + resultNano / 1000; if (time <= 0) { - System.out.println("id : " + AnalyzerUtil.toHexdecimal(id) + DA_LOG.debug("id : " + AnalyzerUtil.toHexdecimal(id) + " time : " + time); - System.out.println("profile start time : " + DA_LOG.debug("profile start time : " + startTime.toString() + " time : " + sec + "," + nano); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java index 100d306..5adfd1a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/BinarySettingManager.java @@ -44,8 +44,10 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.InputRow; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class BinarySettingManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private static BinarySettingManager instance = null; private HashMap targetBinInfoMap = new HashMap(); @@ -125,7 +127,7 @@ public class BinarySettingManager { File rpms = new File(rpmPath); if (!rpms.exists()) { if (!rpms.mkdirs()) { - System.out.println("rpm directory create failed..."); + DA_LOG.debug("rpm directory create failed..."); continue; } } @@ -175,9 +177,9 @@ public class BinarySettingManager { while (null != (line = reader.readLine())) { lineCount++; if (lineCount == 1) { - System.out.println("CHANGE DIR : " + line); + DA_LOG.debug("CHANGE DIR : " + line); } else { - System.out.println("EXTRACE RPM : " + line); + DA_LOG.debug("EXTRACE RPM : " + line); } } if (lineCount == 0) { @@ -185,8 +187,7 @@ public class BinarySettingManager { new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - System.out - .println("debug info file extract failed... : " + DA_LOG.debug("debug info file extract failed... : " + errorStr); continue; } @@ -224,14 +225,13 @@ public class BinarySettingManager { new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - System.out - .println("debug source file extract failed... : " + DA_LOG.debug("debug source file extract failed... : " + errorStr); continue; } debugFilePath = rpmPath + line.substring(1, line.length()); - System.out.println("DEBUG PATH : " + debugFilePath); + DA_LOG.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); continue; @@ -261,13 +261,12 @@ public class BinarySettingManager { new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - System.out - .println("source file path get failed.. : " + DA_LOG.debug("source file path get failed.. : " + errorStr); continue; } sourceFilePath = rpmPath; - System.out.println("SOURCE PATH : " + DA_LOG.debug("SOURCE PATH : " + sourceFilePath); } catch (IOException e) { e.printStackTrace(); @@ -297,14 +296,13 @@ public class BinarySettingManager { new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - System.out - .println("debug source file extract failed... : " + DA_LOG.debug("debug source file extract failed... : " + errorStr); continue; } debugFilePath = rpmPath + line.substring(1, line.length()); - System.out.println("DEBUG PATH : " + debugFilePath); + DA_LOG.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); continue; @@ -428,7 +426,7 @@ public class BinarySettingManager { BinarySettingManager.getInstance().putRealBinarySettingData( binarySettings); } catch (FileNotFoundException e) { - System.out.println("BinarySettings.save file is not exist - normal operation"); + DA_LOG.debug("BinarySettings.save file is not exist - normal operation"); } catch (IOException e) { e.printStackTrace(); } finally { @@ -468,14 +466,14 @@ public class BinarySettingManager { String line = null; while (null != (line = reader.readLine())) { lineCount++; - System.out.println("LINE (" + lineCount + ") : " + line); + DA_LOG.debug("LINE (" + lineCount + ") : " + line); lines.add(line); } if (lineCount == 0) { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - System.out.println("find debug info path fail.. " + errorStr); + DA_LOG.error("find debug info path fail.. " + errorStr); isDebugInfo = false; } } catch (IOException e) { @@ -509,14 +507,14 @@ public class BinarySettingManager { String line = null; while (null != (line = reader.readLine())) { lineCount++; - System.out.println("LINE (" + lineCount + ") : " + line); + DA_LOG.debug("LINE (" + lineCount + ") : " + line); lines.add(line); } if (lineCount == 0) { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - System.out.println("find debug info path fail.. " + DA_LOG.error("find debug info path fail.. " + errorStr); return null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DADeviceExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DADeviceExplorer.java index 2b897d8..681cded 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DADeviceExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DADeviceExplorer.java @@ -4,10 +4,12 @@ import org.eclipse.nebula.widgets.grid.GridItem; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.swap.platform.ui.ExplorerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.sdblib.service.FileEntry; import org.tizen.sdblib.service.FileEntryType; public class DADeviceExplorer extends DeviceExplorer { + private static final DALogger DA_LOG = DALogger.getInstance(); public DADeviceExplorer(Composite parent) { super(parent); @@ -17,7 +19,7 @@ public class DADeviceExplorer extends DeviceExplorer { public void updateData() { if (null == current) { if (null == root) { - System.out.println("Root is empty"); + DA_LOG.debug("Root is empty"); return; } current = root; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java index c393a2a..187b207 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/DeviceExplorer/DeviceExplorer.java @@ -52,6 +52,7 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.DAFileExplorerEmp import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.DAFileExplorerTableRenderer; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -61,6 +62,8 @@ import org.tizen.sdblib.service.FileEntry; import org.tizen.sdblib.service.FileEntryType; public class DeviceExplorer extends Composite { + private static final DALogger DA_LOG = DALogger.getInstance(); + protected static int FAIL = -1; protected static int FILE = 1; protected static int DIRECTORY = 2; @@ -86,7 +89,7 @@ public class DeviceExplorer extends Composite { GridItem selection = selections[0]; FileEntry file = (FileEntry) selection .getData(ExplorerUtil.DATA_FIEL_KEY); - System.out.println("Selected : " + file.getFullPath()); + DA_LOG.debug("Selected : " + file.getFullPath()); selected = file; inputText.setText(selected.getFullPath()); inputText.setBackground(ColorResources.WHITE); @@ -130,7 +133,7 @@ public class DeviceExplorer extends Composite { public void handleClickEvent(DACustomButton button) { String path = inputText.getText(); if (null == path || path.isEmpty()) { - System.out.println("path must not empty"); + DA_LOG.debug("path must not empty"); // inputText.setBackground(ColorResources.RED); // info.setText("Empty path"); inputText.setText(current.getFullPath()); @@ -138,7 +141,7 @@ public class DeviceExplorer extends Composite { } if (!path.contains(root.getFullPath())) { - System.out.println("Out of root range"); + DA_LOG.debug("Out of root range"); // inputText.setBackground(ColorResources.RED); // info.setText("Out of root range"); inputText.setText(current.getFullPath()); @@ -248,7 +251,7 @@ public class DeviceExplorer extends Composite { public void updateData() { if (null == current) { if (null == root) { - System.out.println("Root is empty"); + DA_LOG.debug("Root is empty"); return; } current = root; @@ -321,7 +324,7 @@ public class DeviceExplorer extends Composite { FileEntry rootDir = device.getFileEntry(r); if (null == rootDir || (!rootDir.isDirectory() && !rootDir.isRoot())) { - System.out.println("root path is invalid"); + DA_LOG.debug("root path is invalid"); return; } else { root = rootDir; @@ -369,7 +372,7 @@ public class DeviceExplorer extends Composite { if (null != path && !path.isEmpty()) { FileEntry file = device.getFileEntry(path); if (file == null || file.getType() == FileEntryType.Unknown) { - System.out.println("invalid path"); + DA_LOG.debug("invalid path"); return result; } else if (!file.isDirectory() && !file.isRoot()) { current = file.getParent(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java index b7a0b9c..7deb9fb 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/ExplorerUtil.java @@ -28,7 +28,11 @@ package org.tizen.dynamicanalyzer.swap.platform.ui; import java.io.File; +import org.tizen.dynamicanalyzer.util.DALogger; + public class ExplorerUtil { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static String PARENT_STR = ".."; public static int TYPE_DIR = 0; @@ -45,7 +49,7 @@ public class ExplorerUtil { } else if (file.isHidden()) { return TYPE_HIDDEN; } else { - System.out.println("error : file type error"); + DA_LOG.error("file type error"); return -1; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java index 0b9d01a..c97caf4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/FileExplorer/DAFileExplorer.java @@ -51,12 +51,14 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.platform.ui.ExplorerUtil; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAText; public class DAFileExplorer extends Composite { + private static final DALogger DA_LOG = DALogger.getInstance(); private static int FAIL = -1; private static int FILE = 1; @@ -81,7 +83,7 @@ public class DAFileExplorer extends Composite { GridItem[] selections = table.getSelection(); GridItem selection = selections[0]; File file = (File) selection.getData(ExplorerUtil.DATA_FIEL_KEY); - System.out.println("Selected : " + file.getAbsolutePath()); + DA_LOG.debug("Selected : " + file.getAbsolutePath()); selected = file; String path = selected.getAbsolutePath(); @@ -127,7 +129,7 @@ public class DAFileExplorer extends Composite { public void handleClickEvent(DACustomButton button) { String path = inputText.getText(); if (null == path || path.isEmpty()) { - System.out.println("path must not empty"); + DA_LOG.debug("path must not empty"); // inputText.setBackground(ColorResources.RED); // info.setText("Empty path"); inputText.setText(current.getAbsolutePath()); @@ -135,7 +137,7 @@ public class DAFileExplorer extends Composite { } if (!path.contains(root.getAbsolutePath())) { - System.out.println("Out of root range"); + DA_LOG.debug("Out of root range"); // inputText.setBackground(ColorResources.RED); // info.setText("Out of root range"); inputText.setText(current.getAbsolutePath()); @@ -241,7 +243,7 @@ public class DAFileExplorer extends Composite { public void updateData() { if (null == current) { if (null == root) { - System.out.println("Root is empty"); + DA_LOG.debug("Root is empty"); return; } current = root; @@ -313,7 +315,7 @@ public class DAFileExplorer extends Composite { if (null != r && !r.isEmpty()) { File rootDir = new File(r); if (!rootDir.exists() || !rootDir.isDirectory()) { - System.out.println("root path is invalid"); + DA_LOG.debug("root path is invalid"); return; } else { root = rootDir; @@ -355,7 +357,7 @@ public class DAFileExplorer extends Composite { if (null != path && !path.isEmpty()) { File file = new File(path); if (!file.exists()) { - System.out.println("invalid path"); + DA_LOG.debug("invalid path"); return result; } else if (!file.isDirectory()) { current = file.getParentFile(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java index 5998c2b..d9ffd59 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/LoadSettingDialog.java @@ -53,12 +53,15 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; public class LoadSettingDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static int SAVE_FOLDER = 0; public static int TEMP_FOLDER = 1; @@ -261,7 +264,7 @@ public class LoadSettingDialog extends DAMessageBox { grid.remove(index); } else { // log for debug - System.out.println("delete save file failed..."); //$NON-NLS-1$ + DA_LOG.debug("delete save file failed..."); //$NON-NLS-1$ } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java index d37d5d6..20ba4ef 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/platform/ui/SaveSettingDialog.java @@ -57,6 +57,7 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -64,6 +65,7 @@ import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; import org.tizen.dynamicanalyzer.widgets.da.base.DAText; public class SaveSettingDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); private int MAX_SAVE_FILE_NAME_LENGTH = 35; private final String DEFAULT_TIME_FORMAT = "_yyyy-MM-dd-HH-mm-ss";//$NON-NLS-1$ @@ -166,10 +168,10 @@ public class SaveSettingDialog extends DAMessageBox { if (success) { // add snapshot model update - System.out.println("save binary setting complete!!"); //$NON-NLS-1$ + DA_LOG.debug("save binary setting complete!!"); //$NON-NLS-1$ } else { - System.out.println("save binary setting fail..."); //$NON-NLS-1$ + DA_LOG.debug("save binary setting fail..."); //$NON-NLS-1$ return false; } return true; @@ -251,7 +253,7 @@ public class SaveSettingDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - System.out.println("save file name is null"); + DA_LOG.debug("save file name is null"); return false; } else { textBox.setText(saveFileName); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java index c974ad7..3b1df74 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java @@ -18,6 +18,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; @@ -35,6 +36,8 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class TimelineChartMouseEventListener extends MouseAdapter implements MouseMoveListener { + private static final DALogger DA_LOG = DALogger.getInstance(); + private RangeDataManager rangeDataManager = RangeDataManager.getInstance(); private DAPopupMenu menu; private DATimeline timeline; @@ -69,7 +72,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements DAPopupMenuItem clearItem = itemList.get(4); if (ToolbarArea.getInstance() == null) { - System.out.println("toolbar area is null");//$NON-NLS-1$ + DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ return; } @@ -304,7 +307,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements DAChartPlotMarker marker = plot.getMarkers() .get(SELECTION_MARKER_INDEX); if (!(marker instanceof DAChartPlotIntervalMarker)) { - System.out.println("mouseMove !IntervalMarker"); + DA_LOG.debug("mouseMove !IntervalMarker"); return; } DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseTrackAdapter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseTrackAdapter.java index 5e4e643..ec278e6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseTrackAdapter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseTrackAdapter.java @@ -32,6 +32,7 @@ import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseTrackAdapter; import org.eclipse.swt.widgets.Canvas; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; @@ -41,6 +42,8 @@ import org.tizen.dynamicanalyzer.widgets.chart.DAUIEventChartPlot; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class TimelineChartMouseTrackAdapter extends MouseTrackAdapter { + private static final DALogger DA_LOG = DALogger.getInstance(); + private DATimeline timeline; public TimelineChartMouseTrackAdapter(DATimeline timeline) { @@ -99,7 +102,7 @@ public class TimelineChartMouseTrackAdapter extends MouseTrackAdapter { if (plot instanceof DAUIEventChartPlot) { i = (int) (seriesList.size() * yPosRatio); if (i < 0 || i > 4) { - System.out.println(yPosRatio + " " + i);//$NON-NLS-1$ + DA_LOG.debug(yPosRatio + " " + i);//$NON-NLS-1$ } } DAChartSeries series = seriesList.get(i); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java index dd88eec..12f5a1e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartData.java @@ -39,12 +39,15 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class FileChartData { + private static final DALogger DA_LOG = DALogger.getInstance(); + private List children = new ArrayList(); private DAChartSeries apiSeries; private DAChartSeries accessSeries; @@ -462,7 +465,7 @@ public class FileChartData { ColorResources.FILE_API_USED, event.getTooltipContent()); break; default: - System.out.println("createChartItem : no case FileChartDataEvent"); + DA_LOG.debug("createChartItem : no case FileChartDataEvent"); return -1; } if (seriesItem != null) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java index 701a3ba..9a1903c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java @@ -35,8 +35,10 @@ import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; +import org.tizen.dynamicanalyzer.util.DALogger; public class FileChartManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private FileDataMaker fileDataMaker = null; private static FileChartManager instance = null; @@ -73,7 +75,7 @@ public class FileChartManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java index 127bbcc..d96c676 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java @@ -60,6 +60,7 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; import org.tizen.dynamicanalyzer.ui.timeline.chart.FileChart; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -71,6 +72,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class FileDataMaker { + private static final DALogger DA_LOG = DALogger.getInstance(); + private DAChartBoard board; private List rows = new ArrayList(); private List fileEventQueue = new ArrayList(); @@ -167,7 +170,7 @@ public class FileDataMaker { this.failedChecker.getFailedList().add(ffd); event.setFailedAPI(); } else if (name.equals("fdopen")) { //$NON-NLS-1$ - System.out.println("fdopen"); + DA_LOG.debug("fdopen"); continue; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java index 4878d5d..3171588 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackManager.java @@ -41,9 +41,11 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class CallStackManager extends BaseCallstackManager { + private static final DALogger DA_LOG = DALogger.getInstance(); public void makeUserCallstack(LogData input, ProfileDataMaker profiler) { UserFunctionData log = (UserFunctionData) input; @@ -172,8 +174,7 @@ public class CallStackManager extends BaseCallstackManager { userCallstack.get(size - 2).getCallStackUnit().getFunctionName())) { userCallstack.remove(size - 2); } else { - System.out - .println("makeUserCallstack : [virtual thunk] EXIT caller is not the same" + DA_LOG.debug("makeUserCallstack : [virtual thunk] EXIT caller is not the same" + "as top of user callstack after remove EXIT self"); } } @@ -201,8 +202,7 @@ public class CallStackManager extends BaseCallstackManager { } } } else { - System.out - .println("makeUserCallstack : EXIT self is not the same as top of user callstack"); + DA_LOG.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); } if (AnalyzerManager.isOsp()) { // String apiName = input[LogCenterConstants.APINAME_INDEX]; @@ -290,8 +290,7 @@ public class CallStackManager extends BaseCallstackManager { topUserCallstack.getFunctionName())) { probeCallstack.set(size - 1, new CallStackItem(callerCallstackUnit)); } else { - System.out - .println("bug : probe caller is not the same as top of user callstack"); //$NON-NLS-1$ + DA_LOG.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ } } @@ -354,8 +353,7 @@ public class CallStackManager extends BaseCallstackManager { selfCallstackUnit)) { dupUserCall.increaseDupCallCount(); } else { - System.out - .println("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ + DA_LOG.debug("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ } } return true; @@ -370,8 +368,7 @@ public class CallStackManager extends BaseCallstackManager { dupUserCallMap.remove(tid); } } else { - System.out - .println("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ + DA_LOG.debug("isIrregularUserCall : dup callstack check error"); //$NON-NLS-1$ } return true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java index 28a1302..05cb7c1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/EmulatorScreenshot.java @@ -35,9 +35,11 @@ import java.io.File; import org.json.simple.JSONObject; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.JsonUtil; public class EmulatorScreenshot implements ILsn { + private static final DALogger DA_LOG = DALogger.getInstance(); private final String SCREENSHOT = "Snapshot"; private int filecount = 0; @@ -50,7 +52,7 @@ public class EmulatorScreenshot implements ILsn { @Override public void OnEventProc(String eventname, JSONObject jsParam) { String message = jsParam.get(SocketConstants.MESSAGE_RETURN).toString(); - System.out.println("[info] " + message); + DA_LOG.info(message); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java index 2ea0b1a..8919b82 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ImageViewer.java @@ -55,8 +55,10 @@ import org.tizen.dynamicanalyzer.model.ImageInfo; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite; +import org.tizen.dynamicanalyzer.util.DALogger; public class ImageViewer extends Composite { + private static final DALogger DA_LOG = DALogger.getInstance(); static class ImageData { public GC gc; @@ -277,12 +279,12 @@ public class ImageViewer extends Composite { err.printStackTrace(); img = ImageResources.NO_IMAGE; } catch (SWTException e) { - System.out.println("Wait for receiving image : " + path);//$NON-NLS-1$ + DA_LOG.debug("Wait for receiving image : " + path);//$NON-NLS-1$ img = ImageResources.NO_IMAGE; } if (img.isDisposed()) { - System.out.println("before set image : disposed"); //$NON-NLS-1$ + DA_LOG.debug("before set image : disposed"); //$NON-NLS-1$ } } setImage(img); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java index d6c25f9..9f73fdc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MessageSender.java @@ -36,8 +36,10 @@ import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.KeepAliveAns; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.MonitorReq; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type; +import org.tizen.dynamicanalyzer.util.DALogger; public class MessageSender { + private static final DALogger DA_LOG = DALogger.getInstance(); private static MessageSender m_inst; @@ -57,7 +59,7 @@ public class MessageSender { master.writeTo(SocketClient.getInstance().getOutputStream()); SocketClient.getInstance().getOutputStream().flush(); } catch (IOException e) { - System.out.println("[warn] " + e.getMessage()); + DA_LOG.warning(e.getMessage()); return false; } return true; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java index 7f2c25a..78f7bb6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/MsgMgr.java @@ -34,11 +34,13 @@ import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.JsonUtil; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.EcsIds.Master_Type; public class MsgMgr { + private static final DALogger DA_LOG = DALogger.getInstance(); private Map _msg_map = new HashMap(); @@ -75,7 +77,7 @@ public class MsgMgr { IMsgProc proc = FindMsgProc(subtype); if (proc == null) { - System.out.println("[info] invalid message type - " + subtype.toString()); + DA_LOG.info("invalid message type - " + subtype.toString()); return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java index ccc67e9..9e71193 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java @@ -11,8 +11,11 @@ import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.SystemData; +import org.tizen.dynamicanalyzer.util.DALogger; public class ScreenshotDataManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static ScreenshotDataManager instance = null; private List lastCpuRate = null; private int lastProcessMemory = 0; @@ -54,7 +57,7 @@ public class ScreenshotDataManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public List getLastCpuRate() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java index 9a46579..456efa6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketClient.java @@ -42,7 +42,10 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import org.tizen.dynamicanalyzer.util.DALogger; + public class SocketClient { + private static final DALogger DA_LOG = DALogger.getInstance(); private static SocketClient client; @@ -82,7 +85,7 @@ public class SocketClient { try { socket = new Socket(ip, port); - System.out.println("[info] socket created." + "ip: " + ip + ", port: " + port); + DA_LOG.info("socket created." + "ip: " + ip + ", port: " + port); socket.setReuseAddress(true); @@ -98,10 +101,10 @@ public class SocketClient { SocketConstants.SOCKET_MESSAGE_THREAD).start(); } catch (SocketException e) { - System.out.println("[warn] " + e.getMessage()); + DA_LOG.warning(e.getMessage()); return false; } catch (IOException e) { - System.out.println("[warn] " + e.getMessage()); + DA_LOG.warning(e.getMessage()); return false; } @@ -126,7 +129,7 @@ public class SocketClient { ((Socket) obj).close(); } } catch (final IOException e) { - System.out.println("[warn] " + e.getMessage()); + DA_LOG.warning(e.getMessage()); return false; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java index 257f457..247c648 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketMessage.java @@ -32,8 +32,10 @@ package org.tizen.dynamicanalyzer.ui.info.screenshot; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.util.DALogger; public class SocketMessage implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); // private List list = new ArrayList(); @@ -49,7 +51,7 @@ public class SocketMessage implements Runnable { try { msgQueue.wait(); } catch (InterruptedException e) { - System.out.println("[severe] " + e.getMessage()); + DA_LOG.debug("[severe] " + e.getMessage()); } } while (true) @@ -78,7 +80,7 @@ public class SocketMessage implements Runnable { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - System.out.println("[info] processMsg"); + DA_LOG.info("processMsg"); MsgMgr.getInstance().ProcBufMsg(msg); } }); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java index f81534b..91fa080 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/SocketReceive.java @@ -38,21 +38,24 @@ import java.io.InputStreamReader; import java.nio.ByteBuffer; import org.tizen.dynamicanalyzer.ui.info.screenshot.ecs.Ecs.Master; +import org.tizen.dynamicanalyzer.util.DALogger; import com.google.protobuf.CodedInputStream; public class SocketReceive implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + @Override public void run() { SocketClient client = SocketClient.getInstance(); - System.out.println("[info] Socket Receive runs."); + DA_LOG.info("Socket Receive runs."); DataInputStream in = client.getInputStream(); int size = 0; try { while ((size = in.readInt()) > 0) { if (client.getSocket().isClosed() || !client.isRunning()) { - System.out.println("closed || not running."); + DA_LOG.debug("closed || not running."); break; } @@ -82,7 +85,7 @@ public class SocketReceive implements Runnable { new InputStreamReader(in)); byte[] bSize = ByteBuffer.allocate(4).putInt(size).array(); String message = new String(bSize, 0, 4) + reader.readLine(); - System.out.println("message len: " + message.length() + DA_LOG.debug("message len: " + message.length() + ", message:" + message); // TODO: handle string message } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java index 6edb26d..405f4a2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/CallFlowChart.java @@ -47,6 +47,7 @@ import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataMaker; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataManager; import org.tizen.dynamicanalyzer.ui.kernel.data.KernelDataPerThread; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; @@ -59,6 +60,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class CallFlowChart extends DAChartBoard { + private static final DALogger DA_LOG = DALogger.getInstance(); + private KernelDataPerThread selectedData = null; private boolean dirty = false; private final KernelDataMaker dataMaker = KernelDataManager.getInstance() @@ -201,8 +204,7 @@ public class CallFlowChart extends DAChartBoard { prevItem = curItem; prevSeriesNum = curSeriesNum; } else { - System.out - .println("[ERR] Function series is not exist in call flow chart"); + DA_LOG.error("Function series is not exist in call flow chart"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java index 9b7432a..deee31a 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataMaker.java @@ -35,8 +35,11 @@ import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; import org.tizen.dynamicanalyzer.swap.model.data.ContextSwitchData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; +import org.tizen.dynamicanalyzer.util.DALogger; public class KernelDataMaker { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String queryto_withTime = "where %s < %s and %s > %s order by %s"; private static final String queryto_withTidAndTime = "where %s = %s and %s < %s and %s > %s order by %s"; private static final String queryto_withTid = "where %s = %s group by %s"; @@ -96,8 +99,7 @@ public class KernelDataMaker { } else { // thread id is exist in thread id array if (kdata.getCorelog() != null) { // TODO : error - System.out - .println("[ERR] context switch entry log is coming without exit log of previous context"); + DA_LOG.error("context switch entry log is coming without exit log of previous context"); } else { kdata.setCorelog(csdata); @@ -125,16 +127,13 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // thread id is not exist // TODO : error - System.out - .println("[ERR] context switch exit log is coming without any entry log"); + DA_LOG.error("context switch exit log is coming without any entry log"); } else if ((precore = kdata.getCorelog()) == null) { // TODO : error - System.out - .println("[ERR] context switch exit log is coming without corresponding entry log"); + DA_LOG.error("context switch exit log is coming without corresponding entry log"); } else if (precore.getCpuNum() != csdata.getCpuNum()) { // TODO : error - System.out - .println("[ERR] context switch exit log is coming with different cpu num"); + DA_LOG.error("context switch exit log is coming with different cpu num"); } else { kdata.setCorelog(null); @@ -154,8 +153,7 @@ public class KernelDataMaker { prefunc_type = kdata.getFunclogType(); if (prefunc != null) { if (prefunc.isEmpty() || prefunc_type.isEmpty()) { - System.out - .println("[WRN] context switch exit log is coming but there is no function in stack"); + DA_LOG.warning("context switch exit log is coming but there is no function in stack"); } else { ProfileData lastfunc = prefunc.peek(); int lastfunc_type = prefunc_type.peek(); @@ -192,8 +190,7 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // TODO : error - System.out - .println("[ERR] function entry log is coming without any context entry log"); + DA_LOG.error("function entry log is coming without any context entry log"); } else { assert (kdata.getCorelog() != null); if (kdata.getFunclog() == null) { @@ -241,8 +238,7 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // TODO : error - System.out - .println("[ERR] function entry log is coming without any context entry log"); + DA_LOG.error("function entry log is coming without any context entry log"); } else { assert (kdata.getCorelog() != null); if (kdata.getFunclog() == null) { @@ -255,8 +251,7 @@ public class KernelDataMaker { if (prefunc.isEmpty() || prefunc_type.isEmpty()) { // TODO : error - System.out - .println("[ERR] function exit log is coming without function entry log"); + DA_LOG.error("function exit log is coming without function entry log"); } else { ProfileData lastfunc = prefunc.pop(); int lastfunc_type = prefunc_type.pop(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java index 1661c86..dab7c9e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java @@ -38,8 +38,11 @@ import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataTimeComparator; +import org.tizen.dynamicanalyzer.util.DALogger; public class KernelDataManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static KernelDataManager instance = null; private KernelDataMaker kdataMaker = null; @@ -87,7 +90,7 @@ public class KernelDataManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java index 4552279..271e4bf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java @@ -40,12 +40,15 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.summary.failed.FailedData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class NetworkChartData { + private static final DALogger DA_LOG = DALogger.getInstance(); + private List children = new ArrayList(); private NetworkChartData parent = null; @@ -521,8 +524,7 @@ public class NetworkChartData { } default: - System.out - .println("setStatusColor : no case NetworkChartDataEvent : " + DA_LOG.debug("setStatusColor : no case NetworkChartDataEvent : " + event.getApiType());//$NON-NLS-1$ return; } @@ -774,8 +776,7 @@ public class NetworkChartData { break; default: - System.out - .println("createChartItem : no case NetworkChartDataEvent : " + DA_LOG.debug("createChartItem : no case NetworkChartDataEvent : " + apiType);//$NON-NLS-1$ return -1; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java index 69945dc..8596051 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java @@ -37,8 +37,10 @@ import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; +import org.tizen.dynamicanalyzer.util.DALogger; public class NetworkChartManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private NetworkDataMaker networkDataMaker = null; @@ -82,7 +84,7 @@ public class NetworkChartManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java index 97a51c4..c986c7f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java @@ -58,6 +58,7 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -70,6 +71,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class NetworkDataMaker { + private static final DALogger DA_LOG = DALogger.getInstance(); + private DAChartBoard board; private int preSelectionPId = -1; private List unknownDataList = new ArrayList(); @@ -343,8 +346,7 @@ public class NetworkDataMaker { break; } default: - System.out - .println("makeEventData : no case NetworkChartDataEvent : " + DA_LOG.debug("makeEventData : no case NetworkChartDataEvent : " + apiType);//$NON-NLS-1$ return null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTrafficChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTrafficChart.java index 44751c1..255fa5d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTrafficChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTrafficChart.java @@ -37,6 +37,7 @@ import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -46,6 +47,7 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class NetworkTrafficChart { + private static final DALogger DA_LOG = DALogger.getInstance(); private static class FDCountData { private int type; @@ -157,7 +159,7 @@ public class NetworkTrafficChart { break; } default: - System.out.println("FileChart.java : wrong file api type");//$NON-NLS-1$ + DA_LOG.debug("wrong file api type");//$NON-NLS-1$ } } trafficDataList.clear(); @@ -210,7 +212,7 @@ public class NetworkTrafficChart { break; } default: - System.out.println("FileChart.java : wrong file api type");//$NON-NLS-1$ + DA_LOG.debug("wrong file api type");//$NON-NLS-1$ } trafficDataList.remove(0); } 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 af41a7a..5a11cbf 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 @@ -49,8 +49,11 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLFPSChart; import org.tizen.dynamicanalyzer.ui.opengl.ui.chart.GLFrameTimeChart; import org.tizen.dynamicanalyzer.ui.opengl.ui.context.GLContextTreeTable; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; public class GLDataMaker extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final String DELIMITER = "`,"; public static final String EMPTY = ""; private static final String SPACE = " "; @@ -1437,6 +1440,6 @@ public class GLDataMaker extends PageDataManager { } } - System.out.println(getName() + " thread ended!"); + DA_LOG.debug(getName() + " thread ended!"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java index f7f8cad..af5cdf8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLFrameChartMouseEventListener.java @@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; @@ -48,6 +49,7 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class GLFrameChartMouseEventListener extends GLTimeChartMouseEventListener { + private static final DALogger DA_LOG = DALogger.getInstance(); public GLFrameChartMouseEventListener(DAPopupMenu menu, DATimeline timeline) { super(menu, timeline); @@ -75,7 +77,7 @@ public class GLFrameChartMouseEventListener extends DAPopupMenuItem clearItem = itemList.get(4); if (ToolbarArea.getInstance() == null) { - System.out.println("toolbar area is null");//$NON-NLS-1$ + DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java index 61c8a97..ddf7dd2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/GLTimeChartMouseEventListener.java @@ -42,6 +42,7 @@ import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; @@ -55,6 +56,8 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class GLTimeChartMouseEventListener extends MouseAdapter implements MouseMoveListener { + private static final DALogger DA_LOG = DALogger.getInstance(); + protected RangeDataManager rangeDataManager = RangeDataManager .getInstance(); protected DAPopupMenu menu; @@ -90,7 +93,7 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements DAPopupMenuItem clearItem = itemList.get(4); if (ToolbarArea.getInstance() == null) { - System.out.println("toolbar area is null");//$NON-NLS-1$ + DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ return; } @@ -146,7 +149,7 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements // TODO FrameCountInfo frameCountInfo = GLDataMaker.getInstance() .getFrameCountInfo(index); - System.out.println("start : " + frameCountInfo.getStartFrameIndex() + DA_LOG.debug("start : " + frameCountInfo.getStartFrameIndex() + ", count : " + frameCountInfo.getFrameCount()); AnalyzerManager.getCurrentPage().updateView( @@ -217,7 +220,7 @@ public class GLTimeChartMouseEventListener extends MouseAdapter implements DAChartPlotMarker marker = plot.getMarkers() .get(SELECTION_MARKER_INDEX); if (!(marker instanceof DAChartPlotIntervalMarker)) { - System.out.println("mouseMove !IntervalMarker"); + DA_LOG.debug("mouseMove !IntervalMarker"); return; } DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java index 274110f..46c73b6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java @@ -59,10 +59,13 @@ import org.tizen.dynamicanalyzer.ui.opengl.ui.GLPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; public class GLAPIListTable extends DAApiListTableComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String EMPTY = ""; private String[] columnNames = { GLPageLabels.GL_API_LIST_VIEW_SEQ, @@ -377,7 +380,7 @@ public class GLAPIListTable extends DAApiListTableComposite { int insideColumnIndex = Integer.parseInt(involvedInfo.get(2)); map.put(seq, insideColumnIndex); } catch (NumberFormatException e) { - System.out.println("init log"); + DA_LOG.debug("init log"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java index f579644..c0d5830 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java @@ -39,13 +39,15 @@ import org.tizen.dynamicanalyzer.ui.thread.ThreadPage; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; import org.tizen.dynamicanalyzer.workbench.LayoutManager; public class BaseView extends ViewPart { - + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final String ID = BaseView.class.getName(); DAPageComposite topComposite = null; DATabComposite tabView = null; @@ -92,6 +94,7 @@ public class BaseView extends ViewPart { tabView.getContentComposite(), SWT.NONE); tabView.addView(summaryPage, false); } + DA_LOG.performance("TEST", "DA Start", "Create Toolbar and Add Tab view"); } @Override diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/UpdateViewTimer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/UpdateViewTimer.java index 59be321..8382caf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/UpdateViewTimer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/UpdateViewTimer.java @@ -30,8 +30,10 @@ import java.util.Timer; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.ui.toolbar.UpdateTimerTask; +import org.tizen.dynamicanalyzer.util.DALogger; public class UpdateViewTimer { + private static final DALogger DA_LOG = DALogger.getInstance(); private static Timer timer = null; private static boolean bOpentrace = false; @@ -66,7 +68,7 @@ public class UpdateViewTimer { if (null != timer) { timer.cancel(); timer = null; - System.out.println("update timer stop"); //$NON-NLS-1$ + DA_LOG.debug("update timer stop"); //$NON-NLS-1$ } } } \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java index 81528c7..4aaf6af 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiTable.java @@ -45,9 +45,12 @@ import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; public class FailedApiTable extends DATableComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + private boolean isRange = false; public FailedApiTable(Composite parent, int style, int tableStyle) { @@ -132,7 +135,7 @@ public class FailedApiTable extends DATableComposite { text.add(errCode); // 5 data.add(new Long(failedData.getErrorCode())); } catch (NullPointerException e) { - System.out.println("debug"); + DA_LOG.debug("debug"); continue; } String errMsg = ErrorCodeManager.getInatance().getErrorDescription( 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 a7b8e0d..4309f7c 100644 --- 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 @@ -42,8 +42,10 @@ import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; +import org.tizen.dynamicanalyzer.util.DALogger; public class FunctionUsageProfiler extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); // default sampling rate = 10 ms public static long SAMPLE_TIME = 10; @@ -119,7 +121,7 @@ public class FunctionUsageProfiler extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public static void 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 f25d562..f8c65f2 100644 --- 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 @@ -53,10 +53,12 @@ import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackItem; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.Formatter; public class ProfileDataMaker { + private static final DALogger DA_LOG = DALogger.getInstance(); class CallstackTree { ProfilingData me; @@ -386,8 +388,7 @@ public class ProfileDataMaker { symbol = path + AnalyzerConstants.CALLSTACK_API_TOKEN_STRING + functionName; } else { - System.out - .println("binary for the sample pc is not found :" + AnalyzerUtil.toHexdecimal(pcAddr)); //$NON-NLS-1$ + DA_LOG.debug("binary for the sample pc is not found :" + AnalyzerUtil.toHexdecimal(pcAddr)); //$NON-NLS-1$ symbol = InformationViewLabels.CALLSTACK_TABLE_UNKNOWN_LIBRARY + AnalyzerConstants.CALLSTACK_API_TOKEN_STRING + AnalyzerUtil.toHexdecimal(pcAddr); @@ -437,8 +438,7 @@ public class ProfileDataMaker { } addrs.add(0, selfAddr); } else { - System.out - .println("makeFunctionUsageProfileData : cannot find seq by time"); + DA_LOG.debug("makeFunctionUsageProfileData : cannot find seq by time"); addrs = new ArrayList(); addrs.add(selfAddr); } @@ -638,8 +638,7 @@ public class ProfileDataMaker { if(size == 0 || !userCallstack.get(size - 1).getCallStackUnit() .getFunctionName().equals(inputCallstackApiData.getFunctionName())) { - System.out - .println("exit without entry or EXIT self is not the same as top of user callstack :" + DA_LOG.debug("exit without entry or EXIT self is not the same as top of user callstack :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ return; } @@ -679,8 +678,7 @@ public class ProfileDataMaker { if (type == LogCenterConstants.USER_FUNCTION_EVENT_TYPE_EXIT) { if (null == current) { // bug - System.out - .println("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ + DA_LOG.debug("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ } else { CallstackTree parentCt = current.getParent(); if (null != parentCt) { @@ -718,8 +716,7 @@ public class ProfileDataMaker { if(size == 0 || !userCallstack.get(size - 1).getCallStackUnit() .getFunctionName().equals(inputCallstackApiData.getFunctionName())) { - System.out - .println("exit without entry or EXIT self is not the same as top of user callstack :" + DA_LOG.debug("exit without entry or EXIT self is not the same as top of user callstack :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ return; } @@ -763,8 +760,7 @@ public class ProfileDataMaker { if (type == MSG_FUNCTION_EXIT) { if (null == current) { // bug - System.out - .println("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ + DA_LOG.debug("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ } else { CallstackTree parentCt = current.getParent(); if (null != parentCt) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java index 9c5fad0..726c995 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java @@ -36,9 +36,11 @@ import org.tizen.dynamicanalyzer.swap.logparser.PageDataManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncDataManager; import org.tizen.dynamicanalyzer.ui.thread.thread.ThreadPageThreadDataManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; public class ThreadChartManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private static ThreadChartManager instance = null; @@ -119,7 +121,7 @@ public class ThreadChartManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public int getItemIndexByTid(String tid) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncData.java index 33741e3..a21fd96 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncData.java @@ -33,11 +33,14 @@ import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.thread.ThreadPageData; import org.tizen.dynamicanalyzer.ui.thread.ThreadPageDataEvent; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class ThreadPageSyncData extends ThreadPageData { + private static final DALogger DA_LOG = DALogger.getInstance(); + private List children = new ArrayList(); private DAChartSeries apiSeries; private DAChartSeries stateSeries; @@ -120,7 +123,7 @@ public class ThreadPageSyncData extends ThreadPageData { DAChartSeriesItem stateItem = null; DAChartSeriesItem apiItem = null; if (!(event instanceof ThreadPageSyncDataEvent)) { - System.out.println("error : createChartItem"); + DA_LOG.error("createChartItem"); return -1; } ThreadPageSyncDataEvent syncEvent = (ThreadPageSyncDataEvent) event; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java index 6b1c52c..fb23cc3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataManager.java @@ -51,6 +51,7 @@ import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter; import org.tizen.dynamicanalyzer.ui.thread.ThreadPageData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -62,6 +63,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class ThreadPageSyncDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private DAChartBoard board; private List rows = new ArrayList(); private List syncEventQueue = new ArrayList(); @@ -177,10 +180,10 @@ public class ThreadPageSyncDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushEvent(event); - System.out.println("error : sync parse - type = " + type); + DA_LOG.error("sync parse - type = " + type); break; default: - System.out.println("error : sync parse unknown - type = " + type); + DA_LOG.error("sync parse unknown - type = " + type); } } @@ -242,10 +245,10 @@ public class ThreadPageSyncDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushEvent(event); - System.out.println("error : sync parse - type = " + type); + DA_LOG.error("sync parse - type = " + type); break; default: - System.out.println("error : sync parse unknown - type = " + DA_LOG.error("sync parse unknown - type = " + type); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadData.java index 0549f85..1ad826e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadData.java @@ -34,11 +34,14 @@ import org.tizen.dynamicanalyzer.swap.model.data.ThreadData; import org.tizen.dynamicanalyzer.ui.thread.ThreadPageData; import org.tizen.dynamicanalyzer.ui.thread.ThreadPageDataEvent; import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncData; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class ThreadPageThreadData extends ThreadPageData { + private static final DALogger DA_LOG = DALogger.getInstance(); + private List syncs = new ArrayList(); private String StartTime; private String EndTime; @@ -66,7 +69,7 @@ public class ThreadPageThreadData extends ThreadPageData { protected int createChartItem(ThreadPageDataEvent event) { int ret = -1; if (!(event instanceof ThreadPageThreadDataEvent)) { - System.out.println("error : createChartItem"); + DA_LOG.error("createChartItem"); return ret; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java index c425aea..9faf516 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/thread/ThreadPageThreadDataManager.java @@ -59,6 +59,7 @@ import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncDataEvent; import org.tizen.dynamicanalyzer.ui.thread.sync.ThreadPageSyncDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -71,6 +72,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class ThreadPageThreadDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private DAChartBoard board; // ThreadChartView view; private boolean hasUpdate = false; @@ -356,7 +359,7 @@ public class ThreadPageThreadDataManager { try { tid = temp[j]; } catch (NumberFormatException nfe) { - System.out.println("error : parseLoad - tid parsing"); + DA_LOG.error("parseLoad - tid parsing"); break; } // if (null == findParentData(tid)) { @@ -398,7 +401,7 @@ public class ThreadPageThreadDataManager { try { tid = temp[j]; } catch (NumberFormatException nfe) { - System.out.println("error : parseLoad - tid parsing"); + DA_LOG.error("parseLoad - tid parsing"); break; } // if (null == findParentData(tid)) { @@ -515,7 +518,7 @@ public class ThreadPageThreadDataManager { pushEvent(event); break; default: - System.out.println("thread page err: unknown thread api type"); + DA_LOG.error("thread page err: unknown thread api type"); } } @@ -607,7 +610,7 @@ public class ThreadPageThreadDataManager { pushEvent(event); break; default: - System.out.println("thread page err: unknown thread api type"); + DA_LOG.error("thread page err: unknown thread api type"); } } @@ -632,7 +635,7 @@ public class ThreadPageThreadDataManager { parseTIZEN(log); break; default: - System.out.println("thread page err: unknown thread type"); + DA_LOG.error("thread page err: unknown thread type"); } hasUpdate = true; @@ -659,7 +662,7 @@ public class ThreadPageThreadDataManager { parseTIZEN(input); break; default: - System.out.println("thread page err: unknown thread type"); + DA_LOG.error("thread page err: unknown thread type"); } } } @@ -715,10 +718,10 @@ public class ThreadPageThreadDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushSyncEvent(event); - System.out.println("error : sync parse - type = " + type); + DA_LOG.error("error : sync parse - type = " + type); break; default: - System.out.println("error : sync parse unknown - type = " + type); + DA_LOG.error("error : sync parse unknown - type = " + type); } hasUpdate = true; } @@ -779,10 +782,10 @@ public class ThreadPageThreadDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushSyncEvent(event); - System.out.println("error : sync parse - type = " + type); + DA_LOG.debug("sync parse - type = " + type); break; default: - System.out.println("error : sync parse unknown - type = " + DA_LOG.error("sync parse unknown - type = " + type); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java index b0be205..a065ccd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceTable.java @@ -54,9 +54,12 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DAWindowingTableComposite; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; public class CallTraceTable extends DAWindowingTableComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + public CallTraceTable(Composite parent, int compStyle, int tableStyle) { super(parent, compStyle, tableStyle); setContextMenu(AnalyzerConstants.CONTEXT_TABLE_SOURCE | AnalyzerConstants.CONTEXT_TABLE_RANGE); @@ -120,7 +123,7 @@ public class CallTraceTable extends DAWindowingTableComposite { text.add(data.getReturn()); text.add(data.getLibName()); } else { - System.out.println("wrong log data in calltrace view"); + DA_LOG.debug("wrong log data in calltrace view"); continue; } // create DATableDataFormat diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java index 6951a63..e3b5f52 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java @@ -40,6 +40,7 @@ import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -49,6 +50,8 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; public class FileChart extends TimelineChart { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static class FDCountData { private int type; private double time; @@ -261,8 +264,7 @@ public class FileChart extends TimelineChart { } break; default: - System.out - .println("FileChart.java : wrong file api type");//$NON-NLS-1$ + DA_LOG.debug("wrong file api type");//$NON-NLS-1$ } getFileDataQ().remove(0); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java index b99ec37..96d27d6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java @@ -42,6 +42,7 @@ import org.tizen.dynamicanalyzer.ui.common.UIEventChartContextMenuItem; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.uievent.UIEventListDialog; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; @@ -51,6 +52,8 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuListener; public class UIEventChart extends TimelineChart { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static UIEventChart instance = null; private DAChartSeries touchEventSeries; @@ -179,7 +182,7 @@ public class UIEventChart extends TimelineChart { .getStatus())); break; default: - System.out.println("UIEventChart.java : event type error");//$NON-NLS-1$ + DA_LOG.error("event type error");//$NON-NLS-1$ return; } } catch (NumberFormatException ne) { @@ -297,7 +300,7 @@ public class UIEventChart extends TimelineChart { + logData.getInfo2(); break; default: - System.out.println("UIEventChart.java wrong gesture type");//$NON-NLS-1$ + DA_LOG.debug("wrong gesture type");//$NON-NLS-1$ } return info; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java index 5ad772f..10bf22e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java @@ -64,6 +64,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.logparser.CustomLogParser; import org.tizen.dynamicanalyzer.ui.timeline.logparser.DeviceLogParser; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; @@ -72,6 +73,7 @@ import org.tizen.dynamicanalyzer.widgets.chartBoard.IDAChartSeriesMaker; public class TimelineChartManager extends PageDataManager implements IDAChartSeriesMaker { + private static final DALogger DA_LOG = DALogger.getInstance(); private static TimelineChartManager instance = null; private boolean newCustomChart = false; @@ -378,7 +380,7 @@ public class TimelineChartManager extends PageDataManager implements IDAChartSer } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } private void makeSystemDataTableData(Logs systemLogs, Logs memoryLogs) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java index 7b8bada..e2e84bd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java @@ -50,6 +50,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; @@ -60,6 +61,8 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class TimelineView extends DAViewComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + private final DAChartBoard chartBoard; private final TimelineChartManager timelineChartManager = TimelineChartManager @@ -160,7 +163,7 @@ public class TimelineView extends DAViewComposite { @Override public void updateView() { if (ToolbarArea.getInstance() == null) { - System.out.println("toolbar area is null");//$NON-NLS-1$ + DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java index 279c567..dde5924 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/logparser/CustomLogParser.java @@ -40,10 +40,13 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.timeline.chart.UserCustomChart; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeries; import org.tizen.dynamicanalyzer.widgets.chart.DAChartSeriesItem; public class CustomLogParser { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String API_NAME_CREATE_CHART = "da_create_chart"; //$NON-NLS-1$ private static final String API_NAME_CREATE_SERIES = "da_create_series"; //$NON-NLS-1$ private static final String API_NAME_CREATE_DEFAULT_SERIES = "da_create_default_series"; //$NON-NLS-1$ @@ -91,8 +94,7 @@ public class CustomLogParser { UserCustomChart chart = (UserCustomChart) chartManager .getChartInstance(chartType); if (chart == null) { - System.out - .println("CustomLogParser.java : unrecognized chart handle"); //$NON-NLS-1$ + DA_LOG.debug("unrecognized chart handle"); //$NON-NLS-1$ return; } @@ -105,8 +107,7 @@ public class CustomLogParser { } Color seriesColor = getCustomColor(colorIndex); if (seriesColor == null) { - System.out - .println("CustomLogParser.java : undefined custom color"); //$NON-NLS-1$ + DA_LOG.debug("undefined custom color"); //$NON-NLS-1$ return; } @@ -119,7 +120,7 @@ public class CustomLogParser { UserCustomChart chart = (UserCustomChart) chartManager .getChartInstance(chartType); if (chart == null) { - System.out.println("unrecognized chart handle"); //$NON-NLS-1$ + DA_LOG.debug("unrecognized chart handle"); //$NON-NLS-1$ return; } 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 1bc3ff7..cfca76c 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 @@ -37,12 +37,15 @@ import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.model.data.LifeCycleLogData; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; import org.tizen.dynamicanalyzer.widgets.lifecycle.LifecycleBar; import org.tizen.dynamicanalyzer.widgets.lifecycle.LifecycleData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class LifecycleLogParser { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static LifecycleLogParser instance = null; private static final int API_ID_INITIALIZING = 3; @@ -83,23 +86,27 @@ public class LifecycleLogParser { String text; if (apiId == API_ID_INITIALIZING) { + DA_LOG.performance("TEST", "App Lifecycle", "Initializing"); colorTop = ColorResources.LIFECYCLE_INITIALIZING_TOP; colorBottom = ColorResources.LIFECYCLE_INITIALIZING_BOTTOM; text = TimelineChartLabels.LIFECYCLE_INITIALIZING; } else if (apiId == API_ID_RUNNING) { + DA_LOG.performance("TEST", "App Lifecycle", "Running"); colorTop = ColorResources.LIFECYCLE_RUNNING_TOP; colorBottom = ColorResources.LIFECYCLE_RUNNING_BOTTOM; text = TimelineChartLabels.LIFECYCLE_RUNNING; } else if (apiId ==API_ID_PAUSING) { + DA_LOG.performance("TEST", "App Lifecycle", "Pausing"); colorTop = ColorResources.LIFECYCLE_PAUSING_TOP; colorBottom = ColorResources.LIFECYCLE_PAUSING_BOTTOM; text = TimelineChartLabels.LIFECYCLE_PAUSING; } else if (apiId == API_ID_TERMINATING) { + DA_LOG.performance("TEST", "App Lifecycle", "Terminating"); colorTop = ColorResources.LIFECYCLE_TERMINATING_TOP; colorBottom = ColorResources.LIFECYCLE_TERMINATING_BOTTOM; text = TimelineChartLabels.LIFECYCLE_TERMINATING; } else { - System.out.println("LifecycleLogParser.java : lifecycle log error"); //$NON-NLS-1$ + DA_LOG.error("lifecycle log error"); //$NON-NLS-1$ return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java index 5360fc4..89994a9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ConfigureManager.java @@ -47,8 +47,10 @@ import org.tizen.dynamicanalyzer.model.DeviceInfo; import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public class ConfigureManager { + private static final DALogger DA_LOG = DALogger.getInstance(); // default value private static final int DEFAULT_THEME = 1; @@ -305,6 +307,12 @@ public class ConfigureManager { ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC, Long.toString(AnalyzerConstants.SYSTEM_INFOMATION_SAMPLING_PERIODIC)); } + if (null == data + .get(ConfigureLabels.INTERNAL_LOG_LEVEL)) { + data.put( + ConfigureLabels.INTERNAL_LOG_LEVEL, + Long.toString(DALogger.DEBUG)); + } } private void initConfigDataFromFile() { @@ -315,7 +323,7 @@ public class ConfigureManager { File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { if (!configFolder.mkdirs()) { - System.out.println("config directory create failed..."); + DA_LOG.debug("config directory create failed..."); return; } } @@ -346,6 +354,8 @@ public class ConfigureManager { } setCheckDefaultConfigData(); setConfigDataToFile(); + // set log level +// DA_LOG.setLogLevel(getValueInt(ConfigureLabels.INTERNAL_LOG_LEVEL)); } private void setConfigDataToFile() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java index 3227dd0..ae28aa2 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java @@ -55,6 +55,7 @@ import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -63,7 +64,8 @@ import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; import org.tizen.dynamicanalyzer.widgets.da.base.DAText; public class SaveAsDialog extends DAMessageBox { - + private static final DALogger DA_LOG = DALogger.getInstance(); + private int MAX_SAVE_FILE_NAME_LENGTH = 35; private DAText textBox = null; @@ -162,7 +164,7 @@ public class SaveAsDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - System.out.println("save file name is null"); + DA_LOG.debug("save file name is null"); return false; } else { textBox.setText(saveFileName); @@ -257,7 +259,7 @@ public class SaveAsDialog extends DAMessageBox { File sourceFolder = new File(sourcePath); if (!sourceFolder.isDirectory()) { if (!sourceFolder.mkdirs()) { - System.out.println("source directory create failed..."); + DA_LOG.debug("source directory create failed..."); return false; } } @@ -265,7 +267,7 @@ public class SaveAsDialog extends DAMessageBox { File targetFolder = new File(targetPath); if (!targetFolder.isDirectory()) { if (!targetFolder.mkdirs()) { - System.out.println("target directory create failed..."); + DA_LOG.debug("target directory create failed..."); return false; } } @@ -275,10 +277,10 @@ public class SaveAsDialog extends DAMessageBox { AnalyzerManager.removeFromProjectList(sourcePath); if (success) { // add snapshot model update - System.out.println("save complete!!"); //$NON-NLS-1$ + DA_LOG.debug("save complete!!"); //$NON-NLS-1$ } else { - System.out.println("save fail..."); //$NON-NLS-1$ + DA_LOG.debug("save fail..."); //$NON-NLS-1$ return false; } return true; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java index 32bc0b5..72f7971 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/StartProcessManager.java @@ -6,10 +6,13 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; public class StartProcessManager implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static StartProgressDialog dialog = null; private static int count = 1; private static boolean canceled = false; @@ -72,7 +75,7 @@ public class StartProcessManager implements Runnable { @Override public void run() { count = 10; - System.out.println("appinfo : " + DA_LOG.debug("appinfo : " + AnalyzerManager.isProcessInfoArrived() + "is exit :" + AnalyzerManager.isExit()); while ((!AnalyzerManager.isExit()) && (canceled == false)) { @@ -101,6 +104,7 @@ public class StartProcessManager implements Runnable { } } stopProgress(); + DA_LOG.performance("TEST", "Start Trace", "Start Process Manager"); } public boolean isCancelled() { 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 e793a9e..bdf03c8 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 @@ -37,8 +37,11 @@ import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.swap.logparser.SWAPLogParser; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; import org.tizen.dynamicanalyzer.uirecorder.UIRecorderTool; +import org.tizen.dynamicanalyzer.util.DALogger; public class StopLogProcessor implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static Thread stopLogProcessThread = null; private static int count = 0; @@ -65,6 +68,7 @@ public class StopLogProcessor implements Runnable { @Override public void run() { + DA_LOG.performance("TEST", "DA end", "Run stop log process thread", DALogger.testState.START); Project project = AnalyzerManager.getProject(); int percent = 0; @@ -103,11 +107,10 @@ public class StopLogProcessor implements Runnable { StopProcessManager.getInstance().setValue(percent); /* save Project */ - System.out.println(" save project and others..."); //$NON-NLS-1$ + DA_LOG.debug(" save project and others..."); //$NON-NLS-1$ if (null == project || !project.isValid()) { - System.out - .println("project temp save is fail : project is not valid"); //$NON-NLS-1$ + DA_LOG.debug("project temp save is fail : project is not valid"); //$NON-NLS-1$ } else { project.setLastTime(ToolbarArea.getInstance().getTime()); SqlManager.getInstance().insertProject(); @@ -122,7 +125,7 @@ public class StopLogProcessor implements Runnable { SqlManager.getInstance().saveApiNames(); SqlManager.getInstance().closeConnection(); - System.out.println("insert to db complete..."); //$NON-NLS-1$ + DA_LOG.debug("insert to db complete..."); //$NON-NLS-1$ percent += 10; StopProcessManager.getInstance().setValue(percent); @@ -134,6 +137,7 @@ public class StopLogProcessor implements Runnable { @Override public void run() { StopProcessManager.getInstance().stopTrace(); + DA_LOG.performance("TEST", "DA end", "Run stop log process thread", DALogger.testState.END); } }); @@ -145,6 +149,8 @@ public class StopLogProcessor implements Runnable { ToolbarArea.getInstance().setSettingsButtonEnablement(true); } }); + + DA_LOG.performance("TEST", DALogger.testState.END); count--; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java index b3e9ed2..679ad1b 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java @@ -64,6 +64,7 @@ import org.tizen.dynamicanalyzer.ui.widgets.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.widgets.TitleComboRenderer; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; @@ -75,7 +76,8 @@ import org.tizen.dynamicanalyzer.widgets.timer.TimerClock; import org.tizen.sdblib.IDevice; public class ToolbarArea { - + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final int START_BUTTON = 0; public static final int SAVE_BUTTON = 1; public static final int OPEN_BUTTON = 2; @@ -483,8 +485,10 @@ public class ToolbarArea { setSaveButtonEnable(false); ShortCutManager.getInstance().setEnabled(true); + DA_LOG.performance("TEST", "Start Trace", "Check valid application"); return; } + DA_LOG.performance("TEST", "Start Trace", "Check valid application"); Display.getDefault().syncExec(new Runnable() { @Override @@ -495,6 +499,7 @@ public class ToolbarArea { }); AnalyzerUtil.changePage(TimelinePage.pageID); + DA_LOG.performance("TEST", "Start Trace", "Change to the Timeline page"); AnalyzerManager.setRunningState(true); processCombo.initCombo(); processCombo.add(ALL_PROCESS); @@ -1118,7 +1123,7 @@ public class ToolbarArea { private boolean checkValidApplication() { List devices = DACommunicator.getDevices(); if (null == devices || devices.isEmpty()) { - System.out.println("Device is empty"); + DA_LOG.debug("Device is empty"); return false; } String selectedDevice = deviceCombo.getText(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java index a5716b8..e8f12bf 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/BinarySettingsPage.java @@ -63,6 +63,7 @@ import org.tizen.dynamicanalyzer.swap.platform.ui.DeviceExplorer.DeviceExplorerD import org.tizen.dynamicanalyzer.swap.platform.ui.FileExplorer.FileExplorerDialog; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -70,6 +71,8 @@ import org.tizen.dynamicanalyzer.widgets.da.base.WarningDialog; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; public class BinarySettingsPage extends DAPageComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final String ID = BinarySettingsPage.class.getName(); public static final int RADIO_CURRENT = 1; @@ -248,7 +251,7 @@ public class BinarySettingsPage extends DAPageComposite { File settingFolder = new File(settingPath); if (!settingFolder.exists() || !settingFolder.isDirectory()) { if (!settingFolder.mkdirs()) { - System.out.println("setting directory create failed..."); + DA_LOG.debug("setting directory create failed..."); } } @@ -379,7 +382,7 @@ public class BinarySettingsPage extends DAPageComposite { binData.setUserSourcePath(source); } - System.out.println("update complete!"); + DA_LOG.debug("update complete!"); } public void doClose() { @@ -409,10 +412,10 @@ public class BinarySettingsPage extends DAPageComposite { if (success) { // add snapshot model update - System.out.println("binary settings auto save success!!"); //$NON-NLS-1$ + DA_LOG.debug("binary settings auto save success!!"); //$NON-NLS-1$ } else { - System.out.println("binary settings auto save fail..."); //$NON-NLS-1$ + DA_LOG.debug("binary settings auto save fail..."); //$NON-NLS-1$ } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java index 1e57f24..efa5045 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialog.java @@ -47,6 +47,7 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -55,6 +56,8 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class ConfigurationDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static boolean opened = false; private DACustomButton applyButton = null; private DACustomButton okButton = null; @@ -140,7 +143,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - System.out.println("shell disposed!"); //$NON-NLS-1$ + DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } @@ -214,7 +217,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - System.out.println("binary settings show"); + DA_LOG.debug("binary settings show"); cancelButton.setText(WidgetLabels.CLOSE); FormData data = (FormData) okButton.getLayoutData(); data.width = 0; @@ -230,7 +233,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - System.out.println("binary settings hide"); + DA_LOG.debug("binary settings hide"); cancelButton.setText(WidgetLabels.CANCEL); FormData data = (FormData) okButton.getLayoutData(); data.width = 100; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java index a52bac4..e3434be 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogDataManager.java @@ -42,9 +42,12 @@ import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; public class ConfigurationDialogDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static ConfigurationDialogDataManager instance = null; private DAMessageBox configDlg = null; @@ -315,7 +318,7 @@ public class ConfigurationDialogDataManager { .equals(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC)) { value = AnalyzerConstants.SYSTEM_INFOMATION_SAMPLING_PERIODIC; } else { - System.out.println("undefine feature : " + featureName); + DA_LOG.debug("undefine feature : " + featureName); } } featuresValueHashMap.put(featureName, new ConfigurationDialogData( @@ -445,7 +448,7 @@ public class ConfigurationDialogDataManager { long configFileStatus = mConfig.getValueLong(featureName); if (featuresStatus != configFileStatus) { if (apply) { - System.out.println("change values : " + featureName); + DA_LOG.debug("change values : " + featureName); } isChangeValue = true; } @@ -497,7 +500,7 @@ public class ConfigurationDialogDataManager { long configFileStatus = mConfig.getValueLong(featureName); if (featuresStatus != configFileStatus) { if (apply) { - System.out.println("change values : " + featureName); + DA_LOG.debug("change values : " + featureName); } isChangeValue = true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java index 93f8ae6..42c4c65 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceDialog.java @@ -66,6 +66,7 @@ import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -73,6 +74,8 @@ import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; public class OpenTraceDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static boolean opened = false; public static int SAVE_FOLDER = 0; public static int TEMP_FOLDER = 1; @@ -125,7 +128,7 @@ public class OpenTraceDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - System.out.println("shell disposed!"); //$NON-NLS-1$ + DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } @@ -487,7 +490,7 @@ public class OpenTraceDialog extends DAMessageBox { grid.remove(index); } else { // log for debug - System.out.println("delete save file failed..."); //$NON-NLS-1$ + DA_LOG.debug("delete save file failed..."); //$NON-NLS-1$ } updateDetails(); updateOKButtonStatus(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java index 6b9bb58..9c5f990 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/opentrace/OpenTraceInputReader.java @@ -38,8 +38,10 @@ import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; import org.tizen.dynamicanalyzer.swap.logparser.Logs; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; +import org.tizen.dynamicanalyzer.util.DALogger; public class OpenTraceInputReader implements Runnable { + private static final DALogger DA_LOG = DALogger.getInstance(); private static Thread openTraceInputThread = null; @@ -88,7 +90,7 @@ public class OpenTraceInputReader implements Runnable { // last = p.getProfileLogCount(); // createPackage(last, DataChannelConstants.MSG_DATA_SAMPLE); - System.out.println("input reader complete"); //$NON-NLS-1$ + DA_LOG.debug("input reader complete"); //$NON-NLS-1$ AnalyzerManager.setLogParsingComplete(true); // end } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java index 72144b2..1564fc5 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java @@ -54,6 +54,7 @@ import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -61,6 +62,7 @@ import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; public class RepalyEditSaveDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); public int MAX_SAVE_FILE_NAME_LENGTH = 35; @@ -160,7 +162,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - System.out.println("save file name is null"); + DA_LOG.debug("save file name is null"); return false; } else { textBox.setText(saveFileName); @@ -256,7 +258,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { File sourceFolder = new File(sourcePath); if (!sourceFolder.isDirectory()) { if (!sourceFolder.mkdirs()) { - System.out.println("source directory create failed..."); + DA_LOG.debug("source directory create failed..."); return false; } } @@ -264,7 +266,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { File targetFolder = new File(targetPath); if (!targetFolder.isDirectory()) { if (!targetFolder.mkdirs()) { - System.out.println("target directory create failed..."); + DA_LOG.debug("target directory create failed..."); return false; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialog.java index f85df62..9fe498d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialog.java @@ -45,12 +45,15 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox; public class ReplayEditDialog extends DAMessageBox { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static boolean opened = false; private DACustomButton cancelButton = null; //private DATabComposite tabView = null; @@ -100,7 +103,7 @@ public class ReplayEditDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - System.out.println("shell disposed!"); //$NON-NLS-1$ + DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java index 104a276..eac86fd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditSnapShopTableCellRenderer.java @@ -40,8 +40,11 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.ScreenshotConstants; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; +import org.tizen.dynamicanalyzer.util.DALogger; public class ReplayEditSnapShopTableCellRenderer extends DefaultCellRenderer { + private static final DALogger DA_LOG = DALogger.getInstance(); + int leftMargin = 4; int rightMargin = 4; int textTopMargin = 1; @@ -102,12 +105,12 @@ public class ReplayEditSnapShopTableCellRenderer extends DefaultCellRenderer { err.printStackTrace(); img = ImageResources.NO_IMAGE; } catch (SWTException e) { - System.out.println("Wait for receiving image : " + path); + DA_LOG.debug("Wait for receiving image : " + path); img = ImageResources.NO_IMAGE; } if (img.isDisposed()) { - System.out.println("before set image : disposed"); + DA_LOG.debug("before set image : disposed"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java index a001f50..d8c9184 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/UIDataManager.java @@ -41,8 +41,10 @@ import org.tizen.dynamicanalyzer.swap.model.data.SceneData; import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListDataChecker; import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingDataChecker; import org.tizen.dynamicanalyzer.ui.userinterface.scene.UISceneDataChecker; +import org.tizen.dynamicanalyzer.util.DALogger; public class UIDataManager extends PageDataManager { + private static final DALogger DA_LOG = DALogger.getInstance(); private static UIDataManager instance = null; @@ -96,7 +98,7 @@ public class UIDataManager extends PageDataManager { } /* log for debug */ - System.out.println(getName() + " thread end!!"); //$NON-NLS-1$ + DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ } public void clear() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java index e509847..9450f37 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListDataChecker.java @@ -33,8 +33,10 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.swap.model.data.ControlData; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingData; +import org.tizen.dynamicanalyzer.util.DALogger; public class UIControlListDataChecker { + private static final DALogger DA_LOG = DALogger.getInstance(); private List controlList = null; private List removeCallControlList = null; @@ -63,7 +65,7 @@ public class UIControlListDataChecker { || stClassName.contains("RemoveAllControl")) {//$NON-NLS-1$ return; } else { - System.out.println("wrong type log : " + stClassName.trim()); + DA_LOG.debug("wrong type log : " + stClassName.trim()); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java index cf6c21c..ccb54e7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingDataChecker.java @@ -45,9 +45,11 @@ import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.Formatter; public class UIFunctionProfilingDataChecker { + private static final DALogger DA_LOG = DALogger.getInstance(); List profilingList; static private TreeSet userInterfaceFunctionTree = new TreeSet(); @@ -297,7 +299,7 @@ public class UIFunctionProfilingDataChecker { String sourcePath = PathManager.getTizenHeaderPath(isArm, platform); File sourceFolder = new File(sourcePath); if (!sourceFolder.exists() && !sourceFolder.isDirectory()) { - System.out.println("Not Found the tizen_header_file folder : " + DA_LOG.debug("Not Found the tizen_header_file folder : " + sourcePath); return; } @@ -418,12 +420,12 @@ public class UIFunctionProfilingDataChecker { String configFileName = AnalyzerConstants.USER_INTERFACE_API_LIST_FILE_NAME; File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { - System.out.println("Not Exist UI API List Option Path "); + DA_LOG.debug("Not Exist UI API List Option Path "); return CommonConstants.EMPTY; } File apiListFile = new File(configFolder, configFileName); if (!apiListFile.isFile()) { - System.out.println("Not Exist UI API List Option File"); + DA_LOG.debug("Not Exist UI API List Option File"); return CommonConstants.EMPTY; } else { BufferedReader in = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboPopupRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboPopupRenderer.java index 0cdfeff..85fdb98 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboPopupRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboPopupRenderer.java @@ -34,9 +34,11 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboPopupRenderer; public class TitleComboPopupRenderer extends DACustomComboPopupRenderer { + private static final DALogger DA_LOG = DALogger.getInstance(); @Override public void draw(GC gc, Canvas canvas, int state, List rects, @@ -44,8 +46,7 @@ public class TitleComboPopupRenderer extends DACustomComboPopupRenderer { int size = rects.size(); int itemSize = items.size(); if (size != itemSize) { - System.out - .println("invalid parameter in popup renderer : Rect size " + DA_LOG.debug("invalid parameter in popup renderer : Rect size " + size + "item size :" + itemSize); return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java index a04f4f7..9b43ffe 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java @@ -66,11 +66,13 @@ import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.FindDialog; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuListener; public abstract class DATableComposite extends Composite { + private static final DALogger DA_LOG = DALogger.getInstance(); protected static final int START_TIME = 0; protected static final int END_TIME = 1; @@ -314,7 +316,7 @@ public abstract class DATableComposite extends Composite { List dbColumnsName = new ArrayList(); if (null == this.columnNames || this.columnNames.length < 1) { - System.out.println("tableName is null"); + DA_LOG.debug("tableName is null"); } else { for (int i = 0; i < this.columnNames.length; i++) { dbColumnsName.add(this.columnNames[i]); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATreeComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATreeComposite.java index a5a6e4d..45ce731 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATreeComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATreeComposite.java @@ -38,8 +38,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.model.TreeInput; +import org.tizen.dynamicanalyzer.util.DALogger; public abstract class DATreeComposite extends DATableComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + List selSeqs = null; GridItem[] selections = null; int[] sels = null; @@ -86,8 +89,7 @@ public abstract class DATreeComposite extends DATableComposite { } else if (parent instanceof GridItem) { gridItem = new GridItem((GridItem) parent, SWT.NONE); } else { - System.out - .println("it is bug!! need debug - DATreeComposite makeTreeItem");//$NON-NLS-1$ + DA_LOG.debug("it is bug!! need debug - DATreeComposite makeTreeItem");//$NON-NLS-1$ return null; } // data diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java index 592a0bb..ce271c3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java @@ -55,8 +55,11 @@ import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.FindDialog; import org.tizen.dynamicanalyzer.util.CommonUtil; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; +import org.tizen.dynamicanalyzer.util.DALogger; public abstract class DAWindowingTableComposite extends DATableComposite { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String queryto_GetItemCount = "select count(*) from %s where %s"; private static final String queryto_GetLimitedItem = "select limit %s %s %s from %s where %s"; @@ -290,7 +293,7 @@ public abstract class DAWindowingTableComposite extends DATableComposite { } public void updateHScrollBar(int tableWidth) { - System.out.println("width : " + tableWidth); + DA_LOG.debug("width : " + tableWidth); hScrollbar.setMaximum(totalColumnSize); hScrollbar.setThumb(tableWidth); hScrollbar.setVisible(true); @@ -404,8 +407,7 @@ public abstract class DAWindowingTableComposite extends DATableComposite { } else if (object instanceof Long) { totalItemCount = ((Long) object).intValue(); } else { - System.out - .println("[ERR] result of item count query is not expected!!"); + DA_LOG.error("result of item count query is not expected!!"); totalItemCount = 0; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderPlayThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderPlayThread.java index 4d2b54f..3f6c56a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderPlayThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderPlayThread.java @@ -35,8 +35,11 @@ import org.tizen.dynamicanalyzer.common.ErrorCode; import org.tizen.dynamicanalyzer.common.HostResult; import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.constant.CommonConstants; +import org.tizen.dynamicanalyzer.util.DALogger; public class UIRecorderPlayThread extends Thread { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static final String FILTER_STRING = "ls:";//$NON-NLS-1$ private long readyTime = 100000; @@ -62,10 +65,10 @@ public class UIRecorderPlayThread extends Thread { ArrayList playDatas = xml.getPlayDatas(xmlFileName); try { - System.out.println("Replay event ready for app start!!"); + DA_LOG.debug("Replay event ready for app start!!"); Thread.sleep(readyTime); } catch (InterruptedException e) { - System.out.println("Replay start!!"); + DA_LOG.debug("Replay start!!"); } for (XmlData data : playDatas) { if (AnalyzerManager.isExit() || !AnalyzerManager.isRunning()) { @@ -77,7 +80,7 @@ public class UIRecorderPlayThread extends Thread { } catch (NumberFormatException e) { e.printStackTrace(); } catch (InterruptedException e) { - System.out.println("UI recorder play thread exit by interrupt"); + DA_LOG.debug("UI recorder play thread exit by interrupt"); break; } @@ -92,7 +95,7 @@ public class UIRecorderPlayThread extends Thread { HostResult result = DACommunicator .handleControlMessage(replayEvent); if (result.isSuccess()) { - System.out.println("replay message ack :" + DA_LOG.debug("replay message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); @@ -104,7 +107,7 @@ public class UIRecorderPlayThread extends Thread { try { int errno = Integer .parseInt(splitResult[ErrorCode.ERROR_NUMBER_INDEX]); - System.out.println(ErrorCode.getError(errno) + DA_LOG.error(ErrorCode.getError(errno) .getMessage()); } catch (NumberFormatException e) { e.printStackTrace(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderRecordThread.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderRecordThread.java index a39198b..9d34667 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderRecordThread.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderRecordThread.java @@ -31,8 +31,11 @@ import java.util.ArrayList; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.util.DALogger; public class UIRecorderRecordThread extends Thread { + private static final DALogger DA_LOG = DALogger.getInstance(); + ArrayList recordDatas; private static RecordingQueue recordQueue = null; @@ -51,7 +54,7 @@ public class UIRecorderRecordThread extends Thread { break; } - System.out.println("record data : " + record); + DA_LOG.debug("record data : " + record); recordData = xml.setEvent(record, coolbarArea.getTime() / 1000); if (null != recordData) { @@ -62,7 +65,7 @@ public class UIRecorderRecordThread extends Thread { } } xml.createXml(AnalyzerManager.getProject().getSavePath()); - System.out.println("create xml file..."); + DA_LOG.debug("create xml file..."); end = true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderTool.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderTool.java index 27e9a12..bce201c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderTool.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/uirecorder/UIRecorderTool.java @@ -28,8 +28,11 @@ package org.tizen.dynamicanalyzer.uirecorder; import org.tizen.dynamicanalyzer.common.AnalyzerManager; +import org.tizen.dynamicanalyzer.util.DALogger; public class UIRecorderTool { + private static final DALogger DA_LOG = DALogger.getInstance(); + private static UIRecorderTool instance; private UIRecorderRecordThread recordThread; private UIRecorderPlayThread playThread; @@ -72,23 +75,23 @@ public class UIRecorderTool { if (recordThread != null && recordThread.isAlive()) { try { sendNotify(); - System.out.println("record thread join wait!"); + DA_LOG.debug("record thread join wait!"); recordThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); } catch (InterruptedException e) { e.printStackTrace(); - System.out.println("record thread join interrupted!"); + DA_LOG.debug("record thread join interrupted!"); } recordThread = null; } if (playThread != null && playThread.isAlive()) { try { playThread.interrupt(); - System.out.println("replay thread join wait!"); + DA_LOG.debug("replay thread join wait!"); playThread.join(AnalyzerManager.THREAD_JOIN_WAIT_TIME); - System.out.println("replay thread join successed!"); + DA_LOG.debug("replay thread join successed!"); } catch (InterruptedException e) { e.printStackTrace(); - System.out.println("play thread join interrupted!"); + DA_LOG.debug("play thread join interrupted!"); } playThread = null; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java index 7a49679..8c71c50 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -64,12 +64,15 @@ import org.tizen.dynamicanalyzer.swap.channel.data.ProcessInfoPackage; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite; public class AnalyzerUtil { + private static final DALogger DA_LOG = DALogger.getInstance(); + // FIXME start private static TimelineView timelineComposite; @@ -114,8 +117,7 @@ public class AnalyzerUtil { if (sourceLocation.isDirectory()) { if (!targetLocation.exists()) { if (!targetLocation.mkdir()) { - System.out - .println("Copy Failed : target directory create failed.."); + DA_LOG.debug("Copy Failed : target directory create failed.."); return; } } @@ -383,7 +385,7 @@ public class AnalyzerUtil { retStr = CommonConstants.HEX_PREFIX + Long.toHexString(lValue).toUpperCase(); } else { - System.out.println("Input type error!!"); + DA_LOG.error("Input type error!!"); retStr = value.toString(); } return retStr; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java index 9c8d3fd..f6e859e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java @@ -35,8 +35,11 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketConstants; +import org.tizen.dynamicanalyzer.util.DALogger; public class JsonUtil { + private static final DALogger DA_LOG = DALogger.getInstance(); + public static final String CMD_SCREENDUMP = "screendump"; public static final String CMD_EXECUTE = "execute"; public static final String CMD_ARGS = "arguments"; @@ -47,15 +50,15 @@ public class JsonUtil { public static JSONObject decodeObject(String message) { JSONObject obj = null; if (null == message) { - System.out.println("decodeObject - message string is null."); + DA_LOG.debug("decodeObject - message string is null."); return obj; } try { obj = (JSONObject) parser.parse(message); } catch (ParseException e) { e.printStackTrace(); - System.out.println("[info] position: " + e.getPosition()); - System.out.println("[info] " + e.toString()); + DA_LOG.info("position: " + e.getPosition()); + DA_LOG.info(e.toString()); } return obj; } @@ -63,21 +66,21 @@ public class JsonUtil { public static JSONArray decodeArray(String message) { JSONArray obj = null; if (null == message) { - System.out.println("decodeArray - message string is null."); + DA_LOG.debug("decodeArray - message string is null."); return obj; } try { obj = (JSONArray) parser.parse(message); } catch (ParseException e) { - System.out.println("[info] position: " + e.getPosition()); - System.out.println("[info] " + e.toString()); + DA_LOG.info("position: " + e.getPosition()); + DA_LOG.info(e.toString()); } return obj; } public static String decodeString(String message) { if (null == message) { - System.out.println("decodeArray - message string is null."); + DA_LOG.debug("decodeArray - message string is null."); return null; } JSONObject obj = decodeObject(message);