Merge pull request #37 from re-cheid/ping

Fixed ping and heartbeat issue when receiving lots of messages [.NET 3.5]

Author: mattqs

Src/EngineIoClientDotNet.mono/Client/Socket_net35.cs

@@ -63,8 +63,8 @@ private enum ReadyStateEnum
         private Dictionary<string, string> Cookies = new Dictionary<string, string>();
         /*package*/
         public Transport Transport;
-        private EasyTimer PingTimeoutTimer;
-        private EasyTimer PingIntervalTimer;
+        private Heartbeat HeartbeatTimer;
+        private TriggeredLoopTimer PingIntervalTimer;
 
         private ReadyStateEnum ReadyState;
         private bool Agent = false;
@@ -474,7 +474,7 @@ public void OnPacket(Packet packet)
                 }
                 else if (packet.Type == Packet.PONG)
                 {
-                    this.SetPing();
+                    PingIntervalTimer.Trigger();
                 }
                 else if (packet.Type == Packet.ERROR)
                 {
@@ -529,7 +529,7 @@ public OnHeartbeatAsListener(Socket socket)
 
             void IListener.Call(params object[] args)
             {
-                socket.OnHeartbeat(args.Length > 0 ? (long)args[0] : 0);
+                socket.OnHeartbeat();
             }
 
             public int CompareTo(IListener other)
@@ -549,20 +549,16 @@ private void SetPing()
         {
             //var log = LogManager.GetLogger(Global.CallerName());
 
-            if (this.PingIntervalTimer != null)
-            {
-                PingIntervalTimer.Stop();
-            }
             var log = LogManager.GetLogger(Global.CallerName());
             log.Info(string.Format("writing ping packet - expecting pong within {0}ms", PingTimeout));
 
-            PingIntervalTimer = EasyTimer.SetTimeout(() =>
+            PingIntervalTimer = TriggeredLoopTimer.Start(() =>
             {
                 var log2 = LogManager.GetLogger(Global.CallerName());
                 log2.Info("EasyTimer SetPing start");
 
                 Ping();
-                OnHeartbeat(PingTimeout);
+                SetHeartbeat(PingTimeout);
                 log2.Info("EasyTimer SetPing finish");
             }, (int)PingInterval);
         }
@@ -1056,9 +1052,9 @@ private void OnClose(string reason, Exception desc = null)
                 {
                     this.PingIntervalTimer.Stop();
                 }
-                if (this.PingTimeoutTimer != null)
+                if (this.HeartbeatTimer != null)
                 {
-                    this.PingTimeoutTimer.Stop();
+                    this.HeartbeatTimer.Stop();
                 }
 
 
@@ -1113,22 +1109,22 @@ public List<string> FilterUpgrades(IEnumerable<string> upgrades)
             return filterUpgrades;
         }
 
-
-
-        internal void OnHeartbeat(long timeout)
+        internal void OnHeartbeat()
         {
-            if (this.PingTimeoutTimer != null)
+            if(this.HeartbeatTimer != null)
             {
-                PingTimeoutTimer.Stop();
-                PingTimeoutTimer = null;
+                this.HeartbeatTimer.OnHeartbeat();
             }
+        }
 
+        internal void SetHeartbeat(long timeout)
+        {
             if (timeout <= 0)
             {
                 timeout = this.PingInterval + this.PingTimeout;
             }
 
-            PingTimeoutTimer = EasyTimer.SetTimeout(() =>
+            HeartbeatTimer = Heartbeat.Start (() =>
             {
                 var log2 = LogManager.GetLogger(Global.CallerName());
                 log2.Info("EasyTimer OnHeartbeat start");

Src/EngineIoClientDotNet.mono/Thread/Heartbeat_net35.cs

@@ -0,0 +1,55 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+
+namespace Quobject.EngineIoClientDotNet.Thread
+{
+    public class Heartbeat
+    {
+        private volatile bool gotHeartbeat = false;
+        private BackgroundWorker heartBeatTimer;
+        private CancellationTokenSource ts;
+
+        private Heartbeat()
+        {
+            ts = new CancellationTokenSource();
+        }
+
+        public static Heartbeat Start(Action onTimeout, int timeout)
+        {
+            Heartbeat heartbeat = new Heartbeat();
+            heartbeat.Run(onTimeout, timeout);
+            return heartbeat;            
+        }
+
+        public void OnHeartbeat()
+        {
+            gotHeartbeat = true;
+        }
+
+        private void Run(Action onTimeout, int timeout)
+        {
+            heartBeatTimer = new BackgroundWorker();
+
+            heartBeatTimer.DoWork += (s, e) =>
+            {
+                while (!ts.IsCancellationRequested)
+                {
+                    System.Threading.Thread.Sleep(timeout);
+                    if (!gotHeartbeat && !ts.IsCancellationRequested)
+                    {
+                        onTimeout();
+                        break;
+                    }
+                }
+            };
+
+            heartBeatTimer.RunWorkerAsync();
+        }
+
+        public void Stop()
+        {
+            ts.Cancel();
+        }
+    }
+}

Src/EngineIoClientDotNet.mono/Thread/TriggeredLoopTimer_net35.cs

@@ -0,0 +1,61 @@
+using System;
+using System.ComponentModel;
+using System.Threading;
+
+namespace Quobject.EngineIoClientDotNet.Thread
+{
+    public class TriggeredLoopTimer
+    {
+        private ManualResetEvent trigger;
+        private CancellationTokenSource ts;
+
+        private TriggeredLoopTimer()
+        {
+            trigger = new ManualResetEvent(false);
+            ts = new CancellationTokenSource();
+        }
+
+        public static TriggeredLoopTimer Start (Action method, int delayInMilliseconds)
+        {
+            TriggeredLoopTimer ping = new TriggeredLoopTimer();
+            ping.Run (method, delayInMilliseconds);
+            return ping;
+        }
+
+
+        public void Trigger()
+        {
+            trigger.Set();
+        }
+
+        private void Run (Action method, int delayInMilliseconds)
+        {
+            var worker = new BackgroundWorker();
+
+            worker.DoWork += (s, e) =>
+            {
+                while (!ts.IsCancellationRequested)
+                {
+                    System.Threading.Thread.Sleep (delayInMilliseconds);
+                    if (!ts.IsCancellationRequested)
+                    {
+                        method();
+                        trigger.WaitOne();
+                        trigger.Reset();
+                    }
+                }
+            };
+
+            worker.RunWorkerAsync();
+        }
+
+        public void Stop()
+        {
+            if (ts != null)
+            {
+                ts.Cancel();
+                trigger.Set();
+            }
+        }
+    }
+}

Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.csproj

@@ -115,6 +115,12 @@
     <Compile Include="..\EngineIoClientDotNet.mono\Thread\EasyTimer_net35.cs">
       <Link>Thread\EasyTimer_net35.cs</Link>
     </Compile>
+    <Compile Include="..\EngineIoClientDotNet.mono\Thread\Heartbeat_net35.cs">
+      <Link>Thread\Heartbeat_net35.cs</Link>
+    </Compile>
+    <Compile Include="..\EngineIoClientDotNet.mono\Thread\TriggeredLoopTimer_net35.cs">
+      <Link>Thread\TriggeredLoopTimer_net35.cs</Link>
+    </Compile>
     <Compile Include="Parser\Packet_net35.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>