commit 3e2d719dd434c494c07b53112fe59e4892367f8f
author Wyatt Hepler <hepler@google.com> Thu Jun 11 08:28:21 2020 -0700
committer Wyatt Hepler <hepler@google.com> Tue Jun 16 10:12:12 2020 -0700
tree 55c0296f8ac5dbfbeb01093a5ce21b77e4c3b299
parent 70f033e2d42464c70ba884e7d20c9a86b8cb25a5

pw_rpc: Use pw::IntrusiveList for services

Replace the ServiceRegistry and custom intrusive list logic with
pw::IntrusiveList.

Change-Id: Id2b01730593564d167795edd9506a9aa750b45a5

pw_rpc/public/pw_rpc/internal/service.h

diff --git a/pw_rpc/public/pw_rpc/internal/service.h b/pw_rpc/public/pw_rpc/internal/service.h
index fb42585..7e5a96f 100644
--- a/pw_rpc/public/pw_rpc/internal/service.h
+++ b/pw_rpc/public/pw_rpc/internal/service.h
@@ -16,6 +16,7 @@
 #include <cstdint>
 #include <utility>
 
+#include "pw_containers/intrusive_list.h"
 #include "pw_rpc/internal/method.h"
 #include "pw_span/span.h"
 
@@ -23,7 +24,7 @@
 
 // Base class for all RPC services. This cannot be instantiated directly; use a
 // generated subclass instead.
-class Service {
+class Service : public IntrusiveList<Service>::Item {
  public:
   uint32_t id() const { return id_; }
 
@@ -33,14 +34,13 @@
  protected:
   template <typename T>
   constexpr Service(uint32_t id, T&& methods)
-      : id_(id), methods_(std::forward<T>(methods)), next_(nullptr) {}
+      : id_(id), methods_(std::forward<T>(methods)) {}
 
  private:
   friend class ServiceRegistry;
 
   uint32_t id_;
   span<const Method> methods_;
-  Service* next_;
 };
 
 }  // namespace pw::rpc::internal