remove file bin/Mono.Posix.dll that causes problems with mono

httptests
UbitUmarov 2017-05-09 11:58:07 +01:00
parent d952d62baa
commit 957ca41b13
3 changed files with 8 additions and 1 deletions

View File

@ -126,6 +126,7 @@ namespace OpenSim
m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod); m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
} }
#if (_MONO)
private static Mono.Unix.UnixSignal[] signals; private static Mono.Unix.UnixSignal[] signals;
@ -140,6 +141,7 @@ namespace OpenSim
MainConsole.Instance.RunCommand("shutdown"); MainConsole.Instance.RunCommand("shutdown");
} }
}); });
#endif
/// <summary> /// <summary>
/// Performs initialisation of the scene, such as loading configuration from disk. /// Performs initialisation of the scene, such as loading configuration from disk.
@ -150,6 +152,7 @@ namespace OpenSim
m_log.Info("========================= STARTING OPENSIM ========================="); m_log.Info("========================= STARTING OPENSIM =========================");
m_log.Info("===================================================================="); m_log.Info("====================================================================");
#if (_MONO)
if(!Util.IsWindows()) if(!Util.IsWindows())
{ {
try try
@ -168,6 +171,7 @@ namespace OpenSim
m_log.Debug("Exception was: ", e); m_log.Debug("Exception was: ", e);
} }
} }
#endif
//m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
// http://msdn.microsoft.com/en-us/library/bb384202.aspx // http://msdn.microsoft.com/en-us/library/bb384202.aspx
//GCSettings.LatencyMode = GCLatencyMode.Batch; //GCSettings.LatencyMode = GCLatencyMode.Batch;

View File

@ -61,8 +61,9 @@ namespace OpenSim.Server.Base
// //
private bool m_Running = true; private bool m_Running = true;
#if (_MONO)
private static Mono.Unix.UnixSignal[] signals; private static Mono.Unix.UnixSignal[] signals;
#endif
// Handle all the automagical stuff // Handle all the automagical stuff
// //
@ -186,6 +187,7 @@ namespace OpenSim.Server.Base
RegisterCommonCommands(); RegisterCommonCommands();
RegisterCommonComponents(Config); RegisterCommonComponents(Config);
#if (_MONO)
Thread signal_thread = new Thread (delegate () Thread signal_thread = new Thread (delegate ()
{ {
while (true) while (true)
@ -218,6 +220,7 @@ namespace OpenSim.Server.Base
m_log.Debug("Exception was: ", e); m_log.Debug("Exception was: ", e);
} }
} }
#endif
// Allow derived classes to perform initialization that // Allow derived classes to perform initialization that
// needs to be done after the console has opened // needs to be done after the console has opened

Binary file not shown.