From: Hyunjong,park Date: Mon, 28 Oct 2013 07:41:51 +0000 (+0900) Subject: [Title] fix windowing table X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c10c8f755c24e1d0404c4570e6952285fd5bf3d5;p=sdk%2Ftools%2Fdynamic-analyzer.git [Title] fix windowing table [Desc.] change DB table [Issue] - --- 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 8391329..6a438b8 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -1300,89 +1300,120 @@ public class SqlManager { return dbInfo; } +// public synchronized List> selectTableData( +// DATableComposite tableComp, int from, int to) { +// String tableName = tableComp.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } +// List dbColumns = tableComp.getColumnsName(); +// int size = dbColumns.size(); +// int optionColumnCount = 4; +// String[] columnName = new String[size + optionColumnCount]; +// columnName[0] = "id";//$NON-NLS-1$ +// columnName[1] = "seq";//$NON-NLS-1$ +// columnName[2] = "image";//$NON-NLS-1$ +// columnName[3] = "rangeTime";//$NON-NLS-1$ +// for (int i = 0; i < size; i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// columnName[i + optionColumnCount] = dbColumnName.replace( +// CommonConstants.SPACE, CommonConstants.UNDERBAR); +// } else { +// columnName[i + optionColumnCount] = dbColumnName; +// } +// } +// +// String queryOption = " where id >= " + from + " and id < " + to;//$NON-NLS-1$ //$NON-NLS-2$ +// List> dbInfo = selectQuery(null, columnName, tableName, +// queryOption.toString()); +// return dbInfo; +// } + public synchronized List> selectTableData( - DATableComposite tableComp, int from, int to) { - String tableName = tableComp.getTableName().trim(); - if (tableName.contains(CommonConstants.SPACE)) { - tableName = tableName.replace(CommonConstants.SPACE, - CommonConstants.UNDERBAR); - } - List dbColumns = tableComp.getColumnsName(); - int size = dbColumns.size(); - int optionColumnCount = 4; - String[] columnName = new String[size + optionColumnCount]; - columnName[0] = "id";//$NON-NLS-1$ - columnName[1] = "seq";//$NON-NLS-1$ - columnName[2] = "image";//$NON-NLS-1$ - columnName[3] = "rangeTime";//$NON-NLS-1$ - for (int i = 0; i < size; i++) { - String dbColumnName = dbColumns.get(i).trim(); - if (dbColumnName.contains(CommonConstants.SPACE)) { - columnName[i + optionColumnCount] = dbColumnName.replace( - CommonConstants.SPACE, CommonConstants.UNDERBAR); - } else { - columnName[i + optionColumnCount] = dbColumnName; - } - } - - String queryOption = " where id >= " + from + " and id < " + to;//$NON-NLS-1$ //$NON-NLS-2$ + String tableName, int from, int to) { +// String tableName = tableComp.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } + String[] columnName = new String[6]; + columnName[0] = "rid";//$NON-NLS-1$ + columnName[1] = "seqnumber";//$NON-NLS-1$ + columnName[2] = "time";//$NON-NLS-1$ + columnName[3] = "pid";//$NON-NLS-1$ + columnName[4] = "tid";//$NON-NLS-1$ + columnName[5] = "apiname";//$NON-NLS-1$ + +// for (int i = 0; i < size; i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// columnName[i + optionColumnCount] = dbColumnName.replace( +// CommonConstants.SPACE, CommonConstants.UNDERBAR); +// } else { +// columnName[i + optionColumnCount] = dbColumnName; +// } +// } + + String queryOption = " where rid >= " + from + " and rid < " + to;//$NON-NLS-1$ //$NON-NLS-2$ List> dbInfo = selectQuery(null, columnName, tableName, queryOption.toString()); return dbInfo; } - public void insertTableWidgetData(DATableComposite tableComp, - List> insetData) { - String tableName = tableComp.getTableName().trim(); - if (tableName.contains(CommonConstants.SPACE)) { - tableName = tableName.replace(CommonConstants.SPACE, - CommonConstants.UNDERBAR); - } - StringBuffer query = new StringBuffer(); - query.append("insert into "); //$NON-NLS-1$ - query.append(tableName); - query.append(" ("); //$NON-NLS-1$ - - List dbColumns = tableComp.getColumnsName(); - for (int i = 0; i < dbColumns.size(); i++) { - String dbColumnName = dbColumns.get(i).trim(); - if (dbColumnName.contains(CommonConstants.SPACE)) { - dbColumns.set(i, dbColumnName.replace(CommonConstants.SPACE, - CommonConstants.UNDERBAR)); - } - } - - int size = tableComp.getColumnsName().size(); - query.append("seq").append(CommonConstants.COMMA);//$NON-NLS-1$ - query.append("image").append(CommonConstants.COMMA);//$NON-NLS-1$ - query.append("rangeTime").append(CommonConstants.COMMA);//$NON-NLS-1$ - for (int i = 0; i < size; i++) { - query.append(dbColumns.get(i)); //$NON-NLS-1$ - if (i + 1 == size) { - query.append(CommonConstants.CLOSE_BRACKET); - break; - } else { - query.append(CommonConstants.COMMA); - } - } - query.append(" values ("); //$NON-NLS-1$ - - size = tableComp.getColumnsName().size(); - query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ - query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ - query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ - for (int i = 0; i < size; i++) { - query.append("?"); //$NON-NLS-1$ - if (i + 1 == size) { - query.append(CommonConstants.CLOSE_BRACKET); - break; - } else { - query.append(CommonConstants.COMMA); - } - } - - insertQuery(query.toString(), insetData); - } +// public void insertTableWidgetData(DATableComposite tableComp, +// List> insetData) { +// String tableName = tableComp.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } +// StringBuffer query = new StringBuffer(); +// query.append("insert into "); //$NON-NLS-1$ +// query.append(tableName); +// query.append(" ("); //$NON-NLS-1$ +// +// List dbColumns = tableComp.getColumnsName(); +// for (int i = 0; i < dbColumns.size(); i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// dbColumns.set(i, dbColumnName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR)); +// } +// } +// +// int size = tableComp.getColumnsName().size(); +// query.append("seq").append(CommonConstants.COMMA);//$NON-NLS-1$ +// query.append("image").append(CommonConstants.COMMA);//$NON-NLS-1$ +// query.append("rangeTime").append(CommonConstants.COMMA);//$NON-NLS-1$ +// for (int i = 0; i < size; i++) { +// query.append(dbColumns.get(i)); //$NON-NLS-1$ +// if (i + 1 == size) { +// query.append(CommonConstants.CLOSE_BRACKET); +// break; +// } else { +// query.append(CommonConstants.COMMA); +// } +// } +// query.append(" values ("); //$NON-NLS-1$ +// +// size = tableComp.getColumnsName().size(); +// query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ +// query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ +// query.append("?").append(CommonConstants.COMMA);//$NON-NLS-1$ +// for (int i = 0; i < size; i++) { +// query.append("?"); //$NON-NLS-1$ +// if (i + 1 == size) { +// query.append(CommonConstants.CLOSE_BRACKET); +// break; +// } else { +// query.append(CommonConstants.COMMA); +// } +// } +// +// insertQuery(query.toString(), insetData); +// } public boolean isExistTable(String tableName) { System.out.println("isExistTable"); @@ -1434,70 +1465,70 @@ public class SqlManager { return false; } - public void createTable(DATableComposite tableComp) { - StringBuffer query = new StringBuffer(); - query.append("create table "); //$NON-NLS-1$ - String name = tableComp.getTableName().trim(); - if (name.contains(CommonConstants.SPACE)) { - name = name - .replace(CommonConstants.SPACE, CommonConstants.UNDERBAR); - } - query.append(name); - query.append(CommonConstants.SPACE + CommonConstants.OPEN_BRACKET); - List dbColumns = tableComp.getColumnsName(); - for (int i = 0; i < dbColumns.size(); i++) { - String dbColumnName = dbColumns.get(i).trim(); - if (dbColumnName.contains(CommonConstants.SPACE)) { - dbColumns.set(i, dbColumnName.replace(CommonConstants.SPACE, - CommonConstants.UNDERBAR)); - } - } - - query.append("id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 0, INCREMENT BY 1) not null, ");//$NON-NLS-1$ - - query.append("seq").append(CommonConstants.SPACE);//$NON-NLS-1$ - query.append(DBTableManager.INTEGER).append(CommonConstants.COMMA); - - query.append("image").append(CommonConstants.SPACE);//$NON-NLS-1$ - query.append(DBTableManager.TEXT).append(CommonConstants.COMMA); - - query.append("rangeTime").append(CommonConstants.SPACE);//$NON-NLS-1$ - query.append(DBTableManager.INTEGER).append(CommonConstants.COMMA); - - int size = dbColumns.size(); - for (int i = 0; i < size; i++) { - query.append(dbColumns.get(i)).append(CommonConstants.SPACE); - query.append(DBTableManager.TEXT); - if (i + 1 == size) { - query.append(CommonConstants.COMMA); - query.append("constraint DID PRIMARY KEY(id)");//$NON-NLS-1$ - query.append(CommonConstants.CLOSE_BRACKET).append( - CommonConstants.SEMICOLON); - } else { - query.append(CommonConstants.COMMA); - } - } - Statement stat = null; - try { - Connection conn = getConnection(); - if (null == conn) { - return; - } - semaphoreAcquire(); - stat = conn.createStatement(); - if (!executeUpdateCreateTable(stat, query.toString())) { - System.out.println("failed createTable : " + query.toString()); - } - } catch (SQLException e) { - e.printStackTrace(); - } finally { - AnalyzerUtil.tryClose(stat); - semaphoreRelease(); - } - } +// public void createTable(DATableComposite tableComp) { +// StringBuffer query = new StringBuffer(); +// query.append("create table "); //$NON-NLS-1$ +// String name = tableComp.getTableName().trim(); +// if (name.contains(CommonConstants.SPACE)) { +// name = name +// .replace(CommonConstants.SPACE, CommonConstants.UNDERBAR); +// } +// query.append(name); +// query.append(CommonConstants.SPACE + CommonConstants.OPEN_BRACKET); +// List dbColumns = tableComp.getColumnsName(); +// for (int i = 0; i < dbColumns.size(); i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// dbColumns.set(i, dbColumnName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR)); +// } +// } +// +// query.append("id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 0, INCREMENT BY 1) not null, ");//$NON-NLS-1$ +// +// query.append("seq").append(CommonConstants.SPACE);//$NON-NLS-1$ +// query.append(DBTableManager.INTEGER).append(CommonConstants.COMMA); +// +// query.append("image").append(CommonConstants.SPACE);//$NON-NLS-1$ +// query.append(DBTableManager.TEXT).append(CommonConstants.COMMA); +// +// query.append("rangeTime").append(CommonConstants.SPACE);//$NON-NLS-1$ +// query.append(DBTableManager.INTEGER).append(CommonConstants.COMMA); +// +// int size = dbColumns.size(); +// for (int i = 0; i < size; i++) { +// query.append(dbColumns.get(i)).append(CommonConstants.SPACE); +// query.append(DBTableManager.TEXT); +// if (i + 1 == size) { +// query.append(CommonConstants.COMMA); +// query.append("constraint DID PRIMARY KEY(id)");//$NON-NLS-1$ +// query.append(CommonConstants.CLOSE_BRACKET).append( +// CommonConstants.SEMICOLON); +// } else { +// query.append(CommonConstants.COMMA); +// } +// } +// Statement stat = null; +// try { +// Connection conn = getConnection(); +// if (null == conn) { +// return; +// } +// semaphoreAcquire(); +// stat = conn.createStatement(); +// if (!executeUpdateCreateTable(stat, query.toString())) { +// System.out.println("failed createTable : " + query.toString()); +// } +// } catch (SQLException e) { +// e.printStackTrace(); +// } finally { +// AnalyzerUtil.tryClose(stat); +// semaphoreRelease(); +// } +// } public int getTableItemCount(String tableName) { - System.out.println("getTableItemCount"); +// System.out.println("getTableItemCount"); String query = null; Statement stat = null; ResultSet rs = null; @@ -1550,25 +1581,15 @@ public class SqlManager { tableName = tableName.replace(CommonConstants.SPACE, CommonConstants.UNDERBAR); } - List dbColumns = tableComp.getColumnsName(); - int size = dbColumns.size(); - int optionColumnCount = 4; - String[] columnName = new String[size + optionColumnCount]; - columnName[0] = "id";//$NON-NLS-1$ - columnName[1] = "seq";//$NON-NLS-1$ - columnName[2] = "image";//$NON-NLS-1$ - columnName[3] = "rangeTime";//$NON-NLS-1$ - for (int i = 0; i < size; i++) { - String dbColumnName = dbColumns.get(i).trim(); - if (dbColumnName.contains(CommonConstants.SPACE)) { - columnName[i + optionColumnCount] = dbColumnName.replace( - CommonConstants.SPACE, CommonConstants.UNDERBAR); - } else { - columnName[i + optionColumnCount] = dbColumnName; - } - } - - String queryOption = " where rangeTime < " + startTime;//$NON-NLS-1$ //$NON-NLS-2$ + String[] columnName = new String[6]; + columnName[0] = "rid";//$NON-NLS-1$ + columnName[1] = "seqnumber";//$NON-NLS-1$ + columnName[2] = "time";//$NON-NLS-1$ + columnName[3] = "pid";//$NON-NLS-1$ + columnName[4] = "tid";//$NON-NLS-1$ + columnName[5] = "apiname";//$NON-NLS-1$ + + String queryOption = " where time < " + startTime;//$NON-NLS-1$ //$NON-NLS-2$ List> dbInfo = selectQuery(null, columnName, tableName, queryOption.toString()); return dbInfo.size(); @@ -1581,27 +1602,79 @@ public class SqlManager { tableName = tableName.replace(CommonConstants.SPACE, CommonConstants.UNDERBAR); } - List dbColumns = tableComp.getColumnsName(); - int size = dbColumns.size(); - int optionColumnCount = 4; - String[] columnName = new String[size + optionColumnCount]; - columnName[0] = "id";//$NON-NLS-1$ - columnName[1] = "seq";//$NON-NLS-1$ - columnName[2] = "image";//$NON-NLS-1$ - columnName[3] = "rangeTime";//$NON-NLS-1$ - for (int i = 0; i < size; i++) { - String dbColumnName = dbColumns.get(i).trim(); - if (dbColumnName.contains(CommonConstants.SPACE)) { - columnName[i + optionColumnCount] = dbColumnName.replace( - CommonConstants.SPACE, CommonConstants.UNDERBAR); - } else { - columnName[i + optionColumnCount] = dbColumnName; - } - } - - String queryOption = " where rangeTime > " + startTime +" and rangeTime <= "+ endTime;//$NON-NLS-1$ //$NON-NLS-2$ + String[] columnName = new String[6]; + columnName[0] = "rid";//$NON-NLS-1$ + columnName[1] = "seqnumber";//$NON-NLS-1$ + columnName[2] = "time";//$NON-NLS-1$ + columnName[3] = "pid";//$NON-NLS-1$ + columnName[4] = "tid";//$NON-NLS-1$ + columnName[5] = "apiname";//$NON-NLS-1$ + + String queryOption = " where time > " + startTime +" and time <= "+ endTime;//$NON-NLS-1$ //$NON-NLS-2$ List> dbInfo = selectQuery(null, columnName, tableName, queryOption.toString()); return dbInfo.size(); } + +// public synchronized int getSelectionIndex( +// DATableComposite tableComp, long startTime) { +// String tableName = tableComp.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } +// List dbColumns = tableComp.getColumnsName(); +// int size = dbColumns.size(); +// int optionColumnCount = 4; +// String[] columnName = new String[size + optionColumnCount]; +// columnName[0] = "id";//$NON-NLS-1$ +// columnName[1] = "seq";//$NON-NLS-1$ +// columnName[2] = "image";//$NON-NLS-1$ +// columnName[3] = "rangeTime";//$NON-NLS-1$ +// for (int i = 0; i < size; i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// columnName[i + optionColumnCount] = dbColumnName.replace( +// CommonConstants.SPACE, CommonConstants.UNDERBAR); +// } else { +// columnName[i + optionColumnCount] = dbColumnName; +// } +// } +// +// String queryOption = " where rangeTime < " + startTime;//$NON-NLS-1$ //$NON-NLS-2$ +// List> dbInfo = selectQuery(null, columnName, tableName, +// queryOption.toString()); +// return dbInfo.size(); +// } +// +// public synchronized int getSelectionItemCount( +// DATableComposite tableComp, long startTime, long endTime) { +// String tableName = tableComp.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } +// List dbColumns = tableComp.getColumnsName(); +// int size = dbColumns.size(); +// int optionColumnCount = 4; +// String[] columnName = new String[size + optionColumnCount]; +// columnName[0] = "id";//$NON-NLS-1$ +// columnName[1] = "seq";//$NON-NLS-1$ +// columnName[2] = "image";//$NON-NLS-1$ +// columnName[3] = "rangeTime";//$NON-NLS-1$ +// for (int i = 0; i < size; i++) { +// String dbColumnName = dbColumns.get(i).trim(); +// if (dbColumnName.contains(CommonConstants.SPACE)) { +// columnName[i + optionColumnCount] = dbColumnName.replace( +// CommonConstants.SPACE, CommonConstants.UNDERBAR); +// } else { +// columnName[i + optionColumnCount] = dbColumnName; +// } +// } +// +// String queryOption = " where rangeTime > " + startTime +" and rangeTime <= "+ endTime;//$NON-NLS-1$ //$NON-NLS-2$ +// List> dbInfo = selectQuery(null, columnName, tableName, +// queryOption.toString()); +// return dbInfo.size(); +// } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java index fc91a65..3e2b45a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/calltrace/CallTraceView.java @@ -26,8 +26,6 @@ package org.tizen.dynamicanalyzer.ui.timeline.calltrace; -import java.util.List; - import org.eclipse.nebula.widgets.grid.Grid; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -35,17 +33,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.tizen.dynamicanalyzer.common.AnalyzerConstants; import org.tizen.dynamicanalyzer.common.DASelectionData; -import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.model.DAView; import org.tizen.dynamicanalyzer.nl.TimelinePageLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.sql.SqlManager; -import org.tizen.dynamicanalyzer.swap.channel.data.DataChannelConstants; 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.ProfileData; -import org.tizen.dynamicanalyzer.swap.model.data.UserFunctionData; import org.tizen.dynamicanalyzer.ui.info.callstack.CallstackView; import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage; import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineView; @@ -94,34 +86,34 @@ public class CallTraceView extends DAView { setMaxWeight(innerMaxWeight, outerMaxWeight); } -// @Override -// public void updateView(DASelectionData selData) { -// long start = selData.getStartTime(); -// long end = selData.getEndTime(); -// updateView(); -// ((CallTraceTable) tableComp).setSelectionByTime(start, end); -// updateView(); -// /* only callstack update */ -// // timeline view and tabcomp top view : callstack -// if (selData.getViewId().equals(TimelineView.ID)) { -// DATabComposite tabView = (DATabComposite) AnalyzerUtil.getView( -// TimelinePage.ID, DATabComposite.ID); -// Composite comp = tabView.getTopComposite(); -// if (comp instanceof CallstackView) { -// ((CallstackView) comp).updateView(); -// } -// } -// } - + // @Override + // public void updateView(DASelectionData selData) { + // long start = selData.getStartTime(); + // long end = selData.getEndTime(); + // updateView(); + // ((CallTraceTable) tableComp).setSelectionByTime(start, end); + // updateView(); + // /* only callstack update */ + // // timeline view and tabcomp top view : callstack + // if (selData.getViewId().equals(TimelineView.ID)) { + // DATabComposite tabView = (DATabComposite) AnalyzerUtil.getView( + // TimelinePage.ID, DATabComposite.ID); + // Composite comp = tabView.getTopComposite(); + // if (comp instanceof CallstackView) { + // ((CallstackView) comp).updateView(); + // } + // } + // } + @Override public void updateView(DASelectionData selData) { long start = selData.getStartTime(); long end = selData.getEndTime(); - int selectionIndex = SqlManager.getInstance() - .getSelectionIndex(tableComp, start); - int selectionCount = SqlManager.getInstance() - .getSelectionItemCount(tableComp, start, end); + int selectionIndex = SqlManager.getInstance().getSelectionIndex( + tableComp, start); + int selectionCount = SqlManager.getInstance().getSelectionItemCount( + tableComp, start, end); selectionIndex = ((selectionIndex < 0) && (selectionCount > 0)) ? 0 : selectionIndex; @@ -176,29 +168,30 @@ public class CallTraceView extends DAView { @Override public void updateLog(LogPackage logPack) { - Logs logs = logPack.getLogs(LogCenterConstants.LOG_USER_FUNCTION); - if (null == logs) { - logs = logPack.getLogs(DataChannelConstants.MSG_FUNCTION_ENTRY); - } - if (null == logs || null == logs.getLogs() || logs.getLogs().isEmpty()) { - return; - } - List inputs = logs.getLogs(); - - int size = inputs.size(); - for (int i = 0; i < size; i++) { - if (logs.getId() == DataChannelConstants.MSG_FUNCTION_ENTRY) { - ProfileData pData = (ProfileData) inputs.get(i); - UserFunctionManager.getInstance().addLog(pData); - } else if (logs.getId() == LogCenterConstants.LOG_USER_FUNCTION) { - UserFunctionData input = (UserFunctionData) inputs.get(i); - int type = input.getType(); - if (type == LogCenterConstants.USER_FUNCTION_EVENT_TYPE_ENTER) { - UserFunctionManager.getInstance().addLog(input); - } - } - - } + // Logs logs = logPack.getLogs(LogCenterConstants.LOG_USER_FUNCTION); + // if (null == logs) { + // logs = logPack.getLogs(DataChannelConstants.MSG_FUNCTION_ENTRY); + // } + // if (null == logs || null == logs.getLogs() || + // logs.getLogs().isEmpty()) { + // return; + // } + // List inputs = logs.getLogs(); + // + // int size = inputs.size(); + // for (int i = 0; i < size; i++) { + // if (logs.getId() == DataChannelConstants.MSG_FUNCTION_ENTRY) { + // ProfileData pData = (ProfileData) inputs.get(i); + // UserFunctionManager.getInstance().addLog(pData); + // } else if (logs.getId() == LogCenterConstants.LOG_USER_FUNCTION) { + // UserFunctionData input = (UserFunctionData) inputs.get(i); + // int type = input.getType(); + // if (type == LogCenterConstants.USER_FUNCTION_EVENT_TYPE_ENTER) { + // UserFunctionManager.getInstance().addLog(input); + // } + // } + // + // } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java index dcf9868..d8879da 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DAWindowingTableComposite.java @@ -36,14 +36,11 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ScrollBar; -import org.tizen.dynamicanalyzer.common.AnalyzerManager; -import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.model.TableInput; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.sql.SqlManager; import org.tizen.dynamicanalyzer.swap.model.data.WindowingTableData; import org.tizen.dynamicanalyzer.ui.range.RangeDataManager; -import org.tizen.dynamicanalyzer.ui.timeline.calltrace.UserFunctionManager; public class DAWindowingTableComposite extends DATableComposite { @@ -52,8 +49,11 @@ public class DAWindowingTableComposite extends DATableComposite { private int preScrollSelectionIndex = -1; private int seqIndex = 1; - private int timeIndex = 3; - private int optionColumnCount = 4; + private int timeIndex = 2; + private int pidIndex = 3; + private int tidIndex = 4; + private int apiIndex = 5; + //private int optionColumnCount = 4; private boolean isCreateTable = false; @@ -71,7 +71,7 @@ public class DAWindowingTableComposite extends DATableComposite { private List makeTableInputFromDB() { if (!isCreateTable() || getItemCount() < 1) { - return null; + // return null; } List> userLog = getItemListFromDB(); if (null == userLog) { @@ -82,12 +82,11 @@ public class DAWindowingTableComposite extends DATableComposite { private List> getItemListFromDB() { int scrollSelection = scrollbar.getSelection(); -// System.out.println("scrollSelection : "+scrollSelection); int selectedEndIndex = scrollSelection + getTableLenght() + 1; if (getItemCount() <= selectedEndIndex) { selectedEndIndex = getItemCount(); } - return SqlManager.getInstance().selectTableData(this, scrollSelection, + return SqlManager.getInstance().selectTableData(getDBTableName(), scrollSelection, selectedEndIndex); } @@ -96,9 +95,14 @@ public class DAWindowingTableComposite extends DATableComposite { int size = userLog.size(); for (int i = 0; i < size; i++) { List text = new ArrayList(); - for (int j = optionColumnCount; j < userLog.get(i).size(); j++) { - text.add(userLog.get(i).get(j)); - } +// for (int j = optionColumnCount; j < userLog.get(i).size(); j++) { +// text.add(userLog.get(i).get(j)); +// } + + text.add(userLog.get(i).get(timeIndex)); + text.add(userLog.get(i).get(pidIndex)); + text.add(userLog.get(i).get(tidIndex)); + text.add(userLog.get(i).get(apiIndex)); DATableDataFormat tableData = new DATableDataFormat(Long.parseLong(userLog.get(i) .get(seqIndex))); @@ -133,60 +137,65 @@ public class DAWindowingTableComposite extends DATableComposite { return input; } - private void insetTableInputList(List input) { - int size = input.size(); - if (size < 1) { - return; - } - createTableManagement(); - if (AnalyzerManager.isRunning()) { - SqlManager.getInstance().insertTableWidgetData(this, - makeDBDataList(input)); - setItemCount(size); - } - - UserFunctionManager.getInstance().getLog().clear(); - } - - private void createTableManagement() { - if (null != AnalyzerManager.getProject() && !isCreateTable()) { - if (!SqlManager.getInstance().isExistTable(getDBTableName())) { - SqlManager.getInstance().createTable(this); - } - setCreateTable(true); - updateItemCount(); - } - } - - private List> makeDBDataList(List input) { - List> insertLog = new ArrayList>(); - int size = input.size(); - for (int i = 0; i < size; i++) { - DATableDataFormat gridData = (DATableDataFormat) input.get(i) - .getData(); - List text = new ArrayList(); - text.add(Long.toString(gridData.getSelectionKey())); - text.add(CommonConstants.EMPTY); - text.add(Long.toString(gridData.getLogData().getTime())); - - for (int j = 0; j < input.get(i).getText().size(); j++) { - text.add(input.get(i).getText().get(j)); - } - insertLog.add(text); - } - return insertLog; - } - +// private void insetTableInputList(List input) { +// int size = input.size(); +// if (size < 1) { +// return; +// } +// createTableManagement(); +// if (AnalyzerManager.isRunning()) { +// SqlManager.getInstance().insertTableWidgetData(this, +// makeDBDataList(input)); +// setItemCount(size); +// } +// +// UserFunctionManager.getInstance().getLog().clear(); +// } +// +// private void createTableManagement() { +// if (null != AnalyzerManager.getProject() && !isCreateTable()) { +// if (!SqlManager.getInstance().isExistTable(getDBTableName())) { +// SqlManager.getInstance().createTable(this); +// } +// setCreateTable(true); +// updateItemCount(); +// } +// } +// +// private List> makeDBDataList(List input) { +// List> insertLog = new ArrayList>(); +// int size = input.size(); +// for (int i = 0; i < size; i++) { +// DATableDataFormat gridData = (DATableDataFormat) input.get(i) +// .getData(); +// List text = new ArrayList(); +// text.add(Long.toString(gridData.getSelectionKey())); +// text.add(CommonConstants.EMPTY); +// text.add(Long.toString(gridData.getLogData().getTime())); +// +// for (int j = 0; j < input.get(i).getText().size(); j++) { +// text.add(input.get(i).getText().get(j)); +// } +// insertLog.add(text); +// } +// return insertLog; +// } +// +// private String getDBTableName() { +// String tableName = this.getTableName().trim(); +// if (tableName.contains(CommonConstants.SPACE)) { +// tableName = tableName.replace(CommonConstants.SPACE, +// CommonConstants.UNDERBAR); +// } +// return tableName; +// } + private String getDBTableName() { - String tableName = this.getTableName().trim(); - if (tableName.contains(CommonConstants.SPACE)) { - tableName = tableName.replace(CommonConstants.SPACE, - CommonConstants.UNDERBAR); - } - return tableName; + return "profiling"; } public void updateTable() { + GridItem[] selections = table.getSelection(); List selSeqs = new ArrayList(); for (int i = 0; i < selections.length; i++) { @@ -199,11 +208,13 @@ public class DAWindowingTableComposite extends DATableComposite { } } - List logList = makeTableInput(); - insetTableInputList(logList); + //List logList = makeTableInput(); + //insetTableInputList(logList); int scrollSelectionIndex = scrollbar.getSelection(); + updateItemCount(); + // System.out.println("getItemCount() : "+getItemCount()); table.setItemCount(getItemCount()); if (scrollSelectionIndex != 0 @@ -311,10 +322,10 @@ public class DAWindowingTableComposite extends DATableComposite { return this.itemCount; } - private void setItemCount(int count) { - this.itemCount += count; - } - +// private void setItemCount(int count) { +// this.itemCount += count; +// } +// private void updateItemCount() { this.itemCount = SqlManager.getInstance().getTableItemCount( getDBTableName());