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

slight optimization in the actor registration code

dsg
Robert Adams 2011-02-04 09:25:54 -08:00
parent 4a4ecb1cde
commit f5870a1e23
1 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -467,29 +467,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
public virtual bool RegisterActor(GridActorInfo gai, GridQuarkInfo gqi) public virtual bool RegisterActor(GridActorInfo gai, GridQuarkInfo gqi)
{ {
OSDMap quarkMap = new OSDMap List<GridActorInfo> lgqi = new List<GridActorInfo>();
{ lgqi.Add(gqi);
{ "locX", OSD.FromInteger(gqi.locX) }, return RegisterActor(gai, lgqi);
{ "locY", OSD.FromInteger(gqi.locY) }
};
OSDArray quarks = new OSDArray();
quarks.Add(quarkMap);
NameValueCollection requestArgs = new NameValueCollection
{
{ "RequestMethod", "RegisterActor" },
{ "actorID", gai.actorID },
{ "actorType", gai.type },
{ "address", gai.address },
{ "port", gai.port.ToString() },
{ "quarks", OSDParser.SerializeJsonString(quarks) }
};
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean())
{
return true;
}
return false;
} }
public virtual List<GridActorInfo> LookupQuark(GridQuarkInfo gqi) public virtual List<GridActorInfo> LookupQuark(GridQuarkInfo gqi)
@ -500,26 +480,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "locX", gqi.locX.ToString() }, { "locX", gqi.locX.ToString() },
{ "locY", gqi.locY.ToString() } { "locY", gqi.locY.ToString() }
}; };
return LookupQuark(requestArgs);
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean())
{
List<GridActorInfo> lgai = new List<GridActorInfo>();
OSDArray gridActors = (OSDArray)response["actors"];
for (int ii = 0; ii < gridActors.Count; ii++)
{
OSDMap thisGridActor = (OSDMap)gridActors[ii];
GridActorInfo gai = new GridActorInfo();
gai.actorID = thisGridActor["actorID"].AsString();
gai.type = thisGridActor["actorType"].AsString();
gai.address = thisGridActor["address"].AsString();
gai.port = thisGridActor["port"].AsInteger();
lgai.Add(gai);
}
return lgai;
}
return null;
} }
public virtual List<GridActorInfo> LookupQuark(GridQuarkInfo gqi, string actorType) public virtual List<GridActorInfo> LookupQuark(GridQuarkInfo gqi, string actorType)
{ {
NameValueCollection requestArgs = new NameValueCollection NameValueCollection requestArgs = new NameValueCollection
@ -529,7 +492,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "locY", gqi.locY.ToString() }, { "locY", gqi.locY.ToString() },
{ "actorType", actorType } { "actorType", actorType }
}; };
return LookupQuark(requestArgs);
}
private List<GridActorInfo> LookupQuark(NameValueCollection requestArgs)
{
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {