OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testing ...

0.9.1.0-post-fixes
UbitUmarov 2019-04-09 18:50:08 +01:00
parent 49fb9d6b4b
commit c09b312b05
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5429,7 +5429,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.DataLength = lastpos; buf.DataLength = lastpos;
// zero encode is not as spec // zero encode is not as spec
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true);
null, false, true);
tau = new List<EntityUpdate>(30); tau = new List<EntityUpdate>(30);
tau.Add(eu); tau.Add(eu);
@ -5444,7 +5445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.Data[17] = (byte)count; buf.Data[17] = (byte)count;
buf.DataLength = pos; buf.DataLength = pos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true);
null, false, true);
} }
} }

6
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -728,6 +728,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// acknowledgement</param> /// acknowledgement</param>
public void UpdateRoundTrip(float r) public void UpdateRoundTrip(float r)
{ {
return;
/*
const float ALPHA = 0.125f; const float ALPHA = 0.125f;
const float BETA = 0.25f; const float BETA = 0.25f;
const float K = 4.0f; const float K = 4.0f;
@ -755,6 +757,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//if (RTO != rto) //if (RTO != rto)
// m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " + // m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " +
//RTTVAR + " based on new RTT of " + r + "ms"); //RTTVAR + " based on new RTT of " + r + "ms");
*/
} }
/// <summary> /// <summary>
@ -763,13 +766,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary> /// </summary>
public void BackoffRTO() public void BackoffRTO()
{ {
return;
// Reset SRTT and RTTVAR, we assume they are bogus since things // Reset SRTT and RTTVAR, we assume they are bogus since things
// didn't work out and we're backing off the timeout // didn't work out and we're backing off the timeout
/*
SRTT = 0.0f; SRTT = 0.0f;
RTTVAR = 0.0f; RTTVAR = 0.0f;
// Double the retransmission timeout // Double the retransmission timeout
RTO = Math.Min(RTO * 2, m_maxRTO); RTO = Math.Min(RTO * 2, m_maxRTO);
*/
} }
const double MIN_CALLBACK_MS = 20.0; const double MIN_CALLBACK_MS = 20.0;

1
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -1214,7 +1214,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Stats tracking // Stats tracking
Interlocked.Increment(ref udpClient.PacketsSent); Interlocked.Increment(ref udpClient.PacketsSent);
PacketsSentCount++; PacketsSentCount++;
SyncSend(buffer); SyncSend(buffer);
// Keep track of when this packet was sent out (right now) // Keep track of when this packet was sent out (right now)