aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/common-protocol.hh
diff options
context:
space:
mode:
authoreldritch horrors <pennae@lix.systems>2024-05-18 02:35:34 +0200
committereldritch horrors <pennae@lix.systems>2024-07-16 00:57:42 +0000
commita5d1f698417dff4e470eb94c38ad6c4e5ebf38ff (patch)
tree116b887a80fd96f9008bc55c872a24ef1955ca2f /src/libstore/common-protocol.hh
parent5271424d14241ec5cbe7ab3bda85ddeb486cff76 (diff)
libstore: generatorize protocol serializers
this is cursed. deeply and profoundly cursed. under NO CIRCUMSTANCES must protocol serializer helpers be applied to temporaries! doing so will inevitably cause dangling references and cause the entire thing to crash. we need to do this even so to get rid of boost coroutines, and likewise to encapsulate the serializers we suffer today at least a little bit to allow a gradual migration to an actual IPC protocol. (this isn't a problem that's unique to generators. c++ coroutines in general cannot safely take references to arbitrary temporaries since c++ does not have a lifetime system that can make this safe. -sigh-) Change-Id: I2921ba451e04d86798752d140885d3c5cc08e146
Diffstat (limited to 'src/libstore/common-protocol.hh')
-rw-r--r--src/libstore/common-protocol.hh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstore/common-protocol.hh b/src/libstore/common-protocol.hh
index f3f28972a..7f9f2808a 100644
--- a/src/libstore/common-protocol.hh
+++ b/src/libstore/common-protocol.hh
@@ -48,9 +48,10 @@ struct CommonProto
* infer the type instead of having to write it down explicitly.
*/
template<typename T>
- static void write(const Store & store, WriteConn conn, const T & t)
+ [[nodiscard]]
+ static WireFormatGenerator write(const Store & store, WriteConn conn, const T & t)
{
- CommonProto::Serialise<T>::write(store, conn, t);
+ return CommonProto::Serialise<T>::write(store, conn, t);
}
};
@@ -58,7 +59,7 @@ struct CommonProto
struct CommonProto::Serialise< T > \
{ \
static T read(const Store & store, CommonProto::ReadConn conn); \
- static void write(const Store & store, CommonProto::WriteConn conn, const T & str); \
+ [[nodiscard]] static WireFormatGenerator write(const Store & store, CommonProto::WriteConn conn, const T & str); \
}
template<>