Eliminated several compiler warning messages

0.6.0-stable
Johan Berntsson 2008-03-11 04:40:39 +00:00
parent bec947cde3
commit f0bfb87979
4 changed files with 5 additions and 163 deletions

View File

@ -521,11 +521,6 @@ namespace OpenSim
return udpServer; return udpServer;
} }
private static void CreateDefaultRegionInfoXml(string fileName)
{
new RegionInfo("DEFAULT REGION CONFIG", fileName,false);
}
protected override StorageManager CreateStorageManager(string connectionstring) protected override StorageManager CreateStorageManager(string connectionstring)
{ {
return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories); return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories);
@ -1254,14 +1249,7 @@ namespace OpenSim
/// <param name="usernum">The first out parameter describing the number of all the avatars in the Region server</param> /// <param name="usernum">The first out parameter describing the number of all the avatars in the Region server</param>
public void GetAvatarNumber(out int usernum) public void GetAvatarNumber(out int usernum)
{ {
int accounter = 0; usernum = m_sceneManager.GetCurrentSceneAvatars().Count;
foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars()) {
//presence.RegionHandle;
accounter++;
}
usernum = accounter;
} }
/// <summary> /// <summary>

View File

@ -37,8 +37,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
public class AsynchronousClient { public class AsynchronousClient {
private static ManualResetEvent connectDone = new ManualResetEvent(false); private static ManualResetEvent connectDone = new ManualResetEvent(false);
private static ManualResetEvent sendDone = new ManualResetEvent(false); private static ManualResetEvent sendDone = new ManualResetEvent(false);
private static ManualResetEvent receiveDone = new ManualResetEvent(false);
private static String response = String.Empty;
public static Socket StartClient(string hostname, int port) { public static Socket StartClient(string hostname, int port) {
try { try {
@ -114,7 +112,10 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
try { try {
Socket client = (Socket) ar.AsyncState; Socket client = (Socket) ar.AsyncState;
int bytesSent = client.EndSend(ar); int bytesSent = client.EndSend(ar);
if(bytesSent > 0)
{
//Console.WriteLine("Sent {0} bytes to server.", bytesSent); //Console.WriteLine("Sent {0} bytes to server.", bytesSent);
}
sendDone.Set(); sendDone.Set();
} catch (Exception e) { } catch (Exception e) {
Console.WriteLine(e.ToString()); Console.WriteLine(e.ToString());

View File

@ -89,7 +89,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
} }
public static void ReadCallback(IAsyncResult ar) { public static void ReadCallback(IAsyncResult ar) {
String content = String.Empty;
StateObject state = (StateObject) ar.AsyncState; StateObject state = (StateObject) ar.AsyncState;
Socket handler = state.workSocket; Socket handler = state.workSocket;
@ -183,23 +182,6 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer {
handler.BeginReceive( state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReadCallback), state); handler.BeginReceive( state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReadCallback), state);
} }
private static void Send(Socket handler, String data) {
byte[] byteData = Encoding.ASCII.GetBytes(data);
handler.BeginSend(byteData, 0, byteData.Length, 0, new AsyncCallback(SendCallback), handler);
}
private static void SendCallback(IAsyncResult ar) {
try {
Socket handler = (Socket) ar.AsyncState;
int bytesSent = handler.EndSend(ar);
//Console.WriteLine("Sent {0} bytes to client.", bytesSent);
handler.Shutdown(SocketShutdown.Both);
handler.Close();
} catch (Exception e) {
Console.WriteLine(e.ToString());
}
}
} }
public class TcpServer { public class TcpServer {

View File

@ -1,129 +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 OpenSim 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.Runtime.Remoting;
using System.Threading;
using Mono.Addins;
using OpenSim;
using OpenSim.Framework.Console;
using MonitorLib;
[assembly:Addin]
[assembly:AddinDependency ("OpenSim", "0.5")]
namespace OpenSim.ApplicationPlugins.RegionMonitor
{
[Extension("/OpenSim/Startup")]
public class RegionMonitorPlugin : MonitorLibBase, IApplicationPlugin
{
protected Thread m_mointorThread;
protected static OpenSimMain m_openSimMain;
public void Initialise(OpenSimMain opensim)
{
m_openSimMain = opensim;
Start();
MainLog.Instance.Verbose("Monitor", "Region monitor is runing ...");
}
public void Close()
{
}
public void Start()
{
// start monitor thread (remoting module)
m_mointorThread = new Thread(new ThreadStart(StartMonitor));
m_mointorThread.IsBackground = true;
m_mointorThread.Start();
}
private void StartMonitor()
{
try
{
Object lockObj = new Object();
RemotingConfiguration.Configure("monitorS.config", false);
lock (lockObj)
{
System.Threading.Monitor.Wait(lockObj);
}
}
catch (Exception e)
{
MainLog.Instance.Warn("MONITOR", "Error - " + e.Message);
}
}
public override bool FetchInfo(out string outstr)
{
MainLog.Instance.Verbose("MONITOR", "Fetch Information from Region server");
bool status = true;
string startTime = "";
string upTime = "";
int userNumber = 0;
int regionNumber = 0;
m_openSimMain.GetRunTime(out startTime, out upTime);
m_openSimMain.GetAvatarNumber(out userNumber);
m_openSimMain.GetRegionNumber(out regionNumber);
outstr = startTime
+ "," + upTime
+ "," + regionNumber
+ "," + userNumber;
return status;
}
public override bool MoveRegion()
{
MainLog.Instance.Verbose("MONITOR", "Move Region");
bool status = true;
return status;
}
public override bool SplitRegion()
{
MainLog.Instance.Verbose("MONITOR", "Split Region");
bool status = true;
return status;
}
public override bool MergeScenes()
{
MainLog.Instance.Verbose("MONITOR", "Merge Scenes");
bool status = true;
return status;
}
}
}