mirror of https://github.com/oxen-io/lokinet
Rename PumpLL -> TriggerPump
And rename the actual pump implementation back to PumpLL.
This commit is contained in:
parent
031ea7aa37
commit
78cc466bf2
|
@ -233,7 +233,7 @@ namespace llarp
|
|||
void
|
||||
Session::TriggerPump()
|
||||
{
|
||||
m_Parent->Router()->PumpLL();
|
||||
m_Parent->Router()->TriggerPump();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -251,7 +251,7 @@ namespace llarp
|
|||
}
|
||||
m_AuthedLinks.emplace(pk, itr->second);
|
||||
itr = m_Pending.erase(itr);
|
||||
m_Router->PumpLL();
|
||||
m_Router->TriggerPump();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace llarp
|
|||
pkt.first.resize(X.sz);
|
||||
std::copy_n(X.base, X.sz, pkt.first.begin());
|
||||
pkt.second = Y;
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ namespace llarp
|
|||
pkt.first.resize(X.sz);
|
||||
std::copy_n(X.base, X.sz, pkt.first.begin());
|
||||
pkt.second = Y;
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -488,7 +488,7 @@ namespace llarp
|
|||
LogDebug("failed to send upstream to ", Upstream());
|
||||
}
|
||||
}
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -600,7 +600,7 @@ namespace llarp
|
|||
m_RXRate += buf.sz;
|
||||
if (HandleRoutingMessage(buf, r))
|
||||
{
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
m_LastRecvMessage = r->Now();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -200,7 +200,7 @@ namespace llarp
|
|||
r->SendToOrQueue(info.upstream, msg);
|
||||
}
|
||||
}
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -217,7 +217,7 @@ namespace llarp
|
|||
info.downstream);
|
||||
r->SendToOrQueue(info.downstream, msg);
|
||||
}
|
||||
r->PumpLL();
|
||||
r->TriggerPump();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -210,9 +210,9 @@ namespace llarp
|
|||
virtual void
|
||||
Die() = 0;
|
||||
|
||||
/// pump low level links
|
||||
/// Trigger a pump of low level links. Idempotent.
|
||||
virtual void
|
||||
PumpLL() = 0;
|
||||
TriggerPump() = 0;
|
||||
|
||||
virtual bool
|
||||
IsBootstrapNode(RouterID r) const = 0;
|
||||
|
|
|
@ -87,7 +87,7 @@ namespace llarp
|
|||
recentlyRemovedPaths.Decay();
|
||||
ProcessOutboundQueue();
|
||||
if (/*bool more = */ SendRoundRobin())
|
||||
_router->PumpLL();
|
||||
_router->TriggerPump();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ namespace llarp
|
|||
QueueMessage(const RouterID& remote, const ILinkMessage& msg, SendStatusHandler callback)
|
||||
override EXCLUDES(_mutex);
|
||||
|
||||
/* Called when pumping output queues, typically scheduled via a call to Router::PumpLL().
|
||||
/* Called when pumping output queues, typically scheduled via a call to Router::TriggerPump().
|
||||
*
|
||||
* Processes messages on the shared message queue into their paths' respective
|
||||
* individual queues.
|
||||
|
|
|
@ -72,7 +72,7 @@ namespace llarp
|
|||
m_Pump = _loop->make_waker([this]() {
|
||||
paths.PumpDownstream();
|
||||
paths.PumpUpstream();
|
||||
PumpLLNonIdempotent();
|
||||
PumpLL();
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -82,7 +82,7 @@ namespace llarp
|
|||
}
|
||||
|
||||
void
|
||||
Router::PumpLLNonIdempotent()
|
||||
Router::PumpLL()
|
||||
{
|
||||
llarp::LogTrace("Router::PumpLL() start");
|
||||
if (_stopping.load())
|
||||
|
@ -256,7 +256,7 @@ namespace llarp
|
|||
}
|
||||
|
||||
void
|
||||
Router::PumpLL()
|
||||
Router::TriggerPump()
|
||||
{
|
||||
m_Pump->Trigger();
|
||||
}
|
||||
|
@ -707,7 +707,7 @@ namespace llarp
|
|||
util::memFn(&AbstractRouter::CheckRenegotiateValid, this),
|
||||
util::memFn(&Router::ConnectionTimedOut, this),
|
||||
util::memFn(&AbstractRouter::SessionClosed, this),
|
||||
util::memFn(&AbstractRouter::PumpLL, this),
|
||||
util::memFn(&AbstractRouter::TriggerPump, this),
|
||||
util::memFn(&AbstractRouter::QueueWork, this));
|
||||
|
||||
const std::string& key = serverConfig.interface;
|
||||
|
@ -1244,7 +1244,7 @@ namespace llarp
|
|||
|
||||
#ifdef _WIN32
|
||||
// windows uses proactor event loop so we need to constantly pump
|
||||
_loop->add_ticker([this] { PumpLLNonIdempotent(); });
|
||||
_loop->add_ticker([this] { PumpLL(); });
|
||||
#endif
|
||||
_loop->call_every(ROUTER_TICK_INTERVAL, weak_from_this(), [this] { Tick(); });
|
||||
_running.store(true);
|
||||
|
@ -1508,7 +1508,7 @@ namespace llarp
|
|||
util::memFn(&AbstractRouter::CheckRenegotiateValid, this),
|
||||
util::memFn(&Router::ConnectionTimedOut, this),
|
||||
util::memFn(&AbstractRouter::SessionClosed, this),
|
||||
util::memFn(&AbstractRouter::PumpLL, this),
|
||||
util::memFn(&AbstractRouter::TriggerPump, this),
|
||||
util::memFn(&AbstractRouter::QueueWork, this));
|
||||
|
||||
if (!link)
|
||||
|
|
|
@ -284,10 +284,10 @@ namespace llarp
|
|||
RoutePoker m_RoutePoker;
|
||||
|
||||
void
|
||||
PumpLL() override;
|
||||
TriggerPump() override;
|
||||
|
||||
void
|
||||
PumpLLNonIdempotent();
|
||||
PumpLL();
|
||||
|
||||
const oxenmq::address DefaultRPCBindAddr = oxenmq::address::tcp("127.0.0.1", 1190);
|
||||
bool enableRPCServer = false;
|
||||
|
|
|
@ -1587,7 +1587,7 @@ namespace llarp
|
|||
if (*ptr == m_Identity.pub.Addr())
|
||||
{
|
||||
ConvoTagTX(tag);
|
||||
m_state->m_Router->PumpLL();
|
||||
m_state->m_Router->TriggerPump();
|
||||
if (not HandleInboundPacket(tag, pkt, t, 0))
|
||||
return false;
|
||||
ConvoTagRX(tag);
|
||||
|
@ -1596,7 +1596,7 @@ namespace llarp
|
|||
}
|
||||
if (not SendToOrQueue(*maybe, pkt, t))
|
||||
return false;
|
||||
m_state->m_Router->PumpLL();
|
||||
m_state->m_Router->TriggerPump();
|
||||
return true;
|
||||
}
|
||||
LogDebug("SendToOrQueue failed: no endpoint for convo tag ", tag);
|
||||
|
@ -1673,7 +1673,7 @@ namespace llarp
|
|||
}
|
||||
|
||||
UpstreamFlush(router);
|
||||
router->PumpLL();
|
||||
router->TriggerPump();
|
||||
}
|
||||
|
||||
std::optional<ConvoTag>
|
||||
|
|
Loading…
Reference in New Issue