<div dir="ltr">Is that guaranteed to be thread-safe? If so it seems like a good alternative.<div><br></div><div>-- Lang.</div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 30, 2018 at 2:53 PM David Blaikie <<a href="mailto:dblaikie@gmail.com">dblaikie@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">hey, sorry I didn't spot this earlier, but looking at the RPCTypeName traits, would it be possible to implement this without mutable globals & maybe avoid user provided mutexes?<br><br>...<br> static const char* getName() {<br> static const std::string Name = []() {<br> raw_string_ostream(Name) << ... ;<br> }();<br> return Name;<br> } <br><br>This avoids any problems with order of initialization of global statics (eg: if RPC was used from a global initializer - getName could be invoked before the Name std::string had been constructed (before it would be valid to even call 'empty()')).<br><br>(Google's C++ style guide also has issues with global /dtors/ too: <a href="https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables" target="_blank">https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables</a> - but not sure LLVM worries about that particular issue)</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jul 30, 2018 at 2:08 PM Lang Hames via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: lhames<br>
Date: Mon Jul 30 14:08:06 2018<br>
New Revision: 338305<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=338305&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=338305&view=rev</a><br>
Log:<br>
[ORC] Add SerializationTraits for std::set and std::map.<br>
<br>
Also, make SerializationTraits for pairs forward the actual pair<br>
template type arguments to the underlying serializer. This allows, for example,<br>
std::pair<StringRef, bool> to be passed as an argument to an RPC call expecting<br>
a std::pair<std::string, bool>, since there is an underlying serializer from<br>
StringRef to std::string that can be used.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h<br>
llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h?rev=338305&r1=338304&r2=338305&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h?rev=338305&r1=338304&r2=338305&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h (original)<br>
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCSerialization.h Mon Jul 30 14:08:06 2018<br>
@@ -14,7 +14,10 @@<br>
#include "llvm/Support/thread.h"<br>
#include <map><br>
#include <mutex><br>
+#include <set><br>
#include <sstream><br>
+#include <string><br>
+#include <vector><br>
<br>
namespace llvm {<br>
namespace orc {<br>
@@ -205,6 +208,42 @@ std::mutex RPCTypeName<std::vector<T>>::<br>
template <typename T><br>
std::string RPCTypeName<std::vector<T>>::Name;<br>
<br>
+template <typename T> class RPCTypeName<std::set<T>> {<br>
+public:<br>
+ static const char *getName() {<br>
+ std::lock_guard<std::mutex> Lock(NameMutex);<br>
+ if (Name.empty())<br>
+ raw_string_ostream(Name)<br>
+ << "std::set<" << RPCTypeName<T>::getName() << ">";<br>
+ return Name.data();<br>
+ }<br>
+<br>
+private:<br>
+ static std::mutex NameMutex;<br>
+ static std::string Name;<br>
+};<br>
+<br>
+template <typename T> std::mutex RPCTypeName<std::set<T>>::NameMutex;<br>
+template <typename T> std::string RPCTypeName<std::set<T>>::Name;<br>
+<br>
+template <typename K, typename V> class RPCTypeName<std::map<K, V>> {<br>
+public:<br>
+ static const char *getName() {<br>
+ std::lock_guard<std::mutex> Lock(NameMutex);<br>
+ if (Name.empty())<br>
+ raw_string_ostream(Name)<br>
+ << "std::map<" << RPCTypeNameSequence<K, V>() << ">";<br>
+ return Name.data();<br>
+ }<br>
+<br>
+private:<br>
+ static std::mutex NameMutex;<br>
+ static std::string Name;<br>
+};<br>
+<br>
+template <typename K, typename V><br>
+std::mutex RPCTypeName<std::map<K, V>>::NameMutex;<br>
+template <typename K, typename V> std::string RPCTypeName<std::map<K, V>>::Name;<br>
<br>
/// The SerializationTraits<ChannelT, T> class describes how to serialize and<br>
/// deserialize an instance of type T to/from an abstract channel of type<br>
@@ -527,15 +566,20 @@ public:<br>
};<br>
<br>
/// SerializationTraits default specialization for std::pair.<br>
-template <typename ChannelT, typename T1, typename T2><br>
-class SerializationTraits<ChannelT, std::pair<T1, T2>> {<br>
+template <typename ChannelT, typename T1, typename T2, typename T3, typename T4><br>
+class SerializationTraits<ChannelT, std::pair<T1, T2>, std::pair<T3, T4>> {<br>
public:<br>
- static Error serialize(ChannelT &C, const std::pair<T1, T2> &V) {<br>
- return serializeSeq(C, V.first, V.second);<br>
+ static Error serialize(ChannelT &C, const std::pair<T3, T4> &V) {<br>
+ if (auto Err = SerializationTraits<ChannelT, T1, T3>::serialize(C, V.first))<br>
+ return Err;<br>
+ return SerializationTraits<ChannelT, T2, T4>::serialize(C, V.second);<br>
}<br>
<br>
- static Error deserialize(ChannelT &C, std::pair<T1, T2> &V) {<br>
- return deserializeSeq(C, V.first, V.second);<br>
+ static Error deserialize(ChannelT &C, std::pair<T3, T4> &V) {<br>
+ if (auto Err =<br>
+ SerializationTraits<ChannelT, T1, T3>::deserialize(C, V.first))<br>
+ return Err;<br>
+ return SerializationTraits<ChannelT, T2, T4>::deserialize(C, V.second);<br>
}<br>
};<br>
<br>
@@ -589,6 +633,9 @@ public:<br>
<br>
/// Deserialize a std::vector<T> to a std::vector<T>.<br>
static Error deserialize(ChannelT &C, std::vector<T> &V) {<br>
+ assert(V.empty() &&<br>
+ "Expected default-constructed vector to deserialize into");<br>
+<br>
uint64_t Count = 0;<br>
if (auto Err = deserializeSeq(C, Count))<br>
return Err;<br>
@@ -600,6 +647,92 @@ public:<br>
<br>
return Error::success();<br>
}<br>
+};<br>
+<br>
+template <typename ChannelT, typename T, typename T2><br>
+class SerializationTraits<ChannelT, std::set<T>, std::set<T2>> {<br>
+public:<br>
+ /// Serialize a std::set<T> from std::set<T2>.<br>
+ static Error serialize(ChannelT &C, const std::set<T2> &S) {<br>
+ if (auto Err = serializeSeq(C, static_cast<uint64_t>(S.size())))<br>
+ return Err;<br>
+<br>
+ for (const auto &E : S)<br>
+ if (auto Err = SerializationTraits<ChannelT, T, T2>::serialize(C, E))<br>
+ return Err;<br>
+<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ /// Deserialize a std::set<T> to a std::set<T>.<br>
+ static Error deserialize(ChannelT &C, std::set<T2> &S) {<br>
+ assert(S.empty() && "Expected default-constructed set to deserialize into");<br>
+<br>
+ uint64_t Count = 0;<br>
+ if (auto Err = deserializeSeq(C, Count))<br>
+ return Err;<br>
+<br>
+ while (Count-- != 0) {<br>
+ T2 Val;<br>
+ if (auto Err = SerializationTraits<ChannelT, T, T2>::deserialize(C, Val))<br>
+ return Err;<br>
+<br>
+ auto Added = S.insert(Val).second;<br>
+ if (!Added)<br>
+ return make_error<StringError>("Duplicate element in deserialized set",<br>
+ orcError(OrcErrorCode::UnknownORCError));<br>
+ }<br>
+<br>
+ return Error::success();<br>
+ }<br>
+};<br>
+<br>
+template <typename ChannelT, typename K, typename V, typename K2, typename V2><br>
+class SerializationTraits<ChannelT, std::map<K, V>, std::map<K2, V2>> {<br>
+public:<br>
+ /// Serialize a std::map<K, V> from std::map<K2, V2>.<br>
+ static Error serialize(ChannelT &C, const std::map<K2, V2> &M) {<br>
+ if (auto Err = serializeSeq(C, static_cast<uint64_t>(M.size())))<br>
+ return Err;<br>
+<br>
+ for (const auto &E : M) {<br>
+ if (auto Err =<br>
+ SerializationTraits<ChannelT, K, K2>::serialize(C, E.first))<br>
+ return Err;<br>
+ if (auto Err =<br>
+ SerializationTraits<ChannelT, V, V2>::serialize(C, E.second))<br>
+ return Err;<br>
+ }<br>
+<br>
+ return Error::success();<br>
+ }<br>
+<br>
+ /// Deserialize a std::map<K, V> to a std::map<K, V>.<br>
+ static Error deserialize(ChannelT &C, std::map<K2, V2> &M) {<br>
+ assert(M.empty() && "Expected default-constructed map to deserialize into");<br>
+<br>
+ uint64_t Count = 0;<br>
+ if (auto Err = deserializeSeq(C, Count))<br>
+ return Err;<br>
+<br>
+ while (Count-- != 0) {<br>
+ std::pair<K2, V2> Val;<br>
+ if (auto Err =<br>
+ SerializationTraits<ChannelT, K, K2>::deserialize(C, Val.first))<br>
+ return Err;<br>
+<br>
+ if (auto Err =<br>
+ SerializationTraits<ChannelT, V, V2>::deserialize(C, Val.second))<br>
+ return Err;<br>
+<br>
+ auto Added = M.insert(Val).second;<br>
+ if (!Added)<br>
+ return make_error<StringError>("Duplicate element in deserialized map",<br>
+ orcError(OrcErrorCode::UnknownORCError));<br>
+ }<br>
+<br>
+ return Error::success();<br>
+ }<br>
};<br>
<br>
} // end namespace rpc<br>
<br>
Modified: llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp?rev=338305&r1=338304&r2=338305&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp?rev=338305&r1=338304&r2=338305&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp (original)<br>
+++ llvm/trunk/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp Mon Jul 30 14:08:06 2018<br>
@@ -133,10 +133,10 @@ namespace DummyRPCAPI {<br>
};<br>
<br>
class AllTheTypes<br>
- : public Function<AllTheTypes,<br>
- void(int8_t, uint8_t, int16_t, uint16_t, int32_t,<br>
- uint32_t, int64_t, uint64_t, bool, std::string,<br>
- std::vector<int>)> {<br>
+ : public Function<AllTheTypes, void(int8_t, uint8_t, int16_t, uint16_t,<br>
+ int32_t, uint32_t, int64_t, uint64_t,<br>
+ bool, std::string, std::vector<int>,<br>
+ std::set<int>, std::map<int, bool>)> {<br>
public:<br>
static const char* getName() { return "AllTheTypes"; }<br>
};<br>
@@ -451,43 +451,50 @@ TEST(DummyRPC, TestSerialization) {<br>
DummyRPCEndpoint Server(*Channels.second);<br>
<br>
std::thread ServerThread([&]() {<br>
- Server.addHandler<DummyRPCAPI::AllTheTypes>(<br>
- [&](int8_t S8, uint8_t U8, int16_t S16, uint16_t U16,<br>
- int32_t S32, uint32_t U32, int64_t S64, uint64_t U64,<br>
- bool B, std::string S, std::vector<int> V) {<br>
-<br>
- EXPECT_EQ(S8, -101) << "int8_t serialization broken";<br>
- EXPECT_EQ(U8, 250) << "uint8_t serialization broken";<br>
- EXPECT_EQ(S16, -10000) << "int16_t serialization broken";<br>
- EXPECT_EQ(U16, 10000) << "uint16_t serialization broken";<br>
- EXPECT_EQ(S32, -1000000000) << "int32_t serialization broken";<br>
- EXPECT_EQ(U32, 1000000000ULL) << "uint32_t serialization broken";<br>
- EXPECT_EQ(S64, -10000000000) << "int64_t serialization broken";<br>
- EXPECT_EQ(U64, 10000000000ULL) << "uint64_t serialization broken";<br>
- EXPECT_EQ(B, true) << "bool serialization broken";<br>
- EXPECT_EQ(S, "foo") << "std::string serialization broken";<br>
- EXPECT_EQ(V, std::vector<int>({42, 7}))<br>
- << "std::vector serialization broken";<br>
- return Error::success();<br>
- });<br>
-<br>
- {<br>
- // Poke the server to handle the negotiate call.<br>
- auto Err = Server.handleOne();<br>
- EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";<br>
- }<br>
-<br>
- {<br>
- // Poke the server to handle the AllTheTypes call.<br>
- auto Err = Server.handleOne();<br>
- EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";<br>
- }<br>
+ Server.addHandler<DummyRPCAPI::AllTheTypes>([&](int8_t S8, uint8_t U8,<br>
+ int16_t S16, uint16_t U16,<br>
+ int32_t S32, uint32_t U32,<br>
+ int64_t S64, uint64_t U64,<br>
+ bool B, std::string S,<br>
+ std::vector<int> V,<br>
+ std::set<int> S2,<br>
+ std::map<int, bool> M) {<br>
+ EXPECT_EQ(S8, -101) << "int8_t serialization broken";<br>
+ EXPECT_EQ(U8, 250) << "uint8_t serialization broken";<br>
+ EXPECT_EQ(S16, -10000) << "int16_t serialization broken";<br>
+ EXPECT_EQ(U16, 10000) << "uint16_t serialization broken";<br>
+ EXPECT_EQ(S32, -1000000000) << "int32_t serialization broken";<br>
+ EXPECT_EQ(U32, 1000000000ULL) << "uint32_t serialization broken";<br>
+ EXPECT_EQ(S64, -10000000000) << "int64_t serialization broken";<br>
+ EXPECT_EQ(U64, 10000000000ULL) << "uint64_t serialization broken";<br>
+ EXPECT_EQ(B, true) << "bool serialization broken";<br>
+ EXPECT_EQ(S, "foo") << "std::string serialization broken";<br>
+ EXPECT_EQ(V, std::vector<int>({42, 7}))<br>
+ << "std::vector serialization broken";<br>
+ EXPECT_EQ(S2, std::set<int>({7, 42})) << "std::set serialization broken";<br>
+ EXPECT_EQ(M, (std::map<int, bool>({{7, false}, {42, true}})))<br>
+ << "std::map serialization broken";<br>
+ return Error::success();<br>
});<br>
<br>
+ {<br>
+ // Poke the server to handle the negotiate call.<br>
+ auto Err = Server.handleOne();<br>
+ EXPECT_FALSE(!!Err) << "Server failed to handle call to negotiate";<br>
+ }<br>
+<br>
+ {<br>
+ // Poke the server to handle the AllTheTypes call.<br>
+ auto Err = Server.handleOne();<br>
+ EXPECT_FALSE(!!Err) << "Server failed to handle call to void(bool)";<br>
+ }<br>
+ });<br>
<br>
{<br>
// Make an async call.<br>
- std::vector<int> v({42, 7});<br>
+ std::vector<int> V({42, 7});<br>
+ std::set<int> S({7, 42});<br>
+ std::map<int, bool> M({{7, false}, {42, true}});<br>
auto Err = Client.callAsync<DummyRPCAPI::AllTheTypes>(<br>
[](Error Err) {<br>
EXPECT_FALSE(!!Err) << "Async AllTheTypes response handler failed";<br>
@@ -497,7 +504,7 @@ TEST(DummyRPC, TestSerialization) {<br>
static_cast<int16_t>(-10000), static_cast<uint16_t>(10000),<br>
static_cast<int32_t>(-1000000000), static_cast<uint32_t>(1000000000),<br>
static_cast<int64_t>(-10000000000), static_cast<uint64_t>(10000000000),<br>
- true, std::string("foo"), v);<br>
+ true, std::string("foo"), V, S, M);<br>
EXPECT_FALSE(!!Err) << "Client.callAsync failed for AllTheTypes";<br>
}<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>
</blockquote></div>