NeonTea
/
quakeball
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize reliable boolean in packets

This commit is contained in:
Sofia 2020-08-11 01:05:04 +03:00
parent 990438011f
commit 779716b66e
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/TeaNet/Packets/ByteBuffer.cs
View File

@ -217,7 +217,6 @@ namespace NeonTea.Quakeball.TeaNet.Packets {
public void WritePacket(Protocol protocol, Packet p) { public void WritePacket(Protocol protocol, Packet p) {
int old = Bytes.Count; int old = Bytes.Count;
Write(protocol.GetPacketTypeID(p)); Write(protocol.GetPacketTypeID(p));
p.WriteMeta(this);
p.Write(this); p.Write(this);
p.Size = Bytes.Count - old; p.Size = Bytes.Count - old;
} }
@ -228,7 +227,6 @@ namespace NeonTea.Quakeball.TeaNet.Packets {
int packetType = ReadInt(); int packetType = ReadInt();
Type t = protocol.GetPacketType(packetType); Type t = protocol.GetPacketType(packetType);
Packet p = (Packet)Activator.CreateInstance(t); Packet p = (Packet)Activator.CreateInstance(t);
p.ReadMeta(this);
p.Read(this); p.Read(this);
p.Size = pos - old; p.Size = pos - old;
return p; return p;

10
Assets/Scripts/TeaNet/Packets/Packet.cs
View File

@ -13,16 +13,6 @@ namespace NeonTea.Quakeball.TeaNet.Packets {
/// <summary>Read and assign any relevant information about this packet from the buffer.</summary> /// <summary>Read and assign any relevant information about this packet from the buffer.</summary>
public abstract void Read(ByteBuffer buffer); public abstract void Read(ByteBuffer buffer);
/// <summary>Reads packet meta-information from the buffer.</summary>
public void ReadMeta(ByteBuffer buffer) {
PacketIsReliable = buffer.ReadBool();
}
/// <summary>Writes packet meta-information to the buffer.</summary>
public void WriteMeta(ByteBuffer buffer) {
buffer.Write(PacketIsReliable);
}
/// <summary>Make a shallow copy for this packet, copying any primitives but retaining any references to instances.</summary> /// <summary>Make a shallow copy for this packet, copying any primitives but retaining any references to instances.</summary>
public Packet ShallowCopy() { public Packet ShallowCopy() {
return (Packet)this.MemberwiseClone(); return (Packet)this.MemberwiseClone();

3
Assets/Scripts/TeaNet/Packets/Protocol.cs
View File

@ -37,7 +37,7 @@ namespace NeonTea.Quakeball.TeaNet.Packets {
return id; return id;
} }
public ByteBuffer BuildMessage(Connection connection, int firstId) { public ByteBuffer BuildMessage(Connection connection, int firstId, bool reliable) {
ByteBuffer buffer = new ByteBuffer(); ByteBuffer buffer = new ByteBuffer();
foreach (byte b in Peer.Fingerprint) { foreach (byte b in Peer.Fingerprint) {
buffer.Write(b); buffer.Write(b);
@ -55,6 +55,7 @@ namespace NeonTea.Quakeball.TeaNet.Packets {
buffer.Write((byte)PacketStage.Ready); buffer.Write((byte)PacketStage.Ready);
buffer.Write(connection.Internal.LatestInwardReliable); buffer.Write(connection.Internal.LatestInwardReliable);
buffer.Write(firstId); buffer.Write(firstId);
buffer.Write(reliable);
} }
return buffer; return buffer;
} }

8
Assets/Scripts/TeaNet/Peers/ConnectionManager.cs
View File

@ -97,7 +97,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
if (list.Length > 0) { if (list.Length > 0) {
firstId = list[0].PacketId; firstId = list[0].PacketId;
} }
ByteBuffer buffer = protocol.BuildMessage(conn, firstId); ByteBuffer buffer = protocol.BuildMessage(conn, firstId, true);
buffer.Write(list.Length); buffer.Write(list.Length);
foreach (Packet p in list) { foreach (Packet p in list) {
buffer.WritePacket(protocol, p); buffer.WritePacket(protocol, p);
@ -122,7 +122,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
p.PacketIsReliable = false; p.PacketIsReliable = false;
Protocol protocol = Peer.GetProtocol(conn.Internal.AssignedProtocol); Protocol protocol = Peer.GetProtocol(conn.Internal.AssignedProtocol);
if (protocol != null && conn.IsReady()) { if (protocol != null && conn.IsReady()) {
ByteBuffer buffer = protocol.BuildMessage(conn, p.PacketId); ByteBuffer buffer = protocol.BuildMessage(conn, p.PacketId, false);
buffer.Write(1); buffer.Write(1);
buffer.WritePacket(protocol, p); buffer.WritePacket(protocol, p);
Send(conn, buffer); Send(conn, buffer);
@ -174,7 +174,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
private void SendPlain(Connection conn) { private void SendPlain(Connection conn) {
Protocol protocol = Peer.GetProtocol(conn.Internal.AssignedProtocol); Protocol protocol = Peer.GetProtocol(conn.Internal.AssignedProtocol);
if (protocol != null) { if (protocol != null) {
ByteBuffer buffer = protocol.BuildMessage(conn, Int32.MaxValue); ByteBuffer buffer = protocol.BuildMessage(conn, Int32.MaxValue, false);
Send(conn, buffer); Send(conn, buffer);
} }
} }
@ -244,6 +244,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
conn.Internal.LatestOutwardReliable = buffer.ReadInt(); conn.Internal.LatestOutwardReliable = buffer.ReadInt();
int FirstPacketId = buffer.ReadInt(); int FirstPacketId = buffer.ReadInt();
bool Reliable = buffer.ReadBool();
ConcurrentQueue<Packet> queue = PacketQueue[conn.uid]; ConcurrentQueue<Packet> queue = PacketQueue[conn.uid];
Packet peeked; Packet peeked;
@ -261,6 +262,7 @@ namespace NeonTea.Quakeball.TeaNet.Peers {
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;
p.PacketIsReliable = Reliable;
if (p.PacketIsReliable) { if (p.PacketIsReliable) {
if (p.PacketId > conn.Internal.LatestInwardReliable) { if (p.PacketId > conn.Internal.LatestInwardReliable) {
conn.Internal.LatestInwardReliable = p.PacketId; conn.Internal.LatestInwardReliable = p.PacketId;