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

add a simple files expire to Xfer to catch some that never got a request (opened xfers also need a timeout) (not pretty code, but should not have heavy use)

LSLKeyTest
UbitUmarov 2016-07-09 01:32:27 +01:00
parent fa9a4a9a2b
commit 415c45b097
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
private Scene m_scene; private Scene m_scene;
private Dictionary<string, FileData> NewFiles = new Dictionary<string, FileData>(); private Dictionary<string, FileData> NewFiles = new Dictionary<string, FileData>();
private Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>(); private Dictionary<ulong, XferDownLoad> Transfers = new Dictionary<ulong, XferDownLoad>();
private double lastFilesExpire = 0;
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public struct XferRequest public struct XferRequest
@ -59,13 +59,15 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
private class FileData private class FileData
{ {
public byte[] Data; public byte[] Data;
public int Count; public int refsCount;
public double timeStampMS;
} }
#region INonSharedRegionModule Members #region INonSharedRegionModule Members
public void Initialise(IConfigSource config) public void Initialise(IConfigSource config)
{ {
lastFilesExpire = Util.GetTimeStampMS() + 300000.0;
} }
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
@ -118,20 +120,36 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
{ {
lock (NewFiles) lock (NewFiles)
{ {
double now = Util.GetTimeStampMS();
if (NewFiles.ContainsKey(fileName)) if (NewFiles.ContainsKey(fileName))
{ {
NewFiles[fileName].Count++; NewFiles[fileName].refsCount++;
NewFiles[fileName].Data = data; NewFiles[fileName].Data = data;
NewFiles[fileName].timeStampMS = now;
} }
else else
{ {
FileData fd = new FileData(); FileData fd = new FileData();
fd.Count = 1; fd.refsCount = 1;
fd.Data = data; fd.Data = data;
fd.timeStampMS = now;
NewFiles.Add(fileName, fd); NewFiles.Add(fileName, fd);
} }
}
// lazy expires hopefully we will not have many files so nasty code will do it
if(now - lastFilesExpire > 180000.0)
{
lastFilesExpire = now;
List<string> expires = new List<string>();
foreach(string fname in NewFiles.Keys)
{
if(NewFiles[fname].refsCount == 0 && now - NewFiles[fname].timeStampMS > 180000.0)
expires.Add(fname);
}
foreach(string fname in expires)
NewFiles.Remove(fname);
}
}
return true; return true;
} }
@ -226,10 +244,10 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
if (NewFiles.ContainsKey(fileName)) if (NewFiles.ContainsKey(fileName))
{ {
if (NewFiles[fileName].Count == 1) if (NewFiles[fileName].refsCount == 1)
NewFiles.Remove(fileName); NewFiles.Remove(fileName);
else else
NewFiles[fileName].Count--; NewFiles[fileName].refsCount--;
} }
} }