From f6d65dd396b0863ea3623462381b69a9a4ef4e8e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 21 Mar 2012 18:55:07 -0400 Subject: [PATCH] Remove old, unused network stats --- .../PubUtilLib/plNetClient/CMakeLists.txt | 2 - .../PubUtilLib/plNetClient/plNetClientMgr.cpp | 5 - .../PubUtilLib/plNetClient/plNetClientMgr.h | 3 - .../plNetClient/plNetClientStats.cpp | 107 ---------- .../PubUtilLib/plNetClient/plNetClientStats.h | 92 --------- .../plStatGather/plCalculatedProfiles.cpp | 182 ------------------ 6 files changed, 391 deletions(-) delete mode 100644 Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.cpp delete mode 100644 Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.h diff --git a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt index 3b4947ab..e7904cc0 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/plNetClient/CMakeLists.txt @@ -18,7 +18,6 @@ set(plNetClient_SOURCES plNetClientMgrVoice.cpp plNetClientMsgHandler.cpp plNetClientMsgScreener.cpp - plNetClientStats.cpp plNetLinkingMgr.cpp plNetObjectDebugger.cpp plNetVoiceList.cpp @@ -33,7 +32,6 @@ set(plNetClient_HEADERS plNetClientMgr.h plNetClientMsgHandler.h plNetClientMsgScreener.h - plNetClientStats.h plNetLinkingMgr.h plNetObjectDebugger.h plNetVoiceList.h diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp index f563a2c6..50704007 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp @@ -571,11 +571,6 @@ int plNetClientMgr::Update(double secs) } lastUpdateTime=curTime; - if (!GetFlagsBit(kDisabled)) - { - fNetClientStats.UpdateAgeStats(); - } - if (GetFlagsBit(kPlayingGame) ) { MaybeSendPendingPagingRoomMsgs(); diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index 5d435364..2f6bef94 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -48,7 +48,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetClientGroup.h" #include "plNetVoiceList.h" #include "plNetClientMsgHandler.h" -#include "plNetClientStats.h" // STATS Counters #include "plNetClientMsgScreener.h" #include "pnNetCommon/plNetApp.h" @@ -186,7 +185,6 @@ private: plKey fAgeSDLObjectKey; uint8_t fExperimentalLevel; - plNetClientStats fNetClientStats; uint8_t fPingServerType; // non-zero if we're pinging someone float fOverrideAgeTimeOfDayPercent; // for console debugging @@ -360,7 +358,6 @@ public: plUoid GetAgeSDLObjectUoid(const char* ageName) const; plNetClientComm& GetNetClientComm() { return fNetClientComm; } const char* GetNextAgeFilename(); - plNetClientStats& GetNetClientStats() { return fNetClientStats; } void SetOverrideAgeTimeOfDayPercent(float f) { fOverrideAgeTimeOfDayPercent=f; } void AddPendingPagingRoomMsg( plNetMsgPagingRoom * msg ); diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.cpp deleted file mode 100644 index f848a1c4..00000000 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#include "plNetClientStats.h" -#include "plNetClientMgr.h" -#include "hsTimer.h" - - -plNetClientStats::plNetClientStats() : - fNumVaultMsgsSent(0), - fNumVaultMsgsRcvd(0), - fVaultMsgSentBytes(0), - fVaultMsgRcvdBytes(0), - fAgeStatsULBits(0), - fAgeStatsDLBits(0), - fAgeStatsLinkInTime(0) -{ - -} -// -// return the avg UL bps used so far in this age -// -float plNetClientStats::GetAgeStatsULBitsPerSec() const -{ - double elapsedAgeTime = hsTimer::GetSeconds() - fAgeStatsLinkInTime; - return (float)(fAgeStatsULBits/elapsedAgeTime); -} - -// -// return the acks that were conpressed so far -// -uint32_t plNetClientStats::GetRecvdMultipleAcks() const -{ - return fRecvdMultipleAcks; -} - -// -// return the avg DL bps used so far in this age -// -float plNetClientStats::GetAgeStatsDLBitsPerSec() const -{ - double elapsedAgeTime = hsTimer::GetSeconds() - fAgeStatsLinkInTime; - return (float)(fAgeStatsDLBits/elapsedAgeTime); -} - -// -// Accumulate the UL/DL bits & acks used from the netCore state -// -void plNetClientStats::UpdateAgeStats() -{ - plNetClientMgr* nc=plNetClientMgr::GetInstance(); - -#if 0 - fAgeStatsDLBits += nc->GetNetCore()->GetStats()->GetDLBits(); - fAgeStatsULBits += nc->GetNetCore()->GetStats()->GetULBits(); - fRecvdMultipleAcks += nc->GetNetCore()->GetStats()->GetRecvdMultipleAcks(); -#endif -} - - -// -// Call when you join an age -// -void plNetClientStats::ResetAgeStats() -{ - fAgeStatsDLBits = fAgeStatsULBits = 0; - fRecvdMultipleAcks = 0; - fAgeStatsLinkInTime = hsTimer::GetSeconds(); -} \ No newline at end of file diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.h deleted file mode 100644 index fa010e72..00000000 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientStats.h +++ /dev/null @@ -1,92 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -#ifndef plNetClientStats_h -#define plNetClientStats_h - -#include "HeadSpin.h" - -// -// Holds stats counters used by the Net Client -// - -class plNetClientStats -{ -public: - plNetClientStats(); - - // - // Vault Stats - // -private: - // Vault msg counters - uint32_t fNumVaultMsgsSent; - uint32_t fNumVaultMsgsRcvd; - uint32_t fVaultMsgSentBytes; - uint32_t fVaultMsgRcvdBytes; -public: - // msg counters - uint32_t GetNumVaultMsgsSent() const { return fNumVaultMsgsSent; } - uint32_t GetNumVaultMsgsRcvd() const { return fNumVaultMsgsRcvd; } - uint32_t GetVaultMsgSentBytes() const { return fVaultMsgSentBytes; } - uint32_t GetVaultMsgRcvdBytes() const { return fVaultMsgRcvdBytes; } - void TallyVaultMsgSent( int size ) { fNumVaultMsgsSent++; fVaultMsgSentBytes+=size; } - void TallyVaultMsgRcvd( int size ) { fNumVaultMsgsRcvd++; fVaultMsgRcvdBytes+=size; } - void ResetVaultMsgCounters() { fNumVaultMsgsSent=fNumVaultMsgsRcvd=fVaultMsgSentBytes=fVaultMsgRcvdBytes=0; } - - // - // NetClient BW Stats, kept per age - // -private: - int fAgeStatsULBits, fAgeStatsDLBits; - uint32_t fRecvdMultipleAcks; - double fAgeStatsLinkInTime; - -public: - void UpdateAgeStats(); - void ResetAgeStats(); - float GetAgeStatsULBitsPerSec() const; - float GetAgeStatsDLBitsPerSec() const; - uint32_t GetRecvdMultipleAcks() const; -}; - -#endif // plNetClientStats_h - diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp index af6586bc..b79a3188 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plCalculatedProfiles.cpp @@ -45,28 +45,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTimer.h" #include "plPipeline/plPlates.h" -plProfile_CreateCounter("Age Upload BitsPerSec", "Network", UploadAgeBitsPerSec); -plProfile_CreateMemCounter("Upload Bytes", "Network", UploadBW); -plProfile_CreateMemCounter("Upload Avg Packet Size", "Network", UploadAPS); -plProfile_CreateCounter("Upload Num Packets", "Network", UploadPPS); -plProfile_CreateCounter("Upload Avg Packets Queued", "Network", UploadPQ); -plProfile_CreateCounter("Recvd Multiple Acks", "Network", RMultAcksPQ); - -plProfile_CreateCounter("Age Download BitsPerSec", "Network", DownloadAgeBitsPerSec); -plProfile_CreateMemCounter("Download Bytes", "Network", DownloadBW); -plProfile_CreateMemCounter("Download Avg Packet Size", "Network", DownloadAPS); -plProfile_CreateCounter("Download Num Packets", "Network", DownloadPPS); -plProfile_CreateCounter("Download Avg Packets Queued", "Network", DownloadPQ); -plProfile_CreateCounter("Download Dropped Pkts", "Network", DownloadDP); - -plProfile_CreateCounter("Remote Players", "Network", RemotePlayers); -plProfile_CreateCounter("Peers", "Network", Peers); -plProfile_CreateCounter("Player ID", "Network", PlayerID); -plProfile_CreateCounter("Account ID", "Network", AccountID); - -plProfile_CreateTimer("Avg Receipt Time", "Network", AvgReceiptTime); -plProfile_CreateTimer("Peak Receipt Time", "Network", PeakReceiptTime); - #ifdef HS_FIND_MEM_LEAKS plProfile_CreateMemCounter("Allocated", "Memory", MemAllocated); plProfile_CreateMemCounter("Peak Alloc", "Memory", MemPeakAlloc); @@ -102,47 +80,9 @@ void CalculateProfiles() // plProfile_Set(MemAllocated, MemGetAllocated()); // plProfile_Set(MemPeakAlloc, MemGetPeakAllocated()); #endif - - // Network stats - plNetClientMgr* nc = plNetClientMgr::GetInstance(); - if (!nc->GetFlagsBit(plNetClientMgr::kDisabled)) - { -#if 0 - hsAssert(nc->GetNetCore(), "nil net core in stats?"); - plNetCoreStats* ns = nc->GetNetCore()->GetStats(); - - plProfile_Set(UploadAgeBitsPerSec, (uint32_t)nc->GetNetClientStats().GetAgeStatsULBitsPerSec()); - plProfile_Set(UploadBW, ns->GetULBits()/8); - plProfile_Set(UploadPPS, ns->GetULPackets()); - plProfile_Set(UploadAPS, (uint32_t)ns->GetULAvgPacketBytes()); - plProfile_Set(UploadPQ, (uint32_t)ns->GetULAvgNumPacketsQueued()); - plProfile_Set(RMultAcksPQ, nc->GetNetClientStats().GetRecvdMultipleAcks()); - - plProfile_Set(DownloadAgeBitsPerSec, (uint32_t)nc->GetNetClientStats().GetAgeStatsDLBitsPerSec()); - plProfile_Set(DownloadBW, ns->GetDLBits()/8); - plProfile_Set(DownloadPPS, ns->GetDLPackets()); - plProfile_Set(DownloadAPS, (uint32_t)ns->GetDLAvgPacketBytes()); - plProfile_Set(DownloadPQ, (uint32_t)ns->GetDLAvgNumPacketsQueued()); - plProfile_Set(DownloadDP, ns->GetDLDroppedPackets()); - - plProfile_Set(RemotePlayers, nc->RemotePlayerKeys().size()); - plProfile_Set(Peers, ns->GetNumPeers()); - plProfile_Set(PlayerID, nc->GetPlayerID()); - plProfile_Set(AccountID, nc->GetAccountID()); - - plProfile_Set(AvgReceiptTime, hsTimer::PrecSecsToTicks(ns->GetAvgReceiptTime())); - plProfile_Set(PeakReceiptTime, hsTimer::PrecSecsToTicks(ns->GetPeakReceiptTime())); -#endif - } } static plGraphPlate* fFPSPlate = nil; -static plGraphPlate* fNetBWPlate = nil; -static plGraphPlate* fNetPPSPlate = nil; -static plGraphPlate* fNetQueuesPlate = nil; -static plGraphPlate* fNetAvgBWPlate = nil; -static plGraphPlate* fNetAvgPPSPlate = nil; -static plGraphPlate* fNetAvgQueuesPlate = nil; static int ICreateStdPlate(plGraphPlate** graph) { @@ -174,68 +114,6 @@ void CreateStandardGraphs(const char* groupName, bool create) fFPSPlate = nil; } } - else if (strcmp(groupName, "Network") == 0) - { - if (create) - { - if (ICreateStdPlate(&fNetBWPlate) == hsOK) - { - fNetBWPlate->SetDataLabels(0, 2000); - fNetBWPlate->SetTitle("Bytes"); - fNetBWPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetPPSPlate); - fNetPPSPlate->SetDataLabels(0, 20); - fNetPPSPlate->SetTitle("Packets"); - fNetPPSPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetQueuesPlate); - fNetQueuesPlate->SetDataLabels(0, 20); - fNetQueuesPlate->SetTitle("Queue Counts"); - fNetQueuesPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetQueuesPlate); - fNetQueuesPlate->SetDataLabels(0, 20); - fNetQueuesPlate->SetTitle("Queue Counts"); - fNetQueuesPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetQueuesPlate); - fNetQueuesPlate->SetDataLabels(0, 20); - fNetQueuesPlate->SetTitle("Queue Counts"); - fNetQueuesPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetAvgBWPlate); - fNetAvgBWPlate->SetDataLabels(0, 5000); - fNetAvgBWPlate->SetTitle("Avg BytesPS"); - fNetAvgBWPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetAvgPPSPlate); - fNetAvgPPSPlate->SetDataLabels(0, 40); - fNetAvgPPSPlate->SetTitle("Avg PacketsPS"); - fNetAvgPPSPlate->SetLabelText("UL", "DL"); - - ICreateStdPlate(&fNetAvgQueuesPlate); - fNetAvgQueuesPlate->SetDataLabels(0, 40); - fNetAvgQueuesPlate->SetTitle("Avg Queue CountsPS"); - fNetAvgQueuesPlate->SetLabelText("UL", "DL"); - } - } - else - { - plPlateManager::Instance().DestroyPlate(fNetBWPlate); - plPlateManager::Instance().DestroyPlate(fNetPPSPlate); - plPlateManager::Instance().DestroyPlate(fNetQueuesPlate); - plPlateManager::Instance().DestroyPlate(fNetAvgBWPlate); - plPlateManager::Instance().DestroyPlate(fNetAvgPPSPlate); - plPlateManager::Instance().DestroyPlate(fNetAvgQueuesPlate); - fNetBWPlate = nil; - fNetPPSPlate = nil; - fNetQueuesPlate = nil; - fNetAvgBWPlate = nil; - fNetAvgPPSPlate = nil; - fNetAvgQueuesPlate = nil; - } - } } plProfile_CreateTimer("Draw", "General", DrawTime); @@ -256,64 +134,4 @@ void UpdateStandardGraphs(float xPos, float yPos) plProfile_GetValue(UpdateTime)); PositionPlate(fFPSPlate); } - - plNetClientMgr* nc = plNetClientMgr::GetInstance(); - - -#if 0 - plNetCoreStats* ns = nc ? nc->GetNetCore()->GetStats() : nil; - - if (!nc || !ns) - return; - - if (fNetBWPlate) - { - fNetBWPlate->AddData( - (uint32_t)(ns->GetULBits()/8.f), - (uint32_t)(ns->GetDLBits()/8.f)); - PositionPlate(fNetBWPlate); - } - - if (fNetPPSPlate) - { - fNetPPSPlate->AddData( - ns->GetULPackets(), - ns->GetDLPackets()); - PositionPlate(fNetPPSPlate); - } - - if (fNetQueuesPlate) - { - unsigned int ul, dl; - nc->GetNetCore()->GetOutQueueMsgCount(plNetCore::kPeerAll,ul); - nc->GetNetCore()->GetInQueueMsgCount(plNetCore::kPeerAll,dl); - fNetQueuesPlate->AddData(ul,dl); - PositionPlate(fNetQueuesPlate); - } - - if (fNetAvgBWPlate) - { - fNetAvgBWPlate->AddData( - (uint32_t)(ns->GetULBitsPS()/8.f), - (uint32_t)(ns->GetDLBitsPS()/8.f)); - PositionPlate(fNetAvgBWPlate); - } - - if (fNetAvgPPSPlate) - { - fNetAvgPPSPlate->AddData( - (int32_t)ns->GetULNumPacketsPS(), - (int32_t)ns->GetDLNumPacketsPS()); - PositionPlate(fNetAvgPPSPlate); - } - - if (fNetAvgQueuesPlate) - { - fNetAvgQueuesPlate->AddData( - (int32_t)ns->GetULAvgNumPacketsQueued(), - (int32_t)ns->GetDLAvgNumPacketsQueued()); - PositionPlate(fNetAvgQueuesPlate); - } -#endif - }