[llvm] r281171 - [ORC] Rename RPCChannel to RPCByteChannel. NFC.
Duncan P. N. Exon Smith via llvm-commits
llvm-commits at lists.llvm.org
Sun Sep 11 12:09:06 PDT 2016
It looks like you missed the unit tests:
http://lab.llvm.org:8011/builders/clang-x86_64-linux-selfhost-modules/builds/19522
--
[ 92%] Building CXX object unittests/ExecutionEngine/Orc/CMakeFiles/OrcJITTests.dir/RPCUtilsTest.cpp.o
/home/buildbot/modules-slave-1/clang-x86_64-linux-selfhost-modules/llvm.src/unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp:10:10: fatal error: 'llvm/ExecutionEngine/Orc/RPCChannel.h' file not found
#include "llvm/ExecutionEngine/Orc/RPCChannel.h"
^
--
> On 2016-Sep-11, at 11:41, Lang Hames via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>
> Author: lhames
> Date: Sun Sep 11 13:41:05 2016
> New Revision: 281171
>
> URL: http://llvm.org/viewvc/llvm-project?rev=281171&view=rev
> Log:
> [ORC] Rename RPCChannel to RPCByteChannel. NFC.
>
> Added:
> llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCByteChannel.h
> - copied, changed from r281170, llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h
> Removed:
> llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h
> Modified:
> llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
> llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
> llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
> llvm/trunk/tools/lli/RemoteJITUtils.h
> llvm/trunk/tools/lli/lli.cpp
>
> Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h?rev=281171&r1=281170&r2=281171&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h Sun Sep 11 13:41:05 2016
> @@ -8,8 +8,8 @@
> //===----------------------------------------------------------------------===//
> //
> // This file defines the OrcRemoteTargetClient class and helpers. This class
> -// can be used to communicate over an RPCChannel with an OrcRemoteTargetServer
> -// instance to support remote-JITing.
> +// can be used to communicate over an RPCByteChannel with an
> +// OrcRemoteTargetServer instance to support remote-JITing.
> //
> //===----------------------------------------------------------------------===//
>
> @@ -601,7 +601,7 @@ public:
> Expected<int> callIntVoid(JITTargetAddress Addr) {
> DEBUG(dbgs() << "Calling int(*)(void) " << format("0x%016x", Addr) << "\n");
>
> - auto Listen = [&](RPCChannel &C, uint32_t Id) {
> + auto Listen = [&](RPCByteChannel &C, uint32_t Id) {
> return listenForCompileRequests(C, Id);
> };
> return callSTHandling<CallIntVoid>(Channel, Listen, Addr);
> @@ -614,7 +614,7 @@ public:
> DEBUG(dbgs() << "Calling int(*)(int, char*[]) " << format("0x%016x", Addr)
> << "\n");
>
> - auto Listen = [&](RPCChannel &C, uint32_t Id) {
> + auto Listen = [&](RPCByteChannel &C, uint32_t Id) {
> return listenForCompileRequests(C, Id);
> };
> return callSTHandling<CallMain>(Channel, Listen, Addr, Args);
> @@ -626,7 +626,7 @@ public:
> DEBUG(dbgs() << "Calling void(*)(void) " << format("0x%016x", Addr)
> << "\n");
>
> - auto Listen = [&](RPCChannel &C, uint32_t Id) {
> + auto Listen = [&](RPCByteChannel &C, uint32_t Id) {
> return listenForCompileRequests(C, Id);
> };
> return callSTHandling<CallVoidVoid>(Channel, Listen, Addr);
> @@ -736,7 +736,7 @@ private:
>
> uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
>
> - Error listenForCompileRequests(RPCChannel &C, uint32_t &Id) {
> + Error listenForCompileRequests(RPCByteChannel &C, uint32_t &Id) {
> assert(CallbackManager &&
> "No calback manager. enableCompileCallbacks must be called first");
>
>
> Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h?rev=281171&r1=281170&r2=281171&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h Sun Sep 11 13:41:05 2016
> @@ -16,7 +16,7 @@
> #ifndef LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETRPCAPI_H
> #define LLVM_EXECUTIONENGINE_ORC_ORCREMOTETARGETRPCAPI_H
>
> -#include "RPCChannel.h"
> +#include "RPCByteChannel.h"
> #include "RPCUtils.h"
> #include "llvm/ExecutionEngine/JITSymbol.h"
>
> @@ -40,7 +40,7 @@ private:
> uint64_t Size;
> };
>
> -inline Error serialize(RPCChannel &C, const DirectBufferWriter &DBW) {
> +inline Error serialize(RPCByteChannel &C, const DirectBufferWriter &DBW) {
> if (auto EC = serialize(C, DBW.getDst()))
> return EC;
> if (auto EC = serialize(C, DBW.getSize()))
> @@ -48,7 +48,7 @@ inline Error serialize(RPCChannel &C, co
> return C.appendBytes(DBW.getSrc(), DBW.getSize());
> }
>
> -inline Error deserialize(RPCChannel &C, DirectBufferWriter &DBW) {
> +inline Error deserialize(RPCByteChannel &C, DirectBufferWriter &DBW) {
> JITTargetAddress Dst;
> if (auto EC = deserialize(C, Dst))
> return EC;
> @@ -62,7 +62,7 @@ inline Error deserialize(RPCChannel &C,
> return C.readBytes(Addr, Size);
> }
>
> -class OrcRemoteTargetRPCAPI : public RPC<RPCChannel> {
> +class OrcRemoteTargetRPCAPI : public RPC<RPCByteChannel> {
> protected:
> class ResourceIdMgr {
> public:
>
> Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h?rev=281171&r1=281170&r2=281171&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h Sun Sep 11 13:41:05 2016
> @@ -119,7 +119,7 @@ public:
> }
>
> Expected<JITTargetAddress> requestCompile(JITTargetAddress TrampolineAddr) {
> - auto Listen = [&](RPCChannel &C, uint32_t Id) {
> + auto Listen = [&](RPCByteChannel &C, uint32_t Id) {
> return handleKnownFunction(static_cast<JITFuncId>(Id));
> };
>
>
> Copied: llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCByteChannel.h (from r281170, llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h)
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCByteChannel.h?p2=llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCByteChannel.h&p1=llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h&r1=281170&r2=281171&rev=281171&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCByteChannel.h Sun Sep 11 13:41:05 2016
> @@ -1,4 +1,4 @@
> -//===- llvm/ExecutionEngine/Orc/RPCChannel.h --------------------*- C++ -*-===//
> +//===- llvm/ExecutionEngine/Orc/RPCByteChannel.h ----------------*- C++ -*-===//
> //
> // The LLVM Compiler Infrastructure
> //
> @@ -7,8 +7,8 @@
> //
> //===----------------------------------------------------------------------===//
>
> -#ifndef LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
> -#define LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
> +#ifndef LLVM_EXECUTIONENGINE_ORC_RPCBYTECHANNEL_H
> +#define LLVM_EXECUTIONENGINE_ORC_RPCBYTECHANNEL_H
>
> #include "OrcError.h"
> #include "llvm/ADT/ArrayRef.h"
> @@ -28,9 +28,9 @@ namespace orc {
> namespace remote {
>
> /// Interface for byte-streams to be used with RPC.
> -class RPCChannel {
> +class RPCByteChannel {
> public:
> - virtual ~RPCChannel() {}
> + virtual ~RPCByteChannel() {}
>
> /// Read Size bytes from the stream into *Dst.
> virtual Error readBytes(char *Dst, unsigned Size) = 0;
> @@ -53,53 +53,53 @@ private:
>
> /// Notify the channel that we're starting a message send.
> /// Locks the channel for writing.
> -inline Error startSendMessage(RPCChannel &C) {
> +inline Error startSendMessage(RPCByteChannel &C) {
> C.getWriteLock().lock();
> return Error::success();
> }
>
> /// Notify the channel that we're ending a message send.
> /// Unlocks the channel for writing.
> -inline Error endSendMessage(RPCChannel &C) {
> +inline Error endSendMessage(RPCByteChannel &C) {
> C.getWriteLock().unlock();
> return Error::success();
> }
>
> /// Notify the channel that we're starting a message receive.
> /// Locks the channel for reading.
> -inline Error startReceiveMessage(RPCChannel &C) {
> +inline Error startReceiveMessage(RPCByteChannel &C) {
> C.getReadLock().lock();
> return Error::success();
> }
>
> /// Notify the channel that we're ending a message receive.
> /// Unlocks the channel for reading.
> -inline Error endReceiveMessage(RPCChannel &C) {
> +inline Error endReceiveMessage(RPCByteChannel &C) {
> C.getReadLock().unlock();
> return Error::success();
> }
>
> /// RPC channel serialization for a variadic list of arguments.
> template <typename T, typename... Ts>
> -Error serializeSeq(RPCChannel &C, const T &Arg, const Ts &... Args) {
> +Error serializeSeq(RPCByteChannel &C, const T &Arg, const Ts &... Args) {
> if (auto Err = serialize(C, Arg))
> return Err;
> return serializeSeq(C, Args...);
> }
>
> /// RPC channel serialization for an (empty) variadic list of arguments.
> -inline Error serializeSeq(RPCChannel &C) { return Error::success(); }
> +inline Error serializeSeq(RPCByteChannel &C) { return Error::success(); }
>
> /// RPC channel deserialization for a variadic list of arguments.
> template <typename T, typename... Ts>
> -Error deserializeSeq(RPCChannel &C, T &Arg, Ts &... Args) {
> +Error deserializeSeq(RPCByteChannel &C, T &Arg, Ts &... Args) {
> if (auto Err = deserialize(C, Arg))
> return Err;
> return deserializeSeq(C, Args...);
> }
>
> /// RPC channel serialization for an (empty) variadic list of arguments.
> -inline Error deserializeSeq(RPCChannel &C) { return Error::success(); }
> +inline Error deserializeSeq(RPCByteChannel &C) { return Error::success(); }
>
> /// RPC channel serialization for integer primitives.
> template <typename T>
> @@ -109,7 +109,7 @@ typename std::enable_if<
> std::is_same<T, uint16_t>::value || std::is_same<T, int16_t>::value ||
> std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value,
> Error>::type
> -serialize(RPCChannel &C, T V) {
> +serialize(RPCByteChannel &C, T V) {
> support::endian::byte_swap<T, support::big>(V);
> return C.appendBytes(reinterpret_cast<const char *>(&V), sizeof(T));
> }
> @@ -122,7 +122,7 @@ typename std::enable_if<
> std::is_same<T, uint16_t>::value || std::is_same<T, int16_t>::value ||
> std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value,
> Error>::type
> -deserialize(RPCChannel &C, T &V) {
> +deserialize(RPCByteChannel &C, T &V) {
> if (auto Err = C.readBytes(reinterpret_cast<char *>(&V), sizeof(T)))
> return Err;
> support::endian::byte_swap<T, support::big>(V);
> @@ -132,14 +132,14 @@ deserialize(RPCChannel &C, T &V) {
> /// RPC channel serialization for enums.
> template <typename T>
> typename std::enable_if<std::is_enum<T>::value, Error>::type
> -serialize(RPCChannel &C, T V) {
> +serialize(RPCByteChannel &C, T V) {
> return serialize(C, static_cast<typename std::underlying_type<T>::type>(V));
> }
>
> /// RPC channel deserialization for enums.
> template <typename T>
> typename std::enable_if<std::is_enum<T>::value, Error>::type
> -deserialize(RPCChannel &C, T &V) {
> +deserialize(RPCByteChannel &C, T &V) {
> typename std::underlying_type<T>::type Tmp;
> Error Err = deserialize(C, Tmp);
> V = static_cast<T>(Tmp);
> @@ -147,13 +147,13 @@ deserialize(RPCChannel &C, T &V) {
> }
>
> /// RPC channel serialization for bools.
> -inline Error serialize(RPCChannel &C, bool V) {
> +inline Error serialize(RPCByteChannel &C, bool V) {
> uint8_t VN = V ? 1 : 0;
> return C.appendBytes(reinterpret_cast<const char *>(&VN), 1);
> }
>
> /// RPC channel deserialization for bools.
> -inline Error deserialize(RPCChannel &C, bool &V) {
> +inline Error deserialize(RPCByteChannel &C, bool &V) {
> uint8_t VN = 0;
> if (auto Err = C.readBytes(reinterpret_cast<char *>(&VN), 1))
> return Err;
> @@ -165,19 +165,19 @@ inline Error deserialize(RPCChannel &C,
> /// RPC channel serialization for StringRefs.
> /// Note: There is no corresponding deseralization for this, as StringRef
> /// doesn't own its memory and so can't hold the deserialized data.
> -inline Error serialize(RPCChannel &C, StringRef S) {
> +inline Error serialize(RPCByteChannel &C, StringRef S) {
> if (auto Err = serialize(C, static_cast<uint64_t>(S.size())))
> return Err;
> return C.appendBytes((const char *)S.bytes_begin(), S.size());
> }
>
> /// RPC channel serialization for std::strings.
> -inline Error serialize(RPCChannel &C, const std::string &S) {
> +inline Error serialize(RPCByteChannel &C, const std::string &S) {
> return serialize(C, StringRef(S));
> }
>
> /// RPC channel deserialization for std::strings.
> -inline Error deserialize(RPCChannel &C, std::string &S) {
> +inline Error deserialize(RPCByteChannel &C, std::string &S) {
> uint64_t Count;
> if (auto Err = deserialize(C, Count))
> return Err;
> @@ -187,32 +187,32 @@ inline Error deserialize(RPCChannel &C,
>
> // Serialization helper for std::tuple.
> template <typename TupleT, size_t... Is>
> -inline Error serializeTupleHelper(RPCChannel &C, const TupleT &V,
> +inline Error serializeTupleHelper(RPCByteChannel &C, const TupleT &V,
> llvm::index_sequence<Is...> _) {
> return serializeSeq(C, std::get<Is>(V)...);
> }
>
> /// RPC channel serialization for std::tuple.
> template <typename... ArgTs>
> -inline Error serialize(RPCChannel &C, const std::tuple<ArgTs...> &V) {
> +inline Error serialize(RPCByteChannel &C, const std::tuple<ArgTs...> &V) {
> return serializeTupleHelper(C, V, llvm::index_sequence_for<ArgTs...>());
> }
>
> // Serialization helper for std::tuple.
> template <typename TupleT, size_t... Is>
> -inline Error deserializeTupleHelper(RPCChannel &C, TupleT &V,
> +inline Error deserializeTupleHelper(RPCByteChannel &C, TupleT &V,
> llvm::index_sequence<Is...> _) {
> return deserializeSeq(C, std::get<Is>(V)...);
> }
>
> /// RPC channel deserialization for std::tuple.
> template <typename... ArgTs>
> -inline Error deserialize(RPCChannel &C, std::tuple<ArgTs...> &V) {
> +inline Error deserialize(RPCByteChannel &C, std::tuple<ArgTs...> &V) {
> return deserializeTupleHelper(C, V, llvm::index_sequence_for<ArgTs...>());
> }
>
> /// RPC channel serialization for ArrayRef<T>.
> -template <typename T> Error serialize(RPCChannel &C, const ArrayRef<T> &A) {
> +template <typename T> Error serialize(RPCByteChannel &C, const ArrayRef<T> &A) {
> if (auto Err = serialize(C, static_cast<uint64_t>(A.size())))
> return Err;
>
> @@ -224,12 +224,13 @@ template <typename T> Error serialize(RP
> }
>
> /// RPC channel serialization for std::array<T>.
> -template <typename T> Error serialize(RPCChannel &C, const std::vector<T> &V) {
> +template <typename T> Error serialize(RPCByteChannel &C,
> + const std::vector<T> &V) {
> return serialize(C, ArrayRef<T>(V));
> }
>
> /// RPC channel deserialization for std::array<T>.
> -template <typename T> Error deserialize(RPCChannel &C, std::vector<T> &V) {
> +template <typename T> Error deserialize(RPCByteChannel &C, std::vector<T> &V) {
> uint64_t Count = 0;
> if (auto Err = deserialize(C, Count))
> return Err;
> @@ -246,4 +247,4 @@ template <typename T> Error deserialize(
> } // end namespace orc
> } // end namespace llvm
>
> -#endif // LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
> +#endif // LLVM_EXECUTIONENGINE_ORC_RPCBYTECHANNEL_H
>
> Removed: llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h?rev=281170&view=auto
> ==============================================================================
> --- llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h (original)
> +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/RPCChannel.h (removed)
> @@ -1,249 +0,0 @@
> -//===- llvm/ExecutionEngine/Orc/RPCChannel.h --------------------*- C++ -*-===//
> -//
> -// The LLVM Compiler Infrastructure
> -//
> -// This file is distributed under the University of Illinois Open Source
> -// License. See LICENSE.TXT for details.
> -//
> -//===----------------------------------------------------------------------===//
> -
> -#ifndef LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
> -#define LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
> -
> -#include "OrcError.h"
> -#include "llvm/ADT/ArrayRef.h"
> -#include "llvm/ADT/STLExtras.h"
> -#include "llvm/ADT/StringRef.h"
> -#include "llvm/Support/Endian.h"
> -#include "llvm/Support/Error.h"
> -#include <cstddef>
> -#include <cstdint>
> -#include <mutex>
> -#include <string>
> -#include <tuple>
> -#include <vector>
> -
> -namespace llvm {
> -namespace orc {
> -namespace remote {
> -
> -/// Interface for byte-streams to be used with RPC.
> -class RPCChannel {
> -public:
> - virtual ~RPCChannel() {}
> -
> - /// Read Size bytes from the stream into *Dst.
> - virtual Error readBytes(char *Dst, unsigned Size) = 0;
> -
> - /// Read size bytes from *Src and append them to the stream.
> - virtual Error appendBytes(const char *Src, unsigned Size) = 0;
> -
> - /// Flush the stream if possible.
> - virtual Error send() = 0;
> -
> - /// Get the lock for stream reading.
> - std::mutex &getReadLock() { return readLock; }
> -
> - /// Get the lock for stream writing.
> - std::mutex &getWriteLock() { return writeLock; }
> -
> -private:
> - std::mutex readLock, writeLock;
> -};
> -
> -/// Notify the channel that we're starting a message send.
> -/// Locks the channel for writing.
> -inline Error startSendMessage(RPCChannel &C) {
> - C.getWriteLock().lock();
> - return Error::success();
> -}
> -
> -/// Notify the channel that we're ending a message send.
> -/// Unlocks the channel for writing.
> -inline Error endSendMessage(RPCChannel &C) {
> - C.getWriteLock().unlock();
> - return Error::success();
> -}
> -
> -/// Notify the channel that we're starting a message receive.
> -/// Locks the channel for reading.
> -inline Error startReceiveMessage(RPCChannel &C) {
> - C.getReadLock().lock();
> - return Error::success();
> -}
> -
> -/// Notify the channel that we're ending a message receive.
> -/// Unlocks the channel for reading.
> -inline Error endReceiveMessage(RPCChannel &C) {
> - C.getReadLock().unlock();
> - return Error::success();
> -}
> -
> -/// RPC channel serialization for a variadic list of arguments.
> -template <typename T, typename... Ts>
> -Error serializeSeq(RPCChannel &C, const T &Arg, const Ts &... Args) {
> - if (auto Err = serialize(C, Arg))
> - return Err;
> - return serializeSeq(C, Args...);
> -}
> -
> -/// RPC channel serialization for an (empty) variadic list of arguments.
> -inline Error serializeSeq(RPCChannel &C) { return Error::success(); }
> -
> -/// RPC channel deserialization for a variadic list of arguments.
> -template <typename T, typename... Ts>
> -Error deserializeSeq(RPCChannel &C, T &Arg, Ts &... Args) {
> - if (auto Err = deserialize(C, Arg))
> - return Err;
> - return deserializeSeq(C, Args...);
> -}
> -
> -/// RPC channel serialization for an (empty) variadic list of arguments.
> -inline Error deserializeSeq(RPCChannel &C) { return Error::success(); }
> -
> -/// RPC channel serialization for integer primitives.
> -template <typename T>
> -typename std::enable_if<
> - std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||
> - std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||
> - std::is_same<T, uint16_t>::value || std::is_same<T, int16_t>::value ||
> - std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value,
> - Error>::type
> -serialize(RPCChannel &C, T V) {
> - support::endian::byte_swap<T, support::big>(V);
> - return C.appendBytes(reinterpret_cast<const char *>(&V), sizeof(T));
> -}
> -
> -/// RPC channel deserialization for integer primitives.
> -template <typename T>
> -typename std::enable_if<
> - std::is_same<T, uint64_t>::value || std::is_same<T, int64_t>::value ||
> - std::is_same<T, uint32_t>::value || std::is_same<T, int32_t>::value ||
> - std::is_same<T, uint16_t>::value || std::is_same<T, int16_t>::value ||
> - std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value,
> - Error>::type
> -deserialize(RPCChannel &C, T &V) {
> - if (auto Err = C.readBytes(reinterpret_cast<char *>(&V), sizeof(T)))
> - return Err;
> - support::endian::byte_swap<T, support::big>(V);
> - return Error::success();
> -}
> -
> -/// RPC channel serialization for enums.
> -template <typename T>
> -typename std::enable_if<std::is_enum<T>::value, Error>::type
> -serialize(RPCChannel &C, T V) {
> - return serialize(C, static_cast<typename std::underlying_type<T>::type>(V));
> -}
> -
> -/// RPC channel deserialization for enums.
> -template <typename T>
> -typename std::enable_if<std::is_enum<T>::value, Error>::type
> -deserialize(RPCChannel &C, T &V) {
> - typename std::underlying_type<T>::type Tmp;
> - Error Err = deserialize(C, Tmp);
> - V = static_cast<T>(Tmp);
> - return Err;
> -}
> -
> -/// RPC channel serialization for bools.
> -inline Error serialize(RPCChannel &C, bool V) {
> - uint8_t VN = V ? 1 : 0;
> - return C.appendBytes(reinterpret_cast<const char *>(&VN), 1);
> -}
> -
> -/// RPC channel deserialization for bools.
> -inline Error deserialize(RPCChannel &C, bool &V) {
> - uint8_t VN = 0;
> - if (auto Err = C.readBytes(reinterpret_cast<char *>(&VN), 1))
> - return Err;
> -
> - V = (VN != 0);
> - return Error::success();
> -}
> -
> -/// RPC channel serialization for StringRefs.
> -/// Note: There is no corresponding deseralization for this, as StringRef
> -/// doesn't own its memory and so can't hold the deserialized data.
> -inline Error serialize(RPCChannel &C, StringRef S) {
> - if (auto Err = serialize(C, static_cast<uint64_t>(S.size())))
> - return Err;
> - return C.appendBytes((const char *)S.bytes_begin(), S.size());
> -}
> -
> -/// RPC channel serialization for std::strings.
> -inline Error serialize(RPCChannel &C, const std::string &S) {
> - return serialize(C, StringRef(S));
> -}
> -
> -/// RPC channel deserialization for std::strings.
> -inline Error deserialize(RPCChannel &C, std::string &S) {
> - uint64_t Count;
> - if (auto Err = deserialize(C, Count))
> - return Err;
> - S.resize(Count);
> - return C.readBytes(&S[0], Count);
> -}
> -
> -// Serialization helper for std::tuple.
> -template <typename TupleT, size_t... Is>
> -inline Error serializeTupleHelper(RPCChannel &C, const TupleT &V,
> - llvm::index_sequence<Is...> _) {
> - return serializeSeq(C, std::get<Is>(V)...);
> -}
> -
> -/// RPC channel serialization for std::tuple.
> -template <typename... ArgTs>
> -inline Error serialize(RPCChannel &C, const std::tuple<ArgTs...> &V) {
> - return serializeTupleHelper(C, V, llvm::index_sequence_for<ArgTs...>());
> -}
> -
> -// Serialization helper for std::tuple.
> -template <typename TupleT, size_t... Is>
> -inline Error deserializeTupleHelper(RPCChannel &C, TupleT &V,
> - llvm::index_sequence<Is...> _) {
> - return deserializeSeq(C, std::get<Is>(V)...);
> -}
> -
> -/// RPC channel deserialization for std::tuple.
> -template <typename... ArgTs>
> -inline Error deserialize(RPCChannel &C, std::tuple<ArgTs...> &V) {
> - return deserializeTupleHelper(C, V, llvm::index_sequence_for<ArgTs...>());
> -}
> -
> -/// RPC channel serialization for ArrayRef<T>.
> -template <typename T> Error serialize(RPCChannel &C, const ArrayRef<T> &A) {
> - if (auto Err = serialize(C, static_cast<uint64_t>(A.size())))
> - return Err;
> -
> - for (const auto &E : A)
> - if (auto Err = serialize(C, E))
> - return Err;
> -
> - return Error::success();
> -}
> -
> -/// RPC channel serialization for std::array<T>.
> -template <typename T> Error serialize(RPCChannel &C, const std::vector<T> &V) {
> - return serialize(C, ArrayRef<T>(V));
> -}
> -
> -/// RPC channel deserialization for std::array<T>.
> -template <typename T> Error deserialize(RPCChannel &C, std::vector<T> &V) {
> - uint64_t Count = 0;
> - if (auto Err = deserialize(C, Count))
> - return Err;
> -
> - V.resize(Count);
> - for (auto &E : V)
> - if (auto Err = deserialize(C, E))
> - return Err;
> -
> - return Error::success();
> -}
> -
> -} // end namespace remote
> -} // end namespace orc
> -} // end namespace llvm
> -
> -#endif // LLVM_EXECUTIONENGINE_ORC_RPCCHANNEL_H
>
> Modified: llvm/trunk/tools/lli/RemoteJITUtils.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/RemoteJITUtils.h?rev=281171&r1=281170&r2=281171&view=diff
> ==============================================================================
> --- llvm/trunk/tools/lli/RemoteJITUtils.h (original)
> +++ llvm/trunk/tools/lli/RemoteJITUtils.h Sun Sep 11 13:41:05 2016
> @@ -14,7 +14,7 @@
> #ifndef LLVM_TOOLS_LLI_REMOTEJITUTILS_H
> #define LLVM_TOOLS_LLI_REMOTEJITUTILS_H
>
> -#include "llvm/ExecutionEngine/Orc/RPCChannel.h"
> +#include "llvm/ExecutionEngine/Orc/RPCByteChannel.h"
> #include "llvm/ExecutionEngine/RTDyldMemoryManager.h"
> #include <mutex>
>
> @@ -25,7 +25,7 @@
> #endif
>
> /// RPC channel that reads from and writes from file descriptors.
> -class FDRPCChannel final : public llvm::orc::remote::RPCChannel {
> +class FDRPCChannel final : public llvm::orc::remote::RPCByteChannel {
> public:
> FDRPCChannel(int InFD, int OutFD) : InFD(InFD), OutFD(OutFD) {}
>
>
> Modified: llvm/trunk/tools/lli/lli.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=281171&r1=281170&r2=281171&view=diff
> ==============================================================================
> --- llvm/trunk/tools/lli/lli.cpp (original)
> +++ llvm/trunk/tools/lli/lli.cpp Sun Sep 11 13:41:05 2016
> @@ -662,7 +662,8 @@ int main(int argc, char **argv, char * c
> }
>
> // Create a remote target client running over the channel.
> - typedef orc::remote::OrcRemoteTargetClient<orc::remote::RPCChannel> MyRemote;
> + typedef orc::remote::OrcRemoteTargetClient<orc::remote::RPCByteChannel>
> + MyRemote;
> MyRemote R = ExitOnErr(MyRemote::Create(*C));
>
> // Create a remote memory manager.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list