void DBusConnection::disconnect() {
if (isConnected()) {
- stopDispatching_ = true;
-
if (!dbusSignalMatchRulesMap_.empty()) {
dbus_connection_remove_filter(libdbusConnection_, &onLibdbusSignalFilterThunk, this);
}
+ dbus_connection_close(libdbusConnection_);
+
+ stopDispatching_ = true;
+
dispatchThread_.join();
- dbus_connection_close(libdbusConnection_);
dbus_connection_unref(libdbusConnection_);
libdbusConnection_ = NULL;
const std::shared_ptr<DBusServiceRegistry> DBusConnection::getDBusServiceRegistry() {
std::shared_ptr<DBusServiceRegistry> serviceRegistry = dbusServiceRegistry_.lock();
if (!serviceRegistry) {
- auto blub = this->shared_from_this();
- serviceRegistry = std::make_shared<DBusServiceRegistry>(blub);
+ serviceRegistry = std::make_shared<DBusServiceRegistry>(this->shared_from_this());
+ serviceRegistry->init();
dbusServiceRegistry_ = serviceRegistry;
}
DBusServiceRegistry::DBusServiceRegistry(std::shared_ptr<DBusProxyConnection> dbusProxyConnection):
dbusDaemonProxy_(std::make_shared<CommonAPI::DBus::DBusDaemonProxy>(dbusProxyConnection)),
dbusServicesStatus_(AvailabilityStatus::UNKNOWN) {
+}
+
+DBusServiceRegistry::~DBusServiceRegistry() {
+ dbusDaemonProxy_->getNameOwnerChangedEvent().unsubscribe(dbusDaemonProxyNameOwnerChangedEventSubscription_);
+ dbusDaemonProxy_->getProxyStatusEvent().unsubscribe(dbusDaemonProxyStatusEventSubscription_);
+ std::cout << "Crushing stuff" << std::endl;
+}
+void DBusServiceRegistry::init() {
dbusDaemonProxyStatusEventSubscription_ =
dbusDaemonProxy_->getProxyStatusEvent().subscribeCancellableListener(
- std::bind(&DBusServiceRegistry::onDBusDaemonProxyStatusEvent, this, std::placeholders::_1));
+ std::bind(&DBusServiceRegistry::onDBusDaemonProxyStatusEvent, this->shared_from_this(), std::placeholders::_1));
dbusDaemonProxyNameOwnerChangedEventSubscription_ =
dbusDaemonProxy_->getNameOwnerChangedEvent().subscribeCancellableListener(
std::bind(&DBusServiceRegistry::onDBusDaemonProxyNameOwnerChangedEvent,
- this,
+ this->shared_from_this(),
std::placeholders::_1,
std::placeholders::_2,
std::placeholders::_3));
}
-DBusServiceRegistry::~DBusServiceRegistry() {
- dbusDaemonProxy_->getNameOwnerChangedEvent().unsubscribe(dbusDaemonProxyNameOwnerChangedEventSubscription_);
- dbusDaemonProxy_->getProxyStatusEvent().unsubscribe(dbusDaemonProxyStatusEventSubscription_);
-}
-
bool DBusServiceRegistry::waitDBusServicesAvailable(std::unique_lock<std::mutex>& lock, std::chrono::milliseconds& timeout) {
bool dbusServicesStatusIsKnown = (dbusServicesStatus_ != AvailabilityStatus::UNKNOWN);
dbusServicesStatus_ = AvailabilityStatus::UNKNOWN;
dbusDaemonProxy_->listNamesAsync(std::bind(
&DBusServiceRegistry::onListNamesCallback,
- this,
+ this->shared_from_this(),
std::placeholders::_1,
std::placeholders::_2));
break;
// search for remote instances
DBusDaemonProxy::GetManagedObjectsAsyncCallback callback = std::bind(&DBusServiceRegistry::onGetManagedObjectsCallback,
- this,
+ this->shared_from_this(),
std::placeholders::_1,
std::placeholders::_2,
dbusServiceName);
class DBusDaemonProxy;
-class DBusServiceRegistry {
+class DBusServiceRegistry: public std::enable_shared_from_this<DBusServiceRegistry> {
public:
enum class DBusServiceState {
UNKNOWN,
virtual ~DBusServiceRegistry();
+ void init();
+
bool isServiceInstanceAlive(const std::string& dbusInterfaceName, const std::string& dbusConnectionName, const std::string& dbusObjectPath);
Subscription subscribeAvailabilityListener(const std::string& commonApiAddress,