Use tag dispatching to construct various types of Connection, refactor Connection unit tests

This commit is contained in:
sangelovic committed 2019-11-03 20:30:52 +01:00
1 parent 099bc857ad
commit 304b69dd8b
5 files changed
+153 -148

No files matched your search

+24 -19
View File
@@ -35,6 +35,8 @@
#include <systemd/sd-bus.h>
#include <memory>
#include <thread>
#include <string>
#include <vector>
namespace sdbus { namespace internal {
@@ -43,15 +45,14 @@ namespace sdbus { namespace internal {
, public sdbus::internal::IConnection // Internal, private interface
{
public:
enum class BusType
{
eSystem,
eSession,
eRemoteSystem,
};
// Bus type tags
struct system_bus_t{};
struct session_bus_t{};
struct remote_system_bus_t{};
Connection(BusType type, std::unique_ptr<ISdBus>&& interface);
Connection(const std::string& host, std::unique_ptr<ISdBus>&& interface);
Connection(std::unique_ptr<ISdBus>&& interface, system_bus_t);
Connection(std::unique_ptr<ISdBus>&& interface, session_bus_t);
Connection(std::unique_ptr<ISdBus>&& interface, remote_system_bus_t, const std::string& host);
~Connection() override;
void requestName(const std::string& name) override;
@@ -102,10 +103,12 @@ namespace sdbus { namespace internal {
, void* userData ) override;
private:
sd_bus* openBus(Connection::BusType type);
using BusFactory = std::function<int(sd_bus**)>;
using BusPtr = std::unique_ptr<sd_bus, std::function<sd_bus*(sd_bus*)>>;
Connection(std::unique_ptr<ISdBus>&& interface, const BusFactory& busFactory);
BusPtr openBus(const std::function<int(sd_bus**)>& busFactory);
void finishHandshake(sd_bus* bus);
static int createProcessingLoopExitDescriptor();
static void closeProcessingLoopExitDescriptor(int fd);
bool waitForNextRequest();
static std::string composeSignalMatchFilter( const std::string& objectPath
, const std::string& interfaceName
@@ -113,18 +116,20 @@ namespace sdbus { namespace internal {
void notifyProcessingLoopToExit();
void clearExitNotification();
void joinWithProcessingLoop();
static std::vector</*const */char*> to_strv(const std::vector<std::string>& strings);
struct LoopExitEventFd
{
LoopExitEventFd();
~LoopExitEventFd();
int fd;
};
private:
std::unique_ptr<ISdBus> iface_;
std::unique_ptr<sd_bus, std::function<sd_bus*(sd_bus*)>> bus_ {nullptr, [this](sd_bus* bus)
{
return iface_->sd_bus_flush_close_unref(bus);
}};
BusType busType_;
BusPtr bus_;
std::thread asyncLoopThread_;
int loopExitFd_{-1};
std::string host_;
LoopExitEventFd loopExitFd_;
};
}}