From 0f3fcbe43710609a57479d1fbfde349542953ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 17 Oct 2015 14:10:31 +0200 Subject: [PATCH] launch_daemon: Added volume_mounted event. * Triggered whenever a volume is mounted (surprise!). * There is no way to specify which volume you are interested in for now (if someone knows a good use case, I'd be willing to add that, though :-)). --- src/servers/launch/Events.cpp | 63 ++++++++++++++ src/servers/launch/Jamfile | 1 + src/servers/launch/VolumeWatcher.cpp | 126 +++++++++++++++++++++++++++ src/servers/launch/VolumeWatcher.h | 42 +++++++++ 4 files changed, 232 insertions(+) create mode 100644 src/servers/launch/VolumeWatcher.cpp create mode 100644 src/servers/launch/VolumeWatcher.h diff --git a/src/servers/launch/Events.cpp b/src/servers/launch/Events.cpp index 7326fd68fe..b25fc4bef2 100644 --- a/src/servers/launch/Events.cpp +++ b/src/servers/launch/Events.cpp @@ -18,6 +18,7 @@ #include "BaseJob.h" #include "LaunchDaemon.h" #include "Utility.h" +#include "VolumeWatcher.h" class EventContainer : public Event { @@ -115,6 +116,21 @@ private: }; +class VolumeMountedEvent : public Event, public VolumeListener { +public: + VolumeMountedEvent(Event* parent, + const BMessage& args); + + virtual status_t Register(EventRegistrator& registrator); + virtual void Unregister(EventRegistrator& registrator); + + virtual BString ToString() const; + + virtual void VolumeMounted(dev_t device); + virtual void VolumeUnmounted(dev_t device); +}; + + static Event* create_event(Event* parent, const char* name, const BMessenger* target, const BMessage& args) @@ -130,6 +146,8 @@ create_event(Event* parent, const char* name, const BMessenger* target, return new DemandEvent(parent); if (strcmp(name, "file_created") == 0) return new FileCreatedEvent(parent, args); + if (strcmp(name, "volume_mounted") == 0) + return new VolumeMountedEvent(parent, args); return new ExternalEvent(parent, name, args); } @@ -506,6 +524,51 @@ FileCreatedEvent::ToString() const // #pragma mark - +VolumeMountedEvent::VolumeMountedEvent(Event* parent, const BMessage& args) + : + Event(parent) +{ +} + + +status_t +VolumeMountedEvent::Register(EventRegistrator& registrator) +{ + VolumeWatcher::Register(this); + return B_OK; +} + + +void +VolumeMountedEvent::Unregister(EventRegistrator& registrator) +{ + VolumeWatcher::Unregister(this); +} + + +BString +VolumeMountedEvent::ToString() const +{ + return "volume_mounted"; +} + + +void +VolumeMountedEvent::VolumeMounted(dev_t device) +{ + Trigger(); +} + + +void +VolumeMountedEvent::VolumeUnmounted(dev_t device) +{ +} + + +// #pragma mark - + + /*static*/ Event* Events::FromMessage(const BMessenger& target, const BMessage& message) { diff --git a/src/servers/launch/Jamfile b/src/servers/launch/Jamfile index 068a71c712..e7e219894d 100644 --- a/src/servers/launch/Jamfile +++ b/src/servers/launch/Jamfile @@ -16,6 +16,7 @@ Server launch_daemon SettingsParser.cpp Target.cpp Utility.cpp + VolumeWatcher.cpp Worker.cpp # init jobs diff --git a/src/servers/launch/VolumeWatcher.cpp b/src/servers/launch/VolumeWatcher.cpp new file mode 100644 index 0000000000..af7eb8fc52 --- /dev/null +++ b/src/servers/launch/VolumeWatcher.cpp @@ -0,0 +1,126 @@ +/* + * Copyright 2015, Axel Dörfler, axeld@pinc-software.de. + * Distributed under the terms of the MIT License. + */ + + +//! The backbone of the VolumeMountedEvent. + + +#include "VolumeWatcher.h" + +#include +#include +#include + + +static BLocker sLocker("volume watcher"); +static VolumeWatcher* sWatcher; + + +VolumeListener::~VolumeListener() +{ +} + + +// #pragma mark - + + +VolumeWatcher::VolumeWatcher() + : + BHandler("volume watcher") +{ + if (be_app->Lock()) { + be_app->AddHandler(this); + + watch_node(NULL, B_WATCH_MOUNT, this); + be_app->Unlock(); + } +} + + +VolumeWatcher::~VolumeWatcher() +{ + if (be_app->Lock()) { + stop_watching(this); + + be_app->RemoveHandler(this); + be_app->Unlock(); + } +} + + +void +VolumeWatcher::AddListener(VolumeListener* listener) +{ + BAutolock lock(sLocker); + fListeners.AddItem(listener); +} + + +void +VolumeWatcher::RemoveListener(VolumeListener* listener) +{ + BAutolock lock(sLocker); + fListeners.RemoveItem(listener); +} + + +int32 +VolumeWatcher::CountListeners() const +{ + BAutolock lock(sLocker); + return fListeners.CountItems(); +} + + +void +VolumeWatcher::MessageReceived(BMessage* message) +{ + switch (message->what) { + case B_NODE_MONITOR: + { + int32 opcode = message->GetInt32("opcode", -1); + if (opcode == B_DEVICE_MOUNTED) { + dev_t device; + if (message->FindInt32("new device", &device) == B_OK) { + BAutolock lock(sLocker); + for (int32 i = 0; i < fListeners.CountItems(); i++) { + fListeners.ItemAt(i)->VolumeMounted(device); + } + } + } else if (opcode == B_DEVICE_UNMOUNTED) { + dev_t device; + if (message->FindInt32("device", &device) == B_OK) { + BAutolock lock(sLocker); + for (int32 i = 0; i < fListeners.CountItems(); i++) { + fListeners.ItemAt(i)->VolumeUnmounted(device); + } + } + } + break; + } + } +} + + +/*static*/ void +VolumeWatcher::Register(VolumeListener* listener) +{ + BAutolock lock(sLocker); + if (sWatcher == NULL) + sWatcher = new VolumeWatcher(); + + sWatcher->AddListener(listener); +} + + +/*static*/ void +VolumeWatcher::Unregister(VolumeListener* listener) +{ + BAutolock lock(sLocker); + sWatcher->RemoveListener(listener); + + if (sWatcher->CountListeners() == 0) + delete sWatcher; +} diff --git a/src/servers/launch/VolumeWatcher.h b/src/servers/launch/VolumeWatcher.h new file mode 100644 index 0000000000..dfd533cbcc --- /dev/null +++ b/src/servers/launch/VolumeWatcher.h @@ -0,0 +1,42 @@ +/* + * Copyright 2015, Axel Dörfler, axeld@pinc-software.de. + * Distributed under the terms of the MIT License. + */ +#ifndef VOLUME_WATCHER_H +#define VOLUME_WATCHER_H + + +#include +#include + + +class VolumeListener { +public: + virtual ~VolumeListener(); + + virtual void VolumeMounted(dev_t device) = 0; + virtual void VolumeUnmounted(dev_t device) = 0; +}; + + +class VolumeWatcher : public BHandler { +public: + VolumeWatcher(); + virtual ~VolumeWatcher(); + + void AddListener(VolumeListener* listener); + void RemoveListener(VolumeListener* listener); + int32 CountListeners() const; + + virtual void MessageReceived(BMessage* message); + + static void Register(VolumeListener* listener); + static void Unregister(VolumeListener* listener); + +protected: + BObjectList + fListeners; +}; + + +#endif // VOLUME_WATCHER_H