mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 18:59:09 +00:00
Remove old, unused network stats
This commit is contained in:
@ -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
|
||||
|
@ -571,11 +571,6 @@ int plNetClientMgr::Update(double secs)
|
||||
}
|
||||
lastUpdateTime=curTime;
|
||||
|
||||
if (!GetFlagsBit(kDisabled))
|
||||
{
|
||||
fNetClientStats.UpdateAgeStats();
|
||||
}
|
||||
|
||||
if (GetFlagsBit(kPlayingGame) )
|
||||
{
|
||||
MaybeSendPendingPagingRoomMsgs();
|
||||
|
@ -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 );
|
||||
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
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();
|
||||
}
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
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
|
||||
|
Reference in New Issue
Block a user