--- a/nettools/conntest/Engine/HttpHandler.cpp Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/Engine/HttpHandler.cpp Wed Sep 15 11:52:39 2010 +0300
@@ -382,7 +382,10 @@
void CHttpClient::DisplayTimeElapsed()
{
// Throughput calculation
- TInt size = OverallDataSize();
+ TUint64 packets = iSettingData->iPackets;
+ TUint64 packetSize = iSettingData->iPacketSize;
+ TUint64 size = packets*packetSize;
+
TBuf8<128> b(_L8("Body sent\n"));
Utils::CalculateThroughput(b, iLastTimeStamp, size);
--- a/nettools/conntest/inc/HttpHandler.h Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/HttpHandler.h Wed Sep 15 11:52:39 2010 +0300
@@ -159,7 +159,7 @@
MHTTPDataSupplier* iRespBody;
MUINotify& iConsole; // console for displaying text etc
TTime iStartTime;
- TInt iBodySize;
+ TUint64 iBodySize;
TBool iDoPerformance;
};
--- a/nettools/conntest/inc/SocketsEngine.h Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsEngine.h Wed Sep 15 11:52:39 2010 +0300
@@ -402,7 +402,7 @@
TUint32 iStartTime; // for performance testing only
TTime iStartTTime; // for performance testing only
TTime iThroughputStartTime; // for performance testing only
- TInt iTroughputDataSize;
+ TUint64 iTroughputDataSize;
TCommDbConnPref iPrefs;
TConnPrefList* iPrefsList;
TExtendedConnPref* iExtPrefs;
--- a/nettools/conntest/inc/SocketsRead.h Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsRead.h Wed Sep 15 11:52:39 2010 +0300
@@ -126,7 +126,7 @@
MUINotify& iConsole; // console for displaying text etc
TBuf8<KReadDataSize> iBuffer; // buffer for receiving data
TSockXfrLength iDummyLength; // dummy - length of data read is written here
- TInt iReceivedBytes;
+ TUint64 iReceivedBytes;
TInt32 iUdpPacketCounter;
TBool iDoCount;
TBool iDoPerformance;
--- a/nettools/conntest/inc/SocketsWrite.h Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsWrite.h Wed Sep 15 11:52:39 2010 +0300
@@ -160,7 +160,7 @@
TUint iProtocol;
TInt iPackets;
TInt iPacketSize;
- TInt iSentBytes;
+ TUint64 iSentBytes;
TTime iStartTime;
TInt iDataChunkCount;
HBufC8* iReqBodySubmitBuffer;
--- a/nettools/conntest/inc/Utils.h Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/Utils.h Wed Sep 15 11:52:39 2010 +0300
@@ -42,7 +42,7 @@
/**
* Calculate throughput
*/
- static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TInt aSize);
+ static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TUint64 aSize);
/**
* Set IapId value into connection preferences table.
--- a/nettools/conntest/src/Utils.cpp Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/src/Utils.cpp Wed Sep 15 11:52:39 2010 +0300
@@ -57,13 +57,13 @@
// Calculate throughput
// ----------------------------------------------------------------------------
//
-void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TInt aSize )
+void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TUint64 aSize )
{
TTime now;
now.UniversalTime();
TTimeIntervalMicroSeconds interval;
interval = now.MicroSecondsFrom( aStartTime );
- TInt num = I64INT(interval.Int64());
+ TUint64 num = interval.Int64();
if (num != 0)
{