From 0dd092e8e2f9e541a3f8e6b98a153b021f5ca52f Mon Sep 17 00:00:00 2001 From: kamuru Date: Thu, 7 Nov 2013 15:10:23 +0900 Subject: [PATCH] [Title] Modify to draw mutex white [Desc.] [Issue] --- .../dynamic-analyzer/config/config | 2 +- .../ui/thread/ThreadChartManager.java | 2 +- .../ui/thread/sync/ThreadPageSyncData.java | 36 +++++++++++++++++++++- .../ui/thread/sync/ThreadPageSyncDataEvent.java | 12 ++------ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config index d8cd6ec..58fa239 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config +++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/config @@ -2,5 +2,5 @@ Internal call=off Platform=tizen2.2 Build time=09/05/2012 10:30 AM (GMT) Snapshot=0 -Selected chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,UI event,Disk IO,Network IO +Selected chart list=CPU,Heap allocation,Process Size,UI event Available chart list=CPU,CPU core,CPU frequency,Heap allocation,Process Size,Memory,File,Screenshot,UI event,Disk IO,Network IO \ No newline at end of file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java index 749f2af..b4c3027 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadChartManager.java @@ -98,7 +98,7 @@ public class ThreadChartManager implements Runnable { } } - public List getLogsFromLogPackage(LogPackage logPack, + private List getLogsFromLogPackage(LogPackage logPack, int logCenterConstants) { Logs logs = logPack.getLogs(logCenterConstants); if (null == logs || logs.getLogs().size() == 0) { 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 1dd1b1e..5b7fc45 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 @@ -132,47 +132,81 @@ public class ThreadPageSyncData extends ThreadPageData { case LogCenterConstants.SYNC_API_TYPE_NOTIFY: case LogCenterConstants.SYNC_API_TYPE_NOTIFY_ALL: case LogCenterConstants.SYNC_API_TYPE_OTHER: + if(((DAChartBoardItem)item).getChartBoard() != null){ + stateItem = new DAChartSeriesItem(syncEvent.getTime(), + DAChartSeriesItem.SERIES_STATE_CONNECTION, + ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, + ""); + } else { stateItem = new DAChartSeriesItem(syncEvent.getTime(), DAChartSeriesItem.SERIES_STATE_CONNECTION, ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, ThreadPageLabels.SYNC_CHART_ITEM_UNUSED); - + } apiItem = createApiItem(syncEvent, errorNum); stateSeries.addSeriesItem(stateItem); apiSeries.addSeriesItem(apiItem); break; case LogCenterConstants.SYNC_API_TYPE_ACQUIRE_WAIT_START: case LogCenterConstants.SYNC_API_TYPE_COND_WAIT_START: + if(((DAChartBoardItem)item).getChartBoard() != null){ + stateItem = new DAChartSeriesItem(syncEvent.getTime(), + DAChartSeriesItem.SERIES_STATE_CONNECTION, + ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, + ""); + } else{ stateItem = new DAChartSeriesItem(syncEvent.getTime(), DAChartSeriesItem.SERIES_STATE_CONTINUE, ColorResources.THREAD_GRAPH_LOCK_WAIT_COLOR, ThreadPageLabels.SYNC_CHART_ITEM_WAITED); + } apiItem = createApiItem(syncEvent, errorNum); stateSeries.addSeriesItem(stateItem); apiSeries.addSeriesItem(apiItem); break; case LogCenterConstants.SYNC_API_TYPE_RELEASE: + if(((DAChartBoardItem)item).getChartBoard() != null){ + stateItem = new DAChartSeriesItem(syncEvent.getTime(), + DAChartSeriesItem.SERIES_STATE_CONNECTION, + ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, + ""); + } else{ stateItem = new DAChartSeriesItem(syncEvent.getTime(), DAChartSeriesItem.SERIES_STATE_CONNECTION, ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, ThreadPageLabels.SYNC_CHART_ITEM_UNUSED); + } apiItem = createApiItem(syncEvent, errorNum); stateSeries.addSeriesItem(stateItem); apiSeries.addSeriesItem(apiItem); break; case LogCenterConstants.SYNC_API_TYPE_ACQUIRE_WAIT_END: case LogCenterConstants.SYNC_API_TYPE_COND_WAIT_END: + if(((DAChartBoardItem)item).getChartBoard() != null){ + stateItem = new DAChartSeriesItem(syncEvent.getTime(), + DAChartSeriesItem.SERIES_STATE_CONNECTION, + ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, + ""); + } else{ stateItem = new DAChartSeriesItem(syncEvent.getTime(), DAChartSeriesItem.SERIES_STATE_CONTINUE, ColorResources.THREAD_GRAPH_LOCK_ACQUIRE_COLOR, ThreadPageLabels.SYNC_CHART_ITEM_USED); + } stateSeries.addSeriesItem(stateItem); break; case LogCenterConstants.SYNC_API_TYPE_TRY_ACQUIRE: + if(((DAChartBoardItem)item).getChartBoard() != null){ + stateItem = new DAChartSeriesItem(syncEvent.getTime(), + DAChartSeriesItem.SERIES_STATE_CONNECTION, + ColorResources.THREAD_GRAPH_LOCK_RELEASE_COLOR, + ""); + } else{ stateItem = new DAChartSeriesItem(syncEvent.getTime(), DAChartSeriesItem.SERIES_STATE_CONTINUE, ColorResources.THREAD_GRAPH_LOCK_ACQUIRE_COLOR, ThreadPageLabels.SYNC_CHART_ITEM_USED); + } apiItem = createApiItem(syncEvent, errorNum); stateSeries.addSeriesItem(stateItem); apiSeries.addSeriesItem(apiItem); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataEvent.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataEvent.java index 4a70c16..2982334 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataEvent.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/sync/ThreadPageSyncDataEvent.java @@ -36,23 +36,15 @@ public class ThreadPageSyncDataEvent extends ThreadPageDataEvent { double time, String tid, String tooltip, long errorNum, LogData contents) { super(time, tid, apiType, tooltip, errorNum, contents); - setSyncVal(syncVal); - setType(type); + this.syncVal = syncVal; + this.type = type; } public String getSyncVal() { return syncVal; } - public void setSyncVal(String syncVal) { - this.syncVal = syncVal; - } - public int getType() { return type; } - - public void setType(int type) { - this.type = type; - } } -- 2.7.4