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

Top Scripts

Browse Source 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
This commit is contained in:
StolenRuby
2020-08-15 19:34:20 +01:00
committed by UbitUmarov
parent 1661ee697d
commit 2f0d2db19d
9 changed files with 199 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@@ -771,5 +771,21 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
{
ScriptRemoved(itemID);
}
public Dictionary<UUID, int> GetUrlCountForHosts()
{
Dictionary<UUID, int> dict = new Dictionary<UUID, int>();
foreach(var data in m_UrlMap)
{
int count = 0;
if(dict.ContainsKey(data.Value.hostID))
{
count = dict[data.Value.hostID];
}
count++;
dict[data.Value.hostID] = count;
}
return dict;
}
}
}

77
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -1419,6 +1419,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
return;
Dictionary<uint, float> sceneData = null;
Dictionary<uint, int> bytesUsed = null;
Dictionary<UUID, int> urlsInUse = null;
if (reportType == 1)
{
@@ -1429,9 +1431,26 @@ namespace OpenSim.Region.CoreModules.World.Estate
IScriptModule scriptModule = Scene.RequestModuleInterface<IScriptModule>();
if (scriptModule != null)
{
sceneData = scriptModule.GetObjectScriptsExecutionTimes();
bytesUsed = scriptModule.GetObjectScriptsBytesUsed();
}
IUrlModule urlModule = Scene.RequestModuleInterface<IUrlModule>();
if(urlModule != null)
{
urlsInUse = urlModule.GetUrlCountForHosts();
}
}
// hack: reformat the name so we don't have to do it on every item
if((requestFlags & 0x00000002) != 0)
{
filter = string.Join(" ", filter.Split(new[] { '.' }, 2));
}
filter = filter.ToLower();
List<LandStatReportItem> SceneReport = new List<LandStatReportItem>();
if (sceneData != null)
{
@@ -1449,14 +1468,47 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (entry.Part == null)
continue;
int bytes_used = 0;
if (bytesUsed.ContainsKey(entry.Part.LocalId))
bytes_used = bytesUsed[entry.Part.LocalId];
int urls_used = 0;
if (urlsInUse.ContainsKey(entry.Part.UUID))
urls_used = urlsInUse[entry.Part.UUID];
// Don't show scripts that haven't executed or where execution time is below one microsecond in
// order to produce a more readable report.
if (entry.Measurement < 0.001)
// Unless they are using URLs or using 1024 bytes or more.
if (entry.Measurement < 0.001 && bytes_used < 1024 && urls_used == 0)
continue;
items++;
SceneObjectGroup so = entry.Part.ParentGroup;
ILandObject land = Scene.LandChannel.GetLandObject(entry.Part.AbsolutePosition);
string owner_name = UserManager.GetUserName(so.OwnerID);
string task_name = entry.Part.Name;
string parcel_name = land != null ? land.LandData.Name : "unknown";
if (filter.Length != 0 && requestFlags != 0)
{
if ((requestFlags & 0x00000002) != 0)
{
if (!owner_name.ToLower().Contains(filter))
continue;
}
else if ((requestFlags & 0x00000004) != 0)
{
if (!task_name.ToLower().Contains(filter))
continue;
}
else if ((requestFlags & 0x00000008) != 0)
{
if (!parcel_name.ToLower().Contains(filter))
continue;
}
}
LandStatReportItem lsri = new LandStatReportItem()
{
LocationX = so.AbsolutePosition.X,
@@ -1465,21 +1517,16 @@ namespace OpenSim.Region.CoreModules.World.Estate
Score = entry.Measurement,
TaskID = so.UUID,
TaskLocalID = so.LocalId,
TaskName = entry.Part.Name,
OwnerName = UserManager.GetUserName(so.OwnerID)
TaskName = task_name,
OwnerName = owner_name,
OwnerID = so.OwnerID,
Bytes = bytes_used,
Urls = urls_used,
Time = Utils.DateTimeToUnixTime(entry.Part.Rezzed),
Parcel = parcel_name
};
if (filter.Length != 0)
{
if ((lsri.OwnerName.Contains(filter) || lsri.TaskName.Contains(filter)))
{
}
else
{
continue;
}
}
items++;
SceneReport.Add(lsri);
if (items >= 100)