From 0b68d3db5d81bd4f67f7467676682e71ead2bd0f Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Tue, 30 Apr 2019 11:09:42 -0400
Subject: [PATCH] move stuff arround so that flushing queues are done in the
 correct event loops

TODO: locking
---
 llarp/service/endpoint.cpp      | 19 +++++--------------
 llarp/service/endpoint_util.cpp |  2 +-
 llarp/service/sendcontext.cpp   |  9 +--------
 llarp/service/sendcontext.hpp   |  4 ++--
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 390bb70e5..0e031eb73 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1020,27 +1020,18 @@ namespace llarp
     }
 
     void
-    Endpoint::Pump(llarp_time_t now)
+    Endpoint::Pump(llarp_time_t)
     {
-      auto itr = m_RemoteSessions.begin();
-      while(itr != m_RemoteSessions.end())
-      {
-        itr->second->Pump(now);
-        ++itr;
-      }
-
-      RouterLogic()->queue_func([&]() {
-        for(const auto& item : m_SNodeSessions)
-          item.second->FlushUpstream();
-      });
-
       EndpointLogic()->queue_func([&]() {
         for(const auto& item : m_SNodeSessions)
           item.second->FlushDownstream();
       });
-
       RouterLogic()->queue_func([&]() {
         auto router = Router();
+        for(const auto & item : m_RemoteSessions)
+          item.second->FlushUpstream();
+        for(const auto& item : m_SNodeSessions)
+          item.second->FlushUpstream();
         util::Lock lock(&m_SendQueueMutex);
         for(const auto& item : m_SendQueue)
           item.second->SendRoutingMessage(*item.first, router);
diff --git a/llarp/service/endpoint_util.cpp b/llarp/service/endpoint_util.cpp
index 34cd3e83b..e96b06381 100644
--- a/llarp/service/endpoint_util.cpp
+++ b/llarp/service/endpoint_util.cpp
@@ -90,7 +90,7 @@ namespace llarp
       auto itr = remoteSessions.begin();
       while(itr != remoteSessions.end())
       {
-        if(itr->second->Tick(now))
+        if(itr->second->Pump(now))
         {
           itr->second->Stop();
           deadSessions.emplace(std::move(*itr));
diff --git a/llarp/service/sendcontext.cpp b/llarp/service/sendcontext.cpp
index bd243ea22..585499b2c 100644
--- a/llarp/service/sendcontext.cpp
+++ b/llarp/service/sendcontext.cpp
@@ -29,20 +29,13 @@ namespace llarp
           msg, remoteIntro.pathID);
       {
         util::Lock lock(&m_SendQueueMutex);
-        const auto sz = m_SendQueue.size();
         m_SendQueue.emplace_back(transfer, path);
-        if(sz == 0)
-        {
-          // TODO: use shared_from_this()
-          m_Endpoint->RouterLogic()->queue_func(
-              std::bind(&SendContext::FlushSend, this));
-        }
       }
       return true;
     }
 
     void
-    SendContext::FlushSend()
+    SendContext::FlushUpstream()
     {
       auto r = m_Endpoint->Router();
       util::Lock lock(&m_SendQueueMutex);
diff --git a/llarp/service/sendcontext.hpp b/llarp/service/sendcontext.hpp
index e4cb2b8d7..73e6f3c19 100644
--- a/llarp/service/sendcontext.hpp
+++ b/llarp/service/sendcontext.hpp
@@ -30,9 +30,9 @@ namespace llarp
       Send(const ProtocolFrame& f, path::Path_ptr path)
           LOCKS_EXCLUDED(m_SendQueueMutex);
 
-      /// flush send when in router thread
+      /// flush upstream traffic when in router thread
       void
-      FlushSend() LOCKS_EXCLUDED(m_SendQueueMutex);
+      FlushUpstream() LOCKS_EXCLUDED(m_SendQueueMutex);
 
       SharedSecret sharedKey;
       ServiceInfo remoteIdent;