helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix calling schedule task cause deadlock (#1586)

Browse source
This commit is contained in:
ReinforceZwei 2021-05-12 22:31:06 +08:00 • committed by GitHub
parent 7723ed57ea
commit b15c3a8e46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
MinecraftClient/McClient.cs
View file

@ -701,13 +701,38 @@ namespace MinecraftClient
/// <param name="task">Task to run</param>
public object ScheduleTask(Delegate task)
{
var taskAndResult = new TaskWithResult(task);
lock (threadTasksLock)
if (!InvokeRequired())
{
threadTasks.Enqueue(taskAndResult);
return task.DynamicInvoke();
}
else
{
var taskAndResult = new TaskWithResult(task);
lock (threadTasksLock)
{
threadTasks.Enqueue(taskAndResult);
}
taskAndResult.Block();
return taskAndResult.Result;
}
}
/// <summary>
/// Check if calling thread is main thread or other thread
/// </summary>
/// <returns>True if calling thread is other thread</returns>
public bool InvokeRequired()
{
int callingThreadId = Thread.CurrentThread.ManagedThreadId;
if (handler != null)
{
return handler.GetNetReadThreadId() != callingThreadId;
}
else
{
// net read thread (main thread) not yet ready
return false;
}
taskAndResult.Block();
return taskAndResult.Result;
}
#region Management: Load/Unload ChatBots and Enable/Disable settings

9
MinecraftClient/Protocol/Handlers/Protocol16.cs
View file

@ -201,6 +201,15 @@ namespace MinecraftClient.Protocol.Handlers
netRead.Start();
}
/// <summary>
/// Get net read thread (main thread) ID
/// </summary>
/// <returns>Net read thread ID</returns>
public int GetNetReadThreadId()
{
return netRead != null ? netRead.ManagedThreadId : -1;
}
public void Dispose()
{
try

11
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -67,7 +67,7 @@ namespace MinecraftClient.Protocol.Handlers
PacketTypePalette packetPalette;
SocketWrapper socketWrapper;
DataTypes dataTypes;
Thread netRead;
Thread netRead; // main thread
ILogger log;
public Protocol18Handler(TcpClient Client, int protocolVersion, IMinecraftComHandler handler, ForgeInfo forgeInfo)
@ -1112,6 +1112,15 @@ namespace MinecraftClient.Protocol.Handlers
netRead.Start();
}
/// <summary>
/// Get net read thread (main thread) ID
/// </summary>
/// <returns>Net read thread ID</returns>
public int GetNetReadThreadId()
{
return netRead != null ? netRead.ManagedThreadId : -1;
}
/// <summary>
/// Disconnect from the server, cancel network reading.
/// </summary>

6
MinecraftClient/Protocol/IMinecraftCom.cs
View file

@ -235,5 +235,11 @@ namespace MinecraftClient.Protocol
/// </summary>
/// <param name="selectedSlot">The slot of the trade, starts at 0.</param>
bool SelectTrade(int selectedSlot);
/// <summary>
/// Get net read thread (main thread) ID
/// </summary>
/// <returns>Net read thread ID</returns>
int GetNetReadThreadId();
}
}