moveonly: add mp/type-threadmap.h

Author: ryanofsky

CMakeLists.txt

@@ -60,6 +60,7 @@ set(MP_PUBLIC_HEADERS
   include/mp/type-set.h
   include/mp/type-string.h
   include/mp/type-struct.h
+  include/mp/type-threadmap.h
   include/mp/type-tuple.h
   include/mp/type-vector.h
   include/mp/type-void.h

example/types.h

@@ -9,5 +9,6 @@
 #include <mp/type-decay.h>
 #include <mp/type-interface.h>
 #include <mp/type-string.h>
+#include <mp/type-threadmap.h>
 
 #endif // EXAMPLE_TYPES_H

include/mp/proxy-types.h

@@ -297,35 +297,6 @@ void PassField(Priority<0>, TypeList<>, ServerContext& server_context, const Fn&
     BuildField(TypeList<>(), server_context, Make<StructField, Accessor>(results));
 }
 
-template <>
-struct ProxyServer<ThreadMap> final : public virtual ThreadMap::Server
-{
-public:
-    ProxyServer(Connection& connection);
-    kj::Promise<void> makeThread(MakeThreadContext context) override;
-    Connection& m_connection;
-};
-
-template <typename Output>
-void CustomBuildField(TypeList<>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Output&& output,
-    typename std::enable_if<std::is_same<decltype(output.get()), ThreadMap::Client>::value>::type* enable = nullptr)
-{
-    output.set(kj::heap<ProxyServer<ThreadMap>>(invoke_context.connection));
-}
-
-template <typename Input>
-decltype(auto) CustomReadField(TypeList<>,
-    Priority<1>,
-    InvokeContext& invoke_context,
-    Input&& input,
-    typename std::enable_if<std::is_same<decltype(input.get()), ThreadMap::Client>::value>::type* enable = nullptr)
-{
-    invoke_context.connection.m_thread_map = input.get();
-}
-
 template <typename Derived, size_t N = 0>
 struct IterateFieldsHelper
 {

include/mp/type-threadmap.h

@@ -0,0 +1,41 @@
+// Copyright (c) 2025 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef MP_PROXY_TYPE_THREADMAP_H
+#define MP_PROXY_TYPE_THREADMAP_H
+
+#include <mp/util.h>
+
+namespace mp {
+template <>
+struct ProxyServer<ThreadMap> final : public virtual ThreadMap::Server
+{
+public:
+    ProxyServer(Connection& connection);
+    kj::Promise<void> makeThread(MakeThreadContext context) override;
+    Connection& m_connection;
+};
+
+template <typename Output>
+void CustomBuildField(TypeList<>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Output&& output,
+    typename std::enable_if<std::is_same<decltype(output.get()), ThreadMap::Client>::value>::type* enable = nullptr)
+{
+    output.set(kj::heap<ProxyServer<ThreadMap>>(invoke_context.connection));
+}
+
+template <typename Input>
+decltype(auto) CustomReadField(TypeList<>,
+    Priority<1>,
+    InvokeContext& invoke_context,
+    Input&& input,
+    typename std::enable_if<std::is_same<decltype(input.get()), ThreadMap::Client>::value>::type* enable = nullptr)
+{
+    invoke_context.connection.m_thread_map = input.get();
+}
+} // namespace mp
+
+#endif // MP_PROXY_TYPE_THREADMAP_H

src/mp/proxy.cpp

@@ -7,6 +7,7 @@
 #include <mp/proxy-io.h>
 #include <mp/proxy-types.h>
 #include <mp/proxy.capnp.h>
+#include <mp/type-threadmap.h>
 #include <mp/util.h>
 
 #include <assert.h>

test/mp/test/foo-types.h

@@ -15,6 +15,7 @@
 #include <mp/type-set.h>
 #include <mp/type-string.h>
 #include <mp/type-struct.h>
+#include <mp/type-threadmap.h>
 #include <mp/type-vector.h>
 
 namespace mp {