# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286968278 -10800 # Node ID 4399c14e1ad0c59790eab44793d0882299505eee # Parent 22633ca47dfee29a2ae6349d07136a5dadc43d04 Revision: 201034 Kit: 201041 diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/Engine/HttpHandler.cpp --- a/nettools/conntest/Engine/HttpHandler.cpp Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/Engine/HttpHandler.cpp Wed Oct 13 14:11:18 2010 +0300 @@ -382,10 +382,7 @@ void CHttpClient::DisplayTimeElapsed() { // Throughput calculation - TUint64 packets = iSettingData->iPackets; - TUint64 packetSize = iSettingData->iPacketSize; - TUint64 size = packets*packetSize; - + TInt size = OverallDataSize(); TBuf8<128> b(_L8("Body sent\n")); Utils::CalculateThroughput(b, iLastTimeStamp, size); diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/data/ConnTest_reg.rss --- a/nettools/conntest/data/ConnTest_reg.rss Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/data/ConnTest_reg.rss Wed Oct 13 14:11:18 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -16,7 +16,7 @@ */ #include -#include +#include UID2 KUidAppRegistrationResourceFile UID3 0x101F6D2B // application UID diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/group/ConnTest.mmp --- a/nettools/conntest/group/ConnTest.mmp Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/group/ConnTest.mmp Wed Oct 13 14:11:18 2010 +0300 @@ -76,7 +76,7 @@ LIBRARY apparc.lib LIBRARY apgrfx.lib LIBRARY avkon.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY aknnotify.lib LIBRARY bafl.lib LIBRARY commdb.lib diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/inc/HttpHandler.h --- a/nettools/conntest/inc/HttpHandler.h Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/inc/HttpHandler.h Wed Oct 13 14:11:18 2010 +0300 @@ -159,7 +159,7 @@ MHTTPDataSupplier* iRespBody; MUINotify& iConsole; // console for displaying text etc TTime iStartTime; - TUint64 iBodySize; + TInt iBodySize; TBool iDoPerformance; }; diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/inc/SocketsEngine.h --- a/nettools/conntest/inc/SocketsEngine.h Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/inc/SocketsEngine.h Wed Oct 13 14:11:18 2010 +0300 @@ -402,7 +402,7 @@ TUint32 iStartTime; // for performance testing only TTime iStartTTime; // for performance testing only TTime iThroughputStartTime; // for performance testing only - TUint64 iTroughputDataSize; + TInt iTroughputDataSize; TCommDbConnPref iPrefs; TConnPrefList* iPrefsList; TExtendedConnPref* iExtPrefs; diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/inc/SocketsRead.h --- a/nettools/conntest/inc/SocketsRead.h Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/inc/SocketsRead.h Wed Oct 13 14:11:18 2010 +0300 @@ -126,7 +126,7 @@ MUINotify& iConsole; // console for displaying text etc TBuf8 iBuffer; // buffer for receiving data TSockXfrLength iDummyLength; // dummy - length of data read is written here - TUint64 iReceivedBytes; + TInt iReceivedBytes; TInt32 iUdpPacketCounter; TBool iDoCount; TBool iDoPerformance; diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/inc/SocketsWrite.h --- a/nettools/conntest/inc/SocketsWrite.h Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/inc/SocketsWrite.h Wed Oct 13 14:11:18 2010 +0300 @@ -160,7 +160,7 @@ TUint iProtocol; TInt iPackets; TInt iPacketSize; - TUint64 iSentBytes; + TInt iSentBytes; TTime iStartTime; TInt iDataChunkCount; HBufC8* iReqBodySubmitBuffer; diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/inc/Utils.h --- a/nettools/conntest/inc/Utils.h Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/inc/Utils.h Wed Oct 13 14:11:18 2010 +0300 @@ -42,7 +42,7 @@ /** * Calculate throughput */ - static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TUint64 aSize); + static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TInt aSize); /** * Set IapId value into connection preferences table. diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/src/ConnTestAppUi.cpp --- a/nettools/conntest/src/ConnTestAppUi.cpp Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/src/ConnTestAppUi.cpp Wed Oct 13 14:11:18 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -26,7 +26,7 @@ #include "ConnTestAppUi.h" #include "ConnTestView.h" -#include +#include #include "conntest.hrh" #include "SettingData.h" #include "ipdumpengine.h" diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/src/ConnTestView.cpp --- a/nettools/conntest/src/ConnTestView.cpp Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/src/ConnTestView.cpp Wed Oct 13 14:11:18 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -22,7 +22,7 @@ #include #include -#include +#include #include "ConnTestView.h" #include "ConnTestContainer.h" #include "CustomPrefsItemList.h" diff -r 22633ca47dfe -r 4399c14e1ad0 nettools/conntest/src/Utils.cpp --- a/nettools/conntest/src/Utils.cpp Wed Sep 15 11:52:39 2010 +0300 +++ b/nettools/conntest/src/Utils.cpp Wed Oct 13 14:11:18 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -19,7 +19,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include @@ -57,13 +57,13 @@ // Calculate throughput // ---------------------------------------------------------------------------- // -void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TUint64 aSize ) +void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TInt aSize ) { TTime now; now.UniversalTime(); TTimeIntervalMicroSeconds interval; interval = now.MicroSecondsFrom( aStartTime ); - TUint64 num = interval.Int64(); + TInt num = I64INT(interval.Int64()); if (num != 0) {