mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-02 03:40:12 +00:00
b4440094b0
- util::Mutex is now a std::shared_timed_mutex, which is capable of
exclusive and shared locks.
- util::Lock is still present as a std::lock_guard<util::Mutex>.
- the locking annotations are preserved, but updated to the latest
supported by clang rather than using abseil's older/deprecated ones.
- ACQUIRE_LOCK macro is gone since we don't pass mutexes by pointer into
locks anymore (WTF abseil).
- ReleasableLock is gone. Instead there are now some llarp::util helper
methods to obtain unique and/or shared locks:
- `auto lock = util::unique_lock(mutex);` gets an RAII-but-also
unlockable object (std::unique_lock<T>, with T inferred from
`mutex`).
- `auto lock = util::shared_lock(mutex);` gets an RAII shared (i.e.
"reader") lock of the mutex.
- `auto lock = util::unique_locks(mutex1, mutex2, mutex3);` can be
used to atomically lock multiple mutexes at once (returning a
tuple of the locks).
This are templated on the mutex which makes them a bit more flexible
than using a concrete type: they can be used for any type of lockable
mutex, not only util::Mutex. (Some of the code here uses them for
getting locks around a std::mutex). Until C++17, using the RAII types
is painfully verbose:
```C++
// pre-C++17 - needing to figure out the mutex type here is annoying:
std::unique_lock<util::Mutex> lock(mutex);
// pre-C++17 and even more verbose (but at least the type isn't needed):
std::unique_lock<decltype(mutex)> lock(mutex);
// our compromise:
auto lock = util::unique_lock(mutex);
// C++17:
std::unique_lock lock(mutex);
```
All of these functions will also warn (under gcc or clang) if you
discard the return value. You can also do fancy things like
`auto l = util::unique_lock(mutex, std::adopt_lock)` (which lets a
lock take over an already-locked mutex).
- metrics code is gone, which also removes a big pile of code that was
only used by metrics:
- llarp::util::Scheduler
- llarp:🧵:TimerQueue
- llarp::util::Stopwatch
114 lines
1.9 KiB
C++
114 lines
1.9 KiB
C++
#ifndef LLARP_HPP
|
|
#define LLARP_HPP
|
|
#include <llarp.h>
|
|
#include <util/fs.hpp>
|
|
#include <util/types.hpp>
|
|
#include <ev/ev.hpp>
|
|
|
|
#include <iostream>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
struct llarp_ev_loop;
|
|
struct llarp_nodedb;
|
|
struct llarp_nodedb_iter;
|
|
struct llarp_main;
|
|
|
|
namespace llarp
|
|
{
|
|
class Logic;
|
|
struct AbstractRouter;
|
|
struct Config;
|
|
struct Crypto;
|
|
struct CryptoManager;
|
|
struct RouterContact;
|
|
namespace thread
|
|
{
|
|
class ThreadPool;
|
|
}
|
|
|
|
struct Context
|
|
{
|
|
/// get context from main pointer
|
|
static Context *
|
|
Get(llarp_main *);
|
|
|
|
Context() = default;
|
|
|
|
std::unique_ptr< Crypto > crypto;
|
|
std::unique_ptr< CryptoManager > cryptoManager;
|
|
std::unique_ptr< AbstractRouter > router;
|
|
std::shared_ptr< thread::ThreadPool > worker;
|
|
std::shared_ptr< Logic > logic;
|
|
std::unique_ptr< Config > config;
|
|
std::unique_ptr< llarp_nodedb > nodedb;
|
|
llarp_ev_loop_ptr mainloop;
|
|
std::string nodedb_dir;
|
|
|
|
bool
|
|
LoadConfig(const std::string &fname);
|
|
|
|
void
|
|
Close();
|
|
|
|
int
|
|
LoadDatabase();
|
|
|
|
int
|
|
Setup();
|
|
|
|
int
|
|
Run(llarp_main_runtime_opts opts);
|
|
|
|
void
|
|
HandleSignal(int sig);
|
|
|
|
bool
|
|
Configure();
|
|
|
|
bool
|
|
IsUp() const;
|
|
|
|
bool
|
|
LooksAlive() const;
|
|
|
|
/// close async
|
|
void
|
|
CloseAsync();
|
|
|
|
/// wait until closed and done
|
|
void
|
|
Wait();
|
|
|
|
/// call a function in logic thread
|
|
/// return true if queued for calling
|
|
/// return false if not queued for calling
|
|
bool
|
|
CallSafe(std::function< void(void) > f);
|
|
|
|
private:
|
|
void
|
|
SetPIDFile(const std::string &fname);
|
|
|
|
bool
|
|
WritePIDFile() const;
|
|
|
|
void
|
|
RemovePIDFile() const;
|
|
|
|
void
|
|
SigINT();
|
|
|
|
bool
|
|
ReloadConfig();
|
|
|
|
std::string configfile;
|
|
std::string pidfile;
|
|
std::unique_ptr< std::promise< void > > closeWaiter;
|
|
};
|
|
} // namespace llarp
|
|
|
|
#endif
|