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

log processor arch

master
UbitUmarov 2020-03-18 17:41:29 +00:00
parent 5401e323dc
commit 59d3f9fa62
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -108,7 +108,7 @@ namespace OpenSim.Framework.Servers
return true;
return false;
}
}
/// <summary>
/// Must be overriden by child classes for their own server specific startup behaviour.
/// </summary>
@ -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();

2
OpenSim/Framework/Servers/ServerBase.cs
View File

@ -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)

10
OpenSim/Framework/Util.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Framework
RegressionTest,
QueueUserWorkItem,
SmartThreadPool,
Thread,
Thread
}
/// <summary>
@ -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
/// </summary>
/// <returns>true if so, false if not</returns>
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)