Merge pull request #915 from evoskuil/master

evoskuil · web-flow · commit 33a729d71ccc · 2025-12-10T04:19:58.000-05:00
Clean up use of channel trackers, style, use inline.
diff --git a/include/bitcoin/node/channels/channel.hpp b/include/bitcoin/node/channels/channel.hpp
@@ -36,8 +36,8 @@ class BCN_API channel
     DELETE_COPY_MOVE_DESTRUCT(channel);
 
 protected:
-    channel(const network::logger&, const network::socket::ptr&, uint64_t,
-        const node::configuration&) NOEXCEPT
+    inline channel(const network::logger&, const network::socket::ptr&,
+        uint64_t, const node::configuration&) NOEXCEPT
     {
     }
 };
diff --git a/include/bitcoin/node/channels/channel_http.hpp b/include/bitcoin/node/channels/channel_http.hpp
@@ -29,16 +29,18 @@ namespace node {
 
 class BCN_API channel_http
   : public node::channel,
-    public network::channel_http
+    public network::channel_http,
+    protected network::tracker<channel_http>
 {
 public:
-    typedef std::shared_ptr<node::channel_http> ptr;
+    typedef std::shared_ptr<channel_http> ptr;
 
-    channel_http(const network::logger& log,
+    inline channel_http(const network::logger& log,
         const network::socket::ptr& socket, uint64_t identifier,
         const node::configuration& config, const options_t& options) NOEXCEPT
       : node::channel(log, socket, identifier, config),
-        network::channel_http(log, socket, identifier, config.network, options)
+        network::channel_http(log, socket, identifier, config.network, options),
+        network::tracker<channel_http>(log)
     {
     }
 };
diff --git a/include/bitcoin/node/channels/channel_peer.hpp b/include/bitcoin/node/channels/channel_peer.hpp
@@ -30,18 +30,20 @@ namespace node {
 /// Abstract base peer channel state for the node.
 class BCN_API channel_peer
   : public node::channel,
-    public network::channel_peer
+    public network::channel_peer,
+    protected network::tracker<channel_peer>
 {
 public:
-    typedef std::shared_ptr<node::channel_peer> ptr;
+    typedef std::shared_ptr<channel_peer> ptr;
 
-    channel_peer(network::memory& allocator, const network::logger& log,
+    inline channel_peer(network::memory& allocator, const network::logger& log,
         const network::socket::ptr& socket, uint64_t identifier,
         const node::configuration& config, const options_t& options) NOEXCEPT
       : node::channel(log, socket, identifier, config),
         network::channel_peer(allocator, log, socket, identifier,
           config.network, options),
-        announced_(config.node.announcement_cache)
+        announced_(config.node.announcement_cache),
+        network::tracker<channel_peer>(log)
     {
     }
 
diff --git a/include/bitcoin/node/channels/channel_tcp.hpp b/include/bitcoin/node/channels/channel_tcp.hpp
@@ -31,16 +31,18 @@ namespace node {
 /// This is a placeholder for electrum, bitcoind, and stratum v1/v2 channels.
 class BCN_API channel_tcp
   : public node::channel,
-    public network::channel
+    public network::channel,
+    protected network::tracker<channel_tcp>
 {
 public:
-    typedef std::shared_ptr<node::channel_tcp> ptr;
+    typedef std::shared_ptr<channel_tcp> ptr;
 
-    channel_tcp(const network::logger& log, const network::socket::ptr& socket,
-        uint64_t identifier, const node::configuration& config,
-        const options_t& options) NOEXCEPT
+    inline channel_tcp(const network::logger& log,
+        const network::socket::ptr& socket, uint64_t identifier,
+        const node::configuration& config, const options_t& options) NOEXCEPT
       : node::channel(log, socket, identifier, config),
-        network::channel(log, socket, identifier, config.network, options)
+        network::channel(log, socket, identifier, config.network, options),
+        network::tracker<channel_tcp>(log)
     {
     }
 };
diff --git a/include/bitcoin/node/channels/channel_ws.hpp b/include/bitcoin/node/channels/channel_ws.hpp
@@ -29,7 +29,8 @@ namespace node {
 
 class BCN_API channel_ws
   : public node::channel,
-    public network::channel_ws
+    public network::channel_ws,
+    protected network::tracker<channel_ws>
 {
 public:
     typedef std::shared_ptr<node::channel_ws> ptr;
@@ -74,7 +75,8 @@ class BCN_API channel_ws
         const network::socket::ptr& socket, uint64_t identifier,
         const node::configuration& config, const options_t& options) NOEXCEPT
       : node::channel(log, socket, identifier, config),
-        network::channel_ws(log, socket, identifier, config.network, options)
+        network::channel_ws(log, socket, identifier, config.network, options),
+        network::tracker<channel_ws>(log)
     {
     }
 
diff --git a/include/bitcoin/node/protocols/protocol_bitcoind.hpp b/include/bitcoin/node/protocols/protocol_bitcoind.hpp
@@ -34,7 +34,7 @@ class BCN_API protocol_bitcoind
 public:
     typedef std::shared_ptr<protocol_bitcoind> ptr;
 
-    protocol_bitcoind(const auto& session,
+    inline protocol_bitcoind(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_http(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_bitcoind
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_http::start();
     }
diff --git a/include/bitcoin/node/protocols/protocol_electrum.hpp b/include/bitcoin/node/protocols/protocol_electrum.hpp
@@ -34,7 +34,7 @@ class BCN_API protocol_electrum
 public:
     typedef std::shared_ptr<protocol_electrum> ptr;
 
-    protocol_electrum(const auto& session,
+    inline protocol_electrum(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_tcp(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_electrum
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_tcp::start();
     }
diff --git a/include/bitcoin/node/protocols/protocol_explore.hpp b/include/bitcoin/node/protocols/protocol_explore.hpp
@@ -38,7 +38,7 @@ class BCN_API protocol_explore
     using interface = interface::explore;
     using dispatcher = network::rpc::dispatcher<interface>;
 
-    protocol_explore(const auto& session,
+    inline protocol_explore(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_html(session, channel, options),
diff --git a/include/bitcoin/node/protocols/protocol_html.hpp b/include/bitcoin/node/protocols/protocol_html.hpp
@@ -30,20 +30,22 @@ namespace node {
 /// Abstract base for HTML protocols, thread safe.
 class BCN_API protocol_html
   : public node::protocol,
-    public network::protocol_http
+    public network::protocol_http,
+    protected network::tracker<protocol_html>
 {
 public:
     /// http channel, but html settings.
     using options_t = server::settings::html_server;
     using channel_t = node::channel_http;
 
 protected:
-    protocol_html(const auto& session,
+    inline protocol_html(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol_http(session, channel, options),
-        options_(options)
+        options_(options),
+        network::tracker<protocol_html>(session->log)
     {
     }
 
diff --git a/include/bitcoin/node/protocols/protocol_http.hpp b/include/bitcoin/node/protocols/protocol_http.hpp
@@ -40,7 +40,7 @@ class BCN_API protocol_http
     using channel_t = node::channel_http;
 
 protected:
-    protocol_http(const auto& session,
+    inline protocol_http(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),
diff --git a/include/bitcoin/node/protocols/protocol_peer.hpp b/include/bitcoin/node/protocols/protocol_peer.hpp
@@ -44,7 +44,7 @@ class BCN_API protocol_peer
     /// -----------------------------------------------------------------------
     /// static_pointer_cast relies on create_channel().
 
-    protocol_peer(const auto& session,
+    inline protocol_peer(const auto& session,
         const network::channel::ptr& channel) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol_peer(session, channel),
diff --git a/include/bitcoin/node/protocols/protocol_tcp.hpp b/include/bitcoin/node/protocols/protocol_tcp.hpp
@@ -40,7 +40,7 @@ class BCN_API protocol_tcp
     using channel_t = node::channel_tcp;
 
 protected:
-    protocol_tcp(const auto& session,
+    inline protocol_tcp(const auto& session,
         const network::channel::ptr& channel, const options_t&) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol(session, channel),
diff --git a/include/bitcoin/node/protocols/protocol_web.hpp b/include/bitcoin/node/protocols/protocol_web.hpp
@@ -34,7 +34,7 @@ class BCN_API protocol_web
 public:
     typedef std::shared_ptr<protocol_web> ptr;
 
-    protocol_web(const auto& session,
+    inline protocol_web(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_html(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_web
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_html::start();
     }
diff --git a/include/bitcoin/node/protocols/protocol_ws.hpp b/include/bitcoin/node/protocols/protocol_ws.hpp
@@ -39,7 +39,7 @@ class BCN_API protocol_ws
     // Replace base class channel_t (network::channel_ws). 
     using channel_t = node::channel_ws;
 
-    protocol_ws(const auto& session,
+    inline protocol_ws(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),
@@ -49,11 +49,18 @@ class BCN_API protocol_ws
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
+        BC_ASSERT(stranded());
         network::protocol_ws::start();
     }
 
+    inline void stopping(const code& ec) NOEXCEPT override
+    {
+        BC_ASSERT(stranded());
+        network::protocol_ws::stopping(ec);
+    }
+
 private:
     // This is thread safe.
     ////const options_t& options_;
diff --git a/include/bitcoin/node/sessions/session_server.hpp b/include/bitcoin/node/sessions/session_server.hpp
@@ -39,8 +39,8 @@ class full_node;
 /// and attachment can be overridden and/or augmented with other protocols.
 template <typename Protocol>
 class session_server
-  : public network::session_server,
-    public node::session,
+  : public node::session,
+    public network::session_server,
     protected network::tracker<session_server<Protocol>>
 {
 public:
@@ -53,10 +53,10 @@ class session_server
     /// Construct an instance (network should be started).
     inline session_server(full_node& node, uint64_t identifier,
         const options_t& options) NOEXCEPT
-      : network::session_server((network::net&)node, identifier, options),
-        node::session(node),
-        network::tracker<session_server<Protocol>>(node),
-        options_(options)
+      : node::session(node),
+        network::session_server((network::net&)node, identifier, options),
+        options_(options),
+        network::tracker<session_server<Protocol>>(node)
     {
     }
 
diff --git a/src/protocols/protocol_explore.cpp b/src/protocols/protocol_explore.cpp
@@ -1042,8 +1042,8 @@ void protocol_explore::do_get_address_confirmed(uint8_t media, bool turbo,
 // ----------------------------------------------------------------------------
 
 bool protocol_explore::handle_get_address_unconfirmed(const code& ec,
-    interface::address_unconfirmed, uint8_t, uint8_t media,
-    const hash_cptr& hash, bool turbo) NOEXCEPT
+    interface::address_unconfirmed, uint8_t, uint8_t,
+    const hash_cptr&, bool) NOEXCEPT
 {
     if (stopped(ec))
         return false;
@@ -1052,9 +1052,9 @@ bool protocol_explore::handle_get_address_unconfirmed(const code& ec,
     send_not_implemented();
     return true;
         
-    address_handler complete = BIND(complete_get_address, _1, _2, _3);
-    PARALLEL(do_get_address_unconfirmed, media, turbo, hash, std::move(complete));
-    return true;
+    ////address_handler complete = BIND(complete_get_address, _1, _2, _3);
+    ////PARALLEL(do_get_address_unconfirmed, media, turbo, hash, std::move(complete));
+    ////return true;
 }
 
 void protocol_explore::do_get_address_unconfirmed(uint8_t media, bool,

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ class BCN_API channel`
`36`	`36`	`DELETE_COPY_MOVE_DESTRUCT(channel);`
`37`	`37`
`38`	`38`	`protected:`
`39`		`- channel(const network::logger&, const network::socket::ptr&, uint64_t,`
`40`		`- const node::configuration&) NOEXCEPT`
	`39`	`+ inline channel(const network::logger&, const network::socket::ptr&,`
	`40`	`+ uint64_t, const node::configuration&) NOEXCEPT`
`41`	`41`	`{`
`42`	`42`	`}`
`43`	`43`	`};`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ namespace node {`
`29`	`29`
`30`	`30`	`class BCN_API channel_ws`
`31`	`31`	`: public node::channel,`
`32`		`- public network::channel_ws`
	`32`	`+ public network::channel_ws,`
	`33`	`+ protected network::tracker<channel_ws>`
`33`	`34`	`{`
`34`	`35`	`public:`
`35`	`36`	`typedef std::shared_ptr<node::channel_ws> ptr;`
`@@ -74,7 +75,8 @@ class BCN_API channel_ws`
`74`	`75`	`const network::socket::ptr& socket, uint64_t identifier,`
`75`	`76`	`const node::configuration& config, const options_t& options) NOEXCEPT`
`76`	`77`	`: node::channel(log, socket, identifier, config),`
`77`		`- network::channel_ws(log, socket, identifier, config.network, options)`
	`78`	`+ network::channel_ws(log, socket, identifier, config.network, options),`
	`79`	`+ network::tracker<channel_ws>(log)`
`78`	`80`	`{`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class BCN_API protocol_bitcoind`
`34`	`34`	`public:`
`35`	`35`	`typedef std::shared_ptr<protocol_bitcoind> ptr;`
`36`	`36`
`37`		`- protocol_bitcoind(const auto& session,`
	`37`	`+ inline protocol_bitcoind(const auto& session,`
`38`	`38`	`const network::channel::ptr& channel,`
`39`	`39`	`const options_t& options) NOEXCEPT`
`40`	`40`	`: node::protocol_http(session, channel, options),`
`@@ -43,7 +43,7 @@ class BCN_API protocol_bitcoind`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/// Public start is required.`
`46`		`- void start() NOEXCEPT override`
	`46`	`+ inline void start() NOEXCEPT override`
`47`	`47`	`{`
`48`	`48`	`node::protocol_http::start();`
`49`	`49`	`}`