make it compile

pull/686/head
Jeff Becker 5 years ago
parent 84407b3557
commit ec6a1cfddc
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -51,9 +51,6 @@ namespace llarp
std::unique_ptr< metrics::DefaultManagerGuard > m_metricsManager;
std::unique_ptr< metrics::PublisherScheduler > m_metricsPublisher;
int num_nethreads = 1;
bool singleThreaded = false;
std::unique_ptr< Crypto > crypto;
std::unique_ptr< CryptoManager > cryptoManager;
std::unique_ptr< AbstractRouter > router;

@ -60,20 +60,11 @@ namespace llarp
}
// Router config
if(!singleThreaded && config->router.workerThreads > 0 && !worker)
{
worker = std::make_shared< llarp::thread::ThreadPool >(
config->router.workerThreads, 1024, "llarp-cryptoworker");
}
if(config->router.workerThreads <= 0)
config->router.workerThreads = 1;
if(singleThreaded)
{
num_nethreads = 0;
}
else
{
num_nethreads = config->router.num_nethreads;
}
worker = std::make_shared< llarp::thread::ThreadPool >(
config->router.workerThreads, 1024, "llarp-cryptoworker");
nodedb_dir = config->netdb.nodedb_dir;
@ -415,6 +406,7 @@ extern "C"
struct llarp_main *
llarp_main_init(const char *fname, bool multiProcess)
{
(void)multiProcess;
if(!fname)
fname = "daemon.ini";
char *var = getenv("LLARP_DEBUG");
@ -422,9 +414,8 @@ extern "C"
{
cSetLogLevel(eLogDebug);
}
llarp_main *m = new llarp_main;
m->ctx = std::make_unique< llarp::Context >();
m->ctx->singleThreaded = !multiProcess;
llarp_main *m = new llarp_main;
m->ctx = std::make_unique< llarp::Context >();
if(!m->ctx->LoadConfig(fname))
{
m->ctx->Close();

@ -215,7 +215,8 @@ namespace llarp
, _logic(l)
, paths(this)
, _exitContext(this)
, disk(std::make_shared< llarp::thread::ThreadPool >(1, 1000, "diskworker"))
, disk(std::make_shared< llarp::thread::ThreadPool >(1, 1000,
"diskworker"))
, _dht(llarp_dht_context_new(this))
, inbound_link_msg_parser(this)
, _hiddenServiceContext(this)

Loading…
Cancel
Save