From b3fffb52e5d7dc384aaad7b384d7624fad8fc383 Mon Sep 17 00:00:00 2001 From: Michael Lidgren Date: Fri, 6 Feb 2015 18:57:42 +0100 Subject: [PATCH] changed remaining float representations of time to doubles --- Lidgren.Network/NetConnection.Handshake.cs | 6 +++--- Lidgren.Network/NetConnection.cs | 2 +- Lidgren.Network/NetPeer.Internal.cs | 15 ++++++--------- Lidgren.Network/NetPeer.MessagePools.cs | 4 ++-- Lidgren.Network/NetPeer.cs | 2 +- Lidgren.Network/NetUPnP.cs | 6 +++--- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Lidgren.Network/NetConnection.Handshake.cs b/Lidgren.Network/NetConnection.Handshake.cs index 7e3317e..36cbf08 100644 --- a/Lidgren.Network/NetConnection.Handshake.cs +++ b/Lidgren.Network/NetConnection.Handshake.cs @@ -22,7 +22,7 @@ namespace Lidgren.Network public NetIncomingMessage RemoteHailMessage { get { return m_remoteHailMessage; } } // heartbeat called when connection still is in m_handshakes of NetPeer - internal void UnconnectedHeartbeat(float now) + internal void UnconnectedHeartbeat(double now) { m_peer.VerifyNetworkThread(); @@ -233,7 +233,7 @@ namespace Lidgren.Network m_localHailMessage = null; m_handshakeAttempts = 0; - SendConnectResponse((float)NetTime.Now, false); + SendConnectResponse(NetTime.Now, false); } /// @@ -250,7 +250,7 @@ namespace Lidgren.Network m_localHailMessage = localHail; m_handshakeAttempts = 0; - SendConnectResponse((float)NetTime.Now, false); + SendConnectResponse(NetTime.Now, false); } /// diff --git a/Lidgren.Network/NetConnection.cs b/Lidgren.Network/NetConnection.cs index c456621..6aa71de 100644 --- a/Lidgren.Network/NetConnection.cs +++ b/Lidgren.Network/NetConnection.cs @@ -135,7 +135,7 @@ namespace Lidgren.Network } } - internal void Heartbeat(float now, uint frameCounter) + internal void Heartbeat(double now, uint frameCounter) { m_peer.VerifyNetworkThread(); diff --git a/Lidgren.Network/NetPeer.Internal.cs b/Lidgren.Network/NetPeer.Internal.cs index d829f77..bef2440 100644 --- a/Lidgren.Network/NetPeer.Internal.cs +++ b/Lidgren.Network/NetPeer.Internal.cs @@ -324,10 +324,8 @@ namespace Lidgren.Network { VerifyNetworkThread(); - double dnow = NetTime.Now; - float now = (float)dnow; - - double delta = dnow - m_lastHeartbeat; + double now = NetTime.Now; + double delta = now - m_lastHeartbeat; int maxCHBpS = 1250 - m_connections.Count; if (maxCHBpS < 250) @@ -335,7 +333,7 @@ namespace Lidgren.Network if (delta > (1.0 / (double)maxCHBpS) || delta < 0.0) // max connection heartbeats/second max { m_frameCounter++; - m_lastHeartbeat = dnow; + m_lastHeartbeat = now; // do handshake heartbeats if ((m_frameCounter % 3) == 0) @@ -424,8 +422,7 @@ namespace Lidgren.Network // return; // update now - dnow = NetTime.Now; - now = (float)dnow; + now = NetTime.Now; do { @@ -537,7 +534,7 @@ namespace Lidgren.Network if (sender != null) sender.ReceivedLibraryMessage(tp, ptr, payloadByteLength); else - ReceivedUnconnectedLibraryMessage(dnow, ipsender, tp, ptr, payloadByteLength); + ReceivedUnconnectedLibraryMessage(now, ipsender, tp, ptr, payloadByteLength); } else { @@ -546,7 +543,7 @@ namespace Lidgren.Network NetIncomingMessage msg = CreateIncomingMessage(NetIncomingMessageType.Data, payloadByteLength); msg.m_isFragment = isFragment; - msg.m_receiveTime = dnow; + msg.m_receiveTime = now; msg.m_sequenceNumber = sequenceNumber; msg.m_receivedMessageType = tp; msg.m_senderConnection = sender; diff --git a/Lidgren.Network/NetPeer.MessagePools.cs b/Lidgren.Network/NetPeer.MessagePools.cs index 7f666cc..49aaa2b 100644 --- a/Lidgren.Network/NetPeer.MessagePools.cs +++ b/Lidgren.Network/NetPeer.MessagePools.cs @@ -123,7 +123,7 @@ namespace Lidgren.Network if (m_outgoingMessagesPool == null || !m_outgoingMessagesPool.TryDequeue(out retval)) 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) retval.m_data = GetStorage(initialCapacity); @@ -188,7 +188,7 @@ namespace Lidgren.Network if (m_outgoingMessagesPool == null) 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?"); diff --git a/Lidgren.Network/NetPeer.cs b/Lidgren.Network/NetPeer.cs index f09eed7..7d8088e 100644 --- a/Lidgren.Network/NetPeer.cs +++ b/Lidgren.Network/NetPeer.cs @@ -288,7 +288,7 @@ namespace Lidgren.Network break; case NetConnectionStatus.RespondedConnect: // send another response - hs.SendConnectResponse((float)NetTime.Now, false); + hs.SendConnectResponse(NetTime.Now, false); break; default: // weird diff --git a/Lidgren.Network/NetUPnP.cs b/Lidgren.Network/NetUPnP.cs index 9a130ab..8775724 100644 --- a/Lidgren.Network/NetUPnP.cs +++ b/Lidgren.Network/NetUPnP.cs @@ -40,7 +40,7 @@ namespace Lidgren.Network private NetPeer m_peer; private ManualResetEvent m_discoveryComplete = new ManualResetEvent(false); - internal float m_discoveryResponseDeadline; + internal double m_discoveryResponseDeadline; private UPnPStatus m_status; @@ -55,7 +55,7 @@ namespace Lidgren.Network public NetUPnP(NetPeer peer) { m_peer = peer; - m_discoveryResponseDeadline = float.MinValue; + m_discoveryResponseDeadline = double.MinValue; } internal void Discover(NetPeer peer) @@ -79,7 +79,7 @@ namespace Lidgren.Network // allow some extra time for router to respond // 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; }