From feef68f751e09d8d5a4f2bf2f2f4cab27de1b73e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 17 Jul 2018 14:40:14 -0700 Subject: source/base: Refactor out callback routine The callback mechanism will be used by other callback methods in the same fashion, so we can template and re-use this functionality --- .gitignore | 1 + src/sdeventplus/internal/utils.hpp | 35 ++++++++++++++++++++++++++++++ src/sdeventplus/source/base.cpp | 31 ++++----------------------- src/sdeventplus/source/base.hpp | 2 -- test/Makefile.am | 5 +++++ test/internal/utils.cpp | 38 ++++++++++++++++++++++++++++++++ test/source/base.cpp | 44 ++++++++++++-------------------------- 7 files changed, 97 insertions(+), 59 deletions(-) create mode 100644 test/internal/utils.cpp diff --git a/.gitignore b/.gitignore index 884d17b..61aa582 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ Makefile.in /test/event /test/exception /test/internal_sdref +/test/internal_utils /test/source_base diff --git a/src/sdeventplus/internal/utils.hpp b/src/sdeventplus/internal/utils.hpp index 253e10d..c0b0e68 100644 --- a/src/sdeventplus/internal/utils.hpp +++ b/src/sdeventplus/internal/utils.hpp @@ -1,6 +1,11 @@ #pragma once +#include #include +#include +#include +#include +#include namespace sdeventplus { @@ -9,4 +14,34 @@ namespace sdeventplus using SdEventDuration = std::chrono::duration; +namespace internal +{ + +// Helpers for sd_event callbacks to handle exceptions gracefully +template +static int performCallback(Func func, Args... args) +{ + try + { + func(args...); + return 0; + } + catch (const std::system_error& e) + { + fprintf(stderr, "sdeventplus: callback: %s\n", e.what()); + return -e.code().value(); + } + catch (const std::exception& e) + { + fprintf(stderr, "sdeventplus: callback: %s\n", e.what()); + return -ENOSYS; + } + catch (...) + { + fprintf(stderr, "sdeventplus: callback: Unknown error\n"); + return -ENOSYS; + } +} + +} // namespace internal } // namespace sdeventplus diff --git a/src/sdeventplus/source/base.cpp b/src/sdeventplus/source/base.cpp index 83908d1..5f202db 100644 --- a/src/sdeventplus/source/base.cpp +++ b/src/sdeventplus/source/base.cpp @@ -1,10 +1,10 @@ #include #include -#include +#include #include #include +#include #include -#include #include #include @@ -21,30 +21,6 @@ Base::~Base() } } -int Base::prepareCallback() -{ - try - { - prepare(*this); - return 0; - } - catch (const std::system_error& e) - { - fprintf(stderr, "sdeventplus: prepareCallback: %s\n", e.what()); - return -e.code().value(); - } - catch (const std::exception& e) - { - fprintf(stderr, "sdeventplus: prepareCallback: %s\n", e.what()); - return -ENOSYS; - } - catch (...) - { - fprintf(stderr, "sdeventplus: prepareCallback: Unknown error\n"); - return -ENOSYS; - } -} - sd_event_source* Base::get() const { return source.get(); @@ -84,7 +60,8 @@ static int prepare_callback(sd_event_source*, void* userdata) fprintf(stderr, "sdeventplus: prepare_callback: Missing userdata\n"); return -EINVAL; } - return reinterpret_cast(userdata)->prepareCallback(); + Base* base = reinterpret_cast(userdata); + return internal::performCallback(base->get_prepare(), std::ref(*base)); } void Base::set_prepare(Callback&& callback) diff --git a/src/sdeventplus/source/base.hpp b/src/sdeventplus/source/base.hpp index ed30016..9253b71 100644 --- a/src/sdeventplus/source/base.hpp +++ b/src/sdeventplus/source/base.hpp @@ -19,8 +19,6 @@ class Base virtual ~Base(); - int prepareCallback(); - sd_event_source* get() const; const Event& get_event() const; diff --git a/test/Makefile.am b/test/Makefile.am index d1923fa..4b94144 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -27,6 +27,11 @@ internal_sdref_SOURCES = internal/sdref.cpp internal_sdref_CPPFLAGS = $(gtest_cppflags) internal_sdref_LDADD = $(gtest_ldadd) +check_PROGRAMS += internal_utils +internal_utils_SOURCES = internal/utils.cpp +internal_utils_CPPFLAGS = $(gtest_cppflags) +internal_utils_LDADD = $(gtest_ldadd) + check_PROGRAMS += source_base source_base_SOURCES = source/base.cpp source_base_CPPFLAGS = $(gtest_cppflags) diff --git a/test/internal/utils.cpp b/test/internal/utils.cpp new file mode 100644 index 0000000..2a347ca --- /dev/null +++ b/test/internal/utils.cpp @@ -0,0 +1,38 @@ +#include +#include +#include +#include + +namespace sdeventplus +{ +namespace internal +{ +namespace +{ + +TEST(UtilsTest, PerformCallbackSuccess) +{ + EXPECT_EQ(0, performCallback([]() {})); +} + +TEST(UtilsTest, SetPrepareSystemError) +{ + EXPECT_EQ(-EBUSY, performCallback([]() { + throw std::system_error(EBUSY, std::generic_category()); + })); +} + +TEST(UtilsTest, SetPrepareException) +{ + EXPECT_EQ(-ENOSYS, + performCallback([]() { throw std::runtime_error("Exception"); })); +} + +TEST(UtilsTest, SetPrepareUnknownException) +{ + EXPECT_EQ(-ENOSYS, performCallback([]() { throw static_cast(1); })); +} + +} // namespace +} // namespace internal +} // namespace sdeventplus diff --git a/test/source/base.cpp b/test/source/base.cpp index 69ae8e2..435b6f2 100644 --- a/test/source/base.cpp +++ b/test/source/base.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -322,47 +321,32 @@ TEST_F(BaseMethodTest, SetPrepareCallbackNoUserdata) EXPECT_EQ(-EINVAL, event_handler(nullptr, nullptr)); } -TEST_F(BaseMethodTest, SetPrepareNull) -{ - EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, nullptr)) - .WillOnce(Return(0)); - base->set_prepare(nullptr); - EXPECT_EQ(-ENOSYS, base->prepareCallback()); -} - -TEST_F(BaseMethodTest, SetPrepareSystemError) +TEST_F(BaseMethodTest, SetPrepareError) { - Base::Callback callback = [](Base&) { - throw std::system_error(EBUSY, std::generic_category()); - }; EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, testing::_)) .WillOnce(Return(0)); - base->set_prepare(std::move(callback)); + base->set_prepare(std::move([](Base&) {})); EXPECT_TRUE(base->get_prepare()); - EXPECT_FALSE(callback); - EXPECT_EQ(-EBUSY, base->prepareCallback()); + + Base::Callback callback = [](Base&) {}; + EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, testing::_)) + .WillOnce(Return(-EINVAL)); + EXPECT_THROW(base->set_prepare(std::move(callback)), SdEventError); + EXPECT_FALSE(base->get_prepare()); + EXPECT_TRUE(callback); } -TEST_F(BaseMethodTest, SetPrepareUnknownException) +TEST_F(BaseMethodTest, SetPrepareNull) { - Base::Callback callback = [](Base&) { throw static_cast(1); }; EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, testing::_)) .WillOnce(Return(0)); - base->set_prepare(std::move(callback)); + base->set_prepare(std::move([](Base&) {})); EXPECT_TRUE(base->get_prepare()); - EXPECT_FALSE(callback); - EXPECT_EQ(-ENOSYS, base->prepareCallback()); -} -TEST_F(BaseMethodTest, SetPrepareError) -{ - Base::Callback callback = [](Base&) {}; - EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, testing::_)) - .WillOnce(Return(-EINVAL)); - EXPECT_THROW(base->set_prepare(std::move(callback)), SdEventError); + EXPECT_CALL(mock, sd_event_source_set_prepare(expected_source, nullptr)) + .WillOnce(Return(0)); + base->set_prepare(nullptr); EXPECT_FALSE(base->get_prepare()); - EXPECT_TRUE(callback); - EXPECT_EQ(-ENOSYS, base->prepareCallback()); } TEST_F(BaseMethodTest, GetPendingSuccess) -- cgit v1.2.3