From aee8994c410ebe7e180a07140365bed0ed4e2b8b Mon Sep 17 00:00:00 2001
From: YFdyh000 <yfdyh000@gmail.com>
Date: Wed, 11 Mar 2020 13:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=9C=9F=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v2rayN/v2rayN/Handler/SpeedtestHandler.cs   | 39 ++++++++++-----------
 v2rayN/v2rayN/Handler/V2rayConfigHandler.cs |  2 +-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index 69bc5a9c..cd36682d 100644
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
+using System.Threading.Tasks;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
@@ -138,40 +139,38 @@ namespace v2rayN.Handler
                 _v2rayHandler.LoadV2ray(_config, _selecteds);
 
                 Thread.Sleep(5000);
-
                 var httpPort = _config.GetLocalPort("speedtest");
-                foreach (int index in _selecteds)
+                Task[] tasks = new Task[_selecteds.Count];
+                int i = -1;
+                foreach (int itemIndex in _selecteds)
                 {
-                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    if (_config.vmess[itemIndex].configType == (int)EConfigType.Custom)
                     {
                         continue;
                     }
 
-                    try
-                    {
-                        var webProxy = new WebProxy(Global.Loopback, httpPort + index);
-                        int responseTime = -1;
-                        var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
-                        if (!Utils.IsNullOrEmpty(status))
+                    i++;
+                    tasks[i] = Task.Factory.StartNew(() => {
+                        try
                         {
-                            _updateFunc(index, string.Format("{0}", status));
+                            WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
+                            int responseTime = -1;
+                            var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
+                            string output = Utils.IsNullOrEmpty(status) ? string.Format("{0}ms", responseTime) : string.Format("{0}", status);
+                            _updateFunc(itemIndex, output);
                         }
-                        else
+                        catch (Exception ex)
                         {
-                            _updateFunc(index, string.Format("{0}ms", responseTime));
+                            Utils.SaveLog(ex.Message, ex);
                         }
-                    }
-                    catch (Exception ex)
-                    {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                    Thread.Sleep(100);
+                    });
+                    //Thread.Sleep(100);
                 }
+                Task.WaitAll(tasks);
 
                 Global.reloadV2ray = true;
                 _v2rayHandler.LoadV2ray(_config);
                 Thread.Sleep(100);
-
             }
             catch (Exception ex)
             {
@@ -286,7 +285,6 @@ namespace v2rayN.Handler
         {
             string msg = string.Empty;
             responseTime = -1;
-
             try
             {
                 HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
@@ -313,7 +311,6 @@ namespace v2rayN.Handler
                 msg = ex.Message;
             }
             return msg;
-
         }
     }
 }
diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
index dc34ee2c..fb72a4eb 100644
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -1459,7 +1459,7 @@ namespace v2rayN.Handler
 
                 msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), configCopy.getSummary());
             }
-            catch (Exception ex)
+            catch
             {
                 msg = UIRes.I18N("FailedGenDefaultConfiguration");
                 return -1;