Clean up use of channel trackers, style, use inline.

Author: evoskuil

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
     {
     }
 };

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)
     {
     }
 };

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)
     {
     }
 

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)
     {
     }
 };

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)
     {
     }