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

When scripts are sleeping, don't count that as execution time

Browse Source 
Sleeping doesn't use the CPU.
This commit is contained in:
Oren Hurvitz
2015-08-06 09:54:20 +03:00
parent d24528b3bc
commit a568f06b7f
18 changed files with 95 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiAvatarTests.cs
View File

@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
part.RotationOffset = new Quaternion(0.7071068f, 0, 0, 0.7071068f);
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, part, null, null);
apiGrp1.Initialize(m_engine, part, null, null, null);
ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
// This is disconnected from the actual script - the mock engine does not set up any LSL_Api atm.
// Possibly this could be done and we could obtain it directly from the MockScriptEngine.
m_lslApi = new LSL_Api();
m_lslApi.Initialize(m_engine, so.RootPart, m_scriptItem, null);
m_lslApi.Initialize(m_engine, so.RootPart, m_scriptItem, null, null);
}
[TearDown]

12
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
View File

@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, userId);
LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, null, null);
api.Initialize(m_engine, so1.RootPart, null, null, null);
// Create a second object
SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, userId, "so2", 0x100);
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
m_scene.AddSceneObject(so1);
LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, null, null);
api.Initialize(m_engine, so1.RootPart, null, null, null);
// Create an object embedded inside the first
UUID itemId = TestHelpers.ParseTail(0x20);
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so2 = SceneHelpers.CreateSceneObject(1, user2Id, "so2", 0x100);
m_scene.AddSceneObject(so2);
LSL_Api api2 = new LSL_Api();
api2.Initialize(m_engine, so2.RootPart, null, null);
api2.Initialize(m_engine, so2.RootPart, null, null, null);
// *** Firstly, we test where llAllowInventoryDrop() has not been called. ***
api.llGiveInventory(so2.UUID.ToString(), inventoryItemName);
@@ -184,7 +184,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
m_scene.AddSceneObject(so1);
LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, null, null);
api.Initialize(m_engine, so1.RootPart, null, null, null);
// Create an object embedded inside the first
UUID itemId = TestHelpers.ParseTail(0x20);
@@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, user1Id, "so1", 0x10);
m_scene.AddSceneObject(so1);
LSL_Api api = new LSL_Api();
api.Initialize(m_engine, so1.RootPart, null, null);
api.Initialize(m_engine, so1.RootPart, null, null, null);
// Create an object embedded inside the first
UUID itemId = TestHelpers.ParseTail(0x20);
@@ -250,7 +250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup sourceSo = SceneHelpers.AddSceneObject(m_scene, "sourceSo", user1Id);
m_scene.AddSceneObject(sourceSo);
LSL_Api api = new LSL_Api();
api.Initialize(m_engine, sourceSo.RootPart, null, null);
api.Initialize(m_engine, sourceSo.RootPart, null, null, null);
TaskInventoryHelpers.AddScript(m_scene.AssetService, sourceSo.RootPart, "script", "Hello World");
SceneObjectGroup targetSo = SceneHelpers.AddSceneObject(m_scene, "targetSo", user1Id);

6
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
View File

@@ -104,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(grp2);
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null);
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null, null);
apiGrp1.llCreateLink(grp2.UUID.ToString(), ScriptBaseClass.TRUE);
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null);
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null, null);
apiGrp1.llBreakLink(2);
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null);
apiGrp1.Initialize(m_engine, grp1.RootPart, grp1Item, null, null);
apiGrp1.llBreakAllLinks();

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
View File

@@ -67,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
engine.AddRegion(scene);
m_lslApi = new LSL_Api();
m_lslApi.Initialize(engine, part, null, null);
m_lslApi.Initialize(engine, part, null, null, null);
}
[Test]

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
View File

@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
// This is disconnected from the actual script - the mock engine does not set up any LSL_Api atm.
// Possibly this could be done and we could obtain it directly from the MockScriptEngine.
m_lslApi = new LSL_Api();
m_lslApi.Initialize(m_engine, m_so.RootPart, m_scriptItem, null);
m_lslApi.Initialize(m_engine, m_so.RootPart, m_scriptItem, null, null);
}
[Test]

4
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
View File

@@ -89,7 +89,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(grp1);
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, grp1.RootPart, null, null);
apiGrp1.Initialize(m_engine, grp1.RootPart, null, null, null);
// Check simple 1 prim case
{
@@ -167,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, part1, null, null);
apiGrp1.Initialize(m_engine, part1, null, null, null);
// Note that prim hollow check is passed with the other prim params in order to allow the
// specification of a different check value from the prim param. A cylinder, prism, sphere,

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
View File

@@ -65,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
engine.AddRegion(scene);
m_lslApi = new LSL_Api();
m_lslApi.Initialize(engine, part, null, null);
m_lslApi.Initialize(engine, part, null, null, null);
}
[Test]

2
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiUserTests.cs
View File

@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, part);
LSL_Api apiGrp1 = new LSL_Api();
apiGrp1.Initialize(m_engine, part, scriptItem, null);
apiGrp1.Initialize(m_engine, part, scriptItem, null, null);
// Initially long timeout to test cache
apiGrp1.LlRequestAgentDataCacheTimeoutMs = 20000;

4
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
string notecardName = "appearanceNc";
@@ -134,7 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
string notecardName = "appearanceNc";

12
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
View File

@@ -98,9 +98,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
// SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ua1.PrincipalID);
@@ -144,9 +144,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
// Create an object embedded inside the first
TaskInventoryHelpers.AddNotecard(
@@ -192,9 +192,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
SceneObjectGroup inWorldObj = SceneHelpers.AddSceneObject(m_scene, "inWorldObj", ua1.PrincipalID);
TaskInventoryItem scriptItem = TaskInventoryHelpers.AddScript(m_scene.AssetService, inWorldObj.RootPart);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
new LSL_Api().Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null);
osslApi.Initialize(m_engine, inWorldObj.RootPart, scriptItem, null, null);
// Create an object embedded inside the first
TaskInventoryHelpers.AddSceneObject(

16
OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
View File

@@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName);
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, so.RootPart, null, null);
osslApi.Initialize(m_engine, so.RootPart, null, null, null);
bool gotExpectedException = false;
try
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName);
@@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
osslApi.osOwnerSaveAppearance(firstAppearanceNcName);
@@ -233,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
osslApi.osOwnerSaveAppearance(firstAppearanceNcName);
@@ -285,10 +285,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(otherSo);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
OSSL_Api otherOsslApi = new OSSL_Api();
otherOsslApi.Initialize(m_engine, otherPart, null, null);
otherOsslApi.Initialize(m_engine, otherPart, null, null, null);
string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName);
@@ -332,7 +332,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
m_scene.AddSceneObject(so);
OSSL_Api osslApi = new OSSL_Api();
osslApi.Initialize(m_engine, part, null, null);
osslApi.Initialize(m_engine, part, null, null, null);
string notecardName = "appearanceNc";
osslApi.osOwnerSaveAppearance(notecardName);