mirror of https://github.com/oxen-io/lokinet
Replace libuv with uvw & related refactoring
- removes all the llarp_ev_* functions, replacing with methods/classes/functions in the llarp
namespace.
- banish ev/ev.h to the void
- Passes various things by const lvalue ref, especially shared_ptr's that don't need to be copied
(to avoid an atomic refcount increment/decrement).
- Add a llarp::UDPHandle abstract class for UDP handling
- Removes the UDP tick handler; code that needs tick can just do a separate handler on the event
loop outside the UDP socket.
- Adds an "OwnedBuffer" which owns its own memory but is implicitly convertible to a llarp_buffer_t.
This is mostly needed to take over ownership of buffers from uvw without copying them as,
currently, uvw does its own allocation (pending some open upstream issues/PRs).
- Logic:
- add `make_caller`/`call_forever`/`call_every` utility functions to abstract Call wrapping and
dependent timed tasks.
- Add inLogicThread() so that code can tell its inside the logic thread (typically for
debugging assertions).
- get rid of janky integer returns and dealing with cancellations on call_later: the other methods
added here and the event loop code remove the need for them.
- Event loop:
- redo everything with uvw instead of libuv
- rename EventLoopWakeup::Wakeup to EventLoopWakeup::Trigger to better reflect what it does.
- add EventLoopRepeater for repeated events, and replace the code that reschedules itself every
time it is called with a repeater.
- Split up `EventLoop::run()` into a non-virtual base method and abstract `run_loop()` methods;
the base method does a couple extra setup/teardown things that don't need to be in the derived class.
- udp_listen is replaced with ev->udp(...) which returns a new UDPHandle object rather that
needing gross C-style-but-not-actually-C-compatible structs.
- Remove unused register_poll_fd_(un)readable
- Use shared_ptr for EventLoopWakeup rather than returning a raw pointer; uvw lets us not have to
worry about having the event loop class maintain ownership of it.
- Add factory EventLoop::create() function to create a default (uvw-based) event loop (previously
this was one of the llarp_ev_blahblah unnamespaced functions).
- ev_libuv: this is mostly rewritten; all of the glue code/structs, in particular, are gone as
they are no longer needed with uvw.
- DNS:
- Rename DnsHandler to DnsInterceptor to better describe what it does (this is the code that
intercepts all DNS to the tun IP range for Android).
- endpoint:
- remove unused "isolated network" code
- remove distinct (but actually always the same) variables for router/endpoint logic objects
- llarp_buffer_t
- make constructors type-safe against being called with points to non-size-1 values
- tun packet reading:
- read all available packets off the device/file descriptor; previously we were reading one packet
at a time then returning to the event loop to poll again.
- ReadNextPacket() now returns a 0-size packet if the read would block (so that we can implement
the previous point).
- ReadNextPacket() now throws on I/O error
- Miscellaneous code cleanups/simplifications
pull/1557/head
Jason Rhinelander
3 years ago
parent
c71d3527bd
commit
5b555ee5aa
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 58b299ee60d62386a2339dab3f99d30570b33085
|
||||||
@ -1,88 +0,0 @@
|
|||||||
#ifndef LLARP_EV_H
|
|
||||||
#define LLARP_EV_H
|
|
||||||
|
|
||||||
#include <net/ip_address.hpp>
|
|
||||||
#include <util/buffer.hpp>
|
|
||||||
#include <util/time.hpp>
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <winsock2.h>
|
|
||||||
#include <ws2tcpip.h>
|
|
||||||
#include <wspiapi.h>
|
|
||||||
#else
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#endif
|
|
||||||
#include <net/net_if.hpp>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
#include <cstdlib>
|
|
||||||
|
|
||||||
#include <constants/evloop.hpp>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ev.h
|
|
||||||
*
|
|
||||||
* event handler (cross platform high performance event system for IO)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define EV_TICK_INTERVAL 10
|
|
||||||
|
|
||||||
namespace llarp
|
|
||||||
{
|
|
||||||
class Logic;
|
|
||||||
struct EventLoop;
|
|
||||||
} // namespace llarp
|
|
||||||
|
|
||||||
using llarp_ev_loop_ptr = std::shared_ptr<llarp::EventLoop>;
|
|
||||||
|
|
||||||
/// make an event loop using our baked in event loop on Windows
|
|
||||||
/// make an event loop using libuv otherwise.
|
|
||||||
/// @param queue_size how big the logic job queue is
|
|
||||||
llarp_ev_loop_ptr
|
|
||||||
llarp_make_ev_loop(std::size_t queue_size = llarp::event_loop_queue_size);
|
|
||||||
|
|
||||||
// run mainloop
|
|
||||||
void
|
|
||||||
llarp_ev_loop_run_single_process(llarp_ev_loop_ptr ev, std::shared_ptr<llarp::Logic> logic);
|
|
||||||
|
|
||||||
/// get the current time on the event loop
|
|
||||||
llarp_time_t
|
|
||||||
llarp_ev_loop_time_now_ms(const llarp_ev_loop_ptr& ev);
|
|
||||||
|
|
||||||
/// stop event loop and wait for it to complete all jobs
|
|
||||||
void
|
|
||||||
llarp_ev_loop_stop(const llarp_ev_loop_ptr& ev);
|
|
||||||
|
|
||||||
/// UDP handling configuration
|
|
||||||
struct llarp_udp_io
|
|
||||||
{
|
|
||||||
/// set after added
|
|
||||||
int fd;
|
|
||||||
void* user;
|
|
||||||
void* impl;
|
|
||||||
llarp::EventLoop* parent;
|
|
||||||
|
|
||||||
/// called every event loop tick after reads
|
|
||||||
void (*tick)(struct llarp_udp_io*);
|
|
||||||
|
|
||||||
void (*recvfrom)(struct llarp_udp_io*, const llarp::SockAddr& source, ManagedBuffer);
|
|
||||||
/// set by parent
|
|
||||||
int (*sendto)(struct llarp_udp_io*, const llarp::SockAddr&, const byte_t*, size_t);
|
|
||||||
};
|
|
||||||
|
|
||||||
/// add UDP handler
|
|
||||||
int
|
|
||||||
llarp_ev_add_udp(const llarp_ev_loop_ptr& ev, struct llarp_udp_io* udp, const llarp::SockAddr& src);
|
|
||||||
|
|
||||||
/// send a UDP packet
|
|
||||||
int
|
|
||||||
llarp_ev_udp_sendto(struct llarp_udp_io* udp, const llarp::SockAddr& to, const llarp_buffer_t& pkt);
|
|
||||||
|
|
||||||
/// close UDP handler
|
|
||||||
int
|
|
||||||
llarp_ev_close_udp(struct llarp_udp_io* udp);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
#include "ev.hpp"
|
||||||
|
#include "../util/buffer.hpp"
|
||||||
|
|
||||||
|
namespace llarp
|
||||||
|
{
|
||||||
|
// Base type for UDP handling; constructed via EventLoop::udp().
|
||||||
|
struct UDPHandle
|
||||||
|
{
|
||||||
|
using ReceiveFunc = EventLoop::UDPReceiveFunc;
|
||||||
|
|
||||||
|
// Starts listening for incoming UDP packets on the given address. Returns true on success,
|
||||||
|
// false if the address could not be bound. If you send without calling this first then the
|
||||||
|
// socket will bind to a random high port on 0.0.0.0 (the "all addresses" address).
|
||||||
|
virtual bool
|
||||||
|
listen(const SockAddr& addr) = 0;
|
||||||
|
|
||||||
|
// Sends a packet to the given recipient, immediately. Returns true if the send succeeded,
|
||||||
|
// false it could not be performed (either because of error, or because it would have blocked).
|
||||||
|
// If listen hasn't been called then a random IP/port will be used.
|
||||||
|
virtual bool
|
||||||
|
send(const SockAddr& dest, const llarp_buffer_t& buf) = 0;
|
||||||
|
|
||||||
|
// Closes the listening UDP socket (if opened); this is typically called (automatically) during
|
||||||
|
// destruction. Does nothing if the UDP socket is already closed.
|
||||||
|
virtual void
|
||||||
|
close() = 0;
|
||||||
|
|
||||||
|
// Base class destructor
|
||||||
|
virtual ~UDPHandle() = default;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
explicit UDPHandle(ReceiveFunc on_recv) : on_recv{std::move(on_recv)}
|
||||||
|
{
|
||||||
|
// It makes no sense at all to use this with a null receive function:
|
||||||
|
assert(this->on_recv);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Callback to invoke when data is received
|
||||||
|
ReceiveFunc on_recv;
|
||||||
|
};
|
||||||
|
} // namespace llarp
|
||||||
Loading…
Reference in New Issue