diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index c09e53d1d2..3c2b122899 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -108,7 +108,7 @@ namespace OpenSim.Framework.Servers return true; return false; - } + } /// /// Must be overriden by child classes for their own server specific startup behaviour. /// @@ -190,8 +190,8 @@ namespace OpenSim.Framework.Servers //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); m_log.InfoFormat( "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n", - Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); - + Environment.OSVersion, Environment.OSVersion.Platform, Environment.Is64BitProcess ? "64" : "32"); + m_log.Info("[STARTUP]: Processor Architecture: " + System.Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE")); try { StartupSpecific(); diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 81b112fbe9..eeab173e7c 100755 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs @@ -140,7 +140,7 @@ namespace OpenSim.Framework.Servers //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); m_log.InfoFormat( "[SERVER BASE]: Operating system version: {0}, .NET platform {1}, {2}-bit", - Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32"); + Environment.OSVersion, Environment.OSVersion.Platform, Environment.Is64BitProcess ? "64" : "32"); } public void RegisterCommonAppenders(IConfig startupConfig) diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 3fb32a2473..a12d17a47b 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -113,7 +113,7 @@ namespace OpenSim.Framework RegressionTest, QueueUserWorkItem, SmartThreadPool, - Thread, + Thread } /// @@ -996,7 +996,7 @@ namespace OpenSim.Framework // controlled in config files. string nativeLibraryPath; - if (Util.Is64BitProcess()) + if (Environment.Is64BitProcess) nativeLibraryPath = Path.Combine(Path.Combine(path, "lib64"), libraryName); else nativeLibraryPath = Path.Combine(Path.Combine(path, "lib32"), libraryName); @@ -2712,10 +2712,6 @@ namespace OpenSim.Framework /// Determine whether the current process is 64 bit /// /// true if so, false if not - public static bool Is64BitProcess() - { - return IntPtr.Size == 8; - } #region FireAndForget Threading Pattern @@ -2974,7 +2970,7 @@ namespace OpenSim.Framework realCallback.Invoke(obj); break; case FireAndForgetMethod.QueueUserWorkItem: - ThreadPool.QueueUserWorkItem(realCallback, obj); + ThreadPool.UnsafeQueueUserWorkItem(realCallback, obj); break; case FireAndForgetMethod.SmartThreadPool: if (m_ThreadPool == null)