Optimize SendPingMessage (#1896)

* Optimize SendPing * Optimize * Update src/neo/Network/P2P/TaskManager.cs Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: erikzhang <erik@neo.org>
neo-project · Sep 2, 2020 · 234772c · 234772c
1 parent 9322675
commit 234772c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/neo/Network/P2P/TaskManager.cs b/src/neo/Network/P2P/TaskManager.cs
@@ -4,6 +4,7 @@
 using Neo.IO.Caching;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
+using Neo.Persistence;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -299,14 +300,22 @@ private void RequestTasks()
 
         private void SendPingMessage()
         {
+            if (sessions.Count == 0) return;
+
+            TrimmedBlock block;
+            using (SnapshotView snapshot = Blockchain.Singleton.GetSnapshot())
+            {
+                block = snapshot.Blocks[snapshot.CurrentBlockHash];
+            }
+
             foreach (KeyValuePair<IActorRef, TaskSession> item in sessions)
             {
                 var node = item.Key;
                 var session = item.Value;
 
                 if (session.ExpireTime < TimeProvider.Current.UtcNow ||
-                     (Blockchain.Singleton.Height >= session.LastBlockIndex
-                     && TimeProvider.Current.UtcNow.ToTimestampMS() - PingCoolingOffPeriod >= Blockchain.Singleton.GetBlock(Blockchain.Singleton.CurrentBlockHash)?.Timestamp))
+                     (block.Index >= session.LastBlockIndex &&
+                     TimeProvider.Current.UtcNow.ToTimestampMS() - PingCoolingOffPeriod >= block.Timestamp))
                 {
                     if (session.InvTasks.Remove(MemPoolTaskHash))
                     {