* remove long unused interregion optional module code
parent
cb6baacc31
commit
3b4151b042
|
@ -1,43 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Framework.Scenes;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.CoreModules.Grid.Interregion
|
|
||||||
{
|
|
||||||
public interface IInterregionModule
|
|
||||||
{
|
|
||||||
void RegisterMethod<T>(T e);
|
|
||||||
bool HasInterface<T>(Location loc);
|
|
||||||
T RequestInterface<T>(Location loc);
|
|
||||||
T[] RequestInterface<T>();
|
|
||||||
Location GetLocationByDirection(Scene scene, InterregionModule.Direction dir);
|
|
||||||
void internal_CreateRemotingObjects();
|
|
||||||
void RegisterRemoteRegion(string uri);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,199 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Runtime.Remoting;
|
|
||||||
using System.Runtime.Remoting.Channels;
|
|
||||||
using System.Runtime.Remoting.Channels.Tcp;
|
|
||||||
using Nini.Config;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Region.Framework.Interfaces;
|
|
||||||
using OpenSim.Region.Framework.Scenes;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.CoreModules.Grid.Interregion
|
|
||||||
{
|
|
||||||
public class InterregionModule : IInterregionModule, IRegionModule
|
|
||||||
{
|
|
||||||
#region Direction enum
|
|
||||||
|
|
||||||
public enum Direction
|
|
||||||
{
|
|
||||||
North,
|
|
||||||
NorthEast,
|
|
||||||
East,
|
|
||||||
SouthEast,
|
|
||||||
South,
|
|
||||||
SouthWest,
|
|
||||||
West,
|
|
||||||
NorthWest
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private readonly Dictionary<Type, Object> m_interfaces = new Dictionary<Type, object>();
|
|
||||||
private readonly Object m_lockObject = new object();
|
|
||||||
private readonly List<Location> m_myLocations = new List<Location>();
|
|
||||||
|
|
||||||
private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>();
|
|
||||||
private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>();
|
|
||||||
// private IConfigSource m_config;
|
|
||||||
private const bool m_enabled = false;
|
|
||||||
|
|
||||||
private RemotingObject m_myRemote;
|
|
||||||
private TcpChannel m_tcpChannel;
|
|
||||||
private int m_tcpPort = 10101;
|
|
||||||
|
|
||||||
#region IInterregionModule Members
|
|
||||||
|
|
||||||
public void internal_CreateRemotingObjects()
|
|
||||||
{
|
|
||||||
lock (m_lockObject)
|
|
||||||
{
|
|
||||||
if (m_tcpChannel == null)
|
|
||||||
{
|
|
||||||
m_myRemote = new RemotingObject(m_interfaces, m_myLocations.ToArray());
|
|
||||||
m_tcpChannel = new TcpChannel(m_tcpPort);
|
|
||||||
|
|
||||||
ChannelServices.RegisterChannel(m_tcpChannel, false);
|
|
||||||
RemotingServices.Marshal(m_myRemote, "OpenSimRemote2", typeof (RemotingObject));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RegisterMethod<T>(T e)
|
|
||||||
{
|
|
||||||
m_interfaces[typeof (T)] = e;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool HasInterface<T>(Location loc)
|
|
||||||
{
|
|
||||||
foreach (string val in m_neighbourInterfaces[loc])
|
|
||||||
{
|
|
||||||
if (val == typeof (T).FullName)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public T RequestInterface<T>(Location loc)
|
|
||||||
{
|
|
||||||
if (m_neighbourRemote.ContainsKey(loc))
|
|
||||||
{
|
|
||||||
return m_neighbourRemote[loc].RequestInterface<T>();
|
|
||||||
}
|
|
||||||
throw new IndexOutOfRangeException("No neighbour availible at that location");
|
|
||||||
}
|
|
||||||
|
|
||||||
public T[] RequestInterface<T>()
|
|
||||||
{
|
|
||||||
List<T> m_t = new List<T>();
|
|
||||||
foreach (RemotingObject remote in m_neighbourRemote.Values)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
m_t.Add(remote.RequestInterface<T>());
|
|
||||||
}
|
|
||||||
catch (NotSupportedException)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return m_t.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Location GetLocationByDirection(Scene scene, Direction dir)
|
|
||||||
{
|
|
||||||
return new Location(0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RegisterRemoteRegion(string uri)
|
|
||||||
{
|
|
||||||
RegisterRemotingInterface((RemotingObject) Activator.GetObject(typeof (RemotingObject), uri));
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#region IRegionModule Members
|
|
||||||
|
|
||||||
public void Initialise(Scene scene, IConfigSource source)
|
|
||||||
{
|
|
||||||
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
|
|
||||||
(int) scene.RegionInfo.RegionLocY));
|
|
||||||
// m_config = source;
|
|
||||||
|
|
||||||
scene.RegisterModuleInterface<IInterregionModule>(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void PostInitialise()
|
|
||||||
{
|
|
||||||
// Commenting out to remove 'unreachable code' warning since m_enabled is never true
|
|
||||||
// if (m_enabled)
|
|
||||||
// {
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort);
|
|
||||||
// }
|
|
||||||
// catch
|
|
||||||
// {
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// internal_CreateRemotingObjects();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Close()
|
|
||||||
{
|
|
||||||
if (null != m_tcpChannel)
|
|
||||||
ChannelServices.UnregisterChannel(m_tcpChannel);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Name
|
|
||||||
{
|
|
||||||
get { return "InterregionModule"; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsSharedModule
|
|
||||||
{
|
|
||||||
get { return true; }
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private void RegisterRemotingInterface(RemotingObject remote)
|
|
||||||
{
|
|
||||||
Location[] locs = remote.GetLocations();
|
|
||||||
string[] interfaces = remote.GetInterfaces();
|
|
||||||
foreach (Location loc in locs)
|
|
||||||
{
|
|
||||||
m_neighbourInterfaces[loc] = interfaces;
|
|
||||||
m_neighbourRemote[loc] = remote;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,77 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
|
|
||||||
namespace OpenSim.Region.CoreModules.Grid.Interregion
|
|
||||||
{
|
|
||||||
public class RemotingObject : MarshalByRefObject
|
|
||||||
{
|
|
||||||
private readonly Location[] m_coords;
|
|
||||||
private readonly Dictionary<Type, Object> m_interfaces = new Dictionary<Type, object>();
|
|
||||||
|
|
||||||
public RemotingObject(Dictionary<Type, Object> myInterfaces, Location[] coords)
|
|
||||||
{
|
|
||||||
m_interfaces = myInterfaces;
|
|
||||||
m_coords = coords;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Location[] GetLocations()
|
|
||||||
{
|
|
||||||
return (Location[]) m_coords.Clone();
|
|
||||||
}
|
|
||||||
|
|
||||||
public string[] GetInterfaces()
|
|
||||||
{
|
|
||||||
string[] interfaces = new string[m_interfaces.Count];
|
|
||||||
int i = 0;
|
|
||||||
|
|
||||||
foreach (KeyValuePair<Type, object> pair in m_interfaces)
|
|
||||||
{
|
|
||||||
interfaces[i++] = pair.Key.FullName;
|
|
||||||
}
|
|
||||||
|
|
||||||
return interfaces;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a registered interface availible to neighbouring regions.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">The type of interface you wish to request</typeparam>
|
|
||||||
/// <returns>A MarshalByRefObject inherited from this region inheriting the interface requested.</returns>
|
|
||||||
/// <remarks>All registered interfaces <b>MUST</b> inherit from MarshalByRefObject and use only serialisable types.</remarks>
|
|
||||||
public T RequestInterface<T>()
|
|
||||||
{
|
|
||||||
if (m_interfaces.ContainsKey(typeof (T)))
|
|
||||||
return (T) m_interfaces[typeof (T)];
|
|
||||||
|
|
||||||
throw new NotSupportedException("No such interface registered.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue