Skip to content

Commit 5610981

Browse files
authored
Merge pull request #119 from dr7ana/network-loop-ctor
Construct network from existing loop object
2 parents 8198c31 + bc635ea commit 5610981

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

include/oxen/quic/loop.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ namespace oxen::quic
2424

2525
class Loop
2626
{
27+
friend class Network;
28+
2729
protected:
2830
std::atomic<bool> running{false};
2931
std::shared_ptr<::event_base> ev_loop;

include/oxen/quic/network.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace oxen::quic
1818
{
1919
public:
2020
Network(std::shared_ptr<::event_base> loop_ptr, std::thread::id loop_thread_id);
21+
Network(std::shared_ptr<Loop> ev_loop);
2122
Network();
2223
~Network();
2324

src/network.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ namespace oxen::quic
1515
Network::Network(std::shared_ptr<event_base> loop_ptr, std::thread::id thread_id) :
1616
_loop{std::make_shared<Loop>(std::move(loop_ptr), thread_id)}
1717
{
18-
log::trace(log_cat, "Created network context with pre-existing ev loop thread");
18+
log::trace(log_cat, "Created network context with pre-existing libevent loop and thread!");
19+
}
20+
21+
Network::Network(std::shared_ptr<Loop> ev_loop) : _loop{std::move(ev_loop)}
22+
{
23+
log::trace(log_cat, "Creating network context with pre-existing event loop!");
1924
}
2025

2126
Network::Network() : _loop{std::make_shared<Loop>()} {}

0 commit comments

Comments
 (0)