ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

several changes to simulatorfeatures, special url ones. Centralize those on scene gridinfo. Do host and dns checks, etc. Grid can override local settings, but currently same old mess. Grid login and info fecth should happen before loading anything in scene, specially modules

Browse Source
This commit is contained in:
UbitUmarov
2020-11-12 00:30:20 +00:00
parent ddc1083383
commit 20695be8cd
5 changed files with 308 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Framework/ExpiringCacheOS.cs
View File

@@ -29,7 +29,7 @@
using System;
using System.Threading;
using System.Collections.Generic;
using Timer = System.Threading.Timer ;
using Timer = System.Threading.Timer;
namespace OpenSim.Framework
{
@@ -125,7 +125,8 @@ namespace OpenSim.Framework
List<TKey1> expired = new List<TKey1>(m_expireControl.Count);
foreach(KeyValuePair<TKey1, int> kvp in m_expireControl)
{
if(kvp.Value < now)
int expire = kvp.Value;
if(expire > 0 && expire < now)
expired.Add(kvp.Key);
}
@@ -213,8 +214,14 @@ namespace OpenSim.Framework
public void Add(TKey1 key, TValue1 val, int expireMS)
{
bool gotLock = false;
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
int now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
int now;
if (expireMS > 0)
{
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
}
else
now = int.MinValue;
try
{
@@ -345,8 +352,14 @@ namespace OpenSim.Framework
m_rwLock.EnterWriteLock();
gotWriteLock = true;
}
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
int now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
int now;
if(expireMS > 0)
{
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
}
else
now = int.MinValue;
m_expireControl[key] = now;
return true;
@@ -417,8 +430,14 @@ namespace OpenSim.Framework
m_rwLock.EnterWriteLock();
gotWriteLock = true;
}
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
int now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
int now;
if(expireMS > 0)
{
expireMS = (expireMS > m_expire) ? expireMS : m_expire;
now = (int)(Util.GetTimeStampMS() - m_startTS) + expireMS;
}
else
now = int.MinValue;
m_expireControl[key] = now;
}