davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-19 08:36:34 +09:00
Code Issues Releases Activity

changed remaining float representations of time to doubles

Browse Source
This commit is contained in:
Michael Lidgren
2015-02-06 18:57:42 +01:00
parent 6f52612619
commit b3fffb52e5
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Lidgren.Network/NetConnection.Handshake.cs
View File

@@ -22,7 +22,7 @@ namespace Lidgren.Network
public NetIncomingMessage RemoteHailMessage { get { return m_remoteHailMessage; } } public NetIncomingMessage RemoteHailMessage { get { return m_remoteHailMessage; } }
// heartbeat called when connection still is in m_handshakes of NetPeer // heartbeat called when connection still is in m_handshakes of NetPeer
internal void UnconnectedHeartbeat(float now) internal void UnconnectedHeartbeat(double now)
{ {
m_peer.VerifyNetworkThread(); m_peer.VerifyNetworkThread();
@@ -233,7 +233,7 @@ namespace Lidgren.Network
m_localHailMessage = null; m_localHailMessage = null;
m_handshakeAttempts = 0; m_handshakeAttempts = 0;
SendConnectResponse((float)NetTime.Now, false); SendConnectResponse(NetTime.Now, false);
} }
/// <summary> /// <summary>
@@ -250,7 +250,7 @@ namespace Lidgren.Network
m_localHailMessage = localHail; m_localHailMessage = localHail;
m_handshakeAttempts = 0; m_handshakeAttempts = 0;
SendConnectResponse((float)NetTime.Now, false); SendConnectResponse(NetTime.Now, false);
} }
/// <summary> /// <summary>

2
Lidgren.Network/NetConnection.cs
View File

@@ -135,7 +135,7 @@ namespace Lidgren.Network
} }
} }
internal void Heartbeat(float now, uint frameCounter) internal void Heartbeat(double now, uint frameCounter)
{ {
m_peer.VerifyNetworkThread(); m_peer.VerifyNetworkThread();

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

@@ -324,10 +324,8 @@ namespace Lidgren.Network
{ {
VerifyNetworkThread(); VerifyNetworkThread();
double dnow = NetTime.Now; double now = NetTime.Now;
float now = (float)dnow; double delta = now - m_lastHeartbeat;
double delta = dnow - m_lastHeartbeat;
int maxCHBpS = 1250 - m_connections.Count; int maxCHBpS = 1250 - m_connections.Count;
if (maxCHBpS < 250) if (maxCHBpS < 250)
@@ -335,7 +333,7 @@ namespace Lidgren.Network
if (delta > (1.0 / (double)maxCHBpS) || delta < 0.0) // max connection heartbeats/second max if (delta > (1.0 / (double)maxCHBpS) || delta < 0.0) // max connection heartbeats/second max
{ {
m_frameCounter++; m_frameCounter++;
m_lastHeartbeat = dnow; m_lastHeartbeat = now;
// do handshake heartbeats // do handshake heartbeats
if ((m_frameCounter % 3) == 0) if ((m_frameCounter % 3) == 0)
@@ -424,8 +422,7 @@ namespace Lidgren.Network
// return; // return;
// update now // update now
dnow = NetTime.Now; now = NetTime.Now;
now = (float)dnow;
do do
{ {
@@ -537,7 +534,7 @@ namespace Lidgren.Network
if (sender != null) if (sender != null)
sender.ReceivedLibraryMessage(tp, ptr, payloadByteLength); sender.ReceivedLibraryMessage(tp, ptr, payloadByteLength);
else else
ReceivedUnconnectedLibraryMessage(dnow, ipsender, tp, ptr, payloadByteLength); ReceivedUnconnectedLibraryMessage(now, ipsender, tp, ptr, payloadByteLength);
} }
else else
{ {
@@ -546,7 +543,7 @@ namespace Lidgren.Network
NetIncomingMessage msg = CreateIncomingMessage(NetIncomingMessageType.Data, payloadByteLength); NetIncomingMessage msg = CreateIncomingMessage(NetIncomingMessageType.Data, payloadByteLength);
msg.m_isFragment = isFragment; msg.m_isFragment = isFragment;
msg.m_receiveTime = dnow; msg.m_receiveTime = now;
msg.m_sequenceNumber = sequenceNumber; msg.m_sequenceNumber = sequenceNumber;
msg.m_receivedMessageType = tp; msg.m_receivedMessageType = tp;
msg.m_senderConnection = sender; msg.m_senderConnection = sender;

4
Lidgren.Network/NetPeer.MessagePools.cs
View File

@@ -123,7 +123,7 @@ namespace Lidgren.Network
if (m_outgoingMessagesPool == null || !m_outgoingMessagesPool.TryDequeue(out retval)) if (m_outgoingMessagesPool == null || !m_outgoingMessagesPool.TryDequeue(out retval))
retval = new NetOutgoingMessage(); retval = new NetOutgoingMessage();
NetException.Assert(retval.m_recyclingCount == 0, "Wrong recycling count! Should be zero"); NetException.Assert(retval.m_recyclingCount == 0, "Wrong recycling count! Should be zero" + retval.m_recyclingCount);
if (initialCapacity > 0) if (initialCapacity > 0)
retval.m_data = GetStorage(initialCapacity); retval.m_data = GetStorage(initialCapacity);
@@ -188,7 +188,7 @@ namespace Lidgren.Network
if (m_outgoingMessagesPool == null) if (m_outgoingMessagesPool == null)
return; return;
NetException.Assert(msg.m_recyclingCount == 0, "Wrong recycling count! Should be zero"); NetException.Assert(msg.m_recyclingCount == 0, "Wrong recycling count! Should be zero; found " + msg.m_recyclingCount);
NetException.Assert(m_outgoingMessagesPool.Contains(msg) == false, "Recyling already recycled message! Thread race?"); NetException.Assert(m_outgoingMessagesPool.Contains(msg) == false, "Recyling already recycled message! Thread race?");

2
Lidgren.Network/NetPeer.cs
View File

@@ -288,7 +288,7 @@ namespace Lidgren.Network
break; break;
case NetConnectionStatus.RespondedConnect: case NetConnectionStatus.RespondedConnect:
// send another response // send another response
hs.SendConnectResponse((float)NetTime.Now, false); hs.SendConnectResponse(NetTime.Now, false);
break; break;
default: default:
// weird // weird

6
Lidgren.Network/NetUPnP.cs
View File

@@ -40,7 +40,7 @@ namespace Lidgren.Network
private NetPeer m_peer; private NetPeer m_peer;
private ManualResetEvent m_discoveryComplete = new ManualResetEvent(false); private ManualResetEvent m_discoveryComplete = new ManualResetEvent(false);
internal float m_discoveryResponseDeadline; internal double m_discoveryResponseDeadline;
private UPnPStatus m_status; private UPnPStatus m_status;
@@ -55,7 +55,7 @@ namespace Lidgren.Network
public NetUPnP(NetPeer peer) public NetUPnP(NetPeer peer)
{ {
m_peer = peer; m_peer = peer;
m_discoveryResponseDeadline = float.MinValue; m_discoveryResponseDeadline = double.MinValue;
} }
internal void Discover(NetPeer peer) internal void Discover(NetPeer peer)
@@ -79,7 +79,7 @@ namespace Lidgren.Network
// allow some extra time for router to respond // allow some extra time for router to respond
// System.Threading.Thread.Sleep(50); // System.Threading.Thread.Sleep(50);
m_discoveryResponseDeadline = (float)NetTime.Now + 6.0f; // arbitrarily chosen number, router gets 6 seconds to respond m_discoveryResponseDeadline = NetTime.Now + 6.0; // arbitrarily chosen number, router gets 6 seconds to respond
m_status = UPnPStatus.Discovering; m_status = UPnPStatus.Discovering;
} }