RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:43:36 +01:00
Code Issues Projects Releases Wiki Activity

[Orc][RPC] Rename Single/MultiThreadedRPC to Single/MultithreadedRPCEndpoint.

Browse Source 
llvm-svn: 291374
This commit is contained in:
Lang Hames 2017-01-07 22:48:12 +00:00
parent f2777a2c48
commit 3550b07759
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
View File

@ -83,7 +83,7 @@ public:
namespace remote { namespace remote {
class OrcRemoteTargetRPCAPI class OrcRemoteTargetRPCAPI
: public rpc::SingleThreadedRPC<rpc::RawByteChannel> { : public rpc::SingleThreadedRPCEndpoint<rpc::RawByteChannel> {
protected: protected:
class ResourceIdMgr { class ResourceIdMgr {
public: public:
@ -108,7 +108,7 @@ protected:
public: public:
// FIXME: Remove constructors once MSVC supports synthesizing move-ops. // FIXME: Remove constructors once MSVC supports synthesizing move-ops.
OrcRemoteTargetRPCAPI(rpc::RawByteChannel &C) OrcRemoteTargetRPCAPI(rpc::RawByteChannel &C)
: rpc::SingleThreadedRPC<rpc::RawByteChannel>(C, true) {} : rpc::SingleThreadedRPCEndpoint<rpc::RawByteChannel>(C, true) {}
class CallIntVoid class CallIntVoid
: public rpc::Function<CallIntVoid, int32_t(JITTargetAddress Addr)> { : public rpc::Function<CallIntVoid, int32_t(JITTargetAddress Addr)> {

34
include/llvm/ExecutionEngine/Orc/RPCUtils.h
View File

@ -702,7 +702,7 @@ public:
/// sync. /// sync.
template <typename ImplT, typename ChannelT, typename FunctionIdT, template <typename ImplT, typename ChannelT, typename FunctionIdT,
typename SequenceNumberT> typename SequenceNumberT>
class RPCBase { class RPCEndpointBase {
protected: protected:
class OrcRPCInvalid : public Function<OrcRPCInvalid, void()> { class OrcRPCInvalid : public Function<OrcRPCInvalid, void()> {
public: public:
@ -747,7 +747,7 @@ protected:
public: public:
/// Construct an RPC instance on a channel. /// Construct an RPC instance on a channel.
RPCBase(ChannelT &C, bool LazyAutoNegotiation) RPCEndpointBase(ChannelT &C, bool LazyAutoNegotiation)
: C(C), LazyAutoNegotiation(LazyAutoNegotiation) { : C(C), LazyAutoNegotiation(LazyAutoNegotiation) {
// Hold ResponseId in a special variable, since we expect Response to be // Hold ResponseId in a special variable, since we expect Response to be
// called relatively frequently, and want to avoid the map lookup. // called relatively frequently, and want to avoid the map lookup.
@ -1021,17 +1021,18 @@ protected:
template <typename ChannelT, typename FunctionIdT = uint32_t, template <typename ChannelT, typename FunctionIdT = uint32_t,
typename SequenceNumberT = uint32_t> typename SequenceNumberT = uint32_t>
class MultiThreadedRPC class MultiThreadedRPCEndpoint
: public detail::RPCBase< : public detail::RPCEndpointBase<
MultiThreadedRPC<ChannelT, FunctionIdT, SequenceNumberT>, ChannelT, MultiThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
FunctionIdT, SequenceNumberT> { ChannelT, FunctionIdT, SequenceNumberT> {
private: private:
using BaseClass = using BaseClass =
detail::RPCBase<MultiThreadedRPC<ChannelT, FunctionIdT, SequenceNumberT>, detail::RPCEndpointBase<
ChannelT, FunctionIdT, SequenceNumberT>; MultiThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
ChannelT, FunctionIdT, SequenceNumberT>;
public: public:
MultiThreadedRPC(ChannelT &C, bool LazyAutoNegotiation) MultiThreadedRPCEndpoint(ChannelT &C, bool LazyAutoNegotiation)
: BaseClass(C, LazyAutoNegotiation) {} : BaseClass(C, LazyAutoNegotiation) {}
/// The LaunchPolicy type allows a launch policy to be specified when adding /// The LaunchPolicy type allows a launch policy to be specified when adding
@ -1169,19 +1170,20 @@ public:
template <typename ChannelT, typename FunctionIdT = uint32_t, template <typename ChannelT, typename FunctionIdT = uint32_t,
typename SequenceNumberT = uint32_t> typename SequenceNumberT = uint32_t>
class SingleThreadedRPC class SingleThreadedRPCEndpoint
: public detail::RPCBase< : public detail::RPCEndpointBase<
SingleThreadedRPC<ChannelT, FunctionIdT, SequenceNumberT>, ChannelT, SingleThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
FunctionIdT, SequenceNumberT> { ChannelT, FunctionIdT, SequenceNumberT> {
private: private:
using BaseClass = using BaseClass =
detail::RPCBase<SingleThreadedRPC<ChannelT, FunctionIdT, SequenceNumberT>, detail::RPCEndpointBase<
ChannelT, FunctionIdT, SequenceNumberT>; SingleThreadedRPCEndpoint<ChannelT, FunctionIdT, SequenceNumberT>,
ChannelT, FunctionIdT, SequenceNumberT>;
using LaunchPolicy = typename BaseClass::LaunchPolicy; using LaunchPolicy = typename BaseClass::LaunchPolicy;
public: public:
SingleThreadedRPC(ChannelT &C, bool LazyAutoNegotiation) SingleThreadedRPCEndpoint(ChannelT &C, bool LazyAutoNegotiation)
: BaseClass(C, LazyAutoNegotiation) {} : BaseClass(C, LazyAutoNegotiation) {}
template <typename Func, typename HandlerT> template <typename Func, typename HandlerT>

5
unittests/ExecutionEngine/Orc/RPCUtilsTest.cpp
View File

@ -137,11 +137,10 @@ public:
}; };
class DummyRPCEndpoint : public DummyRPCAPI, class DummyRPCEndpoint : public SingleThreadedRPCEndpoint<QueueChannel> {
public SingleThreadedRPC<QueueChannel> {
public: public:
DummyRPCEndpoint(Queue &Q1, Queue &Q2) DummyRPCEndpoint(Queue &Q1, Queue &Q2)
: SingleThreadedRPC(C, true), C(Q1, Q2) {} : SingleThreadedRPCEndpoint(C, true), C(Q1, Q2) {}
private: private:
QueueChannel C; QueueChannel C;
}; };