发现有一个线程没有被释放

Author: Megghy

MultiSEngine/Core/Adapter/BaseAdapter.cs

@@ -3,6 +3,7 @@
 using System.Collections;
 using System.IO;
 using System.Net.Sockets;
+using System.Threading;
 using System.Threading.Tasks;
 using TrProtocol;
 
@@ -44,7 +45,6 @@ public BaseAdapter(ClientData client, Socket connection)
         public abstract void SendPacket(Packet packet);
         public virtual BaseAdapter Start()
         {
-            //Connection.BeginReceive(Buffer, 0, Buffer.Length, SocketFlags.None, new AsyncCallback(ReceiveMessage), null);
             Task.Run(RecieveLoop);
             Task.Run(ProcessPacketLoop);
             return this;
@@ -76,8 +76,11 @@ protected void ProcessPacketLoop()
         {
             while (!ShouldStop)
             {
-                while (PacketPool.Count < 1)
-                    Task.Delay(1).Wait();
+                if (PacketPool.Count < 1)
+                {
+                    Thread.Sleep(1);
+                    continue;
+                }
                 var packet = PacketPool.Dequeue() as Packet;
                 try
                 {

MultiSEngine/Core/Net.cs

@@ -51,7 +51,6 @@ public static void WatchConnecting()
                 catch (Exception ex)
                 {
                     Logs.Error(ex);
-                    continue;
                 }
             }
         }

MultiSEngine/Logs.cs

@@ -1,4 +1,5 @@
-using System;
+using MultiSEngine.DataStruct;
+using System;
 using System.Collections;
 using System.IO;
 using System.Threading.Tasks;
@@ -10,52 +11,45 @@ public class Logs
         public static string LogPath => Path.Combine(Environment.CurrentDirectory, "Logs");
         public static string LogName => Path.Combine(LogPath, DateTime.Now.ToString("yyyy-MM-dd") + ".log");
         public const ConsoleColor DefaultColor = ConsoleColor.Gray;
-        public static void Text(object text, bool save = true)
+        public static async void Text(object text, bool save = true)
         {
-            LogAndSave(text, "[Log]", DefaultColor, save);
+            await LogAndSave(text, "[Log]", DefaultColor, save);
         }
-        public static void Info(object text, bool save = true)
+        public static async void Info(object text, bool save = true)
         {
-            LogAndSave(text, "[Info]", ConsoleColor.Yellow, save);
+            await LogAndSave(text, "[Info]", ConsoleColor.Yellow, save);
         }
-        public static void Error(object text, bool save = true)
+        public static async void Error(object text, bool save = true)
         {
-            LogAndSave(text, "[Error]", ConsoleColor.Red, save);
+            await LogAndSave(text, "[Error]", ConsoleColor.Red, save);
         }
-        public static void Warn(object text, bool save = true)
+        public static async void Warn(object text, bool save = true)
         {
-            LogAndSave(text, "[Warn]", ConsoleColor.DarkYellow, save);
+            await LogAndSave(text, "[Warn]", ConsoleColor.DarkYellow, save);
         }
-        public static void Success(object text, bool save = true)
+        public static async void Success(object text, bool save = true)
         {
-            LogAndSave(text, "[Success]", ConsoleColor.Green, save);
+            await LogAndSave(text, "[Success]", ConsoleColor.Green, save);
         }
-        private static Queue LogQueue;
-        internal static void SaveLogTask()
+        private static StreamWriter logSW;
+        internal static void Init()
         {
-            LogQueue ??= new();
-            using var sw = File.AppendText(LogName);
-            sw.AutoFlush = true;
-            while (LogQueue != null)
-            {
-                while (LogQueue.Count < 1)
-                    Task.Delay(1).Wait();
-                sw.WriteLine(LogQueue.Dequeue());
-                if (!File.Exists(LogName))
-                {
-                    LogQueue = null;
-                    return;
-                }
-            }
+            if (!Directory.Exists(LogPath))
+                Directory.CreateDirectory(LogPath);
+            logSW = new(new FileStream(LogName, FileMode.OpenOrCreate));
         }
-        public static void LogAndSave(object message, string prefix = "[Log]", ConsoleColor color = DefaultColor, bool save = true)
+        public static async Task LogAndSave(object message, string prefix = "[Log]", ConsoleColor color = DefaultColor, bool save = true)
         {
-            if (LogQueue is null)
-                Task.Run(SaveLogTask);
+            if (!File.Exists(LogName))
+            {
+                logSW?.Dispose();
+                logSW = new(new FileStream(LogName, FileMode.OpenOrCreate)); ;
+            }
             Console.ForegroundColor = color;
             Console.WriteLine($"{prefix} {message}");
-            if (save) LogQueue.Enqueue($"{DateTime.Now:yyyy-MM-dd-HH:mm:ss} - {prefix} {message}");
             Console.ForegroundColor = DefaultColor;
+            if (save)
+                await logSW.WriteLineAsync($"{DateTime.Now:yyyy-MM-dd-HH:mm:ss} - {prefix} {message}");
         }
     }
 }

MultiSEngine/Modules/ConsoleManager.cs

@@ -1,25 +1,31 @@
 using MultiSEngine.DataStruct;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Timers;
 
 namespace MultiSEngine.Modules
 {
     internal class ConsoleManager
     {
         public static readonly string Title = "[MultiSEngine]";
+        private static readonly Timer ConsoleUpdateTimer = new()
+        {
+            Interval = 1000,
+            AutoReset = true
+        };
         [AutoInit]
         public static void Init()
         {
-            Task.Run(Loop);
+            ConsoleUpdateTimer.Elapsed += Loop;
+            ConsoleUpdateTimer.Start();
         }
-        private static void Loop()
+        private static void Loop(object sender, ElapsedEventArgs e)
         {
-            while (true)
-            {
-                Console.Title = $"{Title}  {Data.Clients.Count} Online @{Config.Instance.ListenIP}:{Config.Instance.ListenPort} <V{Assembly.GetExecutingAssembly().GetName().Version}, for Terraria-1.4.3>";
-                Task.Delay(1000).Wait();
-            }
+            Console.Title = $"{Title}  {Data.Clients.Count} Online @{Config.Instance.ListenIP}:{Config.Instance.ListenPort} <V{Assembly.GetExecutingAssembly().GetName().Version}, for Terraria-1.4.3>";
+            Task.Delay(1000).Wait();
         }
     }
 }

MultiSEngine/Program.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MultiSEngine
@@ -11,14 +12,15 @@ internal class Program
     {
         static void Main(string[] args)
         {
-            Init();
+            Logs.Init();
+            AutoInit();
             while (!(Core.Command.HandleCommand(null, Console.ReadLine(), out var c, true) && !c))
-                Task.Delay(1).Wait();
+                Thread.Sleep(1);
             Close();
             Console.WriteLine("Bye!");
             Task.Delay(1000).Wait();
         }
-        public static void Init()
+        public static void AutoInit()
         {
 #if DEBUG
             Logs.Warn($"> MultiSEngine IS IN DEBUG MODE <");