|
|
|
|
@ -12,13 +12,12 @@ static CRITICAL_SECTION HandlerMtx;
|
|
|
|
|
std::list< win32_tun_io* > tun_listeners;
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
begin_tun_loop(int nThreads)
|
|
|
|
|
win32_tun_io::begin_tun_loop(int nThreads)
|
|
|
|
|
{
|
|
|
|
|
kThreadPool = new HANDLE[nThreads];
|
|
|
|
|
for(int i = 0; i < nThreads; ++i)
|
|
|
|
|
{
|
|
|
|
|
kThreadPool[i] =
|
|
|
|
|
CreateThread(nullptr, 0, &tun_ev_loop, nullptr, 0, nullptr);
|
|
|
|
|
kThreadPool[i] = CreateThread(nullptr, 0, &tun_ev_loop, this, 0, nullptr);
|
|
|
|
|
}
|
|
|
|
|
llarp::LogInfo("created ", nThreads, " threads for TUN event queue");
|
|
|
|
|
poolSize = nThreads;
|
|
|
|
|
@ -124,11 +123,48 @@ win32_tun_io::read(byte_t* buf, size_t sz)
|
|
|
|
|
ReadFile(tunif->tun_fd, buf, sz, nullptr, &pkt->pkt);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
tun_ev_tick_and_flush(void* user)
|
|
|
|
|
{
|
|
|
|
|
llarp_tun_io* tun = static_cast< llarp_tun_io* >(user);
|
|
|
|
|
if(tun->tick)
|
|
|
|
|
tun->tick(tun);
|
|
|
|
|
tun->flush(tun);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct tun_pkt_t
|
|
|
|
|
{
|
|
|
|
|
std::vector< byte_t > pkt;
|
|
|
|
|
llarp_tun_io* tun;
|
|
|
|
|
|
|
|
|
|
tun_pkt_t(llarp_tun_io* t, const byte_t* buf, size_t sz) : tun(t), pkt(sz)
|
|
|
|
|
{
|
|
|
|
|
std::copy_n(buf, sz, pkt.begin());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
recv_pkt(void* user)
|
|
|
|
|
{
|
|
|
|
|
tun_pkt_t* pkt = static_cast< tun_pkt_t* >(user);
|
|
|
|
|
pkt->Recv();
|
|
|
|
|
delete pkt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
void
|
|
|
|
|
Recv()
|
|
|
|
|
{
|
|
|
|
|
llarp_buffer_t buf(pkt);
|
|
|
|
|
if(tun->recvpkt)
|
|
|
|
|
tun->recvpkt(tun, buf);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// and now the event loop itself
|
|
|
|
|
extern "C" DWORD FAR PASCAL
|
|
|
|
|
tun_ev_loop(void* unused)
|
|
|
|
|
tun_ev_loop(void* user)
|
|
|
|
|
{
|
|
|
|
|
UNREFERENCED_PARAMETER(unused);
|
|
|
|
|
win32_tun_io* tun_io = static_cast< win32_tun_io* >(user);
|
|
|
|
|
|
|
|
|
|
DWORD size = 0;
|
|
|
|
|
OVERLAPPED* ovl = nullptr;
|
|
|
|
|
@ -148,11 +184,14 @@ tun_ev_loop(void* unused)
|
|
|
|
|
// of the tun logic
|
|
|
|
|
for(const auto& tun : tun_listeners)
|
|
|
|
|
{
|
|
|
|
|
/*
|
|
|
|
|
EnterCriticalSection(&HandlerMtx);
|
|
|
|
|
if(tun->t->tick)
|
|
|
|
|
tun->t->tick(tun->t);
|
|
|
|
|
tun->flush_write();
|
|
|
|
|
LeaveCriticalSection(&HandlerMtx);
|
|
|
|
|
*/
|
|
|
|
|
tun_io->logic->queue_job({tun->t, &tun_ev_tick_and_flush});
|
|
|
|
|
}
|
|
|
|
|
continue; // let's go at it once more
|
|
|
|
|
}
|
|
|
|
|
@ -173,8 +212,10 @@ tun_ev_loop(void* unused)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// EnterCriticalSection(&HandlerMtx);
|
|
|
|
|
if(ev->t->recvpkt)
|
|
|
|
|
ev->t->recvpkt(ev->t, llarp_buffer_t(pkt->buf, size));
|
|
|
|
|
tun_pkt_t* recv_pkt = new tun_pkt_t(ev->t, pkt->buf, size);
|
|
|
|
|
tun_io->logic->queue_job({recv_pkt, &tun_pkt_t::recv_pkt});
|
|
|
|
|
// if(ev->t->recvpkt)
|
|
|
|
|
// ev->t->recvpkt(ev->t, llarp_buffer_t(pkt->buf, size));
|
|
|
|
|
ev->read(ev->readbuf, sizeof(ev->readbuf));
|
|
|
|
|
// LeaveCriticalSection(&HandlerMtx);
|
|
|
|
|
}
|
|
|
|
|
@ -185,11 +226,14 @@ tun_ev_loop(void* unused)
|
|
|
|
|
ev->read(ev->readbuf, sizeof(ev->readbuf));
|
|
|
|
|
// LeaveCriticalSection(&HandlerMtx);
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
EnterCriticalSection(&HandlerMtx);
|
|
|
|
|
if(ev->t->tick)
|
|
|
|
|
ev->t->tick(ev->t);
|
|
|
|
|
ev->flush_write();
|
|
|
|
|
LeaveCriticalSection(&HandlerMtx);
|
|
|
|
|
*/
|
|
|
|
|
tun_io->logic->queue_job({ev->t, &tun_ev_tick_and_flush});
|
|
|
|
|
delete pkt; // don't leak
|
|
|
|
|
}
|
|
|
|
|
llarp::LogDebug("exit TUN event loop thread from system managed thread pool");
|
|
|
|
|
@ -657,4 +701,4 @@ llarp_win32_loop::stop()
|
|
|
|
|
upoll_destroy(upollfd);
|
|
|
|
|
upollfd = nullptr;
|
|
|
|
|
llarp::LogDebug("destroy upoll");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Jeff Becker
5 years ago