From 59a8891ec403d3042ba3a4a197525ea4dd172701 Mon Sep 17 00:00:00 2001 From: "jungwook.ryu" Date: Fri, 18 Jul 2014 15:20:14 +0900 Subject: [PATCH] common : add UnsignedInt.java class for util. it used by SystemData. Change-Id: I9b0643d6dc32b853ca466ce0f72beeb47c00ee1f Signed-off-by: jungwook.ryu --- .../org/tizen/dynamicanalyzer/util/ByteUtil.java | 19 ++++ .../tizen/dynamicanalyzer/util/UnsignedInt.java | 104 +++++++++++++++++++++ .../swap/model/data/SystemData.java | 96 +++++++++---------- .../dynamicanalyzer/ui/timeline/EnergyDBTable.java | 8 +- .../ui/timeline/SystemDataDBTable.java | 32 +++---- .../ui/timeline/chart/DiskIOChart.java | 12 +-- .../ui/timeline/chart/EnergyChart.java | 6 +- .../ui/timeline/chart/NetworkIOChart.java | 4 +- .../ui/timeline/common/TimelineChartManager.java | 30 +++--- 9 files changed, 211 insertions(+), 100 deletions(-) create mode 100644 org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java 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 0400aee..3ed872b 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 @@ -105,6 +105,25 @@ public class ByteUtil { } /** + * Convert byte array(4byte) to Unsigned int. + * + * @param src + * @param srcPos + * @return + */ + public static UnsignedInt toUnsignedInt(byte[] src, int srcPos) { + long qword = 0; + for (int i = 0; i < 4; i++) { + qword = (qword << 8) + (src[i + srcPos] & 0xFF); + } + long b1 = (qword >> 0) & 0xff; + long b2 = (qword >> 8) & 0xff; + long b3 = (qword >> 16) & 0xff; + long b4 = (qword >> 24) & 0xff; + return new UnsignedInt(b1 << 24 | b2 << 16 | b3 << 8 | b4 << 0); + } + + /** * Convert int to byte array(4byte). * * @param value 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 new file mode 100644 index 0000000..17e9977 --- /dev/null +++ b/org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/UnsignedInt.java @@ -0,0 +1,104 @@ +/* + * Dynamic Analyzer + * + * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: + * Jungwook Ryu + * 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; + +import org.tizen.dynamicanalyzer.util.DALogger; + +public class UnsignedInt { + private static final long MAX_VALUE = (long)Integer.MAX_VALUE * 2 - 1; + private static final long MIN_VALUE = 0; + + private long value; // real data, use only 4byte. + + public UnsignedInt() { + this.value = 0; + } + + public UnsignedInt(int value) { + this.value = value & 0xFFFFFFFFL; + } + + public UnsignedInt(long value) { + if (value > MAX_VALUE || value < MIN_VALUE) { + DALogger.getInstance().error("Invalid input : " + value + ". 0 will be set."); + this.value = 0; + } else { + this.value = value; + } + } + + public long getValue() { + return value; + } + + public void add(UnsignedInt operand) { + add(operand.getValue()); + } + + public void minus(UnsignedInt operand) { + minus(operand.getValue()); + } + + public void multiply(UnsignedInt operand) { + multiply(operand.getValue()); + } + + public void divide(UnsignedInt operand) { + divide(operand.getValue()); + } + + private void add(long operand) { + long temp = this.value + operand; + if (temp > MAX_VALUE) { + DALogger.getInstance().error("exceed Max unsigned int size : " + temp); + throw new RuntimeException("Overflow occured"); + } + this.value = temp; + } + + private void minus(long operand) { + long temp = this.value - operand; + if (temp < MIN_VALUE) { + DALogger.getInstance().error("result is a negative : " + temp); + throw new RuntimeException("Underflow occured"); + } + this.value = temp; + } + + private void multiply(long operand) { + long temp = this.value * operand; + if (temp > MAX_VALUE) { + DALogger.getInstance().error("exceed Max unsigned int size : " + temp); + throw new RuntimeException("Overflow occured"); + } + this.value = temp; + } + + private void divide(long operand) { + this.value /= operand; + } +} 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 5c82686..f6d402d 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 @@ -38,6 +38,7 @@ 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.UnsignedInt; public class SystemData extends LogData { @@ -48,13 +49,13 @@ public class SystemData extends LogData { ProcessProfileData[] processProfileDataList = null; int otherProcessCount = 0; String otherProcessLoad = null; - int totalUsedDrive = 0; - int diskReadOpCount = 0; - int diskReadByteSize = 0; - int diskWriteOpCount = 0; - int diskWrittenByteSize = 0; - int networkSendSize = 0; - int networkReceiveSize = 0; + UnsignedInt totalUsedDrive; + UnsignedInt diskReadOpCount; + UnsignedInt diskReadByteSize; + UnsignedInt diskWriteOpCount; + UnsignedInt diskWrittenByteSize; + UnsignedInt networkSendSize; + UnsignedInt networkReceiveSize; int wifi = 0; int btStatus = 0; int gpsStatus = 0; @@ -68,7 +69,7 @@ public class SystemData extends LogData { int video = 0; int call = 0; int dnet = 0; - int energyUsage = 0; + UnsignedInt energyUsage; String deviceEnergyUsage = null; String applicationEnergyUsage = null; @@ -109,25 +110,25 @@ public class SystemData extends LogData { otherProcessLoad = parseLoad(index, data); index += (otherProcessCount * (INT_SIZE + FLOAT_SIZE)); - totalUsedDrive = ByteUtil.toInt(data, index); + totalUsedDrive = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - diskReadOpCount = ByteUtil.toInt(data, index); + diskReadOpCount = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - diskReadByteSize = ByteUtil.toInt(data, index); + diskReadByteSize = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - diskWriteOpCount = ByteUtil.toInt(data, index); + diskWriteOpCount = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - diskWrittenByteSize = ByteUtil.toInt(data, index); + diskWrittenByteSize = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - networkSendSize = ByteUtil.toInt(data, index); + networkSendSize = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; - networkReceiveSize = ByteUtil.toInt(data, index); + networkReceiveSize = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; wifi = ByteUtil.toInt(data, index); @@ -169,7 +170,7 @@ public class SystemData extends LogData { dnet = ByteUtil.toInt(data, index); index += INT_SIZE; - energyUsage = ByteUtil.toInt(data, index); + energyUsage = ByteUtil.toUnsignedInt(data, index); index += INT_SIZE; deviceEnergyUsage = parseUsage(index, data); @@ -226,9 +227,9 @@ public class SystemData extends LogData { .getDeviceCount(); StringBuffer buffer = new StringBuffer(); for (int i = 0; i < count; i++) { - int value = ByteUtil.toInt(payload, start); + UnsignedInt value = ByteUtil.toUnsignedInt(payload, start); start += INT_SIZE; - buffer.append(value); + buffer.append(value.getValue()); if (i + 1 != count) { buffer.append(','); } @@ -262,11 +263,11 @@ public class SystemData extends LogData { } } - public int getEnergy() { + public UnsignedInt getEnergy() { return energyUsage; } - public void setEnergy(int energy) { + public void setEnergy(UnsignedInt energy) { this.energyUsage = energy; } @@ -374,27 +375,27 @@ public class SystemData extends LogData { this.dnet = dnet; } - public int getNetworkSendSize() { + public UnsignedInt getNetworkSendSize() { return networkSendSize; } - public void setNetworkSendSize(int networkSendSize) { + public void setNetworkSendSize(UnsignedInt networkSendSize) { this.networkSendSize = networkSendSize; } - public int getNetworkReceiveSize() { + public UnsignedInt getNetworkReceiveSize() { return networkReceiveSize; } - public void setNetworkReceiveSize(int networkReceiveSize) { + public void setNetworkReceiveSize(UnsignedInt networkReceiveSize) { this.networkReceiveSize = networkReceiveSize; } - public int getTotalUsedDrive() { + public UnsignedInt getTotalUsedDrive() { return totalUsedDrive; } - public void setTotalUsedDrive(int totalUsedDrive) { + public void setTotalUsedDrive(UnsignedInt totalUsedDrive) { this.totalUsedDrive = totalUsedDrive; } @@ -422,43 +423,43 @@ public class SystemData extends LogData { this.systemMemoryUsed = systemMemoryUsed; } - public int getDiskReadOpCount() { + public UnsignedInt getDiskReadOpCount() { return diskReadOpCount; } - public void setDiskReadOpCount(int diskReadOpCount) { + public void setDiskReadOpCount(UnsignedInt diskReadOpCount) { this.diskReadOpCount = diskReadOpCount; } - public int getDiskReadByteSize() { + public UnsignedInt getDiskReadByteSize() { return diskReadByteSize; } - public void setDiskReadByteSize(int diskReadByteSize) { + public void setDiskReadByteSize(UnsignedInt diskReadByteSize) { this.diskReadByteSize = diskReadByteSize; } - public int getDiskWriteOpCount() { + public UnsignedInt getDiskWriteOpCount() { return diskWriteOpCount; } - public void setDiskWriteSize(int diskWriteOpCount) { + public void setDiskWriteSize(UnsignedInt diskWriteOpCount) { this.diskWriteOpCount = diskWriteOpCount; } - public int getDiskWrittenByteSize() { + public UnsignedInt getDiskWrittenByteSize() { return diskWrittenByteSize; } - public void setDiskWrittenByteSize(int diskWrittenByteSize) { + public void setDiskWrittenByteSize(UnsignedInt diskWrittenByteSize) { this.diskWrittenByteSize = diskWrittenByteSize; } - public int getEnergyUsage() { + public UnsignedInt getEnergyUsage() { return energyUsage; } - public void setEnergyUsage(int energyUsage) { + public void setEnergyUsage(UnsignedInt energyUsage) { this.energyUsage = energyUsage; } @@ -534,13 +535,13 @@ public class SystemData extends LogData { prep.setLong(index++, 0); prep.setLong(index++, 0); prep.setLong(index++, systemMemoryUsed); - prep.setInt(index++, totalUsedDrive); - prep.setInt(index++, diskReadOpCount); - prep.setInt(index++, diskReadByteSize); - prep.setInt(index++, diskWriteOpCount); - prep.setInt(index++, diskWrittenByteSize); - prep.setInt(index++, networkSendSize); - prep.setInt(index++, networkReceiveSize); + prep.setInt(index++, 0); + prep.setInt(index++, 0); + prep.setInt(index++, 0); + prep.setInt(index++, 0); + prep.setInt(index++, 0); + prep.setInt(index++, 0); + prep.setInt(index++, 0); prep.setInt(index++, wifi); prep.setInt(index++, btStatus); prep.setInt(index++, gpsStatus); @@ -554,7 +555,7 @@ public class SystemData extends LogData { prep.setInt(index++, video); prep.setInt(index++, call); prep.setInt(index++, dnet); - prep.setInt(index++, energyUsage); + prep.setInt(index++, 0); prep.setString(index++, deviceEnergyUsage); prep.setString(index++, applicationEnergyUsage); } @@ -570,12 +571,6 @@ public class SystemData extends LogData { cpuFrequency = rs.getString(index++); cpuLoad = rs.getString(index++); systemMemoryUsed = rs.getLong(index++); - totalUsedDrive = rs.getInt(index++); - diskReadOpCount = rs.getInt(index++); - diskWriteOpCount = rs.getInt(index++); - diskWrittenByteSize = rs.getInt(index++); - networkSendSize = rs.getInt(index++); - networkReceiveSize = rs.getInt(index++); wifi = rs.getInt(index++); btStatus = rs.getInt(index++); gpsStatus = rs.getInt(index++); @@ -589,7 +584,6 @@ public class SystemData extends LogData { video = rs.getInt(index++); call = rs.getInt(index++); dnet = rs.getInt(index++); - energyUsage = rs.getInt(index++); deviceEnergyUsage = rs.getString(index++); applicationEnergyUsage = rs.getString(index++); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/EnergyDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/EnergyDBTable.java index 6093819..2d704fc 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/EnergyDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/EnergyDBTable.java @@ -57,8 +57,8 @@ public class EnergyDBTable extends DBTable { public EnergyDBTable() { addColumn(new DBColumn(TIME, DBConstants.NOT_NULL, DBConstants.LONG)); addColumn(new DBColumn(DEVICE_NUM, DBConstants.NOT_NULL, DBConstants.INTEGER)); - addColumn(new DBColumn(ENERGY_USAGE_DEVICE, DBConstants.NOT_NULL, DBConstants.INTEGER)); - addColumn(new DBColumn(ENERGY_USAGE_APP, DBConstants.NOT_NULL, DBConstants.INTEGER)); + addColumn(new DBColumn(ENERGY_USAGE_DEVICE, DBConstants.NOT_NULL, DBConstants.LONG)); + addColumn(new DBColumn(ENERGY_USAGE_APP, DBConstants.NOT_NULL, DBConstants.LONG)); } @Override @@ -72,8 +72,8 @@ public class EnergyDBTable extends DBTable { try { prep.setLong(1, (Long) (rowData.get(COLUMN.TIME.ordinal()))); prep.setInt(2, (Integer) (rowData.get(COLUMN.DEVICE_NUM.ordinal()))); - prep.setInt(3, (Integer) (rowData.get(COLUMN.ENERGY_USAGE_DEVICE.ordinal()))); - prep.setInt(4, (Integer) (rowData.get(COLUMN.ENERGY_USAGE_APP.ordinal()))); + prep.setLong(3, (Long) (rowData.get(COLUMN.ENERGY_USAGE_DEVICE.ordinal()))); + prep.setLong(4, (Long) (rowData.get(COLUMN.ENERGY_USAGE_APP.ordinal()))); } catch (SQLException e) { e.printStackTrace(); isPrepared = false; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/SystemDataDBTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/SystemDataDBTable.java index 5c862b4..6862656 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/SystemDataDBTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/SystemDataDBTable.java @@ -104,8 +104,8 @@ public class SystemDataDBTable extends DBTable { addColumn(new DBColumn(PROCESS_COUNT_OTHER, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(PROCESS_COUNT_TARGET, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(MEMORY_USAGE_SYSTEM, DBConstants.EMPTY, DBConstants.LONG)); - addColumn(new DBColumn(NETWORK_SIZE_SEND, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(NETWORK_SIZE_RECEIVE, DBConstants.EMPTY, DBConstants.INTEGER)); + addColumn(new DBColumn(NETWORK_SIZE_SEND, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(NETWORK_SIZE_RECEIVE, DBConstants.EMPTY, DBConstants.LONG)); addColumn(new DBColumn(DEVICE_STATUS_WIFI, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(DEVICE_STATUS_BLUETOOTH, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(DEVICE_STATUS_GPS, DBConstants.EMPTY, DBConstants.INTEGER)); @@ -119,12 +119,12 @@ public class SystemDataDBTable extends DBTable { addColumn(new DBColumn(DEVICE_STATUS_RSSI, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(DEVICE_STATUS_VIDEO, DBConstants.EMPTY, DBConstants.INTEGER)); addColumn(new DBColumn(DEVICE_STATUS_CALL, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(DISK_TOTAL_USAGE, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(DISK_IO_READ_SIZE, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(DISK_IO_READ_SECTOR, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(DISK_IO_WRITE_SIZE, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(DISK_IO_WRITE_SECTOR, DBConstants.EMPTY, DBConstants.INTEGER)); - addColumn(new DBColumn(ENERGY_USAGE, DBConstants.EMPTY, DBConstants.INTEGER)); + addColumn(new DBColumn(DISK_TOTAL_USAGE, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(DISK_IO_READ_SIZE, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(DISK_IO_READ_SECTOR, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(DISK_IO_WRITE_SIZE, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(DISK_IO_WRITE_SECTOR, DBConstants.EMPTY, DBConstants.LONG)); + addColumn(new DBColumn(ENERGY_USAGE, DBConstants.EMPTY, DBConstants.LONG)); } @Override @@ -141,8 +141,8 @@ public class SystemDataDBTable extends DBTable { prep.setInt(3, (Integer) (rowData.get(COLUMN.PROCESS_COUNT_OTHER.ordinal()))); prep.setInt(4, (Integer) (rowData.get(COLUMN.PROCESS_COUNT_TARGET.ordinal()))); prep.setLong(5, (Long) (rowData.get(COLUMN.MEMORY_USAGE_SYSTEM.ordinal()))); - prep.setInt(6, (Integer) (rowData.get(COLUMN.NETWORK_SIZE_SEND.ordinal()))); - prep.setInt(7, (Integer) (rowData.get(COLUMN.NETWORK_SIZE_RECEIVE.ordinal()))); + prep.setLong(6, (Long) (rowData.get(COLUMN.NETWORK_SIZE_SEND.ordinal()))); + prep.setLong(7, (Long) (rowData.get(COLUMN.NETWORK_SIZE_RECEIVE.ordinal()))); prep.setInt(8, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_WIFI.ordinal()))); prep.setInt(9, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_BLUETOOTH.ordinal()))); prep.setInt(10, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_GPS.ordinal()))); @@ -156,12 +156,12 @@ public class SystemDataDBTable extends DBTable { prep.setInt(18, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_RSSI.ordinal()))); prep.setInt(19, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_VIDEO.ordinal()))); prep.setInt(20, (Integer) (rowData.get(COLUMN.DEVICE_STATUS_CALL.ordinal()))); - prep.setInt(21, (Integer) (rowData.get(COLUMN.DISK_TOTAL_USAGE.ordinal()))); - prep.setInt(22, (Integer) (rowData.get(COLUMN.DISK_IO_READ_OP_COUNT.ordinal()))); - prep.setInt(23, (Integer) (rowData.get(COLUMN.DISK_IO_READ_BYTE_SIZE.ordinal()))); - prep.setInt(24, (Integer) (rowData.get(COLUMN.DISK_IO_WRITE_OP_COUNT.ordinal()))); - prep.setInt(25, (Integer) (rowData.get(COLUMN.DISK_IO_WRITE_BYTE_SIZE.ordinal()))); - prep.setInt(26, (Integer) (rowData.get(COLUMN.ENERGY_USAGE.ordinal()))); + prep.setLong(21, (Long) (rowData.get(COLUMN.DISK_TOTAL_USAGE.ordinal()))); + prep.setLong(22, (Long) (rowData.get(COLUMN.DISK_IO_READ_OP_COUNT.ordinal()))); + prep.setLong(23, (Long) (rowData.get(COLUMN.DISK_IO_READ_BYTE_SIZE.ordinal()))); + prep.setLong(24, (Long) (rowData.get(COLUMN.DISK_IO_WRITE_OP_COUNT.ordinal()))); + prep.setLong(25, (Long) (rowData.get(COLUMN.DISK_IO_WRITE_BYTE_SIZE.ordinal()))); + prep.setLong(26, (Long) (rowData.get(COLUMN.ENERGY_USAGE.ordinal()))); } catch (SQLException e) { e.printStackTrace(); isPrepared = false; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java index 49bda73..6d1aa90 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java @@ -51,8 +51,8 @@ public class DiskIOChart extends TimelineChart { private DAChartSeries readByteSizeSeries; private DAChartSeries writeByteSizeSeries; - private int maxOpCount = 0; - private int maxReadWriteSize = 0; + private long maxOpCount = 0; + private long maxReadWriteSize = 0; public static DiskIOChart getInstance() { if (instance == null) { @@ -129,10 +129,10 @@ public class DiskIOChart extends TimelineChart { List row = data.get(i); double time = (Long)row.get(SystemDataDBTable.COLUMN.TIME.ordinal()) / TimelineConstants.MEGA_DOUBLE; - int readCount = (Integer)row.get(SystemDataDBTable.COLUMN.DISK_IO_READ_OP_COUNT.ordinal()); - int writeCount = (Integer)row.get(SystemDataDBTable.COLUMN.DISK_IO_WRITE_OP_COUNT.ordinal()); - int readByteSize = (Integer)row.get(SystemDataDBTable.COLUMN.DISK_IO_READ_BYTE_SIZE.ordinal()); - int writeByteSize = (Integer)row.get(SystemDataDBTable.COLUMN.DISK_IO_WRITE_BYTE_SIZE.ordinal()); + long readCount = (Long)row.get(SystemDataDBTable.COLUMN.DISK_IO_READ_OP_COUNT.ordinal()); + long writeCount = (Long)row.get(SystemDataDBTable.COLUMN.DISK_IO_WRITE_OP_COUNT.ordinal()); + long readByteSize = (Long)row.get(SystemDataDBTable.COLUMN.DISK_IO_READ_BYTE_SIZE.ordinal()); + long writeByteSize = (Long)row.get(SystemDataDBTable.COLUMN.DISK_IO_WRITE_BYTE_SIZE.ordinal()); readOpCountSeries.addSeriesItem(new DAChartSeriesItem(time, readCount, String.valueOf(readCount))); 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 d27b553..f881c3e 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 @@ -174,7 +174,7 @@ public class EnergyChart extends TimelineChart { .ordinal()) / TimelineConstants.MEGA_DOUBLE; try { - int energyUsage = (Integer) row + long energyUsage = (Long) row .get(SystemDataDBTable.COLUMN.ENERGY_USAGE .ordinal()); @@ -197,10 +197,10 @@ public class EnergyChart extends TimelineChart { List oneTime = (List) row.get(ii); double time = (Long) oneTime.get(EnergyDBTable.COLUMN.TIME .ordinal()) / TimelineConstants.MEGA_DOUBLE; - double usage = (Integer) oneTime + long usage = (Long) oneTime .get(EnergyDBTable.COLUMN.ENERGY_USAGE_DEVICE .ordinal()); - double usageApp = (Integer) oneTime + long usageApp = (Long) oneTime .get(EnergyDBTable.COLUMN.ENERGY_USAGE_APP .ordinal()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java index f37eab3..f4a89f0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java @@ -103,8 +103,8 @@ public class NetworkIOChart extends TimelineChart { List row = data.get(i); double time = (Long)row.get(SystemDataDBTable.COLUMN.TIME.ordinal()) / TimelineConstants.MEGA_DOUBLE; - int sendSize = (Integer)row.get(SystemDataDBTable.COLUMN.NETWORK_SIZE_SEND.ordinal()); - int receiveSize = (Integer)row.get(SystemDataDBTable.COLUMN.NETWORK_SIZE_RECEIVE.ordinal()); + long sendSize = (Long)row.get(SystemDataDBTable.COLUMN.NETWORK_SIZE_SEND.ordinal()); + long receiveSize = (Long)row.get(SystemDataDBTable.COLUMN.NETWORK_SIZE_RECEIVE.ordinal()); sendSeries.addSeriesItem(new DAChartSeriesItem( time, sendSize, Formatter.toByteFormat(sendSize))); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java index b59946d..b60416f 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java @@ -70,7 +70,6 @@ import org.tizen.dynamicanalyzer.ui.timeline.UIEventDBTable; import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUCoreChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUFrequencyChart; -import org.tizen.dynamicanalyzer.ui.timeline.chart.DeviceChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.DiskIOChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.EnergyChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.HeapChart; @@ -79,7 +78,6 @@ import org.tizen.dynamicanalyzer.ui.timeline.chart.ProcessMemoryChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.ScreenshotChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.SystemMemoryChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart; -import org.tizen.dynamicanalyzer.ui.timeline.chart.UIEventChart; import org.tizen.dynamicanalyzer.ui.timeline.chart.UserCustomChart; import org.tizen.dynamicanalyzer.ui.timeline.logparser.CustomLogParser; import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser; @@ -425,8 +423,8 @@ public class TimelineChartManager extends PageDataManager implements dbSystemData.add(new Integer(log.getOtherProcessCount())); dbSystemData.add(new Integer(log.getTargetProcessCount())); dbSystemData.add(new Long(log.getSystemMemoryUsed())); - dbSystemData.add(new Integer(log.getNetworkSendSize())); - dbSystemData.add(new Integer(log.getNetworkReceiveSize())); + dbSystemData.add(new Long(log.getNetworkSendSize().getValue())); + dbSystemData.add(new Long(log.getNetworkReceiveSize().getValue())); dbSystemData.add(new Integer(log.getWifi())); dbSystemData.add(new Integer(log.getBtStatus())); dbSystemData.add(new Integer(log.getGpsStatus())); @@ -440,12 +438,12 @@ public class TimelineChartManager extends PageDataManager implements dbSystemData.add(new Integer(log.getRssi())); dbSystemData.add(new Integer(log.getVideo())); dbSystemData.add(new Integer(log.getCall())); - dbSystemData.add(new Integer(log.getTotalUsedDrive())); - dbSystemData.add(new Integer(log.getDiskReadOpCount())); - dbSystemData.add(new Integer(log.getDiskReadByteSize())); - dbSystemData.add(new Integer(log.getDiskWriteOpCount())); - dbSystemData.add(new Integer(log.getDiskWrittenByteSize())); - dbSystemData.add(new Integer(log.getEnergyUsage())); + dbSystemData.add(new Long(log.getTotalUsedDrive().getValue())); + dbSystemData.add(new Long(log.getDiskReadOpCount().getValue())); + dbSystemData.add(new Long(log.getDiskReadByteSize().getValue())); + dbSystemData.add(new Long(log.getDiskWriteOpCount().getValue())); + dbSystemData.add(new Long(log.getDiskWrittenByteSize().getValue())); + dbSystemData.add(new Long(log.getEnergyUsage().getValue())); systemDataList.add(dbSystemData); /* @@ -511,17 +509,13 @@ public class TimelineChartManager extends PageDataManager implements .getApplicationEnergyUsage().split( CommonConstants.COMMA); for (int ii = 0; ii < deviceEnergyUsages.length; ii++) { - double usage = Double.parseDouble(deviceEnergyUsages[ii]); - double usagePerApp = Double - .parseDouble(deviceEnergyUsagesPerApp[ii]); + long usage = Long.parseLong(deviceEnergyUsages[ii]); + long usagePerApp = Long.parseLong(deviceEnergyUsagesPerApp[ii]); ArrayList dbEnergyData = new ArrayList(); dbEnergyData.add(new Long(log.getTime())); dbEnergyData.add(new Integer(ii)); - dbEnergyData.add(new Integer((int) usage)); // TODO change - // float - dbEnergyData.add(new Integer((int) usagePerApp)); // TODO - // change - // float + dbEnergyData.add(new Long(usage)); + dbEnergyData.add(new Long(usagePerApp)); energyDataList.add(dbEnergyData); } } -- 2.7.4