davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-17 15:46:33 +09:00
Code Issues Releases Activity

Statistics fixed and USE_RELEASE_STATISTICS defines added

Browse Source
This commit is contained in:
lidgren
2011-03-26 08:18:21 +00:00
parent c896b180fb
commit 5b4a4a7fc5
3 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Lidgren.Network/NetConnectionStatistics.cs
View File

@@ -16,6 +16,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRA
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
// Uncomment the line below to get statistics in RELEASE builds
//#define USE_RELEASE_STATISTICS
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
@@ -89,6 +93,15 @@ namespace Lidgren.Network
// public double LastSendRespondedTo { get { return m_connection.m_lastSendRespondedTo; } } // public double LastSendRespondedTo { get { return m_connection.m_lastSendRespondedTo; } }
#if USE_RELEASE_STATISTICS
internal void PacketSent(int numBytes, int numMessages)
{
NetException.Assert(numBytes > 0 && numMessages > 0);
m_sentPackets++;
m_sentBytes += numBytes;
m_sentMessages += numMessages;
}
#else
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void PacketSent(int numBytes, int numMessages) internal void PacketSent(int numBytes, int numMessages)
{ {
@@ -97,7 +110,17 @@ namespace Lidgren.Network
m_sentBytes += numBytes; m_sentBytes += numBytes;
m_sentMessages += numMessages; m_sentMessages += numMessages;
} }
#endif
#if USE_RELEASE_STATISTICS
internal void PacketReceived(int numBytes, int numMessages)
{
NetException.Assert(numBytes > 0 && numMessages > 0);
m_receivedPackets++;
m_receivedBytes += numBytes;
m_receivedMessages += numMessages;
}
#else
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void PacketReceived(int numBytes, int numMessages) internal void PacketReceived(int numBytes, int numMessages)
{ {
@@ -106,7 +129,17 @@ namespace Lidgren.Network
m_receivedBytes += numBytes; m_receivedBytes += numBytes;
m_receivedMessages += numMessages; m_receivedMessages += numMessages;
} }
#endif
#if USE_RELEASE_STATISTICS
internal void MessageResent(MessageResendReason reason)
{
if (reason == MessageResendReason.Delay)
m_resentMessagesDueToDelay++;
else
m_resentMessagesDueToHole++;
}
#else
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void MessageResent(MessageResendReason reason) internal void MessageResent(MessageResendReason reason)
{ {
@@ -115,6 +148,7 @@ namespace Lidgren.Network
else else
m_resentMessagesDueToHole++; m_resentMessagesDueToHole++;
} }
#endif
/// <summary> /// <summary>
/// Returns a string that represents this object /// Returns a string that represents this object

7
Lidgren.Network/NetPeer.Internal.cs
View File

@@ -321,6 +321,7 @@ namespace Lidgren.Network
// //
// parse packet into messages // parse packet into messages
// //
int numMessages = 0;
int ptr = 0; int ptr = 0;
while ((bytesReceived - ptr) >= NetConstants.HeaderByteSize) while ((bytesReceived - ptr) >= NetConstants.HeaderByteSize)
{ {
@@ -330,6 +331,8 @@ namespace Lidgren.Network
// 15 bits - Sequence number // 15 bits - Sequence number
// 16 bits - Payload length in bits // 16 bits - Payload length in bits
numMessages++;
NetMessageType tp = (NetMessageType)m_receiveBuffer[ptr++]; NetMessageType tp = (NetMessageType)m_receiveBuffer[ptr++];
byte low = m_receiveBuffer[ptr++]; byte low = m_receiveBuffer[ptr++];
@@ -401,6 +404,10 @@ namespace Lidgren.Network
} }
ptr += payloadByteLength; ptr += payloadByteLength;
} }
m_statistics.PacketReceived(bytesReceived, numMessages);
if (sender != null)
sender.m_statistics.PacketReceived(bytesReceived, numMessages);
} }
private void ReceivedUnconnectedLibraryMessage(double now, IPEndPoint senderEndpoint, NetMessageType tp, int ptr, int payloadByteLength) private void ReceivedUnconnectedLibraryMessage(double now, IPEndPoint senderEndpoint, NetMessageType tp, int ptr, int payloadByteLength)

22
Lidgren.Network/NetPeerStatistics.cs
View File

@@ -17,6 +17,10 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
USE OR OTHER DEALINGS IN THE SOFTWARE. USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
// Uncomment the line below to get statistics in RELEASE builds
//#define USE_RELEASE_STATISTICS
using System; using System;
using System.Text; using System.Text;
using System.Diagnostics; using System.Diagnostics;
@@ -101,6 +105,14 @@ namespace Lidgren.Network
/// </summary> /// </summary>
public int BytesInRecyclePool { get { return m_peer.m_storagePoolBytes; } } public int BytesInRecyclePool { get { return m_peer.m_storagePoolBytes; } }
#if USE_RELEASE_STATISTICS
internal void PacketSent(int numBytes, int numMessages)
{
m_sentPackets++;
m_sentBytes += numBytes;
m_sentMessages += numMessages;
}
#else
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void PacketSent(int numBytes, int numMessages) internal void PacketSent(int numBytes, int numMessages)
{ {
@@ -108,7 +120,16 @@ namespace Lidgren.Network
m_sentBytes += numBytes; m_sentBytes += numBytes;
m_sentMessages += numMessages; m_sentMessages += numMessages;
} }
#endif
#if USE_RELEASE_STATISTICS
internal void PacketReceived(int numBytes, int numMessages)
{
m_receivedPackets++;
m_receivedBytes += numBytes;
m_receivedMessages += numMessages;
}
#else
[Conditional("DEBUG")] [Conditional("DEBUG")]
internal void PacketReceived(int numBytes, int numMessages) internal void PacketReceived(int numBytes, int numMessages)
{ {
@@ -116,6 +137,7 @@ namespace Lidgren.Network
m_receivedBytes += numBytes; m_receivedBytes += numBytes;
m_receivedMessages += numMessages; m_receivedMessages += numMessages;
} }
#endif
/// <summary> /// <summary>
/// Returns a string that represents this object /// Returns a string that represents this object