source/*: Implement heap based userdata
This makes no immediate change to the external interface, but it will
enable us to do things like making copies of the event sources and
support for floating event source types.
Change-Id: Ida73e773eb0869f6f6f21c1e03c61e9ce2b5625c
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/test/source/event.cpp b/test/source/event.cpp
index e4d7b2a..1d5a877 100644
--- a/test/source/event.cpp
+++ b/test/source/event.cpp
@@ -20,6 +20,7 @@
using testing::DoAll;
using testing::Return;
+using testing::ReturnPointee;
using testing::SaveArg;
using testing::SetArgPointee;
@@ -46,14 +47,8 @@
void expect_destruct()
{
- {
- testing::InSequence sequence;
- EXPECT_CALL(mock, sd_event_source_set_enabled(expected_source,
- SD_EVENT_OFF))
- .WillOnce(Return(0));
- EXPECT_CALL(mock, sd_event_source_unref(expected_source))
- .WillOnce(Return(nullptr));
- }
+ EXPECT_CALL(mock, sd_event_source_unref(expected_source))
+ .WillOnce(Return(nullptr));
EXPECT_CALL(mock, sd_event_unref(expected_event))
.WillOnce(Return(nullptr));
}
@@ -63,9 +58,19 @@
{
EXPECT_CALL(mock, sd_event_ref(expected_event))
.WillOnce(Return(expected_event));
+ sd_event_destroy_t destroy;
void* userdata;
- EXPECT_CALL(mock, sd_event_source_set_userdata(expected_source, testing::_))
- .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ {
+ testing::InSequence seq;
+ EXPECT_CALL(mock, sd_event_source_set_destroy_callback(expected_source,
+ testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&destroy), Return(0)));
+ EXPECT_CALL(mock,
+ sd_event_source_set_userdata(expected_source, testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ EXPECT_CALL(mock, sd_event_source_get_userdata(expected_source))
+ .WillRepeatedly(ReturnPointee(&userdata));
+ }
sd_event_handler_t handler;
EXPECT_CALL(mock, sd_event_add_defer(expected_event, testing::_, testing::_,
nullptr))
@@ -76,27 +81,38 @@
completions++;
};
Defer defer(*event, std::move(callback));
- EXPECT_EQ(&defer, userdata);
+ EXPECT_NE(&defer, userdata);
EXPECT_FALSE(callback);
EXPECT_EQ(0, completions);
- EXPECT_EQ(0, handler(nullptr, &defer));
+ EXPECT_EQ(0, handler(nullptr, userdata));
EXPECT_EQ(1, completions);
defer.set_callback(std::bind([]() {}));
- EXPECT_EQ(0, handler(nullptr, &defer));
+ EXPECT_EQ(0, handler(nullptr, userdata));
EXPECT_EQ(1, completions);
expect_destruct();
+ destroy(userdata);
}
TEST_F(EventTest, PostConstruct)
{
EXPECT_CALL(mock, sd_event_ref(expected_event))
.WillOnce(Return(expected_event));
+ sd_event_destroy_t destroy;
void* userdata;
- EXPECT_CALL(mock, sd_event_source_set_userdata(expected_source, testing::_))
- .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ {
+ testing::InSequence seq;
+ EXPECT_CALL(mock, sd_event_source_set_destroy_callback(expected_source,
+ testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&destroy), Return(0)));
+ EXPECT_CALL(mock,
+ sd_event_source_set_userdata(expected_source, testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ EXPECT_CALL(mock, sd_event_source_get_userdata(expected_source))
+ .WillRepeatedly(ReturnPointee(&userdata));
+ }
sd_event_handler_t handler;
EXPECT_CALL(mock, sd_event_add_post(expected_event, testing::_, testing::_,
nullptr))
@@ -107,23 +123,34 @@
completions++;
};
Post post(*event, std::move(callback));
- EXPECT_EQ(&post, userdata);
+ EXPECT_NE(&post, userdata);
EXPECT_FALSE(callback);
EXPECT_EQ(0, completions);
- EXPECT_EQ(0, handler(nullptr, &post));
+ EXPECT_EQ(0, handler(nullptr, userdata));
EXPECT_EQ(1, completions);
expect_destruct();
+ destroy(userdata);
}
TEST_F(EventTest, ExitConstruct)
{
EXPECT_CALL(mock, sd_event_ref(expected_event))
.WillOnce(Return(expected_event));
+ sd_event_destroy_t destroy;
void* userdata;
- EXPECT_CALL(mock, sd_event_source_set_userdata(expected_source, testing::_))
- .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ {
+ testing::InSequence seq;
+ EXPECT_CALL(mock, sd_event_source_set_destroy_callback(expected_source,
+ testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&destroy), Return(0)));
+ EXPECT_CALL(mock,
+ sd_event_source_set_userdata(expected_source, testing::_))
+ .WillOnce(DoAll(SaveArg<1>(&userdata), Return(nullptr)));
+ EXPECT_CALL(mock, sd_event_source_get_userdata(expected_source))
+ .WillRepeatedly(ReturnPointee(&userdata));
+ }
sd_event_handler_t handler;
EXPECT_CALL(mock, sd_event_add_exit(expected_event, testing::_, testing::_,
nullptr))
@@ -134,14 +161,15 @@
completions++;
};
Exit exit(*event, std::move(callback));
- EXPECT_EQ(&exit, userdata);
+ EXPECT_NE(&exit, userdata);
EXPECT_FALSE(callback);
EXPECT_EQ(0, completions);
- EXPECT_EQ(0, handler(nullptr, &exit));
+ EXPECT_EQ(0, handler(nullptr, userdata));
EXPECT_EQ(1, completions);
expect_destruct();
+ destroy(userdata);
}
TEST_F(EventTest, ConstructFailure)