From 357d4625fa862a70b2f02fedaa9da08a8a02cb1d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 10 Feb 2021 08:49:18 -0500 Subject: [PATCH] Cleaned up delegate. --- src/server/sparkd/cmds/Benchmark.cpp | 2 +- src/server/sparkd/cmds/QuickTest.cpp | 2 +- .../sparkd/cmds/spartan/system/Delegate.cpp | 2 + .../spartan/system/{delegate => }/Delegate.h | 67 +++++++++---------- 4 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/system/Delegate.cpp rename src/server/sparkd/cmds/spartan/system/{delegate => }/Delegate.h (68%) diff --git a/src/server/sparkd/cmds/Benchmark.cpp b/src/server/sparkd/cmds/Benchmark.cpp index 8d5604bef..16b6587bb 100644 --- a/src/server/sparkd/cmds/Benchmark.cpp +++ b/src/server/sparkd/cmds/Benchmark.cpp @@ -15,7 +15,7 @@ #include "lib/utils/TimeStamp.h" #include "lib/utils/Uuid.h" #include "lib/utils/mpmc_bounded_queue.h" -#include "system/delegate/Delegate.h" +#include "system/Delegate.h" #include "lib/tracing/PerfLog.h" #include diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index efe7f7d5c..ad5d98627 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -1,6 +1,6 @@ #include "QuickTest.h" #include "feed_handler/FeedHandlerBinder.h" -#include "system/delegate/Delegate.h" +#include "system/Delegate.h" #include "system/reactor/Reactor.h" namespace bts::cmds { diff --git a/src/server/sparkd/cmds/spartan/system/Delegate.cpp b/src/server/sparkd/cmds/spartan/system/Delegate.cpp new file mode 100644 index 000000000..ab9aa99f5 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/system/Delegate.cpp @@ -0,0 +1,2 @@ +#include "Delegate.h" + diff --git a/src/server/sparkd/cmds/spartan/system/delegate/Delegate.h b/src/server/sparkd/cmds/spartan/system/Delegate.h similarity index 68% rename from src/server/sparkd/cmds/spartan/system/delegate/Delegate.h rename to src/server/sparkd/cmds/spartan/system/Delegate.h index 48855c4bb..fed026933 100644 --- a/src/server/sparkd/cmds/spartan/system/delegate/Delegate.h +++ b/src/server/sparkd/cmds/spartan/system/Delegate.h @@ -1,49 +1,52 @@ - #pragma once +#include +#include + namespace bts::spartan { -struct DelegateHelper { - template - struct handler_traits; - template - struct handler_traits { - using HandlerType = T; - using HandlerReturnType = R; - }; - - template - static R invoke_member_handler(void *handler_obj, Arg... arg) { - using HandlerMethod = decltype(handler_member); - static_assert(std::is_member_function_pointer::value); - using HandlerType = typename handler_traits::HandlerType; - return (((HandlerType *)handler_obj)->*handler_member)( - std::forward(arg)...); - } - template - static R invoke_static_handler(void *, Arg... arg) { - return handler(std::forward(arg)...); - } -}; - template class Delegate; template class Delegate { - public: +private: + void *target_obj_; + R (*invoke_)(void *, Arg...); + + template + struct handler_traits; + template + struct handler_traits { + using HandlerType = T; + using HandlerReturnType = Re; + }; + template + static R invoke_member_handler(void *handler_obj, Args... arg) { + using HandlerMethod = decltype(handler_member); + static_assert(std::is_member_function_pointer::value); + using HandlerType = typename handler_traits::HandlerType; + return (((HandlerType *)handler_obj)->*handler_member)( + std::forward(arg)...); + } + template + static R invoke_static_handler(void *, Args... arg) { + return handler(std::forward(arg)...); + } + +public: Delegate() : target_obj_(), invoke_() {} Delegate(Delegate const &d) : target_obj_(d.target_obj), invoke_(d.invoke_) {} - Delegate&operator=(Delegate const&d) { + Delegate &operator=(Delegate const &d) { target_obj_ = d.target_obj_; invoke_ = d.invoke_; return *this; } - + template void bind(C &handler_obj) { target_obj_ = &handler_obj; @@ -51,27 +54,23 @@ class Delegate { } template - void bind(typename DelegateHelper::handler_traits< + void bind(typename handler_traits< decltype(handler_member)>::HandlerType &handler_obj) { target_obj_ = &handler_obj; invoke_ = - DelegateHelper::invoke_member_handler; + invoke_member_handler; } template void bind() { target_obj_ = nullptr; invoke_ = - DelegateHelper::invoke_static_handler; + invoke_static_handler; } R operator()(Arg &&... arg) { return invoke_(target_obj_, std::forward(arg)...); } - - private: - void *target_obj_; - R (*invoke_)(void *, Arg...); }; } // namespace bts::spartan