From: Lee Date: Thu, 18 Oct 2012 04:35:39 +0000 (+0900) Subject: [Title] error number : code and description added X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e141d29e1bc24ae1947e111884d141e6db1fc83d;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] error number : code and description added [Desc.] error number column changed to code and description columns [Issue] sort changed and file api view error number also changed --- diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/CErrorCode.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java similarity index 96% rename from org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/CErrorCode.java rename to org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java index b0e4777..fa6b0ca 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/CErrorCode.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/DAErrorCode.java @@ -1,7 +1,33 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.error; -public enum CErrorCode { +public enum DAErrorCode { /** /usr/include/asm-generic/errno-base.h **/ EPERM(1,"Operation not permitted"), ENOENT(2, "No such file or directory"), @@ -342,7 +368,7 @@ public enum CErrorCode { private static final int E_SEVERITY_POS = 31; private static final int E_TYPE_POS = 29; - private CErrorCode(long errno, String message) { + private DAErrorCode(long errno, String message) { this.errno = errno; this.message = message; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/ErrorCodeManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/ErrorCodeManager.java index 0f197bd..95f8fb5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/ErrorCodeManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/error/ErrorCodeManager.java @@ -1,10 +1,36 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jooyoul Lee + * Juyoung Kim + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Contributors: + * - S-Core Co., Ltd + * + */ + package org.tizen.dynamicanalyzer.error; import java.util.Hashtable; public class ErrorCodeManager { private static ErrorCodeManager instance = null; - private Hashtable hash = new Hashtable(); + private Hashtable hash = new Hashtable(); public static ErrorCodeManager getInatance() { if (instance == null) { @@ -17,7 +43,7 @@ public class ErrorCodeManager { initErrorCode(); } - public String getErrorCode(long errno) { + public DAErrorCode getErrorCode(long errno) { return hash.get(errno); } @@ -29,15 +55,25 @@ public class ErrorCodeManager { e.printStackTrace(); // errno = -1 and returns null } - return hash.get(errno); + return hash.get(errno).name(); + } + + public String getErrorDescription(String strErr) { + long errno = -1; + try { + errno = Long.parseLong(strErr); + } catch (NumberFormatException e) { + e.printStackTrace(); + // errno = -1 and returns null + } + return hash.get(errno).getMessage(); } public void initErrorCode() { - CErrorCode[] cErrorCodes = CErrorCode.values(); + DAErrorCode[] cErrorCodes = DAErrorCode.values(); int size = cErrorCodes.length; for (int i = 0; i < size; i++) { - hash.put((long) cErrorCodes[i].getErrno(), - cErrorCodes[i].getMessage()); + hash.put((long) cErrorCodes[i].getErrno(), cErrorCodes[i]); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ErrorLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ErrorLabels.properties index 291026e..260bd6f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ErrorLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ErrorLabels.properties @@ -9,10 +9,12 @@ E_ALREADY_BOUND=E_ALREADY_BOUND E_ALREADY_CONNECTED=E_ALREADY_CONNECTED E_ALREADY_OPENED=E_ALREADY_OPENED E_AUTHENTICATION=E_AUTHENTICATION + E_CHUNKED_TRANSACTION=E_CHUNKED_TRANSACTION E_CONNECTION_BUSY=E_CONNECTION_BUSY E_CONNECTION_FAILED=E_CONNECTION_FAILED E_CONNECTION_RESET=E_CONNECTION_RESET + E_DATA_NOT_FOUND=E_DATA_NOT_FOUND E_DATABASE=E_DATABASE E_DECODING_FAILED=E_DECODING_FAILED @@ -23,18 +25,23 @@ E_DEVICE_UNAVAILABLE=E_DEVICE_UNAVAILABLE E_DHCP=E_DHCP E_DNS=E_DNS E_DNS_NOT_FOUND=E_DNS_NOT_FOUND + E_EFFECTS_DISABLED=E_EFFECTS_DISABLED E_EMPTY_BODY=E_EMPTY_BODY E_ENCODING_FAILED=E_ENCODING_FAILED E_END_OF_FILE=E_END_OF_FILE + E_FAILURE=E_FAILURE E_FDN_MODE=E_FDN_MODE E_FILE_ALREADY_EXIST=E_FILE_ALREADY_EXIST E_FILE_NOT_FOUND=E_FILE_NOT_FOUND + E_GROUP_NOT_FOUND=E_GROUP_NOT_FOUND + E_HOST_NOT_FOUND=E_HOST_NOT_FOUND E_HOST_UNREACHABLE=E_HOST_UNREACHABLE E_HTTP_USER=E_HTTP_USER + E_ILLEGAL_ACCESS=E_ILLEGAL_ACCESS E_IN_PROGRESS=E_IN_PROGRESS E_INACCESSIBLE_PATH=E_INACCESSIBLE_PATH @@ -64,8 +71,10 @@ E_INVALID_SOCKET=E_INVALID_SOCKET E_INVALID_STATE=E_INVALID_STATE E_INVALID_TRANSACTION=E_INVALID_TRANSACTION E_IO=E_IO + E_KEY_ALREADY_EXIST=E_KEY_ALREADY_EXIST E_KEY_NOT_FOUND=E_KEY_NOT_FOUND + E_LANDMARK=E_LANDMARK E_LIBRARY_NOT_FOUND=E_LIBRARY_NOT_FOUND E_LIBRARY_NOT_LOADED=E_LIBRARY_NOT_LOADED @@ -73,16 +82,19 @@ E_LINK=E_LINK E_LOCATION=E_LOCATION E_LOCATION_SERVICE=E_LOCATION_SERVICE E_LOCK_FAILED=E_LOCK_FAILED + E_MAX_EXCEEDED=E_MAX_EXCEEDED E_MISSING_INPUT=E_MISSING_INPUT E_MOBILE_FAILED=E_MOBILE_FAILED E_MODEL_NOT_FOUND=E_MODEL_NOT_FOUND + E_NETWORK_FAILED=E_NETWORK_FAILED E_NETWORK_UNAVAILABLE=E_NETWORK_UNAVAILABLE E_NOT_A_MEMBER=E_NOT_A_MEMBER E_NOT_PAIRED=E_NOT_PAIRED E_NOT_RESPONDING=E_NOT_RESPONDING E_NUM_FORMAT=E_NUM_FORMAT + E_OBJ_ALREADY_EXIST=E_OBJ_ALREADY_EXIST E_OBJ_NOT_FOUND=E_OBJ_NOT_FOUND E_ON_INITIALIZING=E_ON_INITIALIZING @@ -91,15 +103,18 @@ E_OPERATION_FAILED=E_OPERATION_FAILED E_OUT_OF_MEMORY=E_OUT_OF_MEMORY E_OUT_OF_RANGE=E_OUT_OF_RANGE E_OVERFLOW=E_OVERFLOW + E_PAIRING_FAILED=E_PAIRING_FAILED E_PARSING_FAILED=E_PARSING_FAILED E_PRIVILEGE_DENIED=E_PRIVILEGE_DENIED + E_READ_ONLY=E_READ_ONLY E_REJECTED=E_REJECTED E_REMOTE_DEVICE_NOT_FOUND=E_REMOTE_DEVICE_NOT_FOUND E_REMOVE_SERVICE_NOT_FOUND=E_REMOVE_SERVICE_NOT_FOUND E_RESOURCE_UNAVAILABLE=E_RESOURCE_UNAVAILABLE E_RIGHT_EXPIRED=E_RIGHT_EXPIRED + E_SECTION_ALREADY_EXIST=E_SECTION_ALREADY_EXIST E_SECTION_NOT_FOUND=E_SECTION_NOT_FOUND E_SERVER=E_SERVER @@ -115,9 +130,11 @@ E_SUCCESS=E_SUCCESS E_SYMBOL_NOT_FOUND=E_SYMBOL_NOT_FOUND E_SYNTAX=E_SYNTAX E_SYSTEM=E_SYSTEM + E_TABLE_NOT_FOUND=E_TABLE_NOT_FOUND E_TIMEOUT=E_TIMEOUT E_TYPE_MISMATCH=E_TYPE_MISMATCH + E_UNDERFLOW=E_UNDERFLOW E_UNKNOWN=E_UNKNOWN E_UNSUPPORTED_ALGORITHM=E_UNSUPPORTED_ALGORITHM @@ -133,6 +150,7 @@ E_USER_AGENT_NOT_ALLOWED=E_USER_AGENT_NOT_ALLOWED E_USER_ALREADY_REGISTERED=E_USER_ALREADY_REGISTERED E_USER_NOT_FOUND=E_USER_NOT_FOUND E_USER_NOT_REGISTERED=E_USER_NOT_REGISTERED + E_WOULD_BLOCK=E_WOULD_BLOCK ERR_SRC_FRAMEWORK=ERR_SRC_FRAMEWORK ERR_SRC_USER=ERR_SRC_USER diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties index a57bcb4..6082726 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/FilePageLabels.properties @@ -1,4 +1,3 @@ -FILE_API_LIST_VIEW_ERRNO=Error Description FILE_API_LIST_VIEW_INDEX=\# FILE_API_LIST_VIEW_NAME=File API FILE_API_LIST_VIEW_PARAMETER=Parameter @@ -6,6 +5,7 @@ FILE_API_LIST_VIEW_RETURN=Return value FILE_API_LIST_VIEW_THREAD_ID=Thread ID FILE_API_LIST_VIEW_TIME=Time FILE_API_LIST_VIEW_TITLE=File API List +FILE_API_LIST_VIEW_ERRNO=Error code FILE_CHART_CHART=Chart FILE_CHART_FILE=File diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java index 5ca52ac..6a362ad 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.java @@ -24,13 +24,14 @@ import org.eclipse.osgi.util.NLS; public class SummaryLabels extends NLS { private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.SummaryLabels"; //$NON-NLS-1$ - public static String FAILED_API_LIST_VIEW_ERRNO; public static String FAILED_API_LIST_VIEW_FAILED_API_LIST; public static String FAILED_API_LIST_VIEW_INDEX; public static String FAILED_API_LIST_VIEW_NAME; public static String FAILED_API_LIST_VIEW_PARAMETER; public static String FAILED_API_LIST_VIEW_RETURN; public static String FAILED_API_LIST_VIEW_TIME; + public static String FAILED_API_LIST_VIEW_ERROR_CODE; + public static String FAILED_API_LIST_VIEW_ERROR_DESCRIPTION; public static String FUNCTION_USAGE_PROFILER_APPLICATION; public static String FUNCTION_USAGE_PROFILER_DEPENDENT_LIB; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties index 2a0103c..8a28a81 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/SummaryLabels.properties @@ -1,10 +1,11 @@ -FAILED_API_LIST_VIEW_ERRNO=Error Description FAILED_API_LIST_VIEW_FAILED_API_LIST=Failed APIs FAILED_API_LIST_VIEW_INDEX=\# FAILED_API_LIST_VIEW_NAME=Name FAILED_API_LIST_VIEW_PARAMETER=Parameter FAILED_API_LIST_VIEW_RETURN=Return FAILED_API_LIST_VIEW_TIME=Time +FAILED_API_LIST_VIEW_ERROR_CODE=Error code +FAILED_API_LIST_VIEW_ERROR_DESCRIPTION=Error description FUNCTION_USAGE_PROFILER_APPLICATION=Application FUNCTION_USAGE_PROFILER_DEPENDENT_LIB=Dependent library diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiComparator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiComparator.java index 52b70d0..86b33ca 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiComparator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiComparator.java @@ -27,6 +27,7 @@ package org.tizen.dynamicanalyzer.ui.summary.failed; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; +import org.tizen.dynamicanalyzer.error.ErrorCodeManager; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator; @@ -58,8 +59,15 @@ public class FailedApiComparator extends DefaultTableComparator { str1 = data1.getData().get(LogCenterConstants.RETURN_INDEX); str2 = data2.getData().get(LogCenterConstants.RETURN_INDEX); } else if (column == 5) { - str1 = data1.getData().get(LogCenterConstants.ERROR_INDEX); - str2 = data2.getData().get(LogCenterConstants.ERROR_INDEX); + String err1 = data1.getData().get(LogCenterConstants.ERROR_INDEX); + String err2 = data2.getData().get(LogCenterConstants.ERROR_INDEX); + str1 = ErrorCodeManager.getInatance().getErrorCode(err1); + str2 = ErrorCodeManager.getInatance().getErrorCode(err2); + }else if (column == 6) { + String err1 = data1.getData().get(LogCenterConstants.ERROR_INDEX); + String err2 = data2.getData().get(LogCenterConstants.ERROR_INDEX); + str1 = ErrorCodeManager.getInatance().getErrorDescription(err1); + str2 = ErrorCodeManager.getInatance().getErrorDescription(err2); } switch (type) { case AnalyzerConstants.SORT_TYPE_NUM: diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java index 8f56700..518ee56 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/failed/FailedApiListView.java @@ -41,9 +41,9 @@ public class FailedApiListView extends DAView { public static final String ID = FailedApiListView.class.getName(); private DATableComposite tableComp = null; private String[] columnNames = { SummaryLabels.FAILED_API_LIST_VIEW_INDEX, SummaryLabels.FAILED_API_LIST_VIEW_TIME, SummaryLabels.FAILED_API_LIST_VIEW_NAME, SummaryLabels.FAILED_API_LIST_VIEW_PARAMETER, - SummaryLabels.FAILED_API_LIST_VIEW_RETURN, SummaryLabels.FAILED_API_LIST_VIEW_ERRNO }; - private int[] columnSizes = { 25, 60, 45, 125, 0, 400 }; - private boolean[] columnVisibility = { false, true, true, true, true, true }; + SummaryLabels.FAILED_API_LIST_VIEW_RETURN, SummaryLabels.FAILED_API_LIST_VIEW_ERROR_CODE, SummaryLabels.FAILED_API_LIST_VIEW_ERROR_DESCRIPTION }; + private int[] columnSizes = { 25, 60, 45, 125, 0, 70, 400 }; + private boolean[] columnVisibility = { false, true, true, true, true, true, true }; public FailedApiListView(Composite parent, int style) { super(parent, style); 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 7c874d8..a2c4c3d 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 @@ -54,7 +54,9 @@ public class FailedApiTable extends DATableComposite { AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_STRING, - AnalyzerConstants.SORT_TYPE_NUM }; + AnalyzerConstants.SORT_TYPE_STRING, + AnalyzerConstants.SORT_TYPE_STRING }; + setSortTypes(sortTypes); table.addSelectionListener(new SelectionListener() { @@ -115,13 +117,21 @@ public class FailedApiTable extends DATableComposite { gi.setText(2, failData.get(LogCenterConstants.APINAME_INDEX)); gi.setText(3, failData.get(LogCenterConstants.INPUTPARM_INDEX)); gi.setText(4, failData.get(LogCenterConstants.RETURN_INDEX)); - String errMsg = ErrorCodeManager.getInatance().getErrorCode( + String errCode = ErrorCodeManager.getInatance().getErrorCode( + failData.get(LogCenterConstants.ERROR_INDEX)); + if (null == errCode) { + // FIXME : for debug + errCode = "undefined error number"; + } + gi.setText(5, errCode); + + String errMsg = ErrorCodeManager.getInatance().getErrorDescription( failData.get(LogCenterConstants.ERROR_INDEX)); if (null == errMsg) { // FIXME : for debug errMsg = "undefined error number"; } - gi.setText(5, errMsg); + gi.setText(6, errMsg); for (int ii = 0; ii < selSeqs.size(); ii++) { String seqNum = tableData.getSelectionKey();