From 7c8183fb82716d09cb6f59ea456f8ac1e5f384fd Mon Sep 17 00:00:00 2001 From: "seokgil.kang" Date: Fri, 15 Aug 2014 17:29:48 +0900 Subject: [PATCH] LOG : change DALogger to the Logger Change-Id: I26941ca77535c8524a13b8ad1d7dbfcd01204428 Signed-off-by: seokgil.kang --- .../widgets/da/view/DATabComposite.java | 6 +- .../widgets/da/view/TabButtonRenderer.java | 7 +- .../org/tizen/dynamicanalyzer/util/ByteUtil.java | 7 +- .../util/{DALogger.java => InternalLogger.java} | 146 +++++++++++--------- .../src/org/tizen/dynamicanalyzer/util/Logger.java | 148 +++++++++++++++++++++ .../tizen/dynamicanalyzer/util/UnsignedInt.java | 9 +- .../toggle/DACustomToggleButtonRenderer.java | 8 +- .../dynamicanalyzer/widgets/chart/DAChart.java | 8 +- .../widgets/chart/DAChartRenderer.java | 6 +- .../widgets/combo/DACustomCombo.java | 16 +-- .../widgets/combo/DACustomComboPopupRenderer.java | 6 +- .../widgets/combo/DACustomComboRenderer.java | 6 +- .../dynamicanalyzer/widgets/progress/Progress.java | 6 +- .../dynamicanalyzer/widgets/timer/TimerClock.java | 6 +- .../dynamicanalyzer/common/path/PathConstants.java | 1 + .../dynamicanalyzer/common/path/PathManager.java | 9 ++ .../dynamicanalyzer/workbench/Application.java | 77 +++++------ .../workbench/SingletonFocusManager.java | 10 +- .../dynamicanalyzer/common/AnalyzerManager.java | 12 +- .../dynamicanalyzer/common/AnalyzerPlugin.java | 14 +- .../dynamicanalyzer/common/AutoStartManager.java | 28 ++-- .../tizen/dynamicanalyzer/common/HostResult.java | 7 +- .../common/PostWindowOpenCallback.java | 6 +- .../dynamicanalyzer/common/SymbolManager.java | 8 +- .../communicator/Communicator22.java | 40 +++--- .../communicator/CommunicatorUtils.java | 36 +++-- .../communicator/DACommunicator.java | 24 ++-- .../communicator/IDECommunicator.java | 42 +++--- .../database/SqlConnectionManager.java | 36 +++-- .../handlers/OpenTraceCompleteHandler.java | 8 +- .../dynamicanalyzer/handlers/OpenTraceHandler.java | 10 +- .../listeners/AnalyzerPerspectiveListener.java | 12 +- .../listeners/TableTooltipListener.java | 4 +- .../dynamicanalyzer/logparser/InsertLogQueue.java | 6 +- .../tizen/dynamicanalyzer/logparser/LogParser.java | 14 +- .../tizen/dynamicanalyzer/logparser/LogQueue.java | 6 +- .../dynamicanalyzer/logparser/MessageProcess.java | 12 +- .../org/tizen/dynamicanalyzer/project/AppInfo.java | 32 +++-- .../project/FunctionNameManager.java | 8 +- .../org/tizen/dynamicanalyzer/project/Project.java | 14 +- .../shortcut/ShortCutKeyBindingHandler.java | 46 +++---- .../org/tizen/dynamicanalyzer/sql/SqlManager.java | 99 +++++++------- .../swap/callstack/BaseCallstackManager.java | 6 +- .../swap/callstack/SWAPCallStackManager.java | 5 +- .../swap/channel/data/BasicDataMessage.java | 8 +- .../swap/communicator/Communicator30.java | 64 +++++---- .../swap/communicator/HeartBeatThread.java | 6 +- .../dynamicanalyzer/swap/logparser/LogQueue.java | 6 +- .../swap/logparser/MessageParser.java | 28 ++-- .../swap/logparser/PageDataManager.java | 8 +- .../swap/logparser/SWAPLogParser.java | 18 ++- .../dynamicanalyzer/swap/model/data/ArgsInfo.java | 6 +- .../dynamicanalyzer/swap/model/data/LogData.java | 8 +- .../swap/model/data/ProfileData.java | 5 +- .../swap/model/data/SystemData.java | 4 +- .../swap/platform/BinarySettingManager.java | 34 +++-- .../ui/DeviceExplorer/DADeviceExplorer.java | 6 +- .../platform/ui/DeviceExplorer/DeviceExplorer.java | 16 +-- .../swap/platform/ui/ExplorerUtil.java | 7 +- .../platform/ui/FileExplorer/DAFileExplorer.java | 16 +-- .../swap/platform/ui/LoadSettingDialog.java | 6 +- .../swap/platform/ui/SaveSettingDialog.java | 10 +- .../ui/common/TimelineChartMouseEventListener.java | 8 +- .../ui/common/TimelineChartMouseTrackAdapter.java | 6 +- .../dynamicanalyzer/ui/file/FileApiListView.java | 6 +- .../dynamicanalyzer/ui/file/FileChartView.java | 5 +- .../ui/file/manager/FileChartDataMaker.java | 12 +- .../ui/info/callstack/CallStackManager.java | 7 +- .../ui/info/callstack/CallStackUnit.java | 6 +- .../ui/info/callstack/CallstackTable.java | 8 +- .../ui/info/screenshot/EmulatorScreenshot.java | 6 +- .../ui/info/screenshot/ImageViewer.java | 8 +- .../ui/info/screenshot/MessageSender.java | 6 +- .../dynamicanalyzer/ui/info/screenshot/MsgMgr.java | 6 +- .../ui/info/screenshot/SocketClient.java | 13 +- .../ui/info/screenshot/SocketMessage.java | 8 +- .../ui/info/screenshot/SocketReceive.java | 10 +- .../dynamicanalyzer/ui/kernel/CallFlowChart.java | 6 +- .../ui/kernel/data/KernelDataMaker.java | 20 ++- .../ui/network/data/NetworkDataMaker.java | 15 +-- .../ui/opengl/data/GLStateDBTableManager.java | 4 +- .../ui/opengl/data/GLStateDataMaker.java | 5 +- .../tizen/dynamicanalyzer/ui/page/BaseView.java | 16 +-- .../dynamicanalyzer/ui/page/UpdateViewTimer.java | 6 +- .../ui/summary/SummaryDataManager.java | 3 - .../ui/summary/failed/FailedApiDataMaker.java | 3 - .../ui/summary/failed/FailedApiTable.java | 8 +- .../ui/summary/leaks/LeakDataMaker.java | 3 - .../ui/summary/leaks/LeakTable.java | 10 +- .../ui/summary/leaks/NewLeakDetector.java | 1 - .../ui/summary/profiling/ProfileDataMaker.java | 14 +- .../ui/summary/warning/WarningDataMaker.java | 3 - .../ui/thread/sync/ThreadPageSyncData.java | 6 +- .../ui/thread/sync/ThreadPageSyncDataManager.java | 12 +- .../ui/thread/thread/ThreadPageThreadData.java | 6 +- .../thread/thread/ThreadPageThreadDataManager.java | 24 ++-- .../ui/timeline/chart/CPUChart.java | 4 +- .../ui/timeline/chart/EnergyChart.java | 4 +- .../timeline/common/TimelineEditItemsDialog.java | 6 +- .../ui/timeline/common/TimelineView.java | 6 +- .../ui/timeline/logparser/CustomLogParser.java | 10 +- .../ui/timeline/logparser/LifecycleLogParser.java | 26 ++-- .../dynamicanalyzer/ui/toolbar/AboutDialog.java | 8 +- .../ui/toolbar/ConfigureManager.java | 11 +- .../ui/toolbar/ProcessExplorer.java | 6 +- .../dynamicanalyzer/ui/toolbar/SaveAsDialog.java | 14 +- .../ui/toolbar/StartProcessManager.java | 8 +- .../ui/toolbar/StopLogProcessor.java | 18 +-- .../dynamicanalyzer/ui/toolbar/ToolbarArea.java | 12 +- .../toolbar/configuration/BinarySettingsPage.java | 14 +- .../toolbar/configuration/ConfigurationDialog.java | 10 +- .../ConfigurationDialogDataManager.java | 10 +- .../ui/toolbar/opentrace/OpenTraceDialog.java | 8 +- .../ui/toolbar/opentrace/OpenTraceInputReader.java | 6 +- .../toolbar/replayEditor/RepalyEditSaveDialog.java | 10 +- .../ui/toolbar/replayEditor/ReplayEditDialog.java | 6 +- .../ReplayEditSnapShopTableCellRenderer.java | 8 +- .../ui/toolbar/replayEditor/ReplayEditTable.java | 5 +- .../control/UIControlListDataChecker.java | 6 +- .../profiling/UIFunctionProfilingDataChecker.java | 10 +- .../ui/widgets/table/DATableComposite.java | 6 +- .../ui/widgets/table/DATreeComposite.java | 6 +- .../tizen/dynamicanalyzer/utils/AnalyzerUtil.java | 10 +- .../utils/DownloadContentfileManager.java | 6 +- .../org/tizen/dynamicanalyzer/utils/JsonUtil.java | 18 ++- .../org/tizen/dynamicanalyzer/utils/RpmUtil.java | 10 +- 126 files changed, 893 insertions(+), 942 deletions(-) rename org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/{DALogger.java => InternalLogger.java} (80%) create mode 100644 org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/Logger.java 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 d77de5a..64272a4 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 @@ -53,13 +53,11 @@ import org.tizen.dynamicanalyzer.appearance.DesignConstants; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -508,7 +506,7 @@ public class DATabComposite extends DABaseComposite { int index = children.indexOf(tab); DATabButton button = buttons.get(index); if (null == tab || null == button) { - DA_LOG.debug("tab create bug!!"); // for log //$NON-NLS-1$ + Logger.debug("tab create bug!!"); // for log //$NON-NLS-1$ return; } diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java index a1559d9..5d9d49d 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java @@ -36,13 +36,12 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Display; import org.tizen.dynamicanalyzer.resources.ColorResources; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; import org.tizen.dynamicanalyzer.widgets.button.IDACustomButtonRenderer; public class TabButtonRenderer implements IDACustomButtonRenderer { - protected static final DALogger DA_LOG = DALogger.getInstance(); public int computeFontSize(Rectangle rect) { if (rect.height > 20) { @@ -117,10 +116,10 @@ public class TabButtonRenderer implements IDACustomButtonRenderer { } gc.drawImage(img, x, y); } else { - DA_LOG.error("Image can not be null to draw button image!"); + Logger.error("Image can not be null to draw button image!"); } } else { - DA_LOG.error("ButtonAttribute can not be null to draw button image!"); + Logger.error("ButtonAttribute can not be null to draw button image!"); } } diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java index 92bc609..c76a462 100755 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java @@ -31,7 +31,6 @@ import java.util.List; import org.tizen.dynamicanalyzer.model.Streamable; public class ByteUtil { - private static final DALogger DA_LOG = DALogger.getInstance(); public static byte EOS = '\0'; @@ -436,7 +435,7 @@ public class ByteUtil { } public static void printByteArrayForStart(byte[] input) { - DA_LOG.debug(" ====---- print byte array start----===="); + Logger.debug(" ====---- print byte array start----===="); int line = 0; for (int i = 0; i < input.length; i++, line++) { String b = String.format("%2x", input[i]); @@ -445,10 +444,10 @@ public class ByteUtil { System.out.print(" "); } if (line == 19) { - DA_LOG.debug(); + Logger.debug(); line = -1; } } - DA_LOG.debug(" ====---- print byte array end----===="); + Logger.debug(" ====---- print byte array end----===="); } } diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java similarity index 80% rename from org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java rename to org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java index b76935b..4903698 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/DALogger.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/InternalLogger.java @@ -40,12 +40,12 @@ import java.util.List; import org.tizen.common.core.application.InstallPathConfig; import org.tizen.dynamicanalyzer.util.CommonUtil; -public class DALogger { +public class InternalLogger { public enum testState { START, END }; - private static DALogger instance; + private static InternalLogger instance; public final static int ERROR = 0; public final static int WARNING = 1; @@ -54,10 +54,13 @@ public class DALogger { public final static int DEBUG = 4; public final static int PERFORMANCE = 5; - private final static String separator = " | "; + private final static String SEPARATOR = " | "; private final static int PERFORMANCE_TEST_COUNT = 20; + private final static String TABSPACE = "\t"; + private final static String NEWLINE = "\n"; - private int logLevel; // INFO(release), DEBUG(develop), PERFORMANCE(test) + private int logLevel; // INFO(release), DEBUG & CHECK(develop), PERFORMANCE(test) +// private String userKey = null; private SimpleDateFormat dateFormat; private File outputFile = null; @@ -65,7 +68,7 @@ public class DALogger { private BufferedWriter bufWriter = null; private PrintWriter printWriter = null; - private String performanceSaveFilename = "DA_Autotest_Result.xsd"; + private String defaultSaveFilename = "DA_Autotest_Result.xsd"; // for performance test private HashMap> startTimeMap; @@ -75,57 +78,55 @@ public class DALogger { private HashMap> subThreadStartTimeMap; private HashMap subThreadStartCountMap; - public DALogger() { + public InternalLogger() { init(); } - public synchronized static DALogger getInstance() { + public synchronized static InternalLogger getInstance() { if(instance == null) { - instance = new DALogger(); + instance = new InternalLogger(); } return instance; } private void init() { // TODO : logLevel setting (temporary hard coding) - logLevel = DEBUG; +// 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) { + public boolean checkLevel(int currentLogLevel) { + if (this.logLevel >= currentLogLevel) { return true; } else { return false; } } - private boolean openWriter() { + private boolean openWriter(String folderPath, String savefileName) { 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()); + File testFolderPath = new File(folderPath); if (!testFolderPath.exists()) { if (!testFolderPath.mkdir()) { - System.out.println("test folder create failed..."); + System.out.println("failed to create test folder..."); return false; } } + StringBuilder savePath = new StringBuilder(folderPath); savePath.append(File.separator); - savePath.append(performanceSaveFilename); + if (savefileName == null) { + savePath.append(defaultSaveFilename); + } else { + savePath.append(savefileName); + } outputFile = new File(savePath.toString()); @@ -148,7 +149,11 @@ public class DALogger { printWriter = null; } - private void printLog(int logType, Object msg) { + public void printLog() { + System.out.println(); + } + + public void printLog(int logType, Object msg) { if (logType == PERFORMANCE) { if (printWriter == null) { return; @@ -156,8 +161,6 @@ public class DALogger { printWriter.println(msg); printWriter.checkError(); - // for test -// System.out.println(msg); } else { StringBuilder logMsg = new StringBuilder(); switch (logType) { @@ -181,11 +184,13 @@ public class DALogger { } logMsg.append(dateFormat.format(new Date())); - logMsg.append(separator); - logMsg.append(getCallerInfo()); + logMsg.append(SEPARATOR); + if (logType != ERROR) + logMsg.append(getCallerInfo()); logMsg.append(String.valueOf(msg)); if (logType == ERROR) { + logMsg.append(getCallstackInfo()); System.err.println(logMsg); } else { System.out.println(logMsg); @@ -193,26 +198,37 @@ public class DALogger { } } +// public void printLog(int logType, String userKey, Object msg) { +// if (this.userKey.equals(userKey)) { +// printLog(logType, msg); +// } else { +// return; +// } +// } + 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; } + private String getCallstackInfo() { + String callstackMsg = NEWLINE; + StackTraceElement[] trace = new Throwable().getStackTrace(); + + for (int i = 3; i < trace.length; i++) { + StackTraceElement elt = trace[i]; + callstackMsg += new String(TABSPACE + elt.toString() + NEWLINE); + } + + return callstackMsg; + } + public void error(Object logMessage) { if (checkLevel(ERROR)) { printLog(ERROR, logMessage); @@ -293,22 +309,22 @@ public class DALogger { } } - 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 folderPath, testState state) { +// if (checkLevel(PERFORMANCE)) { +// switch (state) { +// case START: +// performanceStart(key, folderPath); +// break; +// case END: +// performanceEnd(key); +// break; +// default: +// break; +// } +// } else { +// return; +// } +// } public void performance(String key, String testStep, String description) { if (checkLevel(PERFORMANCE)) { @@ -341,9 +357,9 @@ public class DALogger { } } - private void performanceStart(String key) { + public void performanceStart(String folderPath, String savefileName, String key) { if (printWriter == null) { - if (!openWriter()) { + if (!openWriter(folderPath, savefileName)) { // failed to init() return; } @@ -382,7 +398,7 @@ public class DALogger { printLog(PERFORMANCE, msg); } - private String performanceNormal(String key, String description) { + public String performanceNormal(String key, String description) { String msg = null; long nanoTime = System.nanoTime(); @@ -411,7 +427,7 @@ public class DALogger { return msg; } - private void performanceEnd(String key) { + public void performanceEnd(String key) { long nanoTime = System.nanoTime(); Integer count = testCountMap.get(key); @@ -437,7 +453,7 @@ public class DALogger { } } - private void performanceSubThreadStart(String description) { + public void performanceSubThreadStart(String description) { long nanoTime = System.nanoTime(); Integer count = subThreadStartCountMap.get(description); @@ -451,7 +467,7 @@ public class DALogger { } } - private String performanceSubThreadEnd(String key, String testStep, String description) { + public String performanceSubThreadEnd(String key, String testStep, String description) { String msg = null; long nanoTime = System.nanoTime(); @@ -499,14 +515,14 @@ public class DALogger { } msg.append(dateFormat.format(new Date())); - msg.append(separator); + msg.append(SEPARATOR); msg.append(getCallerInfo()); msg.append(logMessage); return msg; } - private CharSequence makeTestLog(String testStep, String message) { + public CharSequence makeTestLog(String testStep, String message) { StringBuilder msg = new StringBuilder(); msg.append(" + * 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.util; + +public class Logger { + private static InternalLogger instance; // InternalLogger + private static boolean isLogOn = true; + + public static void init(int logLevel) { + instance = InternalLogger.getInstance(); + instance.setLogLevel(logLevel); + // check path + } + + public static void error(Object logMessage) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.ERROR)) return; + instance.printLog(InternalLogger.ERROR, logMessage); + } + +// public static void error(String userKey, Object logMessage) { +// if (instance.checkLevel(InternalLogger.ERROR)) { +// instance.printLog(InternalLogger.ERROR, userKey, logMessage); +// } else { +// return; +// } +// } + + public static void error() { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.ERROR)) return; + instance.printLog(); + } + + public static void warning(Object logMessage) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.WARNING)) return; + instance.printLog(InternalLogger.WARNING, logMessage); + } + + public static void warning() { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.WARNING)) return; + instance.printLog(); + } + + public static void info(Object logMessage) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.INFO)) return; + instance.printLog(InternalLogger.INFO, logMessage); + } + + public static void info() { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.INFO)) return; + instance.printLog(); + } + + public static void check(Object logMessage) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.CHECK)) return; + instance.printLog(InternalLogger.CHECK, logMessage); + } + + public static void check() { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.CHECK)) return; + instance.printLog(); + } + + public static void debug(Object logMessage) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.DEBUG)) return; + instance.printLog(InternalLogger.DEBUG, logMessage); + } + + public static void debug() { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.DEBUG)) return; + instance.printLog(); + } + + public static void performanceStart(String folderPath, String savefileName, String key) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.PERFORMANCE)) return; + instance.performanceStart(folderPath, savefileName, key); + } + + public static void performance(String key, String testStep, String description) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.PERFORMANCE)) return; + String msg = instance.performanceNormal(key, description); + if (msg == null) return; + instance.printLog(InternalLogger.PERFORMANCE, instance.makeTestLog(testStep, msg)); + } + + public static void performanceEnd(String key) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.PERFORMANCE)) return; + instance.performanceEnd(key); + } + + public static void performanceSubThreadStart(String key, String testStep, String description) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.PERFORMANCE)) return; + instance.performanceSubThreadStart(description); + } + + public static void performanceSubThreadEnd(String key, String testStep, String description) { + if (!isLogOn) return; + if (!instance.checkLevel(InternalLogger.PERFORMANCE)) return; + String msg = instance.performanceSubThreadEnd(key, testStep, description); + if (msg == null) return; + instance.printLog(InternalLogger.PERFORMANCE, instance.makeTestLog(testStep, msg)); + } + + public static void setLogOn(boolean flag) { + isLogOn = flag; + } + +// public static void setUserKey(String userKey) { +// instance.setUserKey(userKey); +// } +} diff --git a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java index 1d3bce5..fc9a37a 100644 --- a/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.util; -import org.tizen.dynamicanalyzer.util.DALogger; public class UnsignedInt { private static final long MAX_VALUE = (long)Integer.MAX_VALUE * 2 + 1; @@ -44,7 +43,7 @@ public class UnsignedInt { public UnsignedInt(long value) { if (value > MAX_VALUE || value < MIN_VALUE) { - DALogger.getInstance().error("Invalid input : " + value + ". 0 will be set."); + Logger.error("Invalid input : " + value + ". 0 will be set."); this.value = 0; } else { this.value = value; @@ -74,7 +73,7 @@ public class UnsignedInt { private void add(long operand) { long temp = this.value + operand; if (temp > MAX_VALUE) { - DALogger.getInstance().error("exceed Max unsigned int size : " + temp); + Logger.error("exceed Max unsigned int size : " + temp); throw new RuntimeException("Overflow occured"); } this.value = temp; @@ -83,7 +82,7 @@ public class UnsignedInt { private void minus(long operand) { long temp = this.value - operand; if (temp < MIN_VALUE) { - DALogger.getInstance().error("result is a negative : " + temp); + Logger.error("result is a negative : " + temp); throw new RuntimeException("Underflow occured"); } this.value = temp; @@ -92,7 +91,7 @@ public class UnsignedInt { private void multiply(long operand) { long temp = this.value * operand; if (temp > MAX_VALUE) { - DALogger.getInstance().error("exceed Max unsigned int size : " + temp); + Logger.error("exceed Max unsigned int size : " + temp); throw new RuntimeException("Overflow occured"); } this.value = temp; diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java index 13f22ae..52f7ba1 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java @@ -32,14 +32,12 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; public class DACustomToggleButtonRenderer extends DACustomButtonRenderer { - private static final DALogger DA_LOG = DALogger.getInstance(); - @Override public void draw(GC gc, Canvas canvas, int state, DACustomButtonAttribute attr) { @@ -82,13 +80,13 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer { if (width > 0) { x = width / 2; } else { - DA_LOG.debug("width size : " + width); //$NON-NLS-1$ + Logger.debug("width size : " + width); //$NON-NLS-1$ } if (height > 0) { y = height / 2; } else { - DA_LOG.debug("height size : " + height); //$NON-NLS-1$ + Logger.debug("height size : " + height); //$NON-NLS-1$ } } else { x = p.x; 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 a5a318b..d0fd4ff 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 @@ -43,12 +43,10 @@ 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.util.Logger; 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; @@ -267,14 +265,14 @@ public class DAChart extends Canvas { } break; case SWT.MouseEnter: - DA_LOG.debug("MouseEnter"); + Logger.debug("MouseEnter"); if (null != plot) { Shell shell = parent.getShell(); DAChartTooltip.getInstance().open(shell, plot); } break; case SWT.MouseExit: - DA_LOG.debug("MouseExit"); + Logger.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 c484f15..3eb6e51 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 @@ -38,7 +38,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.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; @@ -46,8 +46,6 @@ 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; @@ -220,7 +218,7 @@ public class DAChartRenderer { drawStateAreaSeries(gc, series, i, seriesList.size()); break; default: - DA_LOG.debug("Undefined series style"); + Logger.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 9d5201a..3ea7863 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 @@ -52,7 +52,7 @@ 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.util.Logger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; @@ -60,8 +60,6 @@ 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; @@ -172,7 +170,7 @@ public class DACustomCombo extends Canvas { @Override public void selectionEvent(DACustomCombo combo) { - DA_LOG.debug("default selection" + combo.getText()); //$NON-NLS-1$ + Logger.debug("default selection" + combo.getText()); //$NON-NLS-1$ } }; @@ -390,7 +388,7 @@ public class DACustomCombo extends Canvas { } getRects().clear(); - DA_LOG.debug("rects clear and add new rects. count is :" + boundSize); + Logger.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, height); getRects().add(r); @@ -451,7 +449,7 @@ public class DACustomCombo extends Canvas { itemIndex *= MAX_SIZE; index %= MAX_SIZE; } else if (index < 0) { - DA_LOG.debug("Combo indexing bug!"); + Logger.debug("Combo indexing bug!"); return false; } @@ -580,7 +578,7 @@ public class DACustomCombo extends Canvas { setForeground(attr.getColor(index)); setBackground(attr.getColor(index + 1)); } else { - DA_LOG.debug("DACustomCombo drawType : " + state); + Logger.debug("DACustomCombo drawType : " + state); } } @@ -647,7 +645,7 @@ public class DACustomCombo extends Canvas { public void setImages(Image normal, Image hover, Image push, Image disable) { if (null == normal || null == hover || null == push || null == disable) { - DA_LOG.debug("DACustomCombo setImages parameter is null"); + Logger.debug("DACustomCombo setImages parameter is null"); return; } attr.setImage(STATE_NORMAL, normal); @@ -913,7 +911,7 @@ public class DACustomCombo extends Canvas { childShell.close(); childShell = null; } else { - DA_LOG.debug("combo timer bug : try close child shell "); + Logger.debug("combo timer bug : try close child shell "); } } }); diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java index eda6daa..bc6065c 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupRenderer.java @@ -34,20 +34,18 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; import org.tizen.dynamicanalyzer.widgets.helper.FontResources; public class DACustomComboPopupRenderer implements IDACustomComboPopupRenderer { - private static final DALogger DA_LOG = DALogger.getInstance(); - @Override public void draw(GC gc, Canvas canvas, List rects, int selection, List items, Font font, Color itemFontColor) { int size = rects.size(); int itemSize = items.size(); if (size != itemSize) { - DA_LOG.debug("invalid parameter in popup renderer : Rect size " + Logger.debug("invalid parameter in popup renderer : Rect size " + size + "item size :" + itemSize); return; } // else normal case diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java index 4cd0f78..ab91331 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java @@ -35,17 +35,15 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Canvas; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonAttribute; import org.tizen.dynamicanalyzer.widgets.button.IDACustomButtonRenderer; import org.tizen.dynamicanalyzer.widgets.helper.ColorResources; import org.tizen.dynamicanalyzer.widgets.helper.FontResources; -import org.tizen.dynamicanalyzer.util.DALogger; public class DACustomComboRenderer implements IDACustomButtonRenderer { - private static final DALogger DA_LOG = DALogger.getInstance(); - public void draw(GC gc, Canvas combo, int state, DACustomButtonAttribute attr) { @@ -56,7 +54,7 @@ public class DACustomComboRenderer implements IDACustomButtonRenderer { || attr.getDrawType() == DACustomCombo.TYPE_GRADATION) { drawButton(gc, rect, state, attr); } else { - DA_LOG.debug("DACustomCombo drawType : " + state); + Logger.debug("DACustomCombo drawType : " + state); } } 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 50d0cd7..aefafb3 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 @@ -41,7 +41,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.util.Logger; import org.tizen.dynamicanalyzer.widgets.DAWidgetConstants; import org.tizen.dynamicanalyzer.widgets.animation.DAAnimationIcon; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -51,8 +51,6 @@ 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; public static final int PROGRESS_STYLE_CANCEL = 2; @@ -356,7 +354,7 @@ public class Progress extends Canvas { e.gc.setForeground(barOutlineColor); e.gc.drawRectangle(barRect); } else { - DA_LOG.debug("invalid progress style..."); //$NON-NLS-1$ + Logger.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 8cdc0ff..cc4f071 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,13 +42,11 @@ 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.util.Logger; 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; public String hour2; @@ -220,7 +218,7 @@ public class TimerClock extends Canvas { if (null != timer) { timer.cancel(); timer = null; - DA_LOG.debug("timer canceled!! "); //$NON-NLS-1$ + Logger.debug("timer canceled!! "); //$NON-NLS-1$ } } diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java index ed88872..222639a 100644 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathConstants.java @@ -22,6 +22,7 @@ public class PathConstants { public static final String ABOUT_FILE_NAME = "about.mappings"; //$NON-NLS-1$ public static final String SINGLETON_LOCK_FILE = "active_da";//$NON-NLS-1$ public static final String SINGLETON_PID_FILE = "active_pid";//$NON-NLS-1$ + public static final String TEST_FOLDER_NAME = "test";//$NON-NLS-1$ public static final String DA_DAEMON_NAME = "da_manager"; //$NON-NLS-1$ public static final String TOOL_RECORDER_NAME = "da_event"; //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java index c0048c1..2518416 100755 --- a/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java +++ b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/common/path/PathManager.java @@ -254,4 +254,13 @@ public class PathManager { return returnstr; } + + public static String getTestLogPath() { + String returnstr = null; + + returnstr = getTizenSdkDataPath(); + if (returnstr == null) return returnstr; + return returnstr + File.separator + PathConstants.DYNAMIC_ANALYZER_FOLDER_NAME + + File.separator + PathConstants.TEST_FOLDER_NAME; + } } 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 35a11df..cbfe1a8 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 @@ -53,12 +53,11 @@ import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.nl.WorkbenchLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.util.FileUtil; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.InternalLogger; 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; @@ -129,9 +128,35 @@ public class Application implements IApplication { dialog.open(); System.exit(-1); } + + // TODO : how to set log level? + Logger.init(InternalLogger.DEBUG); + + // for performance test + String[] argv = (String[]) context.getArguments().get("application.args");//$NON-NLS-1$ + String savefileName = null; + 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]); + savefileName = String.valueOf(argv[i+1]); + i++; + } + } - - DA_LOG.performance("TEST", DALogger.testState.START); + Logger.performanceStart(PathManager.getTestLogPath(), savefileName, "TEST"); // set log postfix SimpleDateFormat format = new SimpleDateFormat( @@ -148,7 +173,7 @@ public class Application implements IApplication { String logPath = PathManager.DA_LOG_PATH; File logs = new File(logPath); if (!logs.exists() && !logs.mkdirs()) { - DA_LOG.debug("Log directory create failed.. log file create failed..."); + Logger.debug("Log directory create failed.. log file create failed..."); } else { String logFileName = LOG_PREFIX + logPostFix;//$NON-NLS-1$ logPath += File.separator + logFileName; @@ -171,49 +196,13 @@ public class Application implements IApplication { // check for multiple instance of dynamic analyzer if (SingletonFocusManager.acquireSingleton()) { - DA_LOG.info("The First DA Running"); + Logger.info("The First DA Running"); SingletonFocusManager.saveSingletonPid(); } else { - DA_LOG.info("Already DA Running"); + Logger.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/SingletonFocusManager.java b/org.tizen.dynamicanalyzer.workbench/src/org/tizen/dynamicanalyzer/workbench/SingletonFocusManager.java index 12afffb..d62873c 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,11 +41,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class SingletonFocusManager { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static FileChannel singletonChannel = null; private static FileLock singletonLock = null; @@ -58,7 +56,7 @@ public class SingletonFocusManager { if (activator != null) { returnStr = new String[] { activator, strPid }; } else { - DA_LOG.error("Failed - not Support OS"); + Logger.error("Failed - not Support OS"); } } @@ -71,7 +69,7 @@ public class SingletonFocusManager { + PathConstants.SINGLETON_PID_FILE); if (!singletonFile.isFile()) { - DA_LOG.debug("Failed get pid - exist config file"); + Logger.debug("Failed get pid - exist config file"); } else { BufferedReader in = null; try { @@ -124,7 +122,7 @@ public class SingletonFocusManager { File daSaveFile = new File(saveFolderPath); if (!daSaveFile.isDirectory() && !daSaveFile.mkdirs()) { - DA_LOG.debug("da save file create failed..."); + Logger.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 63fa887..e888a61 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java @@ -57,15 +57,13 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; 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; @@ -144,9 +142,9 @@ public class AnalyzerManager { boolean success = AnalyzerUtil.deleteFile(new File(sourcePath)); if (success) { // logs for debug - DA_LOG.debug("invalid project deleted!"); //$NON-NLS-1$ + Logger.debug("invalid project deleted!"); //$NON-NLS-1$ } else { - DA_LOG.debug("invalid project delete fail..."); //$NON-NLS-1$ + Logger.debug("invalid project delete fail..."); //$NON-NLS-1$ } } } @@ -294,13 +292,13 @@ public class AnalyzerManager { if (!AnalyzerManager.isExit()) { Project project = new Project(); project.initForTrace(); - DA_LOG.performance("TEST", "Start Trace", + Logger.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"); + Logger.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 e3d0777..f0774d6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerPlugin.java @@ -37,12 +37,10 @@ import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; import org.tizen.dynamicanalyzer.listeners.AnalyzerPerspectiveListener; import org.tizen.dynamicanalyzer.sql.SqlManager; +import org.tizen.dynamicanalyzer.util.Logger; 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() { @@ -67,9 +65,9 @@ public class AnalyzerPlugin extends AbstractUIPlugin { File tempDir = new File(PathManager.DA_TEMP_FOLDER_PATH); if (tempDir.isDirectory() && tempDir.exists()) { if (AnalyzerUtil.deleteFile(tempDir)) { - DA_LOG.debug("Delete temp folder!"); //$NON-NLS-1$ + Logger.debug("Delete temp folder!"); //$NON-NLS-1$ } else { - DA_LOG.debug("Delete temp folder fail..."); //$NON-NLS-1$ + Logger.debug("Delete temp folder fail..."); //$NON-NLS-1$ } } } @@ -87,14 +85,14 @@ public class AnalyzerPlugin extends AbstractUIPlugin { File saveFolder = new File(PathManager.DA_TEMP_FOLDER_PATH); if (saveFolder.exists()) { if (AnalyzerUtil.deleteFile(saveFolder)) { - DA_LOG.debug("delete temp folder"); + Logger.debug("delete temp folder"); } else { - DA_LOG.debug("BUG: temp folder is already exists but failed to delete"); + Logger.debug("BUG: temp folder is already exists but failed to delete"); } } if (!saveFolder.isDirectory()) { if (!saveFolder.mkdirs()) { - DA_LOG.debug("save folder create failed..."); + Logger.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 index 1d6b1a0..7a09027 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java @@ -35,14 +35,12 @@ 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.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; 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; @@ -79,7 +77,7 @@ public class AutoStartManager implements Runnable { @Override public void run() { if (strMsg.length < MSG_LENGTH) { - DA_LOG.debug("wrong message format!!"); + Logger.debug("wrong message format!!"); return; } @@ -91,15 +89,15 @@ public class AutoStartManager implements Runnable { 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); - } +// final String resultPath = new String( +// strMsg[MSG_INDEX_RESULTPATH].trim()); +// +// if (!resultPath.isEmpty()) { +// Logger.setPerformanceSaveFilename(resultPath); +// } if (isOpenWelcomeDlg()) { - DA_LOG.debug("Start -AutoRun Waiting..."); + Logger.debug("Start -AutoRun Waiting..."); synchronized (getWaitingWelcomeDlg()) { try { getWaitingWelcomeDlg().wait(); @@ -107,10 +105,10 @@ public class AutoStartManager implements Runnable { e.printStackTrace(); } } - DA_LOG.debug("End - AutoRun Waiting"); + Logger.debug("End - AutoRun Waiting"); } - DA_LOG.debug("auto start : " + appid); + Logger.debug("auto start : " + appid); DeviceInfo device = DACommunicator.getDeviceByName(deviceName); GlobalInformation.setCurrentDeviceInfo(device); @@ -140,11 +138,11 @@ public class AutoStartManager implements Runnable { ToolbarArea.getInstance().setToolbarStartStopState(true); } }); - DA_LOG.debug("invalid application name :" + appid); + Logger.debug("invalid application name :" + appid); return; } final String appLabel = appInfo.getInfo(AppInfo.PROPERTY.LABEL.index); - DA_LOG.debug("IDE recv - deviceName: " + deviceName + Logger.debug("IDE recv - deviceName: " + deviceName + " appName : " + appLabel); ToolbarArea.getInstance().setDeviceComboText(deviceName); 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 f45d17a..bc2d50e 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/HostResult.java @@ -25,7 +25,8 @@ */ package org.tizen.dynamicanalyzer.common; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; + public enum HostResult { SUCCESS(0, "Success!"), @@ -75,8 +76,6 @@ public enum HostResult { ERR_DA_IS_EXIT(-901, "Dynamic Analyzer is closing"), ERR_UNDEFINED(-999, "Unknown error"); - - private static final DALogger DA_LOG = DALogger.getInstance(); private String message; private String method; @@ -210,7 +209,7 @@ public enum HostResult { public static HostResult printAndReturn(HostResult result) { result.setMethod(getMethodName(2) + "()"); - DA_LOG.debug(result.getMethod()); + Logger.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 ffaf43e..c459405 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PostWindowOpenCallback.java @@ -29,18 +29,16 @@ 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.Logger; 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"); + Logger.performance("TEST", "DA Start", "Welcome Dialog"); dialog.open(); } } 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 2b5c899..872fe55 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/SymbolManager.java @@ -63,11 +63,9 @@ import org.tizen.dynamicanalyzer.project.ProcessMemoryMap; import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.swap.model.data.ProfileData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class SymbolManager { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static Map> readerCache = new HashMap>(); private static Map> elfCache = new HashMap>(); @@ -321,7 +319,7 @@ public class SymbolManager { int length = mangled.trim().length(); length = (length > 128) ? 128 : length; demangled = mangled.trim().substring(0, length - 1); - DA_LOG.debug("demangling failed :" + mangled); //$NON-NLS-1$ + Logger.debug("demangling failed :" + mangled); //$NON-NLS-1$ } return demangled; } @@ -431,7 +429,7 @@ public class SymbolManager { if (null == functionName || functionName.isEmpty()) { functionName = InformationViewLabels.CALLSTACK_TABLE_UNKNOWN_FUNCTION; } else if (functionName.equals("_end")) { //$NON-NLS-1$) - DA_LOG.error("function name : _end occurred!\n"); + Logger.error("function name : _end occurred!\n"); functionName = InformationViewLabels.CALLSTACK_TABLE_UNKNOWN_FUNCTION; } else { String prevFunctionName = functionName; 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 c77341d..6ceaedc 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/Communicator22.java @@ -51,11 +51,9 @@ import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class Communicator22 extends BaseCommunicator { - private static final DALogger DA_LOG = DALogger.getInstance(); - protected int remotePort = -1; private Socket controlSock = null; private BufferedWriter controlWriter = null; @@ -81,7 +79,7 @@ public class Communicator22 extends BaseCommunicator { public HostResult startTrace() { HostResult result = connectionProcess(); if (!result.equals(HostResult.SUCCESS)) { - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); Display.getDefault().syncExec(new Runnable() { @Override public void run() { @@ -105,7 +103,7 @@ public class Communicator22 extends BaseCommunicator { /* Timeline */ UpdateViewTimer.start(); - DA_LOG.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); + Logger.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); result = HostResult.SUCCESS; result.setMessage("start trace"); } else { @@ -125,7 +123,7 @@ public class Communicator22 extends BaseCommunicator { HostResult result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - DA_LOG.debug("screenshot message ack :" + result.getMessage()); + Logger.debug("screenshot message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -184,11 +182,11 @@ public class Communicator22 extends BaseCommunicator { String message = AnalyzerConstants.MSG_START + CommonConstants.CMD_SPLIT + rearMessage.length() + CommonConstants.CMD_SPLIT + rearMessage; - DA_LOG.debug("Send message :" + message); //$NON-NLS-1$ + Logger.debug("Send message :" + message); //$NON-NLS-1$ HostResult result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - DA_LOG.debug("start message ack :" + result.getMessage()); + Logger.debug("start message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -207,11 +205,11 @@ public class Communicator22 extends BaseCommunicator { if (DACommunicator.isRunning()) { String message = AnalyzerConstants.MSG_STOP + CommonConstants.CMD_SPLIT + 0 + CommonConstants.CMD_SPLIT; - DA_LOG.debug("stop send message :" + message); + Logger.debug("stop send message :" + message); result = handleControlMessage(message); if (result.equals(HostResult.SUCCESS)) { - DA_LOG.debug("stop message ack :" + result.getMessage()); + Logger.debug("stop message ack :" + result.getMessage()); String[] splitResult = result.getMessage().split( CommonConstants.CMD_SPLIT_READ); if (AnalyzerConstants.MSG_OK.equals(splitResult[0])) { @@ -236,7 +234,7 @@ public class Communicator22 extends BaseCommunicator { controlWriter.flush(); } - DA_LOG.debug("wait for ack... [send message : " + message + " ]"); + Logger.debug("wait for ack... [send message : " + message + " ]"); while (DACommunicator.isRunning()) { char cbuf[] = new char[64]; blocked = true; @@ -276,9 +274,9 @@ public class Communicator22 extends BaseCommunicator { HostResult result = null; // step 1. check readelf and upload if (CommunicatorUtils.getReadelfSize() < 0) { - DA_LOG.debug("upload readelf"); + Logger.debug("upload readelf"); result = CommunicatorUtils.uploadReadElf(); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); if (!result.isSuccess()) { return result; } @@ -298,7 +296,7 @@ public class Communicator22 extends BaseCommunicator { // step 4. port foward result = CommunicatorUtils.foward(CommunicatorUtils.LOCAL_PORT, remotePort); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); if (!HostResult.SUCCESS.equals(result)) { return result; } @@ -311,14 +309,14 @@ public class Communicator22 extends BaseCommunicator { result = createControlSocket(CommunicatorUtils.LOCAL_PORT); if (!result.equals(HostResult.SUCCESS)) { DACommunicator.setRunning(false); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return result; } result = createDataSocket(CommunicatorUtils.LOCAL_PORT); if (!result.equals(HostResult.SUCCESS)) { DACommunicator.setRunning(false); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return result; } @@ -331,7 +329,7 @@ public class Communicator22 extends BaseCommunicator { controlSock = new Socket(CommonConstants.LOCAL_HOST, port); if (null == controlSock) { result = HostResult.ERR_CONTROL_SOCKET_CREATION_FAIL; - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return result; } @@ -346,7 +344,7 @@ public class Communicator22 extends BaseCommunicator { } catch (SocketTimeoutException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; result.setMessage(e.getMessage()); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); e.printStackTrace(); } catch (UnknownHostException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; @@ -366,7 +364,7 @@ public class Communicator22 extends BaseCommunicator { dataSock = new Socket(CommonConstants.LOCAL_HOST, port); if (null == dataSock) { result = HostResult.ERR_DATA_SOCKET_CREATION_FAIL; - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return result; } @@ -381,11 +379,11 @@ public class Communicator22 extends BaseCommunicator { new Thread(null, new ReceiveCommunicator(), AnalyzerConstants.COMMUNICATOR_RECEIVE_THREAD).start(); - DA_LOG.debug("Receive Thread start"); + Logger.debug("Receive Thread start"); } catch (SocketTimeoutException e) { result = HostResult.ERR_EXCEPTION_OCCURRED; result.setMessage(e.getMessage()); - DA_LOG.debug(result.toString()); + Logger.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 e72256b..d19bba9 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java @@ -47,7 +47,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.dynamicanalyzer.util.Logger; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IShellOutputReceiver; import org.tizen.sdblib.exception.SdbCommandRejectedException; @@ -61,8 +61,6 @@ 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 @@ -110,7 +108,7 @@ public class CommunicatorUtils { if (file.exists()) { readelfSize = file.length(); } else { - DA_LOG.debug("upload error! file is not exist : " + source); //$NON-NLS-1$ + Logger.debug("upload error! file is not exist : " + source); //$NON-NLS-1$ return HostResult.ERR_FILE_IS_NOT_EXISTS; } @@ -127,7 +125,7 @@ public class CommunicatorUtils { return HostResult.ERR_READELF_SIZE_GET_FAILED; } if (readelfSize != uploadSize) { - DA_LOG.debug("readelf file size is different!! "); //$NON-NLS-1$ + Logger.debug("readelf file size is different!! "); //$NON-NLS-1$ return HostResult.ERR_READELF_UPLOAD_FAILED; } return HostResult.printAndReturn(result); @@ -193,14 +191,14 @@ public class CommunicatorUtils { HostResult ret = HostResult.SUCCESS; SyncResult result = push(device, source, targetPath); if (null == result || !result.isOk()) { - DA_LOG.debug("upload to" + targetPath + " is failed! "); //$NON-NLS-1$ //$NON-NLS-2$ + Logger.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()); - DA_LOG.debug(ret.toString() + " : " + ret.getMessage()); //$NON-NLS-1$ + Logger.debug(ret.toString() + " : " + ret.getMessage()); //$NON-NLS-1$ } else { ret = HostResult.ERR_SDB_PUSH_FAILED; - DA_LOG.debug(ret.toString()); + Logger.debug(ret.toString()); } return ret; } @@ -327,32 +325,32 @@ public class CommunicatorUtils { Thread.sleep(50); } catch (InterruptedException e) { System.out.print("\n"); - DA_LOG.debug("Interrupt occurred - Getting port number"); + Logger.debug("Interrupt occurred - Getting port number"); break; } catch (SdbCommandRejectedException e) { System.out.print("\n"); - DA_LOG.debug("Maybe Sdb connection closed - Getting port number"); + Logger.debug("Maybe Sdb connection closed - Getting port number"); break; } catch (TimeoutException e) { System.out.print("\n"); - DA_LOG.debug("Timeout occured - Getting port number"); + Logger.debug("Timeout occured - Getting port number"); break; } catch (ShellCommandUnresponsiveException e) { System.out.print("\n"); - DA_LOG.debug("Shell command unresponsive - Getting port number"); + Logger.debug("Shell command unresponsive - Getting port number"); break; } catch (IOException e) { System.out.print("\n"); - DA_LOG.debug("IOExceoption - Getting port number"); + Logger.debug("IOExceoption - Getting port number"); break; } } System.out.print("\n"); if(remotePort < 0) { - DA_LOG.debug("!!port get failed!!"); + Logger.debug("!!port get failed!!"); } else { - DA_LOG.debug("!!port get success!! : " + remotePort); + Logger.debug("!!port get success!! : " + remotePort); } return remotePort; @@ -410,7 +408,7 @@ public class CommunicatorUtils { public static void unfoward(IDevice device, int local, int remote) { if (null != device && isOnline(device)) { try { - DA_LOG.debug("unfoward!!"); + Logger.debug("unfoward!!"); device.removeForward(local, remote); Thread.sleep(AnalyzerConstants.SOCKET_FORWARD_INTERVAL); } catch (TimeoutException e) { @@ -507,9 +505,9 @@ public class CommunicatorUtils { SyncResult res = CommunicatorUtils.pull(device, PathConstants.DA_API_MAP_PATH, apiFilePath); if (null != res && res.isOk()) { - DA_LOG.debug("api map copying success!!");//$NON-NLS-1$ + Logger.debug("api map copying success!!");//$NON-NLS-1$ } else { - DA_LOG.debug("Failed to get " + apiFilePath); //$NON-NLS-1$ + Logger.debug("Failed to get " + apiFilePath); //$NON-NLS-1$ return null; } @@ -518,7 +516,7 @@ public class CommunicatorUtils { File file = new File(apiFilePath); if (!file.exists()) { - DA_LOG.debug("file open failed..."); + Logger.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 952ae3f..89280e8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java @@ -55,7 +55,7 @@ import org.tizen.dynamicanalyzer.project.PackageInfo; import org.tizen.dynamicanalyzer.swap.communicator.Communicator30; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.IDeviceChangeListener; @@ -64,8 +64,6 @@ 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; @@ -88,7 +86,7 @@ public class DACommunicator { for (DeviceInfo device : devices) { HostResult result = device.initCommunicator(); if (!result.isSuccess()) { - DA_LOG.debug("init failed : " + device.getIDevice().getSerialNumber()); + Logger.debug("init failed : " + device.getIDevice().getSerialNumber()); } } } @@ -181,7 +179,7 @@ public class DACommunicator { } } } else { - DA_LOG.debug("sdbbridge is null!"); + Logger.debug("sdbbridge is null!"); } } @@ -210,7 +208,7 @@ public class DACommunicator { return HostResult.ERR_INVALID_VERSION; } else { version = checkVersionResult.get(0); - DA_LOG.debug("version :" + version); + Logger.debug("version :" + version); if (version.contains(DA_VERSION_SWAP)) { info.setTargetVersion(version); result = HostResult.SUCCESS; @@ -573,7 +571,7 @@ public class DACommunicator { } }); - DA_LOG.debug("device disconnected : " + device.getSerialNumber()); + Logger.debug("device disconnected : " + device.getSerialNumber()); DeviceInfo deviceInfo = getDeviceByName(device.getSerialNumber()); DeviceInfo selectedDevice = GlobalInformation.getCurrentDeviceInfo(); if (null != devices && !devices.isEmpty()) { @@ -584,7 +582,7 @@ public class DACommunicator { if (isRunning()) { if (selectedDevice.getIDevice().getSerialNumber() .equals(deviceInfo.getIDevice().getSerialNumber())) { - DA_LOG.debug("Disconnected while DA is running."); //$NON-NLS-1$ + Logger.debug("Disconnected while DA is running."); //$NON-NLS-1$ DACommunicator.setRunning(false); } } @@ -609,7 +607,7 @@ public class DACommunicator { } }); - DA_LOG.debug("device connected : " + device.getSerialNumber()); + Logger.debug("device connected : " + device.getSerialNumber()); // addDevice(device); if (!AnalyzerManager.isRunning()) { DeviceInfo devInfo = new DeviceInfo(device); @@ -648,7 +646,7 @@ public class DACommunicator { } }); - DA_LOG.debug("device changed : " + device.getSerialNumber() + " " + Logger.debug("device changed : " + device.getSerialNumber() + " " + changeMask); if (1 == changeMask) { if (!AnalyzerManager.isRunning()) { @@ -669,7 +667,7 @@ public class DACommunicator { }); } } else { - DA_LOG.debug("device changed type :" + changeMask); + Logger.debug("device changed type :" + changeMask); } Display.getDefault().syncExec(new Runnable() { @@ -748,9 +746,9 @@ public class DACommunicator { + PathManager.getLogPostFix();//$NON-NLS-1$ SyncResult res = CommunicatorUtils.pull(from, to); if (null != res && res.isOk()) { - DA_LOG.debug("daemon log copying success!!");//$NON-NLS-1$ + Logger.debug("daemon log copying success!!");//$NON-NLS-1$ } else { - DA_LOG.debug("Failed to get " + from); //$NON-NLS-1$ + Logger.debug("Failed to get " + from); //$NON-NLS-1$ } AnalyzerUtil 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 194b9e3..d659613 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java @@ -57,15 +57,13 @@ import org.tizen.dynamicanalyzer.project.AppInfo; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.RpmUtil; 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$ @@ -108,23 +106,23 @@ public class IDECommunicator implements Runnable { daServerSocket = setServePort(); // Server Bind if (daServerSocket != null) { if (savePortToFile() != true) { // Save Server port - DA_LOG.debug("failed Save Server port"); + Logger.debug("failed Save Server port"); errorMessageBox(); return; } if (setCheckFileLock() != true) { - DA_LOG.debug("failed socket File Lock"); + Logger.debug("failed socket File Lock"); errorMessageBox(); return; } while (true) { try { - DA_LOG.debug("Waiting IDE Client : " + ideClientSocketArray.size()); + Logger.debug("Waiting IDE Client : " + ideClientSocketArray.size()); lastCommunicationIdeSocket = daServerSocket.accept(); ideClientSocketArray.add(lastCommunicationIdeSocket); - DA_LOG.debug("Connected IDE : " + ideClientSocketArray.size()); + Logger.debug("Connected IDE : " + ideClientSocketArray.size()); } catch (IOException e) { e.printStackTrace(); errorMessageBox(); @@ -141,14 +139,14 @@ public class IDECommunicator implements Runnable { while (true) { try { in = clientSocket.getInputStream(); - DA_LOG.debug("IDE recvMessage Wait : " + Logger.debug("IDE recvMessage Wait : " + ideClientSocketArray.size()); readSize = in.read(receiveBuffer); if (readSize > 0) { lastCommunicationIdeSocket = clientSocket; parsingReceiveMessage(new String(receiveBuffer)); } else { - DA_LOG.debug("Disconnected IDE : " + Logger.debug("Disconnected IDE : " + ideClientSocketArray.size()); clientSocket.close(); ideClientSocketArray.remove(clientSocket); @@ -162,7 +160,7 @@ public class IDECommunicator implements Runnable { } }; acceptThread.start(); - DA_LOG.debug("Start IDE AcceptThread"); + Logger.debug("Start IDE AcceptThread"); } } } @@ -222,7 +220,7 @@ public class IDECommunicator implements Runnable { autoStartApplication(strMsg); } } else { - DA_LOG.debug(" wrong receive message ");//$NON-NLS-1$ + Logger.debug(" wrong receive message ");//$NON-NLS-1$ } } @@ -260,7 +258,7 @@ public class IDECommunicator implements Runnable { // trace Application private void autoStartApplication(String[] strMsg) { if (strMsg.length < MSG_DEFAULT_LENGTH) { - DA_LOG.debug("wrong message format!!"); + Logger.debug("wrong message format!!"); return; } ToolbarArea.getInstance().setToolbarStartStopState(false); @@ -276,7 +274,7 @@ public class IDECommunicator implements Runnable { } if (isOpenWelcomeDlg()) { - DA_LOG.debug("Start -AutoRun Waiting..."); + Logger.debug("Start -AutoRun Waiting..."); synchronized (getWaitingWelcomeDlg()) { try { getWaitingWelcomeDlg().wait((long) configurationWaitingTimeMs); @@ -284,10 +282,10 @@ public class IDECommunicator implements Runnable { e.printStackTrace(); } } - DA_LOG.debug("End - AutoRun Waiting"); + Logger.debug("End - AutoRun Waiting"); } - DA_LOG.debug("auto start : " + binaryOfTarget); + Logger.debug("auto start : " + binaryOfTarget); DeviceInfo device = DACommunicator.getDeviceByName(deviceName); GlobalInformation.setCurrentDeviceInfo(device); DACommunicator.getAppListFromTarget(); @@ -306,7 +304,7 @@ public class IDECommunicator implements Runnable { } final String appLabel = appInfo.getInfo(AppInfo.PROPERTY.LABEL.index); - DA_LOG.debug("IDE recv - deviceName: " + deviceName + " appName : " + Logger.debug("IDE recv - deviceName: " + deviceName + " appName : " + appLabel); Display.getDefault().syncExec(new Runnable() { @@ -356,15 +354,15 @@ public class IDECommunicator implements Runnable { if (libfilelist.size() > 0) { } else { - DA_LOG.error("there is no library in rpm for library tracing"); + Logger.error("there is no library in rpm for library tracing"); popupMessage("Library tracing cannot be started.\nLibrary is not found in rpm."); } } else { - DA_LOG.error("there is no main rpm for library tracing"); + Logger.error("there is no main rpm for library tracing"); popupMessage("Library tracing cannot be started.\nRpm is not found."); } } else { - DA_LOG.error("rpm package for library is not set"); + Logger.error("rpm package for library is not set"); } } else { // TODO : get appInfo from executable path @@ -388,7 +386,7 @@ public class IDECommunicator implements Runnable { ToolbarArea.getInstance().setToolbarStartStopState(true); } }); - DA_LOG.debug("invalid application name :" + appName); + Logger.debug("invalid application name :" + appName); } private void popupMessage(final String message) { @@ -425,11 +423,11 @@ public class IDECommunicator implements Runnable { serverSocket = getServerSocket(0); if (serverSocket != null) { serverPort = serverSocket.getLocalPort(); - DA_LOG.debug("IDE-DA Server port " + serverPort); //$NON-NLS-1$ + Logger.debug("IDE-DA Server port " + serverPort); //$NON-NLS-1$ return serverSocket; } else { - DA_LOG.debug("failed Set Serve Socket"); //$NON-NLS-1$ + Logger.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 5198282..0db2b15 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java @@ -40,11 +40,9 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class SqlConnectionManager { - private static final DALogger DA_LOG = DALogger.getInstance(); - // apply multi connection of DB private static final int CONNECTION_COUNT_UPDATE = 8; private static final int CONNECTION_COUNT_QUERY = 8; @@ -87,11 +85,11 @@ public class SqlConnectionManager { SQLWarning warning = conn.getWarnings(); while (warning != null) { - DA_LOG.debug("[DB][" + i + "] Message: " + Logger.debug("[DB][" + i + "] Message: " + warning.getMessage()); - DA_LOG.debug("[DB][" + i + "] SQL state: " + Logger.debug("[DB][" + i + "] SQL state: " + warning.getSQLState()); - DA_LOG.debug("[DB][" + i + "] Vendor code: " + Logger.debug("[DB][" + i + "] Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } @@ -105,11 +103,11 @@ public class SqlConnectionManager { SQLWarning warning = conn.getWarnings(); while (warning != null) { - DA_LOG.debug("[DB][" + i + "] Message: " + Logger.debug("[DB][" + i + "] Message: " + warning.getMessage()); - DA_LOG.debug("[DB][" + i + "] SQL state: " + Logger.debug("[DB][" + i + "] SQL state: " + warning.getSQLState()); - DA_LOG.debug("[DB][" + i + "] Vendor code: " + Logger.debug("[DB][" + i + "] Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } @@ -186,7 +184,7 @@ public class SqlConnectionManager { st.execute("SHUTDOWN"); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { - DA_LOG.debug("DB did not shutdown normally"); + Logger.debug("DB did not shutdown normally"); } } finally { CommonUtil.tryClose(st); @@ -305,7 +303,7 @@ public class SqlConnectionManager { int datasize = data.size(); int columnsize = columnType.size(); if (columnsize != questionCount) { - DA_LOG.error("column count of columnType is not matches!!"); + Logger.error("column count of columnType is not matches!!"); return; } @@ -344,7 +342,7 @@ public class SqlConnectionManager { } else if (columnType.get(i).equals( DBConstants.INTEGER)) { if (col == null) { - DA_LOG.error("Integer column data is null !!"); + Logger.error("Integer column data is null !!"); isPrepared = false; break; } else { @@ -353,7 +351,7 @@ public class SqlConnectionManager { } else if (columnType.get(i).equals( DBConstants.LONG)) { if (col == null) { - DA_LOG.error("Long column data is null !!"); + Logger.error("Long column data is null !!"); isPrepared = false; break; } else { @@ -362,14 +360,14 @@ public class SqlConnectionManager { } else if (columnType.get(i).equals( DBConstants.FLOAT)) { if (col == null) { - DA_LOG.error("[ERR] FLOAT column data is null !!"); + Logger.error("[ERR] FLOAT column data is null !!"); isPrepared = false; break; } else { prep.setFloat(i + 1, (Float) col); } } else { - DA_LOG.error("not supported DB column type!!"); + Logger.error("not supported DB column type!!"); isPrepared = false; break; } @@ -389,7 +387,7 @@ public class SqlConnectionManager { e.printStackTrace(); } } else { // column count is not equal - DA_LOG.error("column count is not equal !!"); + Logger.error("column count is not equal !!"); } } @@ -452,7 +450,7 @@ public class SqlConnectionManager { e.printStackTrace(); } } else { // column count is not equal - DA_LOG.error("column count is not equal !!"); + Logger.error("column count is not equal !!"); } } @@ -511,7 +509,7 @@ public class SqlConnectionManager { .contains(DBConstants.DBTYPE_INT1)) { rowData.add(Byte.valueOf(rs.getByte(i))); } else { - DA_LOG.error("undefined type : " + Logger.error("undefined type : " + rsMetaData.getColumnTypeName(i)); } } @@ -522,7 +520,7 @@ public class SqlConnectionManager { } catch (SQLSyntaxErrorException e) { String message = e.getMessage(); String state = e.getSQLState(); - DA_LOG.warning(message + " : state(" + state + ")"); + Logger.warning(message + " : state(" + state + ")"); } catch (SQLException e) { e.printStackTrace(); } finally { 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 852a6d4..7833fc0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceCompleteHandler.java @@ -33,12 +33,10 @@ 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.util.Logger; import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite; -public class OpenTraceCompleteHandler extends AbstractHandler { - private static final DALogger DA_LOG = DALogger.getInstance(); - +public class OpenTraceCompleteHandler extends AbstractHandler { public static String ID = OpenTraceCompleteHandler.class.getName(); @Override @@ -65,7 +63,7 @@ public class OpenTraceCompleteHandler extends AbstractHandler { page.updateView(); } }); - DA_LOG.debug("open trace complete!!"); //$NON-NLS-1$ + Logger.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 2317bc3..2037767 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java @@ -63,7 +63,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager; import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo; @@ -71,8 +71,6 @@ 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; @@ -161,7 +159,7 @@ public class OpenTraceHandler extends AbstractHandler { CallStackInserter.getInstance().getCallStackUnitTable() .getCallStackUnitsFromDB(); if (null == callStackUnits) { - DA_LOG.debug("failed - loadCallStackApis"); + Logger.debug("failed - loadCallStackApis"); isSuccess = false; } else { BaseCallstackManager callstackManager = AnalyzerManager @@ -212,7 +210,7 @@ public class OpenTraceHandler extends AbstractHandler { List> profilingDatas = FunctionUsageProfiler.getInstance() .getProfilingDataTable().getProfilingDataFromDB(); if (null == profilingDatas) { - DA_LOG.debug("failed - loadProfilingData"); + Logger.debug("failed - loadProfilingData"); isSuccess = false; } else { for (int i = 0; i < profilingDatas.size(); i++) { @@ -282,7 +280,7 @@ public class OpenTraceHandler extends AbstractHandler { List> profilingChilds = FunctionUsageProfiler.getInstance() .getProfilingChildDataTable().getProfilingChildDataFromDB(); if (null == profilingChilds) { - DA_LOG.debug("failed - loadProfilingChildData"); + Logger.debug("failed - loadProfilingChildData"); isSuccess = false; } else { for (int i = 0; i < profilingChilds.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 53fa97d..04e8dd7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/AnalyzerPerspectiveListener.java @@ -38,12 +38,10 @@ 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.util.Logger; 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 @@ -52,17 +50,17 @@ public class AnalyzerPerspectiveListener extends PerspectiveAdapter { if (!init) { ToolbarArea.getInstance().initToolbarEnablement(); - DA_LOG.performance("TEST", "DA Start", "Init Toolbar Enablement - Host launch"); + Logger.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"); + Logger.performance("TEST", "DA Start", "Device Connection"); BinarySettingManager.getInstance().initBinarySettings(); - DA_LOG.performance("TEST", "DA Start", "Target Binary Setting"); + Logger.performance("TEST", "DA Start", "Target Binary Setting"); IDECommunicator.startIDECommunicatorThread(); - DA_LOG.performance("TEST", "DA Start", "Start IDE Communicator"); + Logger.performance("TEST", "DA Start", "Start IDE Communicator"); ConfigurationDialogDataManager.getInstance() .updateFeaturesValueFromConfigureManager(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java index 5c4a8c1..ae10d77 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java @@ -68,7 +68,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; @@ -258,7 +258,7 @@ public class TableTooltipListener implements Listener { public void viewSource(int x, int y, SourceLine sl, boolean onViewSourceFromContext) { if (sl == null) { - DALogger.getInstance().warning("Input SourceLine is null."); + Logger.warning("Input SourceLine is null."); return; } 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 6c1302b..98982ab 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/InsertLogQueue.java @@ -32,13 +32,11 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.logparser.LogPackage; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; ; 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; @@ -58,7 +56,7 @@ public class InsertLogQueue { try { wait(); } catch (InterruptedException e) { - DA_LOG.debug("insert log queue interrupt called!!"); //$NON-NLS-1$ + Logger.debug("insert log queue interrupt called!!"); //$NON-NLS-1$ continue; } } 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 281c228..d56d3a8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogParser.java @@ -38,11 +38,9 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.util.ByteUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class LogParser implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static Thread logParser = null; private static boolean dropCallTraceLog = false; private static LogQueue logQueue = null; @@ -85,7 +83,7 @@ public class LogParser implements Runnable { logQueue.notifyAll(); } try { - DA_LOG.debug("wait for log parser join");//$NON-NLS-1$ + Logger.debug("wait for log parser join");//$NON-NLS-1$ logParser.join(AnalyzerConstants.THREAD_JOIN_WAIT_TIME); } catch (InterruptedException e) { e.printStackTrace(); @@ -107,7 +105,7 @@ public class LogParser implements Runnable { } /* log for debug */ - DA_LOG.debug("log parsing thread end!!"); //$NON-NLS-1$ + Logger.debug("log parsing thread end!!"); //$NON-NLS-1$ AnalyzerManager.setLogParsingComplete(true); if (!AnalyzerManager.isExit()) { @@ -386,7 +384,7 @@ public class LogParser implements Runnable { front = ByteUtil.getByte(pid, pcAddr, tid, cpuNum); } else { if (id == DataChannelConstants.MSG_PROBE_SCREENSHOT) { - DA_LOG.debug("debug "); + Logger.debug("debug "); } newLog = new String[10]; // api id @@ -411,7 +409,7 @@ public class LogParser implements Runnable { newLog[9] = CommonConstants.EMPTY; if (id == DataChannelConstants.MSG_PROBE_LIFECYCLE) { - DA_LOG.debug("life cycle"); + Logger.debug("life cycle"); } int apiId = FunctionNameManager.getFunctionId(newLog[0]); int pid = initIntPayload(newLog[1]); @@ -482,7 +480,7 @@ public class LogParser implements Runnable { result = ByteUtil.concatByteArray(front, rear); break; case DataChannelConstants.MSG_PROBE_NETWORK: - DA_LOG.debug("case AnalyzerConstants.MSG_PROBE_NETWORK"); + Logger.debug("case AnalyzerConstants.MSG_PROBE_NETWORK"); break; case DataChannelConstants.MSG_PROBE_GLES20: apiType = Integer.parseInt(input[LogCenterConstants.GL_API_TYPE_INDEX]); 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 1dbb3b7..aa6ae49 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogQueue.java @@ -31,12 +31,10 @@ import java.util.ArrayList; import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; /** 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; @@ -52,7 +50,7 @@ public class LogQueue { } wait(); } catch (InterruptedException e) { - DA_LOG.debug("log queue interrupt!!"); //$NON-NLS-1$ + Logger.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 71d4a99..4145247 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/MessageProcess.java @@ -45,12 +45,10 @@ import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.ui.toolbar.StopLogProcessor; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class MessageProcess { - private static final DALogger DA_LOG = DALogger.getInstance(); - final int MSG_ID_INDEX = 0; final int MSG_LENGTH_INDEX = 1; final int MSG_PAYLOAD_INDEX = 2; @@ -319,7 +317,7 @@ public class MessageProcess { } } } // end while() - DA_LOG.debug("Receive thread end!!"); + Logger.debug("Receive thread end!!"); Display.getDefault().asyncExec(new Runnable() { @Override public void run() { @@ -330,7 +328,7 @@ public class MessageProcess { }); endingSteps(); } catch (IOException e) { - DA_LOG.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ + Logger.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ Display.getDefault().asyncExec(new Runnable() { @Override @@ -347,7 +345,7 @@ public class MessageProcess { } private void endingSteps() { - DA_LOG.debug("Ending steps!"); + Logger.debug("Ending steps!"); message = null; DACommunicator.setRunning(false); // AnalyzerUtil.setRecordState(RecordStateSourceProvider.RECORD_READY); @@ -361,7 +359,7 @@ public class MessageProcess { }); stopTimer(); addBufferToList(); - DA_LOG.debug("stop log process start");//$NON-NLS-1$ + Logger.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/AppInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/AppInfo.java index 9b56813..faf3f65 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/AppInfo.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/AppInfo.java @@ -44,7 +44,7 @@ import org.tizen.dynamicanalyzer.common.path.PathManager; import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.model.AddrSymbolPair; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.sdblib.receiver.MultiLineReceiver; @@ -105,8 +105,6 @@ public class AppInfo { public static final String DEBUGPKGTYPE_DEBUGINFO = "debuginfo";//$NON-NLS-1$ public static final String DEBUGPKGTYPE_DEBUGSOURCE = "debugsource";//$NON-NLS-1$ - private static final DALogger DA_LOG = DALogger.getInstance(); - private ElfSymbolExtractor symbolExtractor = new ElfSymbolExtractor(); private String execFileName = null; @@ -230,7 +228,7 @@ public class AppInfo { File rpms = new File(rpmPath); if (!rpms.exists()) { if (!rpms.mkdirs()) { - DA_LOG.debug("rpm directory create failed..."); + Logger.debug("rpm directory create failed..."); return; } } @@ -259,16 +257,16 @@ public class AppInfo { while (null != (line = reader.readLine())) { lineCount++; if (lineCount == 1) { - DA_LOG.debug("CHANGE DIR : " + line); + Logger.debug("CHANGE DIR : " + line); } else { - DA_LOG.debug("EXTRACT RPM : " + line); + Logger.debug("EXTRACT RPM : " + line); } } if (lineCount == 0) { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug info file extract failed... : " + errorStr); + Logger.debug("debug info file extract failed... : " + errorStr); return; } } catch (IOException e) { @@ -296,11 +294,11 @@ public class AppInfo { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug info file find failed... : " + errorStr); + Logger.debug("debug info file find failed... : " + errorStr); return; } debugFilePath = rpmPath + line.substring(1, line.length()); - DA_LOG.debug("DEBUG PATH : " + debugFilePath); + Logger.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); return; @@ -325,11 +323,11 @@ public class AppInfo { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug info file find failed... : " + errorStr); + Logger.debug("debug info file find failed... : " + errorStr); return; } debugFilePath = rpmPath + line.substring(1, line.length()); - DA_LOG.debug("DEBUG PATH : " + debugFilePath); + Logger.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); return; @@ -373,7 +371,7 @@ public class AppInfo { File rpms = new File(rpmPath); if (!rpms.exists()) { if (!rpms.mkdirs()) { - DA_LOG.debug("rpm directory create failed..."); + Logger.debug("rpm directory create failed..."); return; } } @@ -403,16 +401,16 @@ public class AppInfo { while (null != (line = reader.readLine())) { lineCount++; if (lineCount == 1) { - DA_LOG.debug("CHANGE DIR : " + line); + Logger.debug("CHANGE DIR : " + line); } else { - DA_LOG.debug("EXTRACT RPM : " + line); + Logger.debug("EXTRACT RPM : " + line); } } if (lineCount == 0) { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug source file extract failed... : " + errorStr); + Logger.debug("debug source file extract failed... : " + errorStr); return; } } catch (IOException e) { @@ -439,11 +437,11 @@ public class AppInfo { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("source file path get failed... : " + errorStr); + Logger.debug("source file path get failed... : " + errorStr); return; } setSourcePath(rpmPath); - DA_LOG.debug("SOURCE PATH : " + properties.get(PROPERTY.SRCPATH.index)); + Logger.debug("SOURCE PATH : " + properties.get(PROPERTY.SRCPATH.index)); } catch (IOException e) { e.printStackTrace(); return; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java index af08719..64da02d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/FunctionNameManager.java @@ -31,18 +31,16 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class FunctionNameManager { - - private static final DALogger DA_LOG = DALogger.getInstance(); public static String getFunctionName(int apiId) { String name = null; try { return getFunctionList().get(apiId); } catch (IndexOutOfBoundsException e) { - DA_LOG.error("Invalid index for function name list\n"); + Logger.error("Invalid index for function name list\n"); name = AnalyzerConstants.UNKNOWN_API; return name; } @@ -65,7 +63,7 @@ public class FunctionNameManager { if (null != deviceStatusInfo) { return deviceStatusInfo.getFunctionList(); } else { - DA_LOG.warning("Device status info is null\n"); + Logger.warning("Device status info is null\n"); return null; } } 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 2e8d668..57a58a5 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/project/Project.java @@ -59,11 +59,9 @@ import org.tizen.dynamicanalyzer.swap.channel.control.RunTimeConfiguration; 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; +import org.tizen.dynamicanalyzer.util.Logger; public class Project { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static final ProcessInfoDBTable processInfoTable; private static final MemoryMapDBTable memoryMapTable; private static final BinaryInfoDBTable binaryInfoTable; @@ -336,14 +334,14 @@ public class Project { + AnalyzerConstants.IMAGE_FOLDER_NAME); if (!imgFolder.isDirectory()) { if (!imgFolder.mkdirs()) { - DA_LOG.debug("image directory create failed..."); + Logger.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()) { - DA_LOG.debug("small image directory create failed..."); + Logger.debug("small image directory create failed..."); } } } @@ -395,7 +393,7 @@ public class Project { public boolean save() { if (!isValid()) { - DA_LOG.error("project save failed"); + Logger.error("project save failed"); return false; } @@ -520,7 +518,7 @@ public class Project { try { String fail = openPrimitive(in); if (fail != null) { - DA_LOG.error("open project failed at " + fail + " informatiion"); + Logger.error("open project failed at " + fail + " informatiion"); return false; } openTargetStatusInfo(in); @@ -641,7 +639,7 @@ public class Project { List functionList = targetDeviceStatusInfo.getFunctionList(); List> functionNames = functionNameTable.getFunctionNameFromDB(); if (null == functionNames) { - DA_LOG.error("failed - load function names"); + Logger.error("failed - load function names"); } else { int size = functionNames.size(); for (int i = 0; i < size; i++) { 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 2bdcda7..8a7d31e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/shortcut/ShortCutKeyBindingHandler.java @@ -51,15 +51,13 @@ import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceDialog; import org.tizen.dynamicanalyzer.ui.toolbar.replayEditor.ReplayEditDialog; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; 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; @@ -86,68 +84,68 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } if (e.keyCode == SWT.F1) { - DA_LOG.debug("about"); + Logger.debug("about"); Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); AboutDialog dialog = new AboutDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F2) { - DA_LOG.debug("configuration"); + Logger.debug("configuration"); Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); ConfigurationDialog dialog = new ConfigurationDialog(shell); dialog.open(); } else if (e.keyCode == SWT.F3) { - DA_LOG.debug("view source toggle"); + Logger.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) { - DA_LOG.debug("timeline page"); + Logger.debug("timeline page"); AnalyzerUtil.changePage(TimelinePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_4) { - DA_LOG.debug("file page"); + Logger.debug("file page"); AnalyzerUtil.changePage(FilePage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_3) { - DA_LOG.debug("NetworkPage page"); + Logger.debug("NetworkPage page"); AnalyzerUtil.changePage(NetworkPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_2) { - DA_LOG.debug("thread page"); + Logger.debug("thread page"); AnalyzerUtil.changePage(ThreadPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_6) { - DA_LOG.debug("ui page"); + Logger.debug("ui page"); AnalyzerUtil.changePage(UIPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_5) { - DA_LOG.debug("Graphics page"); + Logger.debug("Graphics page"); AnalyzerUtil.changePage(GLPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_7) { - DA_LOG.debug("Kernel page"); + Logger.debug("Kernel page"); AnalyzerUtil.changePage(KernelPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_8) { - DA_LOG.debug("summary page"); + Logger.debug("summary page"); AnalyzerUtil.changePage(SummaryPage.pageID); } else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == KEY_9) { - DA_LOG.debug("range page"); + Logger.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()) { - DA_LOG.debug("start trace"); + Logger.debug("start trace"); enabled = false; - DA_LOG.debug("start trace start"); + Logger.debug("start trace start"); ToolbarArea.getInstance().startTrace(); - DA_LOG.debug("start trace end"); + Logger.debug("start trace end"); } else { - DA_LOG.debug("stop trace"); + Logger.debug("stop trace"); enabled = false; ToolbarArea.getInstance().stopTrace(); } } // o else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 111) { - DA_LOG.debug("open trace"); + Logger.debug("open trace"); if (!AnalyzerManager.isRunning()) { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); OpenTraceDialog dialog = new OpenTraceDialog(shell); @@ -156,7 +154,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // s else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 115) { - DA_LOG.debug("save trace"); + Logger.debug("save trace"); if (ToolbarArea.getInstance().getButton(ToolbarArea.SAVE_BUTTON) .isButtonEnabled()) { Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell(); @@ -171,7 +169,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // p else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 112) { - DA_LOG.debug("replay "); + Logger.debug("replay "); if (!AnalyzerManager.isRunning()) { DACustomButton button = (DACustomButton) ToolbarArea .getInstance().getButton(ToolbarArea.REPLAY_BUTTON); @@ -184,7 +182,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // r else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 114) { - DA_LOG.debug("range "); + Logger.debug("range "); if (RangeDataManager.getInstance().isBeingAnalyzed()) { RangeDataManager.getInstance().initRange(); } else { @@ -195,7 +193,7 @@ public class ShortCutKeyBindingHandler extends AbstractHandler { } // e else if (e.stateMask == CTRL_STATE_MASK && e.keyCode == 101) { - DA_LOG.debug("replay Edit"); + Logger.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 e1c07ed..81b4790 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -48,12 +48,11 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.swap.model.format.LogFormat; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -83,9 +82,9 @@ public class SqlManager { connection = DriverManager.getConnection(dbUrl, "SA", ""); SQLWarning warning = connection.getWarnings(); while (warning != null) { - DA_LOG.debug("Message: " + warning.getMessage()); - DA_LOG.debug("SQL state: " + warning.getSQLState()); - DA_LOG.debug("Vendor code: " + warning.getErrorCode()); + Logger.debug("Message: " + warning.getMessage()); + Logger.debug("SQL state: " + warning.getSQLState()); + Logger.debug("Vendor code: " + warning.getErrorCode()); warning = warning.getNextWarning(); } } catch (ClassNotFoundException e) { @@ -125,7 +124,7 @@ public class SqlManager { connection.close(); } catch (SQLException se) { if (!se.getSQLState().equals("XJ015")) { - DA_LOG.debug("DB did not shutdown normally"); + Logger.debug("DB did not shutdown normally"); } } connection = null; @@ -165,13 +164,13 @@ public class SqlManager { String tableName = lf.getName(); String dropTableQuery = createDropTableQuery(tableName); if (isQueryPrint) { - DA_LOG.debug("query : " + dropTableQuery); + Logger.debug("query : " + dropTableQuery); } stat.executeUpdate(dropTableQuery); String createTableQuery = createTableQuery(lf); if (isQueryPrint) { - DA_LOG.debug("query : " + createTableQuery); + Logger.debug("query : " + createTableQuery); } stat.executeUpdate(createTableQuery); executeCreateIndexTable(stat, tableName, "time");//$NON-NLS-1$//$NON-NLS-2$ @@ -229,7 +228,7 @@ public class SqlManager { executeUpdateCreateTable(stat, createIndexTable); } catch (SQLException e) { e.printStackTrace(); - DA_LOG.debug("table name : " + tableName); + Logger.debug("table name : " + tableName); } } @@ -255,7 +254,7 @@ public class SqlManager { List tableInfos = dbManager.getTableInfos(); for (DBTableInfo info : tableInfos) { if (!executeUpdateCreateTable(stat, info.createQuery())) { - DA_LOG.debug("table create failed..." + info.getTableName()); + Logger.debug("table create failed..." + info.getTableName()); } } } catch (SQLException e) { @@ -270,7 +269,7 @@ public class SqlManager { throws SQLException { if (!AnalyzerManager.isExit()) { if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } stat.executeUpdate(query); return true; @@ -284,7 +283,7 @@ public class SqlManager { try { Connection conn = getConnection(); if (null == conn || null == query || null == input) { - DA_LOG.debug("failed sql inset : " + input); + Logger.debug("failed sql inset : " + input); return false; } semaphoreAcquire(); @@ -355,13 +354,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -381,7 +380,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -416,13 +415,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -440,7 +439,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -450,7 +449,7 @@ public class SqlManager { } } } catch (SQLException e) { - DA_LOG.debug("SQLException - selecte : " + query); + Logger.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { semaphoreRelease(); @@ -476,13 +475,13 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.length < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } else { for (int i = 0; i < columnName.length; i++) { @@ -502,7 +501,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -519,7 +518,7 @@ public class SqlManager { } else if (rsMetaData.getColumnTypeName(i).contains("VARCHAR")) {//$NON-NLS-1$ rowData.add(rs.getString(rsMetaData.getColumnName(i))); } else { - DA_LOG.debug("Error undefine Type : " + Logger.debug("Error undefine Type : " + rsMetaData.getColumnTypeName(i)); } @@ -528,7 +527,7 @@ public class SqlManager { } } } catch (SQLException e) { - DA_LOG.debug("SQLException - selecte : " + query); + Logger.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -556,7 +555,7 @@ public class SqlManager { return null; } if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } @@ -572,7 +571,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -583,7 +582,7 @@ public class SqlManager { } } } catch (SQLException e) { - DA_LOG.debug("SQLException - selecte : " + query); + Logger.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -606,13 +605,13 @@ public class SqlManager { conn = getConnection(dbFilePath); } if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } StringBuilder columns = new StringBuilder(); if (null == columnName || columnName.size() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return null; } else { int csize = columnName.size(); @@ -635,7 +634,7 @@ public class SqlManager { semaphoreAcquire(); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null != rs) { @@ -652,7 +651,7 @@ public class SqlManager { } else if (rsMetaData.getColumnTypeName(i).contains("VARCHAR")) {//$NON-NLS-1$ rowData.add(rs.getString(rsMetaData.getColumnName(i))); } else { - DA_LOG.error("Error undefine Type : " + Logger.error("Error undefine Type : " + rsMetaData.getColumnTypeName(i)); } @@ -661,7 +660,7 @@ public class SqlManager { } } } catch (SQLException e) { - DA_LOG.debug("SQLException - selecte : " + query); + Logger.debug("SQLException - selecte : " + query); e.printStackTrace(); } finally { CommonUtil.tryClose(stat, rs); @@ -843,7 +842,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return 0; } @@ -854,7 +853,7 @@ public class SqlManager { } stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -865,10 +864,10 @@ public class SqlManager { } } catch (SQLException e) { do { - 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()); + Logger.debug("query: " + query); + Logger.debug("Message: " + e.getMessage()); + Logger.debug("SQL state: " + e.getSQLState()); + Logger.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { @@ -893,7 +892,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return 0; } @@ -905,7 +904,7 @@ public class SqlManager { stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -916,10 +915,10 @@ public class SqlManager { } } catch (SQLException e) { do { - 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()); + Logger.debug("query: " + query); + Logger.debug("Message: " + e.getMessage()); + Logger.debug("SQL state: " + e.getSQLState()); + Logger.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { @@ -943,7 +942,7 @@ public class SqlManager { } semaphoreAcquire(); if (null == tableName || tableName.length() < 1) { - DA_LOG.debug("tableName is null"); + Logger.debug("tableName is null"); return 0; } String optionQuery = CommonConstants.EMPTY; @@ -955,7 +954,7 @@ public class SqlManager { tableName, optionQuery); stat = conn.createStatement(); if (isQueryPrint) { - DA_LOG.debug("query : " + query); + Logger.debug("query : " + query); } rs = stat.executeQuery(query); if (null == rs) { @@ -967,10 +966,10 @@ public class SqlManager { } } catch (SQLException e) { do { - 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()); + Logger.debug("query: " + query); + Logger.debug("Message: " + e.getMessage()); + Logger.debug("SQL state: " + e.getSQLState()); + Logger.debug("Vendor code: " + e.getErrorCode()); e.printStackTrace(); } while ((e = e.getNextException()) != null); } finally { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java index 33b9665..d10ee81 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/BaseCallstackManager.java @@ -53,7 +53,7 @@ import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackInserter; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackUnit; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackItem; import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfileDataMaker; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public abstract class BaseCallstackManager { @@ -92,8 +92,6 @@ public abstract class BaseCallstackManager { protected CallStackInserter callstackInserter = null; - protected static final DALogger DA_LOG = DALogger.getInstance(); - abstract public void makeUserCallstack(LogData log, ProfileDataMaker profiler); abstract public void makeCallstackWithoutBacktrace(LogData inputData); @@ -295,7 +293,7 @@ public abstract class BaseCallstackManager { } if (symbol == null) { - DA_LOG.debug("binary for the sample pc is not found :" + AnalyzerUtil.toHexdecimal(addr)); //$NON-NLS-1$ + Logger.debug("binary for the sample pc is not found :" + AnalyzerUtil.toHexdecimal(addr)); //$NON-NLS-1$ symbol = InformationViewLabels.CALLSTACK_TABLE_UNKNOWN_LIBRARY + AnalyzerConstants.CALLSTACK_API_TOKEN_STRING + AnalyzerUtil.toHexdecimal(addr); 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 f08f8f6..7792f15 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 @@ -53,6 +53,7 @@ import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackInserter; 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.Logger; public class SWAPCallStackManager extends BaseCallstackManager { @@ -187,7 +188,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { getCallStackDataBySeqMap().put(seq, callstackData); seqByTimeMap.put(time, seq); } else { - DA_LOG.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); + Logger.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); } String apiName = FunctionNameManager.getFunctionName(log.getApiId()); @@ -251,7 +252,7 @@ public class SWAPCallStackManager extends BaseCallstackManager { if (callerCallstackUnit.getFunctionId() == topUserCallstack.getFunctionId()) { probeCallstack.set(size - 1, new CallStackItem(callerCallstackUnit)); } else { - DA_LOG.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ + Logger.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ } } 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 747da68..fc67774 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,11 +31,9 @@ import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.swap.model.data.LogDataFactory; import org.tizen.dynamicanalyzer.util.ByteUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -114,7 +112,7 @@ public class BasicDataMessage { int startNano = startTime.getNano(); if (0 == startSec && 0 == startNano) { - DA_LOG.debug("if show this log then process info is not comming or late!!"); + Logger.debug("if show this log then process info is not comming or late!!"); startTime.setSec(sec); startTime.setNano(nano); AnalyzerManager.getProject().setProfilingStartTime(startTime); @@ -201,7 +199,7 @@ public class BasicDataMessage { public void printMessage() { if (PRINT_DATA) { String strId = String.format("%4x", id); - DA_LOG.debug("Message [id : " + strId + "] [seq :" + seq + "] [ Time : " + Logger.debug("Message [id : " + strId + "] [seq :" + seq + "] [ Time : " + time + " ms]"); ByteUtil.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 d6f480f..7553925 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 @@ -93,7 +93,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StartProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.ByteUtil; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; @@ -102,8 +102,6 @@ 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; @@ -112,7 +110,7 @@ public class Communicator30 extends BaseCommunicator { // connect ecs server if (devInfo.isEmulator()) { if (!SocketClient.getInstance().connect()) { - DA_LOG.warning("Connect to ecs server is failed"); + Logger.warning("Connect to ecs server is failed"); } devInfo.emulatorScreenshot = new EmulatorScreenshot(); } @@ -120,12 +118,12 @@ public class Communicator30 extends BaseCommunicator { // daemon start Process ps = CommunicatorUtils.execCommand(devInfo.getIDevice(), AnalyzerShellCommands.DACOMMAND_RUN_MANAGER); - DA_LOG.debug(ps.toString()); + Logger.debug(ps.toString()); // get port int remotePort = CommunicatorUtils.getRemotePort(devInfo.getIDevice()); if (remotePort < 0) { - DA_LOG.debug(devInfo.getIDevice().getSerialNumber() + Logger.debug(devInfo.getIDevice().getSerialNumber() + " remote port get failed and remove this device : " + devInfo.getIDevice().getSerialNumber()); return HostResult.ERR_REMOTE_PORT_GET_FAILED; @@ -134,9 +132,9 @@ public class Communicator30 extends BaseCommunicator { // step 4. port foward HostResult result = CommunicatorUtils.foward(devInfo.getIDevice(), CommunicatorUtils.LOCAL_PORT, remotePort); - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); if (!HostResult.SUCCESS.equals(result)) { - DA_LOG.debug(devInfo.getIDevice().getSerialNumber() + Logger.debug(devInfo.getIDevice().getSerialNumber() + " port fowarding failed and remove this device"); return HostResult.ERR_REMOTE_PORT_GET_FAILED; } @@ -145,19 +143,19 @@ public class Communicator30 extends BaseCommunicator { // create control socket HostResult result = createControlSocket(devInfo); if (!result.isSuccess()) { - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return HostResult.ERR_CONTROL_SOCKET_CREATION_FAIL; } else { result = createDataSocket(devInfo); if (!result.isSuccess()) { - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return HostResult.ERR_DATA_SOCKET_CREATION_FAIL; } } // target info get result = getTargetInfo(devInfo); if (!result.isSuccess()) { - DA_LOG.debug(result.toString()); + Logger.debug(result.toString()); return HostResult.ERR_TARGET_INFO_GET_FAIL; } @@ -180,7 +178,7 @@ public class Communicator30 extends BaseCommunicator { public HostResult startTrace() { DACommunicator.setRunning(true); UserSpaceInst userSpaceInst = getUserSpaceInst(); - DA_LOG.performance("TEST", "Start Trace", "Set application inst"); + Logger.performance("TEST", "Start Trace", "Set application inst"); byte[] replayData; // create replay data @@ -195,7 +193,7 @@ public class Communicator30 extends BaseCommunicator { byte[] ret = ByteUtil.getByte(AnalyzerConstants.MSG_START_SWAP, length, rear); - DA_LOG.debug("print start message"); + Logger.debug("print start message"); // ByteUtils.printByteArrayForStart(ret); if (PRINT_CONTROL_LOG_TOFILE) { @@ -218,7 +216,7 @@ public class Communicator30 extends BaseCommunicator { // start message send HostResult result = handleControlMessage( GlobalInformation.getCurrentDeviceInfo(), ret); - DA_LOG.performance("TEST", "Start Trace", "Make and Send start message"); + Logger.performance("TEST", "Start Trace", "Make and Send start message"); // FIX if (!StartProcessManager.getInstance().isCancelled()) { @@ -253,7 +251,7 @@ public class Communicator30 extends BaseCommunicator { } dataThread.start(); - DA_LOG.performance("TEST", "Start Trace", "Start data receiving thread"); + Logger.performance("TEST", "Start Trace", "Start data receiving thread"); // success start trace!! byte[] payload = getMessagePayload(result.getRet()); @@ -267,17 +265,17 @@ public class Communicator30 extends BaseCommunicator { profilingStartTime.setNano(nano); ToolbarArea.getInstance().startTimer(); - DA_LOG.performance("TEST", "Start Trace", "Start Timer"); + Logger.performance("TEST", "Start Trace", "Start Timer"); SWAPLogParser.startLogParser(); - DA_LOG.performance("TEST", "Start Trace", "Start SWAP log parser thread"); + Logger.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"); + Logger.performance("TEST", "Start Trace", "Start DataManager threads"); /* Timeline */ UpdateViewTimer.start(); - DA_LOG.performance("TEST", "Start Trace", "Start Update view timer"); - DA_LOG.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); + Logger.performance("TEST", "Start Trace", "Start Update view timer"); + Logger.debug("Start recorder, timer, log parser, file, thread, ui, profile , update timer"); return result; } @@ -357,7 +355,7 @@ public class Communicator30 extends BaseCommunicator { } appInst.setExecutablePath(app.getExecPath()); - DA_LOG.debug("Set execute path : " + app.getExecPath()); + Logger.debug("Set execute path : " + app.getExecPath()); List functionInstList = getFunctionInstList(app, temppath); appInst.getFunctionInstList().addAll(functionInstList); @@ -469,9 +467,9 @@ public class Communicator30 extends BaseCommunicator { SyncResult res = CommunicatorUtils.pull(from, to); if (null != res && res.isOk()) { - DA_LOG.debug("binary copy success : " + from);//$NON-NLS-1$ + Logger.debug("binary copy success : " + from);//$NON-NLS-1$ } else { - DA_LOG.debug("Failed to get " + from); //$NON-NLS-1$ + Logger.debug("Failed to get " + from); //$NON-NLS-1$ return HostResult.ERR_BIN_INFO_GET_FAIL; } // binInfo.setLocalBinaryPath(localBinaryPath); @@ -582,13 +580,13 @@ public class Communicator30 extends BaseCommunicator { } int msgId = ByteUtil.toInt(message); - DA_LOG.debug("wait for ack... [send message : " + msgId + " ]"); + Logger.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; - DA_LOG.debug("blocked"); + Logger.debug("blocked"); ByteArrayOutputStream baos = new ByteArrayOutputStream(); do { readsize = controlSock.getInputStream().read(cbuf); @@ -605,7 +603,7 @@ public class Communicator30 extends BaseCommunicator { printWriter.printf("\n"); } - DA_LOG.debug("unblocked"); + Logger.debug("unblocked"); if (readsize > 0) { byte[] buf = new byte[readsize]; System.arraycopy(cbuf, 0, buf, 0, readsize); @@ -615,7 +613,7 @@ public class Communicator30 extends BaseCommunicator { // for debug System.out.print("ack id : "); AnalyzerUtil.printHexdecimal(ackId); - DA_LOG.debug(); + Logger.debug(); result.setRet(buf); } else { @@ -707,7 +705,7 @@ public class Communicator30 extends BaseCommunicator { } public HostResult getTargetInfo(DeviceInfo device) { - DA_LOG.debug("Send target info : " + Logger.debug("Send target info : " + ByteUtil.getByte(AnalyzerConstants.MSG_TARGET_INFO, 0)); HostResult result = handleControlMessage(device, ByteUtil.getByte(AnalyzerConstants.MSG_TARGET_INFO, 0)); @@ -726,12 +724,12 @@ public class Communicator30 extends BaseCommunicator { @Override public HostResult sendKeepAliveMessage(DeviceInfo device) { - DA_LOG.debug("Send keep alive message : " + Logger.debug("Send keep alive message : " + ByteUtil.getByte(AnalyzerConstants.MSG_KEEP_ALIVE, 0)); HostResult result = handleControlMessage(device, ByteUtil.getByte(AnalyzerConstants.MSG_KEEP_ALIVE, 0)); if (result.isSuccess()) { - DA_LOG.debug("keep alive message ack :" + result.getMessage()); + Logger.debug("keep alive message ack :" + result.getMessage()); if (isCorrectAck(MSG_KEEP_ALIVE_ACK, result)) { return result; @@ -895,7 +893,7 @@ public class Communicator30 extends BaseCommunicator { if (app != null) { HostResult hr = sendBinaryInfoMessage(app); if (!hr.isSuccess()) { - DA_LOG.debug("binary info get failed :" + hr.getMessage()); + Logger.debug("binary info get failed :" + hr.getMessage()); } } } @@ -909,7 +907,7 @@ public class Communicator30 extends BaseCommunicator { if (null != controlSock && !controlSock.isClosed()) { controlSock.getOutputStream().write(msg); } else { - DA_LOG.debug("control socket is closed"); + Logger.debug("control socket is closed"); result = HostResult.ERR_CONTROL_SOCKET_CONNECTION_CLOSED; } } catch (SocketException e) { @@ -1149,7 +1147,7 @@ public class Communicator30 extends BaseCommunicator { String line = reader.readLine(); String errorStr = error.readLine(); if (null == line) { - DA_LOG.debug("host md5sum get failed : " + errorStr); + Logger.debug("host md5sum get failed : " + errorStr); result = HostResult.ERR_BIN_INFO_GET_FAIL; } else { String[] splitResult = line.trim().split( 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 b402590..9ab9760 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 @@ -32,11 +32,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class HeartBeatThread implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static int interval = 1000; @Override @@ -50,7 +48,7 @@ public class HeartBeatThread implements Runnable { // System.out.println("Heart Beat!!"); HostResult result = DACommunicator.sendKeepAliveMessage(device); if (!result.isSuccess()) { - DA_LOG.debug(result.toString()); + Logger.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 ae1c6d2..15c5b6c 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 @@ -32,12 +32,10 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; /** 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; @@ -55,7 +53,7 @@ public class LogQueue { } wait(); } catch (InterruptedException e) { - DA_LOG.debug("log queue interrupt!!"); //$NON-NLS-1$ + Logger.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 dbc6ea2..6efda0f 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 @@ -69,14 +69,12 @@ import org.tizen.dynamicanalyzer.ui.toolbar.StopLogProcessor; import org.tizen.dynamicanalyzer.ui.toolbar.StopProcessManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.util.ByteUtil; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -225,7 +223,7 @@ public class MessageParser { pMap.addLibraryMap(libObj); } - DA_LOG.debug("process info start time : " + capturedTime.getSec() + " " + Logger.debug("process info start time : " + capturedTime.getSec() + " " + capturedTime.getNano()); pMap.setMainBinary(new LibraryObject(project.getDeviceStatusInfo() @@ -262,7 +260,7 @@ public class MessageParser { ProcessInformation pinfo = project.getProcessInformation(pid); if (null == pinfo) { // bug!!! - DA_LOG.debug("bug occurred!!"); + Logger.debug("bug occurred!!"); return; } @@ -392,15 +390,15 @@ public class MessageParser { processMessage(buffer); if (id == DataChannelConstants.MSG_DATA_TERMINATE) { - DA_LOG.debug("message data terminate arrived!!!"); - DA_LOG.performance("TEST", "While tracing", "Terminate Application"); + Logger.debug("message data terminate arrived!!!"); + Logger.performance("TEST", "While tracing", "Terminate Application"); if (AnalyzerManager.getProcessCount() == 0) { break; } } } // end while() - DA_LOG.debug("Receive thread end!!"); - DA_LOG.performance("TEST", "DA end", "End receive thread"); + Logger.debug("Receive thread end!!"); + Logger.performance("TEST", "DA end", "End receive thread"); if (!StartProcessManager.getInstance().isCancelled()) { Display.getDefault().asyncExec(new Runnable() { @Override @@ -413,7 +411,7 @@ public class MessageParser { } endingSteps(); } catch (IOException e) { - DA_LOG.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ + Logger.debug("### socket timeout - TODO: show this as a dialog."); //$NON-NLS-1$ Display.getDefault().asyncExec(new Runnable() { @Override @@ -428,7 +426,7 @@ public class MessageParser { } private void endingSteps() { - DA_LOG.debug("Ending steps!"); + Logger.debug("Ending steps!"); DACommunicator.setRunning(false); AnalyzerManager.setRunningState(false); Display.getDefault().syncExec(new Runnable() { @@ -439,16 +437,16 @@ public class MessageParser { } }); stopTimer(); - DA_LOG.performance("TEST", "DA end", "Stop timer"); + Logger.performance("TEST", "DA end", "Stop timer"); addBufferToList(); - DA_LOG.performance("TEST", "DA end", "Add buffer to list"); + Logger.performance("TEST", "DA end", "Add buffer to list"); if (!StartProcessManager.getInstance().isCancelled()) { - DA_LOG.debug("start!! : stop log process");//$NON-NLS-1$ + Logger.debug("start!! : stop log process");//$NON-NLS-1$ StopLogProcessor.runStopLogProcessThread(); } AnalyzerUtil.executeCommand(StopHandler.ID); - DA_LOG.performance("TEST", "DA end", "Execute command - StopHandler"); + Logger.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 2da85ca..beda044 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 @@ -31,11 +31,9 @@ import java.util.concurrent.LinkedBlockingQueue; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public abstract class PageDataManager implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - private String name = null; private Thread thread = null; private BlockingQueue logPackQueue = new LinkedBlockingQueue(); @@ -98,7 +96,7 @@ public abstract class PageDataManager implements Runnable { state = State.NOT_RUNNING; thread = null; logPackQueue.clear(); - DA_LOG.debug(getName() + " thread joined!"); //$NON-NLS-1$ + Logger.debug(getName() + " thread joined!"); //$NON-NLS-1$ } catch (InterruptedException e) { e.printStackTrace(); } @@ -136,7 +134,7 @@ public abstract class PageDataManager implements Runnable { onThreadStop(); /* log for debug */ - DA_LOG.debug(getName() + " thread end!!"); //$NON-NLS-1$ + Logger.debug(getName() + " thread end!!"); //$NON-NLS-1$ } protected abstract void makeData(LogPackage pack); 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 171dcb7..240fdeb 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 @@ -53,14 +53,12 @@ import org.tizen.dynamicanalyzer.swap.model.data.SystemData; 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.util.Logger; 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 Thread logParser = null; // default false, turn on when Tizen C++ app // private static boolean dropCallTraceLog = true; @@ -113,7 +111,7 @@ public class SWAPLogParser implements Runnable { logQueue.notifyAll(); } try { - DA_LOG.debug("wait for log parser join");//$NON-NLS-1$ + Logger.debug("wait for log parser join");//$NON-NLS-1$ logParser.join(AnalyzerConstants.THREAD_JOIN_WAIT_TIME); } catch (InterruptedException e) { e.printStackTrace(); @@ -137,7 +135,7 @@ public class SWAPLogParser implements Runnable { } /* log for debug */ - DA_LOG.debug("log parsing thread end!!"); //$NON-NLS-1$ + Logger.debug("log parsing thread end!!"); //$NON-NLS-1$ AnalyzerManager.setLogParsingComplete(true); if (!AnalyzerManager.isExit()) { @@ -177,7 +175,7 @@ public class SWAPLogParser implements Runnable { pData.setEntrySeq(functionStack.get(stackSize - 1)); functionStack.remove(stackSize - 1); } else { // size <= 0 : bug (exit without entry) - DA_LOG.error("function exit log without entry log"); + Logger.error("function exit log without entry log"); } } @@ -279,7 +277,7 @@ public class SWAPLogParser implements Runnable { final String to = AnalyzerManager.getProject().getSavePath() + File.separator + AnalyzerConstants.IMAGE_FOLDER_NAME + File.separator + fileName; if (angle != 0) { - DA_LOG.debug("[ image rotate : " + angle + " ]"); + Logger.debug("[ image rotate : " + angle + " ]"); } new Thread(null, new Runnable() { @@ -311,7 +309,7 @@ public class SWAPLogParser implements Runnable { break; } else { - DA_LOG.debug("Failed to get '" + from + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ + Logger.debug("Failed to get '" + from + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ try { Thread.sleep(1000); count++; @@ -329,7 +327,7 @@ public class SWAPLogParser implements Runnable { final String fileName = getImageName(path); if (angle != 0) { - DA_LOG.debug("[ image rotate : " + angle + " ]"); + Logger.debug("[ image rotate : " + angle + " ]"); } new Thread(null, new Runnable() { @@ -360,7 +358,7 @@ public class SWAPLogParser implements Runnable { break; } else { - DA_LOG.debug("Failed to get '" + path + "' file"); //$NON-NLS-1$ //$NON-NLS-2$ + Logger.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/data/ArgsInfo.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ArgsInfo.java index 9175a6e..829be45 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,11 +26,9 @@ package org.tizen.dynamicanalyzer.swap.model.data; import org.tizen.dynamicanalyzer.constant.CommonConstants; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class ArgsInfo { - private static final DALogger DA_LOG = DALogger.getInstance(); - int lastIndex = 0; String args = null; @@ -53,7 +51,7 @@ public class ArgsInfo { } String ret = args.substring(index + 2, args.length()); if (ret.equals("a")) { - DA_LOG.debug("debug"); + Logger.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 5a8baa0..20a3bc5 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,11 +36,9 @@ import org.tizen.dynamicanalyzer.communicator.DACommunicator; import org.tizen.dynamicanalyzer.swap.model.DATime; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.util.ByteUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -88,9 +86,9 @@ public abstract class LogData implements Cloneable { time = resultSec * 1000000 + resultNano / 1000; if (time <= 0) { - DA_LOG.debug("id : " + AnalyzerUtil.toHexdecimal(id) + Logger.debug("id : " + AnalyzerUtil.toHexdecimal(id) + " time : " + time); - DA_LOG.debug("profile start time : " + Logger.debug("profile start time : " + startTime.toString() + " time : " + sec + "," + nano); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java index a0fba8f..9ee45b3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java @@ -39,10 +39,9 @@ import org.tizen.dynamicanalyzer.project.LibraryObject; import org.tizen.dynamicanalyzer.project.ProcessInformation; import org.tizen.dynamicanalyzer.project.ProcessMemoryMap; import org.tizen.dynamicanalyzer.util.ByteUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class ProfileData extends LogData { - private static final DALogger DA_LOG = DALogger.getInstance(); public static int logCount = 0; long pcAddr = 0; // profiling common long callerPcAddr = 0; // function entry specific @@ -189,7 +188,7 @@ public class ProfileData extends LogData { ProcessInformation process = AnalyzerManager.getProject().getProcessInformation( pid); if (null == process) { - DA_LOG.error("ProfileData of type: " + id + " is from wrong process: " + pid + Logger.error("ProfileData of type: " + id + " is from wrong process: " + pid + "\n"); return false; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java index f6d402d..123cbbc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java @@ -37,7 +37,7 @@ import java.sql.SQLException; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.util.ByteUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.UnsignedInt; public class SystemData extends LogData { @@ -100,7 +100,7 @@ public class SystemData extends LogData { index += INT_SIZE; if (targetProcessCount == 0) { - DALogger.getInstance().error("targetProcessCount is 0"); + Logger.error("targetProcessCount is 0"); } parseTargetProcessInfo(data, targetProcessCount); 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 04fc3a6..7bfda0c 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 @@ -43,12 +43,10 @@ import org.tizen.dynamicanalyzer.project.BinaryInfo; 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.util.Logger; 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 +123,7 @@ public class BinarySettingManager { File rpms = new File(rpmPath); if (!rpms.exists()) { if (!rpms.mkdirs()) { - DA_LOG.debug("rpm directory create failed..."); + Logger.debug("rpm directory create failed..."); continue; } } @@ -173,16 +171,16 @@ public class BinarySettingManager { while (null != (line = reader.readLine())) { lineCount++; if (lineCount == 1) { - DA_LOG.debug("CHANGE DIR : " + line); + Logger.debug("CHANGE DIR : " + line); } else { - DA_LOG.debug("EXTRACE RPM : " + line); + Logger.debug("EXTRACE RPM : " + line); } } if (lineCount == 0) { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug info file extract failed... : " + Logger.debug("debug info file extract failed... : " + errorStr); continue; } @@ -217,12 +215,12 @@ public class BinarySettingManager { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug source file extract failed... : " + Logger.debug("debug source file extract failed... : " + errorStr); continue; } debugFilePath = rpmPath + line.substring(1, line.length()); - DA_LOG.debug("DEBUG PATH : " + debugFilePath); + Logger.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); continue; @@ -249,12 +247,12 @@ public class BinarySettingManager { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("source file path get failed.. : " + Logger.debug("source file path get failed.. : " + errorStr); continue; } sourceFilePath = rpmPath; - DA_LOG.debug("SOURCE PATH : " + sourceFilePath); + Logger.debug("SOURCE PATH : " + sourceFilePath); } catch (IOException e) { e.printStackTrace(); continue; @@ -282,12 +280,12 @@ public class BinarySettingManager { BufferedReader error = new BufferedReader( new InputStreamReader(process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug source file extract failed... : " + Logger.debug("debug source file extract failed... : " + errorStr); continue; } debugFilePath = rpmPath + line.substring(1, line.length()); - DA_LOG.debug("DEBUG PATH : " + debugFilePath); + Logger.debug("DEBUG PATH : " + debugFilePath); } catch (IOException e) { e.printStackTrace(); continue; @@ -401,7 +399,7 @@ public class BinarySettingManager { BinarySettingManager.getInstance().putRealBinarySettingData(binarySettings); } catch (FileNotFoundException e) { - DA_LOG.debug("BinarySettings.save file is not exist - normal operation"); + Logger.debug("BinarySettings.save file is not exist - normal operation"); } catch (IOException e) { e.printStackTrace(); } finally { @@ -440,14 +438,14 @@ public class BinarySettingManager { String line = null; while (null != (line = reader.readLine())) { lineCount++; - DA_LOG.debug("LINE (" + lineCount + ") : " + line); + Logger.debug("LINE (" + lineCount + ") : " + line); lines.add(line); } if (lineCount == 0) { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.error("find debug info path fail.. " + errorStr); + Logger.error("find debug info path fail.. " + errorStr); isDebugInfo = false; } } catch (IOException e) { @@ -480,14 +478,14 @@ public class BinarySettingManager { String line = null; while (null != (line = reader.readLine())) { lineCount++; - DA_LOG.debug("LINE (" + lineCount + ") : " + line); + Logger.debug("LINE (" + lineCount + ") : " + line); lines.add(line); } if (lineCount == 0) { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.error("find debug info path fail.. " + errorStr); + Logger.error("find debug info path fail.. " + errorStr); return null; } } catch (IOException e) { 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 681cded..dba994c 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,13 +4,11 @@ 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.dynamicanalyzer.util.Logger; 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); } @@ -19,7 +17,7 @@ public class DADeviceExplorer extends DeviceExplorer { public void updateData() { if (null == current) { if (null == root) { - DA_LOG.debug("Root is empty"); + Logger.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 187b207..7f57b54 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,7 +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.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -62,8 +62,6 @@ 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; @@ -89,7 +87,7 @@ public class DeviceExplorer extends Composite { GridItem selection = selections[0]; FileEntry file = (FileEntry) selection .getData(ExplorerUtil.DATA_FIEL_KEY); - DA_LOG.debug("Selected : " + file.getFullPath()); + Logger.debug("Selected : " + file.getFullPath()); selected = file; inputText.setText(selected.getFullPath()); inputText.setBackground(ColorResources.WHITE); @@ -133,7 +131,7 @@ public class DeviceExplorer extends Composite { public void handleClickEvent(DACustomButton button) { String path = inputText.getText(); if (null == path || path.isEmpty()) { - DA_LOG.debug("path must not empty"); + Logger.debug("path must not empty"); // inputText.setBackground(ColorResources.RED); // info.setText("Empty path"); inputText.setText(current.getFullPath()); @@ -141,7 +139,7 @@ public class DeviceExplorer extends Composite { } if (!path.contains(root.getFullPath())) { - DA_LOG.debug("Out of root range"); + Logger.debug("Out of root range"); // inputText.setBackground(ColorResources.RED); // info.setText("Out of root range"); inputText.setText(current.getFullPath()); @@ -251,7 +249,7 @@ public class DeviceExplorer extends Composite { public void updateData() { if (null == current) { if (null == root) { - DA_LOG.debug("Root is empty"); + Logger.debug("Root is empty"); return; } current = root; @@ -324,7 +322,7 @@ public class DeviceExplorer extends Composite { FileEntry rootDir = device.getFileEntry(r); if (null == rootDir || (!rootDir.isDirectory() && !rootDir.isRoot())) { - DA_LOG.debug("root path is invalid"); + Logger.debug("root path is invalid"); return; } else { root = rootDir; @@ -372,7 +370,7 @@ public class DeviceExplorer extends Composite { if (null != path && !path.isEmpty()) { FileEntry file = device.getFileEntry(path); if (file == null || file.getType() == FileEntryType.Unknown) { - DA_LOG.debug("invalid path"); + Logger.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 7deb9fb..f0d8545 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,11 +28,10 @@ package org.tizen.dynamicanalyzer.swap.platform.ui; import java.io.File; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; + public class ExplorerUtil { - private static final DALogger DA_LOG = DALogger.getInstance(); - public static String PARENT_STR = ".."; public static int TYPE_DIR = 0; @@ -49,7 +48,7 @@ public class ExplorerUtil { } else if (file.isHidden()) { return TYPE_HIDDEN; } else { - DA_LOG.error("file type error"); + Logger.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 c97caf4..f8eadae 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,15 +51,13 @@ 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.util.Logger; 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; private static int DIRECTORY = 2; @@ -83,7 +81,7 @@ public class DAFileExplorer extends Composite { GridItem[] selections = table.getSelection(); GridItem selection = selections[0]; File file = (File) selection.getData(ExplorerUtil.DATA_FIEL_KEY); - DA_LOG.debug("Selected : " + file.getAbsolutePath()); + Logger.debug("Selected : " + file.getAbsolutePath()); selected = file; String path = selected.getAbsolutePath(); @@ -129,7 +127,7 @@ public class DAFileExplorer extends Composite { public void handleClickEvent(DACustomButton button) { String path = inputText.getText(); if (null == path || path.isEmpty()) { - DA_LOG.debug("path must not empty"); + Logger.debug("path must not empty"); // inputText.setBackground(ColorResources.RED); // info.setText("Empty path"); inputText.setText(current.getAbsolutePath()); @@ -137,7 +135,7 @@ public class DAFileExplorer extends Composite { } if (!path.contains(root.getAbsolutePath())) { - DA_LOG.debug("Out of root range"); + Logger.debug("Out of root range"); // inputText.setBackground(ColorResources.RED); // info.setText("Out of root range"); inputText.setText(current.getAbsolutePath()); @@ -243,7 +241,7 @@ public class DAFileExplorer extends Composite { public void updateData() { if (null == current) { if (null == root) { - DA_LOG.debug("Root is empty"); + Logger.debug("Root is empty"); return; } current = root; @@ -315,7 +313,7 @@ public class DAFileExplorer extends Composite { if (null != r && !r.isEmpty()) { File rootDir = new File(r); if (!rootDir.exists() || !rootDir.isDirectory()) { - DA_LOG.debug("root path is invalid"); + Logger.debug("root path is invalid"); return; } else { root = rootDir; @@ -357,7 +355,7 @@ public class DAFileExplorer extends Composite { if (null != path && !path.isEmpty()) { File file = new File(path); if (!file.exists()) { - DA_LOG.debug("invalid path"); + Logger.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 d9ffd59..ef4a3e3 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 @@ -52,16 +52,14 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; 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.util.Logger; 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; @@ -264,7 +262,7 @@ public class LoadSettingDialog extends DAMessageBox { grid.remove(index); } else { // log for debug - DA_LOG.debug("delete save file failed..."); //$NON-NLS-1$ + Logger.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 20ba4ef..c3a2f56 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 @@ -56,8 +56,8 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData; import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -65,8 +65,6 @@ 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$ @@ -168,10 +166,10 @@ public class SaveSettingDialog extends DAMessageBox { if (success) { // add snapshot model update - DA_LOG.debug("save binary setting complete!!"); //$NON-NLS-1$ + Logger.debug("save binary setting complete!!"); //$NON-NLS-1$ } else { - DA_LOG.debug("save binary setting fail..."); //$NON-NLS-1$ + Logger.debug("save binary setting fail..."); //$NON-NLS-1$ return false; } return true; @@ -253,7 +251,7 @@ public class SaveSettingDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - DA_LOG.debug("save file name is null"); + Logger.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 3b1df74..99de523 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 @@ -17,8 +17,8 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; 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.util.Logger; 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; @@ -36,8 +36,6 @@ 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; @@ -72,7 +70,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements DAPopupMenuItem clearItem = itemList.get(4); if (ToolbarArea.getInstance() == null) { - DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ + Logger.debug("toolbar area is null");//$NON-NLS-1$ return; } @@ -307,7 +305,7 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements DAChartPlotMarker marker = plot.getMarkers() .get(SELECTION_MARKER_INDEX); if (!(marker instanceof DAChartPlotIntervalMarker)) { - DA_LOG.debug("mouseMove !IntervalMarker"); + Logger.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 ec278e6..dee7056 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,7 +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.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; @@ -42,8 +42,6 @@ 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) { @@ -102,7 +100,7 @@ public class TimelineChartMouseTrackAdapter extends MouseTrackAdapter { if (plot instanceof DAUIEventChartPlot) { i = (int) (seriesList.size() * yPosRatio); if (i < 0 || i > 4) { - DA_LOG.debug(yPosRatio + " " + i);//$NON-NLS-1$ + Logger.debug(yPosRatio + " " + i);//$NON-NLS-1$ } } DAChartSeries series = seriesList.get(i); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java index f9bf575..da3da2a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java @@ -44,12 +44,10 @@ import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.ui.file.manager.FileChartManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; //TODO: contains a lot legacy code, need to refatoring this class public class FileApiListView extends DAViewComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); - // TODO: comment below variables // TODO: remove unused variables private long analysisStartTime = 0; @@ -151,7 +149,7 @@ public class FileApiListView extends DAViewComposite { tableComp.updateTable(); } } else { - DA_LOG.error("It can't find data in DB"); + Logger.error("It can't find data in DB"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java index 3d2823e..3ec0bbd 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java @@ -47,7 +47,7 @@ import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard; import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem; @@ -57,7 +57,6 @@ import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline; public class FileChartView extends DAViewComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); // TODO: the height can be changed public final static int FILE_CHART_HEIGHT = 40; @@ -191,7 +190,7 @@ public class FileChartView extends DAViewComposite { null)); } }else{ - DA_LOG.error("It can't find data in DB, seq number:" + seq); + Logger.error("It can't find data in DB, seq number:" + seq); } } } else { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java index e638009..08a4aad 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java @@ -52,13 +52,11 @@ import org.tizen.dynamicanalyzer.ui.file.model.FileStatus; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; 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.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; public class FileChartDataMaker { - private static final DALogger DA_LOG = DALogger.getInstance(); - private List fileStatusList = new ArrayList(); private List fileAccessList = new ArrayList(); private Map fileAccessorMap = new HashMap(); @@ -122,16 +120,16 @@ public class FileChartDataMaker { String arg = input.getArgs(); String returnVal = input.getReturn(); - DA_LOG.info("seqNum:" + seqNum); - DA_LOG.info("apiName:" + apiName); - DA_LOG.info("errNo:" + errNo); + Logger.info("seqNum:" + seqNum); + Logger.info("apiName:" + apiName); + Logger.info("errNo:" + errNo); // check error if (errNo != 0) { SummaryDataManager.getInstance().getFailedApiDataMaker().makeData(input); } else if (apiName.equals("fdopen")) { //$NON-NLS-1$ // TODO: legacy code, need to check - DA_LOG.debug("fdopen"); + Logger.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 6af12dc..73406b7 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 @@ -42,6 +42,7 @@ 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.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class CallStackManager extends BaseCallstackManager { @@ -171,7 +172,7 @@ public class CallStackManager extends BaseCallstackManager { .getFunctionName())) { userCallstack.remove(size - 2); } else { - DA_LOG.debug("makeUserCallstack : [virtual thunk] EXIT caller is not the same" + Logger.debug("makeUserCallstack : [virtual thunk] EXIT caller is not the same" + "as top of user callstack after remove EXIT self"); } } @@ -198,7 +199,7 @@ public class CallStackManager extends BaseCallstackManager { } } } else { - DA_LOG.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); + Logger.debug("makeUserCallstack : EXIT self is not the same as top of user callstack"); } if (AnalyzerManager.isOsp()) { // String apiName = input[LogCenterConstants.APINAME_INDEX]; @@ -290,7 +291,7 @@ public class CallStackManager extends BaseCallstackManager { topUserCallstack.getFunctionName())) { probeCallstack.set(size - 1, new CallStackItem(callerCallstackUnit)); } else { - DA_LOG.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ + Logger.debug("probe caller is not the same as top of user callstack"); //$NON-NLS-1$ } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java index 42c43fd..47b2f85 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallStackUnit.java @@ -34,7 +34,7 @@ import org.tizen.dynamicanalyzer.project.BinaryInfo; import org.tizen.dynamicanalyzer.project.FunctionNameManager; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class CallStackUnit { private final String UNKNOWN_LIBRARY = InformationViewLabels.CALLSTACK_TABLE_UNKNOWN_LIBRARY; @@ -49,8 +49,6 @@ public class CallStackUnit { private int pid; private long time; private int functionId; - - private static final DALogger DA_LOG = DALogger.getInstance(); // TODO: get path and function name as parameter, not symbol public CallStackUnit(long addr, String symbol, LogData log) { @@ -110,7 +108,7 @@ public class CallStackUnit { if (splitPath.length < 2) { if (!splitPath[0].equals(FunctionUsageProfiler.APPLICATION) && !splitPath[0].equals(FunctionUsageProfiler.DEPENDENT_LIB)) { - DA_LOG.error("Invalid function name for calltrace unit\n"); + Logger.error("Invalid function name for calltrace unit\n"); } functionName = UNKNOWN_FUNCTION; } else { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java index ae1829a..5ce428a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java @@ -50,13 +50,11 @@ import org.tizen.dynamicanalyzer.ui.timeline.calltrace.FunctionEntryDBTable; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; 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.util.Logger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData; public class CallstackTable extends DATableComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); - public CallstackTable(Composite parent, int compStyle, int tableStyle) { super(parent, compStyle, tableStyle); @@ -169,13 +167,13 @@ public class CallstackTable extends DATableComposite { CallStackUnit api = addrMap.get(addrs.get(i)); if (null == api) { - DA_LOG.debug("callstackunit for addr : " + hexAddr + " not found"); + Logger.debug("callstackunit for addr : " + hexAddr + " not found"); return; } String path = api.getPath(); if (null == path) { - DA_LOG.debug("callstackunit for addr : " + hexAddr + " not found"); + Logger.debug("callstackunit for addr : " + hexAddr + " not found"); return; } 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 05cb7c1..dde1d92 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,12 +35,10 @@ 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.util.Logger; 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; @@ -52,7 +50,7 @@ public class EmulatorScreenshot implements ILsn { @Override public void OnEventProc(String eventname, JSONObject jsParam) { String message = jsParam.get(SocketConstants.MESSAGE_RETURN).toString(); - DA_LOG.info(message); + Logger.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 8919b82..3938a6e 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,11 +55,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class ImageViewer extends Composite { - private static final DALogger DA_LOG = DALogger.getInstance(); - static class ImageData { public GC gc; public int imgWidth; @@ -279,12 +277,12 @@ public class ImageViewer extends Composite { err.printStackTrace(); img = ImageResources.NO_IMAGE; } catch (SWTException e) { - DA_LOG.debug("Wait for receiving image : " + path);//$NON-NLS-1$ + Logger.debug("Wait for receiving image : " + path);//$NON-NLS-1$ img = ImageResources.NO_IMAGE; } if (img.isDisposed()) { - DA_LOG.debug("before set image : disposed"); //$NON-NLS-1$ + Logger.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 9f73fdc..80c8b68 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,11 +36,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class MessageSender { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static MessageSender m_inst; public static MessageSender getInstance() { @@ -59,7 +57,7 @@ public class MessageSender { master.writeTo(SocketClient.getInstance().getOutputStream()); SocketClient.getInstance().getOutputStream().flush(); } catch (IOException e) { - DA_LOG.warning(e.getMessage()); + Logger.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 78f7bb6..986c7ba 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,14 +34,12 @@ import java.util.HashMap; import java.util.Map; import org.json.simple.JSONObject; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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(); private String contents = null; @@ -77,7 +75,7 @@ public class MsgMgr { IMsgProc proc = FindMsgProc(subtype); if (proc == null) { - DA_LOG.info("invalid message type - " + subtype.toString()); + Logger.info("invalid message type - " + subtype.toString()); return; } 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 456efa6..faa18e1 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,11 +42,10 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; -public class SocketClient { - private static final DALogger DA_LOG = DALogger.getInstance(); +public class SocketClient { private static SocketClient client; private Socket socket; @@ -85,7 +84,7 @@ public class SocketClient { try { socket = new Socket(ip, port); - DA_LOG.info("socket created." + "ip: " + ip + ", port: " + port); + Logger.info("socket created." + "ip: " + ip + ", port: " + port); socket.setReuseAddress(true); @@ -101,10 +100,10 @@ public class SocketClient { SocketConstants.SOCKET_MESSAGE_THREAD).start(); } catch (SocketException e) { - DA_LOG.warning(e.getMessage()); + Logger.warning(e.getMessage()); return false; } catch (IOException e) { - DA_LOG.warning(e.getMessage()); + Logger.warning(e.getMessage()); return false; } @@ -129,7 +128,7 @@ public class SocketClient { ((Socket) obj).close(); } } catch (final IOException e) { - DA_LOG.warning(e.getMessage()); + Logger.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 247c648..3595725 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,11 +32,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class SocketMessage implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - // private List list = new ArrayList(); @Override @@ -51,7 +49,7 @@ public class SocketMessage implements Runnable { try { msgQueue.wait(); } catch (InterruptedException e) { - DA_LOG.debug("[severe] " + e.getMessage()); + Logger.debug("[severe] " + e.getMessage()); } } while (true) @@ -80,7 +78,7 @@ public class SocketMessage implements Runnable { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - DA_LOG.info("processMsg"); + Logger.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 91fa080..2a75ff8 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,24 +38,22 @@ 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 org.tizen.dynamicanalyzer.util.Logger; 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(); - DA_LOG.info("Socket Receive runs."); + Logger.info("Socket Receive runs."); DataInputStream in = client.getInputStream(); int size = 0; try { while ((size = in.readInt()) > 0) { if (client.getSocket().isClosed() || !client.isRunning()) { - DA_LOG.debug("closed || not running."); + Logger.debug("closed || not running."); break; } @@ -85,7 +83,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(); - DA_LOG.debug("message len: " + message.length() + Logger.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 6e46167..86a1fba 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 @@ -48,7 +48,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.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotTooltip; @@ -61,8 +61,6 @@ 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() @@ -206,7 +204,7 @@ public class CallFlowChart extends DAChartBoard { prevItem = curItem; prevSeriesNum = curSeriesNum; } else { - DA_LOG.error("Function series is not exist in call flow chart"); + Logger.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 eda01c1..a893b73 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,11 +35,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; 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"; @@ -99,7 +97,7 @@ public class KernelDataMaker { } else { // thread id is exist in thread id array if (kdata.getCorelog() != null) { // TODO : error - DA_LOG.error("context switch entry log is coming without exit log of previous context"); + Logger.error("context switch entry log is coming without exit log of previous context"); } else { kdata.setCorelog(csdata); @@ -127,13 +125,13 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // thread id is not exist // TODO : error - DA_LOG.error("context switch exit log is coming without any entry log"); + Logger.error("context switch exit log is coming without any entry log"); } else if ((precore = kdata.getCorelog()) == null) { // TODO : error - DA_LOG.error("context switch exit log is coming without corresponding entry log"); + Logger.error("context switch exit log is coming without corresponding entry log"); } else if (precore.getCpuNum() != csdata.getCpuNum()) { // TODO : error - DA_LOG.error("context switch exit log is coming with different cpu num"); + Logger.error("context switch exit log is coming with different cpu num"); } else { kdata.setCorelog(null); @@ -153,7 +151,7 @@ public class KernelDataMaker { prefunc_type = kdata.getFunclogType(); if (prefunc != null) { if (prefunc.isEmpty() || prefunc_type.isEmpty()) { - DA_LOG.warning("context switch exit log is coming but there is no function in stack"); + Logger.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(); @@ -190,7 +188,7 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // TODO : error - // DA_LOG.error("function entry log is coming without any context entry log"); + // Logger.error("function entry log is coming without any context entry log"); } else { assert (kdata.getCorelog() != null); if (kdata.getFunclog() == null) { @@ -238,7 +236,7 @@ public class KernelDataMaker { KernelDataPerThread kdata = findKernelData(tid); if (kdata == null) { // TODO : error - // DA_LOG.error("function entry log is coming without any context entry log"); + // Logger.error("function entry log is coming without any context entry log"); } else { assert (kdata.getCorelog() != null); if (kdata.getFunclog() == null) { @@ -251,7 +249,7 @@ public class KernelDataMaker { if (prefunc.isEmpty() || prefunc_type.isEmpty()) { // TODO : error - DA_LOG.error("function exit log is coming without function entry log"); + Logger.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/network/data/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java index 0716b91..07c793d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java @@ -39,7 +39,7 @@ import org.tizen.dynamicanalyzer.swap.model.data.NetworkData; import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkAPIType; import org.tizen.dynamicanalyzer.ui.network.data.type.NetworkSeriesType; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.DownloadContentfileManager; @@ -131,8 +131,7 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_CONNECT: { String[] strInput = parameter.split(CommonConstants.COMMA); if (strInput.length <= 0) { - DALogger.getInstance().error( - "argument length is wrong : " + input.getApiName()); + Logger.error("argument length is wrong : " + input.getApiName()); return; } apiAddress = strInput[1].trim(); @@ -189,8 +188,7 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_BIND: { String[] strInput = parameter.split(CommonConstants.COMMA); if (strInput.length <= 0) { - DALogger.getInstance().error( - "argument length is wrong : " + input.getApiName()); + Logger.error("argument length is wrong : " + input.getApiName()); return; } apiAddress = strInput[1].trim(); @@ -203,8 +201,7 @@ public class NetworkDataMaker { if (apiName.contains("epoll_ctl")) { //$NON-NLS-1$ String[] strInput = parameter.split(CommonConstants.COMMA); if (strInput.length <= 0) { - DALogger.getInstance().error( - "argument length is wrong : " + input.getApiName()); + Logger.error("argument length is wrong : " + input.getApiName()); return; } String clientFD = strInput[0].trim(); @@ -312,9 +309,7 @@ public class NetworkDataMaker { break; } default: - DALogger.getInstance().error( - "makeEventData : no case NetworkChartDataEvent : " - + apiType); + Logger.error("makeEventData : no case NetworkChartDataEvent : " + apiType); return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDBTableManager.java index 9b25366..cc987d9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDBTableManager.java @@ -36,7 +36,7 @@ import org.tizen.dynamicanalyzer.database.DBConstants; import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.database.SqlConnectionManager; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLContextNameEnum; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class GLStateDBTableManager extends DBTable { private static final String TABLENAME = "GL_CONTEXT";//$NON-NLS-1$ @@ -96,7 +96,7 @@ public class GLStateDBTableManager extends DBTable { } else if (i == GLContextNameEnum.FRAME_BUFFER_BINDING.ordinal()) { types[i] = "VARCHAR(32)"; } else { - DALogger.getInstance().error("undefine column : " + i); + Logger.error("undefine column : " + i); } } for (int i = 0; i < length; i++) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java index cb101d7..c1b06ce 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java @@ -47,7 +47,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSharingContextType; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLStateProgramType; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLStateShaderType; import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLStateTextureType; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.utils.DownloadContentfileManager; @@ -754,8 +754,7 @@ public class GLStateDataMaker { curretnContextValue.textureList.get(i).setWrapT( Integer.parseInt(parameters[2])); } else { - DALogger.getInstance().error( - "undefine type : " + parameters[1]); + Logger.error("undefine type : " + parameters[1]); } } } 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 0c27d2f..02e7b09 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 @@ -46,15 +46,13 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.userinterface.UIPage; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -70,7 +68,7 @@ public class BaseView extends ViewPart { tabView.setTabWidth(114); tabView.isImageTab(true); createTabViewPage(); - DA_LOG.performance("TEST", "DA Start", "Create Toolbar and Add Tab view"); + Logger.performance("TEST", "DA Start", "Create Toolbar and Add Tab view"); } @Override @@ -169,12 +167,12 @@ public class BaseView extends ViewPart { tabView.addView(newPage, false); break; default: - DA_LOG.debug("No Selected View Pages"); + Logger.debug("No Selected View Pages"); break; } } } else { - DA_LOG.error("View Page List is Null"); + Logger.error("View Page List is Null"); } } @@ -227,11 +225,11 @@ public class BaseView extends ViewPart { tabView.addView(newPage, false); break; default: - DA_LOG.debug("No Selected View Pages"); + Logger.debug("No Selected View Pages"); break; } } else { - DA_LOG.info("Add failed : " + tabViewId + " already exists"); + Logger.info("Add failed : " + tabViewId + " already exists"); } } @@ -243,7 +241,7 @@ public class BaseView extends ViewPart { if (tabView.isExistingPage(tabViewId)) { // If the page exist, remove the page tabView.removeView(tabViewId, false); } else { - DA_LOG.debug("Remove failed : " + tabViewId + " does not exist"); + Logger.debug("Remove failed : " + tabViewId + " does not exist"); } } 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 8382caf..9412f34 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,11 +30,9 @@ import java.util.Timer; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.ui.toolbar.UpdateTimerTask; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class UpdateViewTimer { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static Timer timer = null; private static boolean bOpentrace = false; private static boolean bStartRecord = false; @@ -68,7 +66,7 @@ public class UpdateViewTimer { if (null != timer) { timer.cancel(); timer = null; - DA_LOG.debug("update timer stop"); //$NON-NLS-1$ + Logger.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/SummaryDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java index 94e2c78..fbe9a3b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/SummaryDataManager.java @@ -46,11 +46,8 @@ import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.leaks.NewLeakDetector; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBTable; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataMaker; -import org.tizen.dynamicanalyzer.util.DALogger; public class SummaryDataManager extends PageDataManager { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static SummaryDataManager instance = null; private LeakDataMaker leakDataMaker = null; private FailedApiDataMaker failedApiDataMaker = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiDataMaker.java index e59d579..2893707 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiDataMaker.java @@ -33,11 +33,8 @@ import org.tizen.dynamicanalyzer.database.DBTable; import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; -import org.tizen.dynamicanalyzer.util.DALogger; public class FailedApiDataMaker { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static final String query_withTime = "where %s >= %s and %s <= %s order by %s"; private ArrayList> failedApiDataList; 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 428fc05..a2cc2de 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 @@ -49,12 +49,10 @@ 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.util.Logger; import org.tizen.dynamicanalyzer.utils.Formatter; public class FailedApiTable extends DATableComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); - private boolean isRange = false; private final FailedApiDataMaker failedApiDataMaker = SummaryDataManager.getInstance() @@ -139,7 +137,7 @@ public class FailedApiTable extends DATableComposite { // text.add(errCode); // 5 // data.add(new Long(failedData.getErrorCode())); // } catch (NullPointerException e) { - // DA_LOG.debug("debug"); + // Logger.debug("debug"); // continue; // } // String errMsg = ErrorCodeManager.getInatance().getErrorDescription( @@ -246,7 +244,7 @@ public class FailedApiTable extends DATableComposite { text.add(errCode); data.add(Long.valueOf(errNum)); } catch (NullPointerException e) { - DA_LOG.debug("debug"); + Logger.debug("debug"); continue; } String errMsg = ErrorCodeManager.getInatance().getErrorDescription(errNum); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java index 3297cf5..f61d5d8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakDataMaker.java @@ -47,13 +47,10 @@ import org.tizen.dynamicanalyzer.swap.model.data.LogData; import org.tizen.dynamicanalyzer.swap.model.data.MemoryData; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; -import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.da.base.DADialog; public class LeakDataMaker { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static final String query_withSeq = "where %s = %s"; private static final String query_withSeqList = "where %s in ("; private static final String query_addOrderby = " order by %s"; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java index 3a8fa61..d56000c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/LeakTable.java @@ -53,12 +53,10 @@ import org.tizen.dynamicanalyzer.ui.summary.SummaryPage; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat; import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.Formatter; public class LeakTable extends DATreeComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); - private boolean isRange = false; private final LeakDataMaker leakDataMaker = SummaryDataManager.getInstance().getLeakDataMaker(); @@ -210,7 +208,7 @@ public class LeakTable extends DATreeComposite { TreeInput output = null; if (leakData == null) { - DA_LOG.error("very strange case !!"); + Logger.error("very strange case !!"); return null; } @@ -311,11 +309,11 @@ public class LeakTable extends DATreeComposite { int seq = leakInfo.getSequenceNumber(); List> leakData = leakDataMaker.getAllocationDataFromDB(seq); if (leakData == null) { - DA_LOG.error("very strange case !!"); + Logger.error("very strange case !!"); return null; } if (leakData.size() != 1) { // size of leakData must be 1 - DA_LOG.error("size of leakDataMaker.getLeakDataFromDB() is not '1'"); + Logger.error("size of leakDataMaker.getLeakDataFromDB() is not '1'"); return output; } List idata = leakData.get(0); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java index 15d2a1a..b453959 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/leaks/NewLeakDetector.java @@ -40,7 +40,6 @@ import org.tizen.dynamicanalyzer.swap.model.data.MemoryData; import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; -import org.tizen.dynamicanalyzer.util.DALogger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; public class NewLeakDetector { 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 f152979..d87c112 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 @@ -47,12 +47,10 @@ import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; 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.util.Logger; import org.tizen.dynamicanalyzer.utils.Formatter; public class ProfileDataMaker { - private static final DALogger DA_LOG = DALogger.getInstance(); - class CallstackTree { ProfilingData me; CallstackTree parent; @@ -303,7 +301,7 @@ public class ProfileDataMaker { } addrs.add(0, selfAddr); } else { -// DA_LOG.debug("makeFunctionUsageProfileData : cannot find seq by time"); +// Logger.debug("makeFunctionUsageProfileData : cannot find seq by time"); addrs = new ArrayList(); addrs.add(selfAddr); } @@ -500,7 +498,7 @@ public class ProfileDataMaker { if(size == 0 || userCallstack.get(size - 1).getCallStackUnit() .getFunctionId() != inputCallstackApiData.getFunctionId()) { - DA_LOG.debug("exit without entry or EXIT self is not the same as top of user callstack :" + Logger.debug("exit without entry or EXIT self is not the same as top of user callstack :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ return; } @@ -540,7 +538,7 @@ public class ProfileDataMaker { if (type == LogCenterConstants.USER_FUNCTION_EVENT_TYPE_EXIT) { if (null == current) { // bug - DA_LOG.debug("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ + Logger.debug("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ } else { CallstackTree parentCt = current.getParent(); if (null != parentCt) { @@ -578,7 +576,7 @@ public class ProfileDataMaker { if(size == 0 || userCallstack.get(size - 1).getCallStackUnit() .getFunctionId() != inputCallstackApiData.getFunctionId()) { - DA_LOG.debug("exit without entry or EXIT self is not the same as top of user callstack :" + Logger.debug("exit without entry or EXIT self is not the same as top of user callstack :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ return; } @@ -621,7 +619,7 @@ public class ProfileDataMaker { if (type == MSG_FUNCTION_EXIT) { if (null == current) { // bug - DA_LOG.debug("exit without entry - range only :" + inputCallstackApiData.getFunctionName()); //$NON-NLS-1$ + Logger.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/summary/warning/WarningDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java index da3cee9..46b3a5a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/warning/WarningDataMaker.java @@ -35,11 +35,8 @@ import org.tizen.dynamicanalyzer.swap.model.data.ProbeCommonData; import org.tizen.dynamicanalyzer.ui.summary.SummaryDataManager; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBInserter; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningDataDBTable; -import org.tizen.dynamicanalyzer.util.DALogger; public class WarningDataMaker { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static int warningSeq = 1; private static final String query_withKeyAndCase_1 = "where %s = \'"; 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 a21fd96..c13a416 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,14 +33,12 @@ 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.util.Logger; 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; @@ -123,7 +121,7 @@ public class ThreadPageSyncData extends ThreadPageData { DAChartSeriesItem stateItem = null; DAChartSeriesItem apiItem = null; if (!(event instanceof ThreadPageSyncDataEvent)) { - DA_LOG.error("createChartItem"); + Logger.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 6bb1451..f53e045 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 @@ -53,7 +53,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.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -65,8 +65,6 @@ 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(); @@ -182,10 +180,10 @@ public class ThreadPageSyncDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushEvent(event); - DA_LOG.error("sync parse - type = " + type); + Logger.error("sync parse - type = " + type); break; default: - DA_LOG.error("sync parse unknown - type = " + type); + Logger.error("sync parse unknown - type = " + type); } } @@ -247,10 +245,10 @@ public class ThreadPageSyncDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushEvent(event); - DA_LOG.error("sync parse - type = " + type); + Logger.error("sync parse - type = " + type); break; default: - DA_LOG.error("sync parse unknown - type = " + Logger.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 7df646e..34cdb67 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,14 +34,12 @@ 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.util.Logger; 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; @@ -85,7 +83,7 @@ public class ThreadPageThreadData extends ThreadPageData { protected int createChartItem(ThreadPageDataEvent event) { int ret = -1; if (!(event instanceof ThreadPageThreadDataEvent)) { - DA_LOG.error("createChartItem"); + Logger.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 72fe952..9a8be3a 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 @@ -63,7 +63,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.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -76,8 +76,6 @@ 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; @@ -390,7 +388,7 @@ public class ThreadPageThreadDataManager { // try { // tid = temp[j]; // } catch (NumberFormatException nfe) { -// DA_LOG.error("parseLoad - tid parsing"); +// Logger.error("parseLoad - tid parsing"); // break; // } // // if (null == findParentData(tid)) { @@ -432,7 +430,7 @@ public class ThreadPageThreadDataManager { // try { // tid = temp[j]; // } catch (NumberFormatException nfe) { -// DA_LOG.error("parseLoad - tid parsing"); +// Logger.error("parseLoad - tid parsing"); // break; // } // // if (null == findParentData(tid)) { @@ -558,7 +556,7 @@ public class ThreadPageThreadDataManager { pushEvent(event); break; default: - DA_LOG.error("thread page err: unknown thread api type"); + Logger.error("thread page err: unknown thread api type"); } } @@ -656,7 +654,7 @@ public class ThreadPageThreadDataManager { pushEvent(event); break; default: - DA_LOG.error("thread page err: unknown thread api type"); + Logger.error("thread page err: unknown thread api type"); } } @@ -680,7 +678,7 @@ public class ThreadPageThreadDataManager { parseTIZEN(log); break; default: - DA_LOG.error("thread page err: unknown thread type"); + Logger.error("thread page err: unknown thread type"); } hasUpdate = true; @@ -707,7 +705,7 @@ public class ThreadPageThreadDataManager { parseTIZEN(input); break; default: - DA_LOG.error("thread page err: unknown thread type"); + Logger.error("thread page err: unknown thread type"); } } } @@ -763,10 +761,10 @@ public class ThreadPageThreadDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushSyncEvent(event); - DA_LOG.error("error : sync parse - type = " + type); + Logger.error("error : sync parse - type = " + type); break; default: - DA_LOG.error("error : sync parse unknown - type = " + type); + Logger.error("error : sync parse unknown - type = " + type); } hasUpdate = true; } @@ -827,10 +825,10 @@ public class ThreadPageThreadDataManager { event = new ThreadPageSyncDataEvent(name, type, apiType, time, tid, apiName, errorNum, input); pushSyncEvent(event); - DA_LOG.debug("sync parse - type = " + type); + Logger.debug("sync parse - type = " + type); break; default: - DA_LOG.error("sync parse unknown - type = " + Logger.error("sync parse unknown - type = " + type); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java index 866c4c3..6f5261d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java @@ -48,7 +48,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.ProcessLoadDBTable; import org.tizen.dynamicanalyzer.ui.timeline.SystemDataDBTable; import org.tizen.dynamicanalyzer.ui.timeline.TargetProcessDBTable; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.Formatter; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -269,7 +269,7 @@ public class CPUChart extends TimelineChart { newSeries.addSeriesItem(new DAChartSeriesItem(time, load, Formatter.toPercentageFormat(load))); if (processItem == null) { - DALogger.getInstance().error("processItem is null"); + Logger.error("processItem is null"); return; } processItem.getChart().addSeries(newSeries); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java index f881c3e..529a157 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java @@ -42,7 +42,7 @@ import org.tizen.dynamicanalyzer.ui.common.TimelineChartMouseTrackAdapter; import org.tizen.dynamicanalyzer.ui.timeline.EnergyDBTable; import org.tizen.dynamicanalyzer.ui.timeline.SystemDataDBTable; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -80,7 +80,7 @@ public class EnergyChart extends TimelineChart { chartIcon = ImageResources.CHART_ENERGY; addIcon = ImageResources.CHART_ENERGY; - DALogger.getInstance().check("This line was comment.(//FIXME)"); + Logger.check("This line was comment.(//FIXME)"); energyUsageSeries = new DAChartSeries( TimelineChartLabels.ENERGY_CHART_SERIES, DAChartSeries.SERIES_STYLE_LINE, ColorResources.RED); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java index e42a9fc..7c45206 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineEditItemsDialog.java @@ -81,7 +81,7 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; import org.tizen.dynamicanalyzer.ui.toolbar.ConfigureManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -362,7 +362,7 @@ public class TimelineEditItemsDialog extends DAMessageBox { public void dragSetData(DragSourceEvent event) { TableItem sourceItem = findTableItem(event.x, event.y); if (sourceItem == null) { - DALogger.getInstance().warning("drag sourceItem is null."); + Logger.warning("drag sourceItem is null."); return; } event.data = sourceItem.getText(); @@ -374,7 +374,7 @@ public class TimelineEditItemsDialog extends DAMessageBox { // set drag image. this image will be shown below of mouse pointer. TableItem selection = findTableItem(event.x, event.y); if (selection == null) { - DALogger.getInstance().warning("drag selection is null."); + Logger.warning("drag selection is null."); return; } Image dropImage = imageMap.get(((TableItemData)selection.getData()).chartType); 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 e2f2f47..0ac3125 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,7 +50,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; 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.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker; @@ -62,8 +62,6 @@ 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 @@ -170,7 +168,7 @@ public class TimelineView extends DAViewComposite { AnalyzerUtil.translateSecToMicroSec(chartBoard.getVisibleEndTime())); if (ToolbarArea.getInstance() == null) { - DA_LOG.debug("toolbar area is null");//$NON-NLS-1$ + Logger.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 e41b73e..eac2d51 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 @@ -45,14 +45,12 @@ import org.tizen.dynamicanalyzer.ui.timeline.CustomDataDBTable; 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.util.Logger; 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$ @@ -105,7 +103,7 @@ public class CustomLogParser { int chartType = log.getHandle(); UserCustomChart chart = (UserCustomChart) chartManager.getChartInstance(chartType); if (chart == null) { - DA_LOG.debug("CustomLogParser.java : unrecognized chart handle"); //$NON-NLS-1$ + Logger.debug("CustomLogParser.java : unrecognized chart handle"); //$NON-NLS-1$ return; } @@ -118,7 +116,7 @@ public class CustomLogParser { } Color seriesColor = getCustomColor(colorIndex); if (seriesColor == null) { - DA_LOG.debug("CustomLogParser.java : undefined custom color"); //$NON-NLS-1$ + Logger.debug("CustomLogParser.java : undefined custom color"); //$NON-NLS-1$ return; } @@ -129,7 +127,7 @@ public class CustomLogParser { int chartType = log.getType(); UserCustomChart chart = (UserCustomChart) chartManager.getChartInstance(chartType); if (chart == null) { - DA_LOG.debug("unrecognized chart handle"); //$NON-NLS-1$ + Logger.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 abd65c3..5078add 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 @@ -41,14 +41,12 @@ 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.util.Logger; 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; // 2 void _AppImpl::OnTerminate(void* user_data) @@ -120,23 +118,23 @@ public class LifecycleLogParser { if (AnalyzerManager.getProject().getApplicationInfo().getAppType(). contains(AppInfo.APPTYPE_CAPP)) { if (apiId == API_ID_INITIALIZING_EFL) { - DA_LOG.performance("TEST", "EFL App Lifecycle", "Initializing"); + Logger.performance("TEST", "EFL App Lifecycle", "Initializing"); color = ColorResources.LIFECYCLE_INITIALIZING; text = TimelineChartLabels.LIFECYCLE_INITIALIZING; } else if (apiId == API_ID_SERVICE_EFL || apiId == API_ID_RESUME_EFL) { - DA_LOG.performance("TEST", "EFL App Lifecycle", "Running"); + Logger.performance("TEST", "EFL App Lifecycle", "Running"); color = ColorResources.LIFECYCLE_RUNNING; text = TimelineChartLabels.LIFECYCLE_RUNNING; } else if (apiId == API_ID_PAUSING_EFL) { - DA_LOG.performance("TEST", "EFL App Lifecycle", "Pausing"); + Logger.performance("TEST", "EFL App Lifecycle", "Pausing"); color = ColorResources.LIFECYCLE_PAUSING; text = TimelineChartLabels.LIFECYCLE_PAUSING; } else if (apiId == API_ID_TERMINATING_EFL) { - DA_LOG.performance("TEST", "EFL App Lifecycle", "Terminating"); + Logger.performance("TEST", "EFL App Lifecycle", "Terminating"); color = ColorResources.LIFECYCLE_TERMINATING; text = TimelineChartLabels.LIFECYCLE_TERMINATING; } else { - DA_LOG.error("lifecycle log error"); //$NON-NLS-1$ + Logger.error("lifecycle log error"); //$NON-NLS-1$ return; } } @@ -144,27 +142,27 @@ public class LifecycleLogParser { else if (AnalyzerManager.getProject().getApplicationInfo().getAppType(). contains(AppInfo.APPTYPE_CPP)) { if (apiId == API_ID_INITIALIZING_OSP) { - DA_LOG.performance("TEST", "OSP App Lifecycle", "Initializing"); + Logger.performance("TEST", "OSP App Lifecycle", "Initializing"); color = ColorResources.LIFECYCLE_INITIALIZING; text = TimelineChartLabels.LIFECYCLE_INITIALIZING; } else if (apiId == API_ID_RUNNING_OSP) { - DA_LOG.performance("TEST", "OSP App Lifecycle", "Running"); + Logger.performance("TEST", "OSP App Lifecycle", "Running"); color = ColorResources.LIFECYCLE_RUNNING; text = TimelineChartLabels.LIFECYCLE_RUNNING; } else if (apiId == API_ID_PAUSING_OSP) { - DA_LOG.performance("TEST", "OSP App Lifecycle", "Pausing"); + Logger.performance("TEST", "OSP App Lifecycle", "Pausing"); color = ColorResources.LIFECYCLE_PAUSING; text = TimelineChartLabels.LIFECYCLE_PAUSING; } else if (apiId == API_ID_TERMINATING_OSP) { - DA_LOG.performance("TEST", "OSP App Lifecycle", "Terminating"); + Logger.performance("TEST", "OSP App Lifecycle", "Terminating"); color = ColorResources.LIFECYCLE_TERMINATING; text = TimelineChartLabels.LIFECYCLE_TERMINATING; } else { - DA_LOG.error("lifecycle log error"); //$NON-NLS-1$ + Logger.error("lifecycle log error"); //$NON-NLS-1$ return; } } else { - DA_LOG.error("It doesn't support lifecycle application type."); + Logger.error("It doesn't support lifecycle application type."); return; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java index d8ce089..df023a2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/AboutDialog.java @@ -58,7 +58,7 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -262,7 +262,7 @@ public class AboutDialog extends DAMessageBox { private static void writeBuildInfoToAboutFile() { File DAAboutFile = new File(daAboutFilePath); if (!DAAboutFile.exists()) { - DALogger.getInstance().error("about dlg, not exists file : " + daAboutFilePath); + Logger.error("about dlg, not exists file : " + daAboutFilePath); return; } FileWriter fileWriter = null; @@ -305,7 +305,7 @@ public class AboutDialog extends DAMessageBox { private static String getIDEVersion() { File ideAboutFile = new File(PathManager.getIDEAboutFilePath()); if (!ideAboutFile.exists()) { - DALogger.getInstance().error( + Logger.error( "about dlg, not exists file : " + PathManager.getIDEAboutFilePath()); return CommonConstants.EMPTY; } @@ -335,7 +335,7 @@ public class AboutDialog extends DAMessageBox { String buildTime; File SDKAboutFile = new File(daAboutFilePath); if (!SDKAboutFile.exists()) { - DALogger.getInstance().error("about dlg, not exists file : " + daAboutFilePath); + Logger.error("about dlg, not exists file : " + daAboutFilePath); 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 3d2fea0..bf75d1a 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,11 +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; +import org.tizen.dynamicanalyzer.util.InternalLogger; +import org.tizen.dynamicanalyzer.util.Logger; public class ConfigureManager { - private static final DALogger DA_LOG = DALogger.getInstance(); - // default value private static final int DEFAULT_THEME = 1; private static final int DEFAULT_NOT_SHOWWELCOME = 0; @@ -309,8 +308,8 @@ public class ConfigureManager { } if (null == data.get(ConfigureLabels.INTERNAL_LOG_LEVEL)) { data.put(ConfigureLabels.INTERNAL_LOG_LEVEL, - Long.toString(DALogger.DEBUG)); - } + Long.toString(InternalLogger.DEBUG)); + } } private void initConfigDataFromFile() { @@ -321,7 +320,7 @@ public class ConfigureManager { File configFolder = new File(PathManager.DA_CONFIG_FOLDER_PATH); if (!configFolder.isDirectory()) { if (!configFolder.mkdirs()) { - DA_LOG.debug("config directory create failed..."); + Logger.debug("config directory create failed..."); return; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ProcessExplorer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ProcessExplorer.java index 2e995fa..6ffe236 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ProcessExplorer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ProcessExplorer.java @@ -18,14 +18,12 @@ import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.ui.widgets.DAGrid; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableCellRenderer; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; public class ProcessExplorer extends Composite { - private static final DALogger DA_LOG = DALogger.getInstance(); - protected Grid table = null; protected DACustomButton unselectAllButton = null; protected DACustomButton refreshButton = null; @@ -126,7 +124,7 @@ public class ProcessExplorer extends Composite { public void updateData() { if (device == null) { - DA_LOG.warning("Device is empty"); + Logger.warning("Device is empty"); return; } 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 a59b441..32399f4 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 @@ -54,9 +54,9 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -65,8 +65,6 @@ 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; @@ -165,7 +163,7 @@ public class SaveAsDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - DA_LOG.debug("save file name is null"); + Logger.debug("save file name is null"); return false; } else { textBox.setText(saveFileName); @@ -260,7 +258,7 @@ public class SaveAsDialog extends DAMessageBox { File sourceFolder = new File(sourcePath); if (!sourceFolder.isDirectory()) { if (!sourceFolder.mkdirs()) { - DA_LOG.debug("source directory create failed..."); + Logger.debug("source directory create failed..."); return false; } } @@ -268,7 +266,7 @@ public class SaveAsDialog extends DAMessageBox { File targetFolder = new File(targetPath); if (!targetFolder.isDirectory()) { if (!targetFolder.mkdirs()) { - DA_LOG.debug("target directory create failed..."); + Logger.debug("target directory create failed..."); return false; } } @@ -278,9 +276,9 @@ public class SaveAsDialog extends DAMessageBox { boolean success = AnalyzerUtil.deleteFile(new File(sourcePath)); if (success) { // add snapshot model update - DA_LOG.debug("save complete!!"); //$NON-NLS-1$ + Logger.debug("save complete!!"); //$NON-NLS-1$ } else { - DA_LOG.debug("save fail..."); //$NON-NLS-1$ + Logger.debug("save fail..."); //$NON-NLS-1$ } // establish db connection with new path 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 72f7971..33e8a38 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 @@ -5,14 +5,12 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -75,7 +73,7 @@ public class StartProcessManager implements Runnable { @Override public void run() { count = 10; - DA_LOG.debug("appinfo : " + Logger.debug("appinfo : " + AnalyzerManager.isProcessInfoArrived() + "is exit :" + AnalyzerManager.isExit()); while ((!AnalyzerManager.isExit()) && (canceled == false)) { @@ -104,7 +102,7 @@ public class StartProcessManager implements Runnable { } } stopProgress(); - DA_LOG.performance("TEST", "Start Trace", "Start Process Manager"); + Logger.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 acb271b..69bad32 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,11 +37,9 @@ import org.tizen.dynamicanalyzer.swap.logparser.SWAPLogParser; import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackInserter; import org.tizen.dynamicanalyzer.ui.page.UpdateViewTimer; import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfiler; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class StopLogProcessor implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static Thread stopLogProcessThread = null; private static int count = 0; @@ -68,8 +66,7 @@ public class StopLogProcessor implements Runnable { @Override public void run() { - DA_LOG.performance("TEST", "DA end", "Run stop log process thread", - DALogger.testState.START); + Logger.performanceSubThreadStart("TEST", "DA end", "Run stop log process thread"); Project project = AnalyzerManager.getProject(); int percent = 0; @@ -102,10 +99,10 @@ public class StopLogProcessor implements Runnable { StopProcessManager.getInstance().setValue(percent); /* save Project */ - DA_LOG.debug(" save project and others..."); //$NON-NLS-1$ + Logger.debug(" save project and others..."); //$NON-NLS-1$ if (null == project || !project.isValid()) { - DA_LOG.debug("project temp save is fail : project is not valid"); //$NON-NLS-1$ + Logger.debug("project temp save is fail : project is not valid"); //$NON-NLS-1$ } else { project.setTotalStopTime(ToolbarArea.getInstance().getTime()); // SqlManager.getInstance().saveLeakData(); @@ -115,7 +112,7 @@ public class StopLogProcessor implements Runnable { FunctionUsageProfiler.getInstance().saveProfilingChildData(); SqlManager.getInstance().closeConnection(); project.save(); - DA_LOG.debug("insert to db complete..."); //$NON-NLS-1$ + Logger.debug("insert to db complete..."); //$NON-NLS-1$ percent += 10; StopProcessManager.getInstance().setValue(percent); } @@ -124,8 +121,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); + Logger.performanceSubThreadEnd("TEST", "DA end", "Run stop log process thread"); } }); @@ -138,7 +134,7 @@ public class StopLogProcessor implements Runnable { } }); - DA_LOG.performance("TEST", DALogger.testState.END); + Logger.performanceEnd("TEST"); 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 00af016..de9d48d 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 @@ -63,7 +63,7 @@ import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialog; import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceDialog; import org.tizen.dynamicanalyzer.ui.toolbar.replayEditor.ReplayEditDialog; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; @@ -77,8 +77,6 @@ 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; @@ -473,10 +471,10 @@ public class ToolbarArea { setSaveButtonEnable(false); ShortCutManager.getInstance().setEnabled(true); - DA_LOG.performance("TEST", "Start Trace", "Check valid application"); + Logger.performance("TEST", "Start Trace", "Check valid application"); return; } - DA_LOG.performance("TEST", "Start Trace", "Check valid application"); + Logger.performance("TEST", "Start Trace", "Check valid application"); Display.getDefault().syncExec(new Runnable() { @Override @@ -486,7 +484,7 @@ public class ToolbarArea { }); AnalyzerUtil.changePage(TimelinePage.pageID); - DA_LOG.performance("TEST", "Start Trace", "Change to the Timeline page"); + Logger.performance("TEST", "Start Trace", "Change to the Timeline page"); AnalyzerManager.setRunningState(true); processCombo.initCombo(); processCombo.add(ALL_PROCESS); @@ -1084,7 +1082,7 @@ public class ToolbarArea { private boolean checkValidApplication() { List devices = DACommunicator.getDevices(); if (null == devices || devices.isEmpty()) { - DA_LOG.debug("Device is empty"); + Logger.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 faed31c..95f3cad 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,7 +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.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -71,8 +71,6 @@ 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; @@ -251,7 +249,7 @@ public class BinarySettingsPage extends DAPageComposite { File settingFolder = new File(settingPath); if (!settingFolder.exists() || !settingFolder.isDirectory()) { if (!settingFolder.mkdirs()) { - DA_LOG.debug("setting directory create failed..."); + Logger.debug("setting directory create failed..."); } } @@ -382,11 +380,11 @@ public class BinarySettingsPage extends DAPageComposite { binData.setDebugRpmPath(debug); binData.setUserSourcePath(source); } else { - DA_LOG.debug("binary data is null"); + Logger.debug("binary data is null"); } } - DA_LOG.debug("update complete!"); + Logger.debug("update complete!"); } public void doClose() { @@ -416,10 +414,10 @@ public class BinarySettingsPage extends DAPageComposite { if (success) { // add snapshot model update - DA_LOG.debug("binary settings auto save success!!"); //$NON-NLS-1$ + Logger.debug("binary settings auto save success!!"); //$NON-NLS-1$ } else { - DA_LOG.debug("binary settings auto save fail..."); //$NON-NLS-1$ + Logger.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 44c2367..648b0ff 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 @@ -49,7 +49,7 @@ import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; import org.tizen.dynamicanalyzer.ui.page.BaseView; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; @@ -59,8 +59,6 @@ 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; @@ -151,7 +149,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ + Logger.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } @@ -225,7 +223,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - DA_LOG.debug("binary settings show"); + Logger.debug("binary settings show"); cancelButton.setText(WidgetLabels.CLOSE); FormData data = (FormData) okButton.getLayoutData(); data.width = 0; @@ -241,7 +239,7 @@ public class ConfigurationDialog extends DAMessageBox { @Override public void handleEvent(Event event) { - DA_LOG.debug("binary settings hide"); + Logger.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 0e298c9..e36dee5 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,13 +42,11 @@ import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineChartManager; 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.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; 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; @@ -372,7 +370,7 @@ public class ConfigurationDialogDataManager { .equals(ConfigureLabels.SYSTEM_INFOMATION_SAMPLING_PERIODIC)) { value = AnalyzerConstants.SYSTEM_INFOMATION_SAMPLING_PERIODIC; } else { - DA_LOG.debug("undefine feature : " + featureName); + Logger.debug("undefine feature : " + featureName); } } featuresValueHashMap.put(featureName, value); @@ -498,7 +496,7 @@ public class ConfigurationDialogDataManager { long configFileStatus = mConfig.getValueLong(featureName); if (featuresStatus != configFileStatus) { if (apply) { - DA_LOG.debug("change values : " + featureName); + Logger.debug("change values : " + featureName); } isChangeValue = true; } @@ -550,7 +548,7 @@ public class ConfigurationDialogDataManager { long configFileStatus = mConfig.getValueLong(featureName); if (featuresStatus != configFileStatus) { if (apply) { - DA_LOG.debug("change values : " + featureName); + Logger.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 c9cd684..374012d 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 @@ -65,8 +65,8 @@ import org.tizen.dynamicanalyzer.resources.FontResources; 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.util.Logger; 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; @@ -74,8 +74,6 @@ 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; @@ -127,7 +125,7 @@ public class OpenTraceDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ + Logger.debug("shell disposed!"); //$NON-NLS-1$ opened = false; ShortCutManager.getInstance().setEnabled(!opened); } @@ -482,7 +480,7 @@ public class OpenTraceDialog extends DAMessageBox { grid.remove(index); } else { // log for debug - DA_LOG.debug("delete save file failed..."); //$NON-NLS-1$ + Logger.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 15ac857..0420f4b 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,11 +38,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class OpenTraceInputReader implements Runnable { - private static final DALogger DA_LOG = DALogger.getInstance(); - private static Thread openTraceInputThread = null; public static synchronized void startOpenTraceInputReader() { @@ -93,7 +91,7 @@ public class OpenTraceInputReader implements Runnable { // TODO : implement load process - DA_LOG.debug("input reader complete"); //$NON-NLS-1$ + Logger.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 71b4877..b714ff5 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 @@ -52,9 +52,9 @@ import org.tizen.dynamicanalyzer.project.Project; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.util.CommonUtil; +import org.tizen.dynamicanalyzer.util.Logger; 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; @@ -62,8 +62,6 @@ 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; public Text textBox = null; @@ -162,7 +160,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { saveFileName = getSaveFileName(); if (null == saveFileName) { // create warning message box - DA_LOG.debug("save file name is null"); + Logger.debug("save file name is null"); return false; } else { textBox.setText(saveFileName); @@ -257,7 +255,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { File sourceFolder = new File(sourcePath); if (!sourceFolder.isDirectory()) { if (!sourceFolder.mkdirs()) { - DA_LOG.debug("source directory create failed..."); + Logger.debug("source directory create failed..."); return false; } } @@ -265,7 +263,7 @@ public class RepalyEditSaveDialog extends DAMessageBox { File targetFolder = new File(targetPath); if (!targetFolder.isDirectory()) { if (!targetFolder.mkdirs()) { - DA_LOG.debug("target directory create failed..."); + Logger.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 9ea769c..8b7caa0 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 @@ -44,15 +44,13 @@ 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.util.Logger; 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 DATableComposite replayTable; @@ -92,7 +90,7 @@ public class ReplayEditDialog extends DAMessageBox { @Override public void widgetDisposed(DisposeEvent e) { - DA_LOG.debug("shell disposed!"); //$NON-NLS-1$ + Logger.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 3b9d216..7f45353 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,11 +40,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class ReplayEditSnapShopTableCellRenderer extends DefaultCellRenderer { - private static final DALogger DA_LOG = DALogger.getInstance(); - @Override public void paint(GC gc, Object value) { GridItem item = (GridItem) value; @@ -98,12 +96,12 @@ public class ReplayEditSnapShopTableCellRenderer extends DefaultCellRenderer { err.printStackTrace(); img = ImageResources.NO_IMAGE; } catch (SWTException e) { - DA_LOG.debug("Wait for receiving image : " + path); + Logger.debug("Wait for receiving image : " + path); img = ImageResources.NO_IMAGE; } if (img.isDisposed()) { - DA_LOG.debug("before set image : disposed"); + Logger.debug("before set image : disposed"); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java index 746d68f..b2c6881 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java @@ -45,14 +45,13 @@ import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.resources.ImageResources; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite; import org.tizen.dynamicanalyzer.ui.widgets.table.DATableHeaderRenderer; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.da.base.DAText; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenu; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuListener; public class ReplayEditTable extends DATableComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); private String[] columnNames = null; protected DAPopupMenu eventTypePopupMenu = null; protected DAPopupMenu eventKeyPopupMenu = null; @@ -1109,7 +1108,7 @@ public class ReplayEditTable extends DATableComposite { if (this.columnNames.length > index) { return this.columnNames[index]; } else { - DA_LOG.error("[ERR] input column index is wrong !!"); + Logger.error("[ERR] input column index is wrong !!"); return CommonConstants.EMPTY; } } 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 e64c94a..a333ca0 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 @@ -34,11 +34,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public class UIControlListDataChecker { - private static final DALogger DA_LOG = DALogger.getInstance(); - private List controlList = null; private List removeCallControlList = null; private int preSeq = -1; @@ -66,7 +64,7 @@ public class UIControlListDataChecker { || stClassName.contains("RemoveAllControl")) {//$NON-NLS-1$ return; } else { - DA_LOG.debug("wrong type log : " + stClassName.trim()); + Logger.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 20a41ff..f36782d 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 @@ -46,12 +46,10 @@ 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.util.Logger; 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(); @@ -304,7 +302,7 @@ public class UIFunctionProfilingDataChecker { String sourcePath = PathManager.getTizenHeaderPath(isArm, platform); File sourceFolder = new File(sourcePath); if (!sourceFolder.exists() && !sourceFolder.isDirectory()) { - DA_LOG.debug("Not Found the tizen_header_file folder : " + Logger.debug("Not Found the tizen_header_file folder : " + sourcePath); return; } @@ -425,12 +423,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()) { - DA_LOG.debug("Not Exist UI API List Option Path "); + Logger.debug("Not Exist UI API List Option Path "); return CommonConstants.EMPTY; } File apiListFile = new File(configFolder, configFileName); if (!apiListFile.isFile()) { - DA_LOG.debug("Not Exist UI API List Option File"); + Logger.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/table/DATableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java index 17dd0a5..5d01a9b 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 @@ -65,15 +65,13 @@ import org.tizen.dynamicanalyzer.ui.common.PopupAnalysisMenuItemClickListener; 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.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.util.WorkbenchUtil; 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; @@ -316,7 +314,7 @@ public abstract class DATableComposite extends Composite { List dbColumnsName = new ArrayList(); if (null == this.columnNames || this.columnNames.length < 1) { - DA_LOG.debug("tableName is null"); + Logger.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 81f3731..3e6b0f1 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 @@ -39,11 +39,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; public abstract class DATreeComposite extends DATableComposite { - private static final DALogger DA_LOG = DALogger.getInstance(); - List selSeqs = null; GridItem[] selections = null; int[] sels = null; @@ -90,7 +88,7 @@ public abstract class DATreeComposite extends DATableComposite { } else if (parent instanceof GridItem) { gridItem = new GridItem((GridItem) parent, SWT.NONE); } else { - DA_LOG.debug("it is bug!! need debug - DATreeComposite makeTreeItem");//$NON-NLS-1$ + Logger.debug("it is bug!! need debug - DATreeComposite makeTreeItem");//$NON-NLS-1$ return null; } // data 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 d2fbcef..bcdc955 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java @@ -63,15 +63,13 @@ import org.tizen.dynamicanalyzer.project.Project; 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.Logger; 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; @@ -116,7 +114,7 @@ public class AnalyzerUtil { if (sourceLocation.isDirectory()) { if (!targetLocation.exists()) { if (!targetLocation.mkdir()) { - DA_LOG.debug("Copy Failed : target directory create failed.."); + Logger.debug("Copy Failed : target directory create failed.."); return; } } @@ -378,7 +376,7 @@ public class AnalyzerUtil { long lValue = Long.parseLong((String) value); retStr = CommonConstants.HEX_PREFIX + Long.toHexString(lValue).toUpperCase(); } else { - DA_LOG.error("Input type error!!"); + Logger.error("Input type error!!"); retStr = value.toString(); } return retStr; @@ -462,7 +460,7 @@ public class AnalyzerUtil { return binName; } else { - DA_LOG.error("Process information of pid " + pid + " does not exist"); + Logger.error("Process information of pid " + pid + " does not exist"); return null; } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java index 956b376..8b86fd9 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/DownloadContentfileManager.java @@ -37,7 +37,7 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.communicator.CommunicatorUtils; import org.tizen.dynamicanalyzer.constant.CommonConstants; import org.tizen.dynamicanalyzer.util.CommonUtil; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.sdblib.service.SyncResult; public class DownloadContentfileManager { @@ -98,9 +98,9 @@ public class DownloadContentfileManager { public static boolean pullFile(String from, String to) { SyncResult res = CommunicatorUtils.pull(from, to); if (null != res && res.isOk()) { - DALogger.getInstance().debug(from + "file copying success!!");//$NON-NLS-1$ + Logger.debug(from + "file copying success!!");//$NON-NLS-1$ } else { - DALogger.getInstance().debug("Failed to get " + from); //$NON-NLS-1$ + Logger.debug("Failed to get " + from); //$NON-NLS-1$ return false; } CommunicatorUtils.removeCommand(from); 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 f6e859e..f1c4513 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/JsonUtil.java @@ -35,11 +35,9 @@ 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; +import org.tizen.dynamicanalyzer.util.Logger; 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"; @@ -50,15 +48,15 @@ public class JsonUtil { public static JSONObject decodeObject(String message) { JSONObject obj = null; if (null == message) { - DA_LOG.debug("decodeObject - message string is null."); + Logger.debug("decodeObject - message string is null."); return obj; } try { obj = (JSONObject) parser.parse(message); } catch (ParseException e) { e.printStackTrace(); - DA_LOG.info("position: " + e.getPosition()); - DA_LOG.info(e.toString()); + Logger.info("position: " + e.getPosition()); + Logger.info(e.toString()); } return obj; } @@ -66,21 +64,21 @@ public class JsonUtil { public static JSONArray decodeArray(String message) { JSONArray obj = null; if (null == message) { - DA_LOG.debug("decodeArray - message string is null."); + Logger.debug("decodeArray - message string is null."); return obj; } try { obj = (JSONArray) parser.parse(message); } catch (ParseException e) { - DA_LOG.info("position: " + e.getPosition()); - DA_LOG.info(e.toString()); + Logger.info("position: " + e.getPosition()); + Logger.info(e.toString()); } return obj; } public static String decodeString(String message) { if (null == message) { - DA_LOG.debug("decodeArray - message string is null."); + Logger.debug("decodeArray - message string is null."); return null; } JSONObject obj = decodeObject(message); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/RpmUtil.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/RpmUtil.java index 28e5f7d..3f4f6c8 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/RpmUtil.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/RpmUtil.java @@ -8,11 +8,9 @@ import java.util.ArrayList; import java.util.List; import org.tizen.dynamicanalyzer.common.path.PathManager; -import org.tizen.dynamicanalyzer.util.DALogger; +import org.tizen.dynamicanalyzer.util.Logger; public class RpmUtil { - private static final DALogger DA_LOG = DALogger.getInstance(); - public static final String RPM_EXT = ".rpm"; public static final String DEBUGINFO = "debuginfo"; public static final String DEBUGSOURCE = "debugsource"; @@ -35,9 +33,9 @@ public class RpmUtil { while (null != (line = reader.readLine())) { lineCount++; if (lineCount == 1) { - DA_LOG.debug("CHANGE DIR : " + line); + Logger.debug("CHANGE DIR : " + line); } else { - DA_LOG.debug("EXTRACE RPM : " + line); + Logger.debug("EXTRACE RPM : " + line); } } @@ -45,7 +43,7 @@ public class RpmUtil { BufferedReader error = new BufferedReader(new InputStreamReader( process.getErrorStream())); String errorStr = error.readLine(); - DA_LOG.debug("debug info file extract failed... : " + errorStr); + Logger.debug("debug info file extract failed... : " + errorStr); } } catch (IOException e) { e.printStackTrace(); -- 2.7.4