Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into feature/statistics_ui

Browse Source 
# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/MenuViewController.cs
This commit is contained in:
icylogic
2015-09-02 00:51:14 +08:00
parent 99baeb89f3 b07a9ef3b0
commit aa2334c9fd
31 changed files with 615 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
+18 -11
View File
@@ -3,6 +3,9 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using Shadowsocks.Model;
using System.IO;
using System.Net.NetworkInformation;
using System.Threading;
using Shadowsocks.Model;
@@ -18,15 +21,6 @@ namespace Shadowsocks.Controller.Strategy
private const int CachedInterval = 30*60*1000; //choose a new server every 30 minutes
private const int RetryInterval = 2*60*1000; //choose a new server every 30 minutes
public class StatisticsData
{
public int SuccessTimes;
public int TimedOutTimes;
public int AverageResponse;
public int MinResponse;
public int MaxResponse;
}
public StatisticsStrategy(ShadowsocksController controller)
{
_controller = controller;
@@ -99,6 +93,15 @@ namespace Shadowsocks.Controller.Strategy
return (double)data.SuccessTimes / (data.SuccessTimes + data.TimedOutTimes); //simply choose min package loss
}
private class StatisticsData
{
public int SuccessTimes;
public int TimedOutTimes;
public int AverageResponse;
public int MinResponse;
public int MaxResponse;
}
private void ChooseNewServer(List<Server> servers)
{
if (_statistics == null || servers.Count == 0)
@@ -118,7 +121,7 @@ namespace Shadowsocks.Controller.Strategy
).Aggregate((result1, result2) => result1.score > result2.score ? result1 : result2);
if (!_currentServer.Equals(bestResult.server)) //output when enabled
{
{
LogWhenEnabled($"Switch to server: {bestResult.server.FriendlyName()} by package loss:{1 - bestResult.score}");
}
_currentServer = bestResult.server;
@@ -137,7 +140,7 @@ namespace Shadowsocks.Controller.Strategy
}
}
public string ID => "com.shadowsocks.strategy.statistics";
public string ID => "com.shadowsocks.strategy.scbs";
public string Name => I18N.GetString("Choose By Total Package Loss");
@@ -148,6 +151,9 @@ namespace Shadowsocks.Controller.Strategy
{
ChooseNewServer(_controller.GetCurrentConfiguration().configs);
}
if (oldServer != _currentServer)
{
}
return _currentServer; //current server cached for CachedInterval
}
@@ -176,5 +182,6 @@ namespace Shadowsocks.Controller.Strategy
{
//TODO: combine this part of data with ICMP statics
}
}
}