Add brand new traffic analytics
This commit is contained in:
parent
cc22f3c804
commit
7bb422cfb4
@ -2,6 +2,7 @@
|
|||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using NeonTea.Quakeball.Networking;
|
using NeonTea.Quakeball.Networking;
|
||||||
|
using NeonTea.Quakeball.TeaNet.Peers;
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
public class NetDebugScreen : MonoBehaviour {
|
public class NetDebugScreen : MonoBehaviour {
|
||||||
@ -33,15 +34,27 @@ public class NetDebugScreen : MonoBehaviour {
|
|||||||
var Peer = Net.Singleton.Instance.Peer;
|
var Peer = Net.Singleton.Instance.Peer;
|
||||||
if (Time.time - LastUpdate > UpdateInterval) {
|
if (Time.time - LastUpdate > UpdateInterval) {
|
||||||
LastUpdate = Time.time;
|
LastUpdate = Time.time;
|
||||||
|
TrafficData data = Peer.TrafficData;
|
||||||
|
|
||||||
float ToSeconds = 1f / (Peer.TrafficDataInterval / 1000f);
|
float ToSeconds = 1f / (Peer.TrafficDataInterval / 1000f);
|
||||||
string received = $"Total Bytes Receivd: {Peer.TrafficReceived * ToSeconds} B/s\nReceived by packet:";
|
string received = $"Total incoming traffic: {data.Received * ToSeconds} B/s";
|
||||||
foreach (Type t in Peer.TrafficReceivedByPacket.Keys) {
|
received += $"\n{data.TotalMessagesReceived * ToSeconds} total messages";
|
||||||
received += $"\n{t.Name} - {Peer.TrafficReceivedByPacket[t] * ToSeconds} B/s";
|
received += $"\n{data.ReliableReceived * ToSeconds} reliable Packets/s";
|
||||||
|
received += $"\n{data.UnreliableReceived * ToSeconds} unreliable Packets/s";
|
||||||
|
received += "\nPer packet received traffic:";
|
||||||
|
foreach (Type t in data.ReceivedByPacket.Keys) {
|
||||||
|
PerPacketData packetData = data.ReceivedByPacket[t];
|
||||||
|
received += $"\n{t.Name} {packetData.Packets * ToSeconds} P/s - {packetData.Bytes * ToSeconds} B/s";
|
||||||
}
|
}
|
||||||
ReceivedText.text = received;
|
ReceivedText.text = received;
|
||||||
string sent = $"Total Bytes Sent: {Net.Singleton.Instance.Peer.TrafficSent * ToSeconds} B/s\nSent by packet:";
|
string sent = $"Total outgoing traffic: {data.Sent * ToSeconds} B/s";
|
||||||
foreach (Type t in Peer.TrafficSentByPacket.Keys) {
|
sent += $"\n{data.TotalMessagesSent * ToSeconds} total messages";
|
||||||
sent += $"\n{t.Name} - {Peer.TrafficSentByPacket[t] * ToSeconds} B/s";
|
sent += $"\n{data.ReliableSent * ToSeconds} reliable Packets/s";
|
||||||
|
sent += $"\n{data.UnreliableSent * ToSeconds} unreliable Packets/s";
|
||||||
|
sent += "\nPer packet sent traffic:";
|
||||||
|
foreach (Type t in data.SentByPacket.Keys) {
|
||||||
|
PerPacketData packetData = data.SentByPacket[t];
|
||||||
|
sent += $"\n{t.Name} {packetData.Packets * ToSeconds} P/s - {data.SentByPacket[t].Bytes * ToSeconds} B/s";
|
||||||
}
|
}
|
||||||
SentText.text = sent;
|
SentText.text = sent;
|
||||||
}
|
}
|
||||||
|
@ -23,10 +23,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
public long Timeout = 8000;
|
public long Timeout = 8000;
|
||||||
public long Interval = 100;
|
public long Interval = 100;
|
||||||
|
|
||||||
/// <summary>The amount of bytes sent since the last clear interval from Peer</summary>
|
public ConnectionManagerTrafficData TrafficData = new ConnectionManagerTrafficData();
|
||||||
public int BytesSent;
|
|
||||||
public ConcurrentDictionary<Type, int> SentByPacket = new ConcurrentDictionary<Type, int>();
|
|
||||||
public ConcurrentDictionary<Type, int> ReceivedByPacket = new ConcurrentDictionary<Type, int>();
|
|
||||||
|
|
||||||
public ConnectionManager(Peer peer) {
|
public ConnectionManager(Peer peer) {
|
||||||
Peer = peer;
|
Peer = peer;
|
||||||
@ -103,9 +100,12 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
buffer.WritePacket(protocol, p);
|
buffer.WritePacket(protocol, p);
|
||||||
|
|
||||||
// Do the analytics dance!
|
// Do the analytics dance!
|
||||||
int OldSentByPacket;
|
PerPacketData OldSentByPacket;
|
||||||
SentByPacket.TryGetValue(p.GetType(), out OldSentByPacket);
|
TrafficData.SentByPacket.TryGetValue(p.GetType(), out OldSentByPacket);
|
||||||
SentByPacket[p.GetType()] = OldSentByPacket + p.Size;
|
OldSentByPacket.Bytes += p.Size;
|
||||||
|
OldSentByPacket.Packets += 1;
|
||||||
|
TrafficData.SentByPacket[p.GetType()] = OldSentByPacket;
|
||||||
|
TrafficData.ReliablePacketsSent++;
|
||||||
}
|
}
|
||||||
Send(conn, buffer);
|
Send(conn, buffer);
|
||||||
}
|
}
|
||||||
@ -126,11 +126,14 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
buffer.Write(1);
|
buffer.Write(1);
|
||||||
buffer.WritePacket(protocol, p);
|
buffer.WritePacket(protocol, p);
|
||||||
Send(conn, buffer);
|
Send(conn, buffer);
|
||||||
|
TrafficData.UnreliablePacketsSent++;
|
||||||
|
|
||||||
// Do the analytics dance!
|
// Do the analytics dance!
|
||||||
int OldSentByPacket;
|
PerPacketData OldSentByPacket;
|
||||||
SentByPacket.TryGetValue(p.GetType(), out OldSentByPacket);
|
TrafficData.SentByPacket.TryGetValue(p.GetType(), out OldSentByPacket);
|
||||||
SentByPacket[p.GetType()] = OldSentByPacket + p.Size;
|
OldSentByPacket.Bytes += p.Size;
|
||||||
|
OldSentByPacket.Packets += 1;
|
||||||
|
TrafficData.SentByPacket[p.GetType()] = OldSentByPacket;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,7 +186,8 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
if (conn.Status == ConnectionStatus.Lost) {
|
if (conn.Status == ConnectionStatus.Lost) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
BytesSent += buffer.Size;
|
TrafficData.BytesSent += buffer.Size;
|
||||||
|
TrafficData.TotalMessagesSent++;
|
||||||
byte[] bytes = buffer.Pack();
|
byte[] bytes = buffer.Pack();
|
||||||
Peer.ListenerThread.LastSentConnection = conn;
|
Peer.ListenerThread.LastSentConnection = conn;
|
||||||
Peer.UdpClient.Send(bytes, bytes.Length, conn.Endpoint);
|
Peer.UdpClient.Send(bytes, bytes.Length, conn.Endpoint);
|
||||||
@ -258,7 +262,15 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
}
|
}
|
||||||
PacketQueue[conn.uid] = queue;
|
PacketQueue[conn.uid] = queue;
|
||||||
|
|
||||||
|
|
||||||
int PacketAmount = buffer.ReadInt();
|
int PacketAmount = buffer.ReadInt();
|
||||||
|
|
||||||
|
if (Reliable) {
|
||||||
|
TrafficData.ReliablePacketsReceived += PacketAmount;
|
||||||
|
} else {
|
||||||
|
TrafficData.UnreliablePacketsreceived += PacketAmount;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < PacketAmount; i++) {
|
for (int i = 0; i < PacketAmount; i++) {
|
||||||
Packet p = buffer.ReadPacket(protocol);
|
Packet p = buffer.ReadPacket(protocol);
|
||||||
p.PacketId = FirstPacketId + i;
|
p.PacketId = FirstPacketId + i;
|
||||||
@ -274,9 +286,11 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Do some analytics!
|
// Do some analytics!
|
||||||
int OldReceivedByPacket;
|
PerPacketData OldReceivedByPacket;
|
||||||
ReceivedByPacket.TryGetValue(p.GetType(), out OldReceivedByPacket);
|
TrafficData.ReceivedByPacket.TryGetValue(p.GetType(), out OldReceivedByPacket);
|
||||||
ReceivedByPacket[p.GetType()] = OldReceivedByPacket + p.Size;
|
OldReceivedByPacket.Bytes += p.Size;
|
||||||
|
OldReceivedByPacket.Packets += 1;
|
||||||
|
TrafficData.ReceivedByPacket[p.GetType()] = OldReceivedByPacket;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -353,4 +367,37 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
Connection = connection;
|
Connection = connection;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class ConnectionManagerTrafficData {
|
||||||
|
/// <summary>The amount of bytes sent since the last clear interval from Peer</summary>
|
||||||
|
public int BytesSent;
|
||||||
|
/// <summary>The amount of total IP messages sent since the last clear interval from Peer</summary>
|
||||||
|
public int TotalMessagesSent;
|
||||||
|
/// <summary>The amount of reliable packets sent since the last clear interval from Peer</summary>
|
||||||
|
public int ReliablePacketsSent;
|
||||||
|
/// <summary>The amount of unreliable packets sent since the last clear interval from Peer</summary>
|
||||||
|
public int UnreliablePacketsSent;
|
||||||
|
/// <summary>The amount of reliable packets received since the last clear interval from Peer</summary>
|
||||||
|
public int ReliablePacketsReceived;
|
||||||
|
/// <summary>The amount of unreliable packets received since the last clear interval from Peer</summary>
|
||||||
|
public int UnreliablePacketsreceived;
|
||||||
|
/// <summary>Data relating to outward packet specific traffic</summary>
|
||||||
|
public ConcurrentDictionary<Type, PerPacketData> SentByPacket = new ConcurrentDictionary<Type, PerPacketData>();
|
||||||
|
/// <summary>Data relating to inward packet specific traffic</summary>
|
||||||
|
public ConcurrentDictionary<Type, PerPacketData> ReceivedByPacket = new ConcurrentDictionary<Type, PerPacketData>();
|
||||||
|
|
||||||
|
public void Clear() {
|
||||||
|
BytesSent = 0;
|
||||||
|
TotalMessagesSent = 0;
|
||||||
|
ReliablePacketsSent = 0;
|
||||||
|
UnreliablePacketsSent = 0;
|
||||||
|
ReliablePacketsReceived = 0;
|
||||||
|
UnreliablePacketsreceived = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public struct PerPacketData {
|
||||||
|
public int Bytes;
|
||||||
|
public int Packets;
|
||||||
|
}
|
||||||
}
|
}
|
@ -18,7 +18,9 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
private static int[] CONN_LOST_CODES = new int[] { 10054, 10051 };
|
private static int[] CONN_LOST_CODES = new int[] { 10054, 10051 };
|
||||||
|
|
||||||
/// <summary>The amount of bytes received since the last clear interval from Peer</summary>
|
/// <summary>The amount of bytes received since the last clear interval from Peer</summary>
|
||||||
public int ReceivedBytes;
|
public int BytesReceived;
|
||||||
|
/// <summary>The amount of bytes received since the last clear interval from Peer</summary>
|
||||||
|
public int MessagesReceived;
|
||||||
|
|
||||||
public ListenerThread(Peer peer, IPEndPoint endpoint) {
|
public ListenerThread(Peer peer, IPEndPoint endpoint) {
|
||||||
EndPoint = endpoint;
|
EndPoint = endpoint;
|
||||||
@ -64,7 +66,8 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
}
|
}
|
||||||
if (Buffer.ReadFingerprint(Peer.Fingerprint)) {
|
if (Buffer.ReadFingerprint(Peer.Fingerprint)) {
|
||||||
Peer.ConnectionManager.Handle(Listened, Buffer);
|
Peer.ConnectionManager.Handle(Listened, Buffer);
|
||||||
ReceivedBytes += Buffer.Size;
|
BytesReceived += Buffer.Size;
|
||||||
|
MessagesReceived++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,14 +33,8 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
}
|
}
|
||||||
/// <summary>The interval of traffic analyzed before updating. By default 5000 (5 seconds)</summary>
|
/// <summary>The interval of traffic analyzed before updating. By default 5000 (5 seconds)</summary>
|
||||||
public long TrafficDataInterval = 5000;
|
public long TrafficDataInterval = 5000;
|
||||||
/// <summary>The amount of bytes received in the last TrafficDataIntervel</summary>
|
/// <summary>Traffic Data for this Peer</summary>
|
||||||
public int TrafficReceived { get; private set; }
|
public TrafficData TrafficData { get; private set; } = new TrafficData();
|
||||||
/// <summary>The amount of bytes sent in the last TrafficDataIntervel</summary>
|
|
||||||
public int TrafficSent { get; private set; }
|
|
||||||
/// <summary>The amount of bytes sent in the last TrafficDataIntervel by Packet</summary>
|
|
||||||
public ConcurrentDictionary<Type, int> TrafficSentByPacket => ConnectionManager.SentByPacket;
|
|
||||||
/// <summary>The amount of bytes received in the last TrafficDataIntervel by Packet</summary>
|
|
||||||
public ConcurrentDictionary<Type, int> TrafficReceivedByPacket => ConnectionManager.ReceivedByPacket;
|
|
||||||
/// <summary>Whether the Peer is currently doing anything or not.null</sumary>
|
/// <summary>Whether the Peer is currently doing anything or not.null</sumary>
|
||||||
public bool Running { get; private set; }
|
public bool Running { get; private set; }
|
||||||
|
|
||||||
@ -168,19 +162,30 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
if (now - LastTrafficData > TrafficDataInterval) {
|
if (now - LastTrafficData > TrafficDataInterval) {
|
||||||
LastTrafficData = now;
|
LastTrafficData = now;
|
||||||
if (ListenerThread != null) {
|
if (ListenerThread != null) {
|
||||||
TrafficReceived = ListenerThread.ReceivedBytes;
|
TrafficData.Received = ListenerThread.BytesReceived;
|
||||||
ListenerThread.ReceivedBytes = 0;
|
TrafficData.TotalMessagesReceived = ListenerThread.MessagesReceived;
|
||||||
|
ListenerThread.BytesReceived = 0;
|
||||||
|
ListenerThread.MessagesReceived = 0;
|
||||||
}
|
}
|
||||||
if (ConnectionManager != null) {
|
if (ConnectionManager != null) {
|
||||||
TrafficSent = ConnectionManager.BytesSent;
|
TrafficData.Sent = ConnectionManager.TrafficData.BytesSent;
|
||||||
ConnectionManager.BytesSent = 0;
|
TrafficData.TotalMessagesSent = ConnectionManager.TrafficData.TotalMessagesSent;
|
||||||
|
TrafficData.UnreliableReceived = ConnectionManager.TrafficData.UnreliablePacketsreceived;
|
||||||
|
TrafficData.ReliableReceived = ConnectionManager.TrafficData.ReliablePacketsReceived;
|
||||||
|
TrafficData.UnreliableSent = ConnectionManager.TrafficData.UnreliablePacketsSent;
|
||||||
|
TrafficData.ReliableSent = ConnectionManager.TrafficData.ReliablePacketsSent;
|
||||||
|
|
||||||
foreach (Type t in ConnectionManager.ReceivedByPacket.Keys) {
|
PerPacketData empty = new PerPacketData();
|
||||||
ConnectionManager.ReceivedByPacket[t] = 0;
|
foreach (Type t in ConnectionManager.TrafficData.ReceivedByPacket.Keys) {
|
||||||
|
TrafficData.ReceivedByPacket[t] = ConnectionManager.TrafficData.ReceivedByPacket[t];
|
||||||
|
ConnectionManager.TrafficData.ReceivedByPacket[t] = empty;
|
||||||
}
|
}
|
||||||
foreach (Type t in ConnectionManager.SentByPacket.Keys) {
|
foreach (Type t in ConnectionManager.TrafficData.SentByPacket.Keys) {
|
||||||
ConnectionManager.SentByPacket[t] = 0;
|
TrafficData.SentByPacket[t] = ConnectionManager.TrafficData.SentByPacket[t];
|
||||||
|
ConnectionManager.TrafficData.SentByPacket[t] = empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConnectionManager.TrafficData.Clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,4 +209,27 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
|
|||||||
void Message(string msg);
|
void Message(string msg);
|
||||||
void Err(string msg);
|
void Err(string msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class TrafficData {
|
||||||
|
/// <summary>The amount of bytes received in the last TrafficDataIntervel</summary>
|
||||||
|
public int Received;
|
||||||
|
/// <summary>The amount of bytes sent in the last TrafficDataIntervel</summary>
|
||||||
|
public int Sent;
|
||||||
|
/// <summary>The amount of total messages received in the last TrafficDataIntervel</summary>
|
||||||
|
public int TotalMessagesReceived;
|
||||||
|
/// <summary>The amount of total messages sent in the last TrafficDataIntervel</summary>
|
||||||
|
public int TotalMessagesSent;
|
||||||
|
/// <summary>The amount of reliable messages received in the last TrafficDataIntervel</summary>
|
||||||
|
public int ReliableReceived;
|
||||||
|
/// <summary>The amount of reliable messages sent in the last TrafficDataIntervel</summary>
|
||||||
|
public int ReliableSent;
|
||||||
|
/// <summary>The amount of unreliable messages received in the last TrafficDataIntervel</summary>
|
||||||
|
public int UnreliableReceived;
|
||||||
|
/// <summary>The amount of unreliable messages sent in the last TrafficDataIntervel</summary>
|
||||||
|
public int UnreliableSent;
|
||||||
|
/// <summary>The amount of bytes sent in the last TrafficDataIntervel by Packet</summary>
|
||||||
|
public Dictionary<Type, PerPacketData> SentByPacket = new Dictionary<Type, PerPacketData>();
|
||||||
|
/// <summary>The amount of bytes received in the last TrafficDataIntervel by Packet</summary>
|
||||||
|
public Dictionary<Type, PerPacketData> ReceivedByPacket = new Dictionary<Type, PerPacketData>();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user