Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

1 files changed, 59 insertions, 63 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 1b6401a..56123a5 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -50,8 +50,8 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private object  timeTickLock = new object();
-        private double  lastTimeTick = 0.0;
-        private double  lastFilesExpire = 0.0;
+        private int  lastTimeTick = 0;
+        private int  lastFilesExpire = 0;
         private bool    inTimeTick = false;
 
         public struct XferRequest
@@ -66,15 +66,15 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         {
             public byte[] Data;
             public int refsCount;
-            public double timeStampMS;
+            public int timeStampMS;
         }
 
         #region INonSharedRegionModule Members
 
         public void Initialise(IConfigSource config)
         {
-            lastTimeTick = Util.GetTimeStampMS() + 30000.0;
-            lastFilesExpire = lastTimeTick + 180000.0;
+            lastTimeTick = (int)Util.GetTimeStampMS() + 30000;
+            lastFilesExpire = lastTimeTick + 180000;
         }
 
         public void AddRegion(Scene scene)
@@ -121,10 +121,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             {
                 if(!inTimeTick)
                 {
-                    double now = Util.GetTimeStampMS();
-                    if(now - lastTimeTick > 1750.0)
+                    int now = (int)Util.GetTimeStampMS();
+                    if(now - lastTimeTick > 750)
                     {
-
                         if(Transfers.Count == 0 && NewFiles.Count == 0)
                             lastTimeTick = now;
                         else
@@ -163,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         {
             lock (NewFiles)
             {
-                double now = Util.GetTimeStampMS();
+                int now = (int)Util.GetTimeStampMS();
                 if (NewFiles.ContainsKey(fileName))
                 {
                     NewFiles[fileName].refsCount++;
@@ -183,18 +182,18 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
         }
 
         #endregion
-        public void expireFiles(double now)
+        public void expireFiles(int now)
         {
             lock (NewFiles)
             {
                 // hopefully we will not have many files so nasty code will do it
-                if(now - lastFilesExpire > 120000.0)
+                if(now - lastFilesExpire > 120000)
                 {
                     lastFilesExpire = now;
                     List<string> expires = new List<string>();
                     foreach(string fname in NewFiles.Keys)
                     {
-                        if(NewFiles[fname].refsCount == 0 && now - NewFiles[fname].timeStampMS > 120000.0)
+                        if(NewFiles[fname].refsCount == 0 && now - NewFiles[fname].timeStampMS > 120000)
                             expires.Add(fname);
                     }
                     foreach(string fname in expires)
@@ -230,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             }
         }
 
-        public void transfersTimeTick(double now)
+        public void transfersTimeTick(int now)
         {
             XferDownLoad[] xfrs;
             lock(Transfers)
@@ -241,6 +240,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                 xfrs = new XferDownLoad[Transfers.Count];
                 Transfers.Values.CopyTo(xfrs,0);
             }
+            
             foreach(XferDownLoad xfr in xfrs)
             {
                 if(xfr.checkTime(now))
@@ -272,14 +272,15 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                         if (!Transfers.ContainsKey(xferID))
                         {
                             byte[] fileData = NewFiles[fileName].Data;
-                            int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Asset) >> 11;
-                            if(Transfers.Count > 1)
-                                burstSize /= Transfers.Count;
+                            int burstSize = remoteClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Task) >> 10;
+                            burstSize *= remoteClient.PingTimeMS;
+                            burstSize >>= 10; //  ping is ms, 1 round trip
+                            if(burstSize > 32)
+                                burstSize = 32;
                             XferDownLoad transaction =
                                 new XferDownLoad(fileName, fileData, xferID, remoteClient, burstSize);
 
                             Transfers.Add(xferID, transaction);
-
                             transaction.StartSend();
 
                             // The transaction for this file is on its way
@@ -320,27 +321,27 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
 
         public class XferDownLoad
         {
-            public IClientAPI Client;
+            public IClientAPI remoteClient;
             public byte[] Data = new byte[0];
             public string FileName = String.Empty;
             public ulong XferID = 0;
             public bool isDeleted = false;
 
             private object myLock = new object();
-            private double lastsendTimeMS;
+            private int lastACKTimeMS;
             private int LastPacket;
             private int lastBytes;
             private int lastSentPacket;
             private int lastAckPacket;
-            private int burstSize;
-            private int retries = 0;
+            private int burstSize; // additional packets, so can be zero
+            private int retries;
 
             public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client, int burstsz)
             {
                 FileName = fileName;
                 Data = data;
                 XferID = xferID;
-                Client = client;
+                remoteClient = client;
                 burstSize = burstsz;
             }
 
@@ -352,7 +353,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             {
                 if(!isDeleted)
                 {
-                    Data = new byte[0];
+                    Data = null;
                     isDeleted = true;
                 }
             }
@@ -381,30 +382,29 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                             lastBytes = 1024;
                             LastPacket--;
                         }
-
                     }
 
                     lastAckPacket = -1;
                     lastSentPacket = -1;
+                    retries = 0;
 
-                    double now = Util.GetTimeStampMS();
-
-                    SendBurst(now);
+                    SendBurst();
                     return;
                 }
             }
 
-            private void SendBurst(double now)
+            private void SendBurst()
             {
                 int start = lastAckPacket + 1;
                 int end = start + burstSize;
                 if (end > LastPacket)
                     end = LastPacket;
-                while(start <= end)
-                    SendPacket(start++ , now);
+                while (start <= end)
+                    SendPacket(start++);
+                lastACKTimeMS = (int)Util.GetTimeStampMS() + 1000; // reset timeout with some slack for queues delays
             }
 
-            private void SendPacket(int pkt, double now)
+            private void SendPacket(int pkt)
             {
                 if(pkt > LastPacket)
                     return;
@@ -422,23 +422,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     pktid = (uint)pkt;
                 }
 
-                byte[] transferData;
-                if(pkt == 0)
-                {
-                    transferData = new byte[pktsize + 4];
-                    Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
-                    Array.Copy(Data, 0, transferData, 4, pktsize);
-                }
-                else
-                {
-                    transferData = new byte[pktsize];
-                    Array.Copy(Data, pkt << 10, transferData, 0, pktsize);
-                }
-
-                Client.SendXferPacket(XferID, pktid, transferData, false);
+                remoteClient.SendXferPacket(XferID, pktid, Data, pkt << 10, pktsize, true);
 
                 lastSentPacket = pkt;
-                lastsendTimeMS = now;
             }
 
             /// <summary>
@@ -453,39 +439,49 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     if(isDeleted)
                         return true;
 
-                    packet &=  0x7fffffff;
-                    if(lastAckPacket < packet)
+                    packet &= 0x7fffffff;
+                    if (lastAckPacket < packet)
                         lastAckPacket = (int)packet;
-
-                    if(lastAckPacket == LastPacket)
+                    else if (lastAckPacket == LastPacket)
                     {
                         done();
                         return true;
                     }
-                    double now = Util.GetTimeStampMS();
-                    SendPacket(lastSentPacket + 1, now);
+
+                    lastACKTimeMS = (int)Util.GetTimeStampMS();
+                    retries = 0;
+                    SendPacket(lastSentPacket + 1);
                     return false;
                 }
             }
 
-            public bool checkTime(double now)
+            public bool checkTime(int now)
             {
-                if(Monitor.TryEnter(myLock))
+                if (Monitor.TryEnter(myLock))
                 {
-                    if(!isDeleted)
+                    if (!isDeleted)
                     {
-                        double timeMS = now - lastsendTimeMS;
-                        if(timeMS > 60000.0)
-                            done();
-                        else if(timeMS > 3500.0 && retries++ < 3)
+                        int timeMS = now - lastACKTimeMS;
+                        int tout = 5 * remoteClient.PingTimeMS;
+                        if (tout < 1000)
+                            tout = 1000;
+                        else if(tout > 10000)
+                            tout = 10000;
+
+                        if (timeMS > tout)
                         {
-                            burstSize >>= 1;
-                            SendBurst(now);
+                            if (++retries > 4)
+                                done();
+                            else
+                            {
+                                burstSize = lastSentPacket - lastAckPacket;
+                                SendBurst();
+                            }
                         }
                     }
-
+                    bool isdel = isDeleted;
                     Monitor.Exit(myLock);
-                    return isDeleted;
+                    return isdel;
                 }
                 return false;
             }