ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

thread.abort is gone. Coment out so things compile

Browse Source
This commit is contained in:
UbitUmarov
2022-10-02 11:30:41 +01:00
parent fc3543c24a
commit f6a47a9f47
9 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Monitoring/Watchdog.cs
View File

@@ -197,8 +197,8 @@ namespace OpenSim.Framework.Monitoring
// m_log.DebugFormat(
// "[WATCHDOG]: Stop: Removing thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
if(t.IsAlive)
t.Abort();
//if(t.IsAlive)
// t.Abort();
}
m_threads.Clear();
}
@@ -271,8 +271,8 @@ namespace OpenSim.Framework.Monitoring
{
if (m_threads.ContainsKey(threadID))
{
ThreadWatchdogInfo twi = m_threads[threadID];
twi.Thread.Abort();
//ThreadWatchdogInfo twi = m_threads[threadID];
//twi.Thread.Abort();
RemoveThread(threadID);
return true;

4
OpenSim/Region/Application/Application.cs
View File

@@ -73,6 +73,8 @@ namespace OpenSim
// First line, hook the appdomain to the crash reporter
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
System.AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true);
Culture.SetCurrentCulture();
Culture.SetDefaultCurrentCulture();
@@ -97,7 +99,7 @@ namespace OpenSim
}
else
{
XmlConfigurator.Configure();
XmlConfigurator.Configure(new System.IO.FileInfo("OpenSim.exe.config"));
m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
}

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -40,7 +40,7 @@ using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Framework.Monitoring;
using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
//using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

2
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@@ -1799,10 +1799,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
incomingPacket = null;
}
}
/*
catch (ThreadAbortException)
{
Thread.ResetAbort();
}
*/
catch (Exception ex)
{
m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex);

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1612,7 +1612,7 @@ namespace OpenSim.Region.Framework.Scenes
//proc.WaitForExit();
//Thread.Sleep(1000);
//Environment.Exit(1);
m_heartbeatThread.Abort();
//m_heartbeatThread.Abort();
Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId);
m_heartbeatThread = null;
}

8
OpenSim/Region/ScriptEngine/YEngine/XMREngXmrTestLs.cs
View File

@@ -41,6 +41,9 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
using SharedEventParams = OpenSim.Region.ScriptEngine.Shared.EventParams;
using SharedScriptBaseClass = OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass;
namespace OpenSim.Region.ScriptEngine.Yengine
{
public partial class Yengine
@@ -253,8 +256,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
return;
i++;
}
OpenSim.Region.ScriptEngine.Shared.EventParams eps =
new OpenSim.Region.ScriptEngine.Shared.EventParams(eventname, paramvalues, zeroDetectParams);
SharedEventParams eps = new SharedEventParams(eventname, paramvalues, zeroDetectParams);
// Scan instance list to find those that match selection criteria.
if(!Monitor.TryEnter(m_InstancesDict, 100))
@@ -367,7 +369,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
}
if(token is TokenName)
{
FieldInfo field = typeof(OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass).GetField(((TokenName)token).val);
FieldInfo field = typeof(SharedScriptBaseClass).GetField(((TokenName)token).val);
if((field != null) && field.IsPublic && (field.IsLiteral || (field.IsStatic && field.IsInitOnly)))
{
return field.GetValue(null);

8
OpenSim/Region/ScriptEngine/YEngine/XMREngine.cs
View File

@@ -60,6 +60,8 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
using SceneScriptEvents = OpenSim.Region.Framework.Scenes.scriptEvents;
[assembly: Addin("YEngine", OpenSim.VersionInfo.VersionNumber)]
[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
@@ -229,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
catch { }
try
{
oscode = ((OpenSim.Region.Framework.Scenes.scriptEvents)(1ul << i)).ToString();
oscode = ((SceneScriptEvents)(1ul << i)).ToString();
Convert.ToInt64(oscode);
oscode = "undefined";
}
@@ -712,8 +714,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
lock(m_SleepQueue)
Monitor.PulseAll(m_SleepQueue);
if(!m_SleepThread.Join(250))
m_SleepThread.Abort();
//if(!m_SleepThread.Join(250))
// m_SleepThread.Abort();
m_SleepThread = null;
}

1
OpenSim/Region/ScriptEngine/YEngine/XMRInstCtor.cs
View File

@@ -30,7 +30,6 @@ using System.Threading;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.Remoting.Lifetime;
using System.Security.Policy;
using System.IO;
using System.Xml;

4
OpenSim/Server/Base/HttpServerBase.cs
View File

@@ -123,13 +123,13 @@ namespace OpenSim.Server.Base
if ( cert_path.Length == 0 )
{
System.Console.WriteLine("Path to X509 certificate is missing, server can't start.");
Thread.CurrentThread.Abort();
//Thread.CurrentThread.Abort();
}
string cert_pass = networkConfig.GetString("cert_pass", string.Empty);
if ( cert_pass.Length == 0 )
{
System.Console.WriteLine("Password for X509 certificate is missing, server can't start.");
Thread.CurrentThread.Abort();
//Thread.CurrentThread.Abort();
}
MainServer.AddHttpServer(new BaseHttpServer(https_port, ssl_listener, cert_path, cert_pass));