[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [dbus PATCH 4/9] events: split event code into separate file



Similarly to the previous patch, split the code into its separate file.

Signed-off-by: Pavel Hrdina <phrdina redhat com>
---
 src/Makefile.am |   3 +-
 src/events.c    | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/events.h    |   9 ++
 src/manager.c   | 243 +-----------------------------------------------------
 4 files changed, 265 insertions(+), 242 deletions(-)
 create mode 100644 src/events.c
 create mode 100644 src/events.h

diff --git a/src/Makefile.am b/src/Makefile.am
index f066ed3..30e7a35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,8 @@ DAEMON_SOURCES = \
 	main.c \
 	manager.c manager.h \
 	util.c util.h \
-	domain.c domain.h
+	domain.c domain.h \
+	events.c events.h
 
 EXTRA_DIST = \
 	$(DAEMON_SOURCES)
diff --git a/src/events.c b/src/events.c
new file mode 100644
index 0000000..4572e39
--- /dev/null
+++ b/src/events.c
@@ -0,0 +1,252 @@
+#include "domain.h"
+#include "events.h"
+#include "util.h"
+
+#include <assert.h>
+#include <systemd/sd-bus.h>
+
+static int
+handle_domain_lifecycle_event(virConnectPtr connection,
+                              virDomainPtr domain,
+                              int event,
+                              int detail,
+                              void *opaque)
+{
+    VirtManager *manager = opaque;
+    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
+    const char *signal = NULL;
+    const char *name;
+    _cleanup_(freep) char *path = NULL;
+    int r;
+
+    switch (event) {
+        case VIR_DOMAIN_EVENT_DEFINED:
+            signal = "DomainDefined";
+            break;
+        case VIR_DOMAIN_EVENT_UNDEFINED:
+            signal = "DomainUndefined";
+            break;
+        case VIR_DOMAIN_EVENT_STARTED:
+            signal = "DomainStarted";
+            break;
+        case VIR_DOMAIN_EVENT_SUSPENDED:
+            signal = "DomainSuspended";
+            break;
+        case VIR_DOMAIN_EVENT_RESUMED:
+            signal = "DomainResumed";
+            break;
+        case VIR_DOMAIN_EVENT_STOPPED:
+            signal = "DomainStopped";
+            break;
+        case VIR_DOMAIN_EVENT_SHUTDOWN:
+            signal = "DomainShutdown";
+            break;
+        case VIR_DOMAIN_EVENT_PMSUSPENDED:
+            signal = "DomainPMSuspended";
+            break;
+        case VIR_DOMAIN_EVENT_CRASHED:
+            signal = "DomainCrashed";
+            break;
+        default:
+            return 0;
+    }
+
+    r = sd_bus_message_new_signal(manager->bus,
+                                  &message,
+                                  "/org/libvirt/Manager",
+                                  "org.libvirt.Manager",
+                                  signal);
+    if (r < 0)
+        return r;
+
+    name = virDomainGetName(domain);
+    path = bus_path_for_domain(domain);
+
+    r = sd_bus_message_append(message, "so", name ? : "", path);
+    if (r < 0)
+        return r;
+
+    return sd_bus_send(manager->bus, message, NULL);
+}
+
+static int
+handle_domain_device_added_event(virConnectPtr connection,
+                                 virDomainPtr domain,
+                                 const char *device,
+                                 void *opaque)
+{
+    VirtManager *manager = opaque;
+    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
+    _cleanup_(freep) char *path = NULL;
+    int r;
+
+    path = bus_path_for_domain(domain);
+
+    r = sd_bus_message_new_signal(manager->bus,
+                                  &message,
+                                  path,
+                                  "org.libvirt.Domain",
+                                  "DeviceAdded");
+    if (r < 0)
+        return r;
+
+    r = sd_bus_message_append(message, "s", device);
+    if (r < 0)
+        return r;
+
+    return sd_bus_send(manager->bus, message, NULL);
+}
+
+static int
+handle_domain_device_removed_event(virConnectPtr connection,
+                                   virDomainPtr domain,
+                                   const char *device,
+                                   void *opaque)
+{
+    VirtManager *manager = opaque;
+    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
+    _cleanup_(freep) char *path = NULL;
+    int r;
+
+    path = bus_path_for_domain(domain);
+
+    r = sd_bus_message_new_signal(manager->bus,
+                                  &message,
+                                  path,
+                                  "org.libvirt.Domain",
+                                  "DeviceRemoved");
+    if (r < 0)
+        return r;
+
+    r = sd_bus_message_append(message, "s", device);
+    if (r < 0)
+        return r;
+
+    return sd_bus_send(manager->bus, message, NULL);
+}
+
+static int
+handle_domain_disk_change_event(virConnectPtr connection,
+                                virDomainPtr domain,
+                                const char *device,
+                                int reason,
+                                void *opaque)
+{
+    VirtManager *manager = opaque;
+    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
+    _cleanup_(freep) char *path = NULL;
+    const char *reasonstr;
+    int r;
+
+    path = bus_path_for_domain(domain);
+
+    r = sd_bus_message_new_signal(manager->bus,
+                                  &message,
+                                  path,
+                                  "org.libvirt.Domain",
+                                  "TrayChange");
+    if (r < 0)
+        return r;
+
+    switch (reason) {
+        case VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN:
+            reasonstr = "open";
+            break;
+        case VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE:
+            reasonstr = "close";
+            break;
+        default:
+            reasonstr = "";
+            break;
+    }
+
+    r = sd_bus_message_append(message, "ssss", device, reasonstr);
+    if (r < 0)
+        return r;
+
+    return sd_bus_send(manager->bus, message, NULL);
+}
+
+static int
+handle_domain_tray_change_event(virConnectPtr connection,
+                                virDomainPtr domain,
+                                const char *old_src_path,
+                                const char *new_src_path,
+                                const char *device,
+                                int reason,
+                                void *opaque)
+{
+    VirtManager *manager = opaque;
+    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
+    _cleanup_(freep) char *path = NULL;
+    const char *reasonstr;
+    int r;
+
+    path = bus_path_for_domain(domain);
+
+    r = sd_bus_message_new_signal(manager->bus,
+                                  &message,
+                                  path,
+                                  "org.libvirt.Domain",
+                                  "DiskChange");
+    if (r < 0)
+        return r;
+
+    switch (reason) {
+        case VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START:
+            reasonstr = "missing-on-start";
+            break;
+        case VIR_DOMAIN_EVENT_DISK_DROP_MISSING_ON_START:
+            reasonstr = "missing-on-start";
+            break;
+        default:
+            reasonstr = "";
+            break;
+    }
+
+    r = sd_bus_message_append(message, "ssss", old_src_path, new_src_path, device, reasonstr);
+    if (r < 0)
+        return r;
+
+    return sd_bus_send(manager->bus, message, NULL);
+}
+
+static void
+virt_manager_register_event(VirtManager *manager,
+                            int id,
+                            virConnectDomainEventGenericCallback callback)
+{
+    assert(manager->callback_ids[id] == -1);
+
+    manager->callback_ids[id] = virConnectDomainEventRegisterAny(manager->connection,
+                                                                 NULL,
+                                                                 id,
+                                                                 VIR_DOMAIN_EVENT_CALLBACK(callback),
+                                                                 manager,
+                                                                 NULL);
+}
+
+void
+virt_manager_register_events(VirtManager *manager)
+{
+    virt_manager_register_event(manager,
+                                VIR_DOMAIN_EVENT_ID_LIFECYCLE,
+                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_lifecycle_event));
+
+    virt_manager_register_event(manager,
+                                VIR_DOMAIN_EVENT_ID_DEVICE_ADDED,
+                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_device_added_event));
+
+    virt_manager_register_event(manager,
+                                VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED,
+                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_device_removed_event));
+
+    virt_manager_register_event(manager,
+                                VIR_DOMAIN_EVENT_ID_DISK_CHANGE,
+                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_tray_change_event));
+
+    virt_manager_register_event(manager,
+                                VIR_DOMAIN_EVENT_ID_TRAY_CHANGE,
+                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_disk_change_event));
+
+}
diff --git a/src/events.h b/src/events.h
new file mode 100644
index 0000000..7f1dfca
--- /dev/null
+++ b/src/events.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "manager.h"
+
+#include <libvirt/libvirt.h>
+
+
+void
+virt_manager_register_events(VirtManager *manager);
diff --git a/src/manager.c b/src/manager.c
index a2709b4..32f38bb 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1,8 +1,8 @@
 #include "domain.h"
+#include "events.h"
 #include "manager.h"
 #include "util.h"
 
-#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 
@@ -126,227 +126,6 @@ virt_manager_define_xml(sd_bus_message *message,
     return sd_bus_reply_method_return(message, "o", path);
 }
 
-static int
-handle_domain_lifecycle_event(virConnectPtr connection,
-                              virDomainPtr domain,
-                              int event,
-                              int detail,
-                              void *opaque)
-{
-    VirtManager *manager = opaque;
-    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
-    const char *signal = NULL;
-    const char *name;
-    _cleanup_(freep) char *path = NULL;
-    int r;
-
-    switch (event) {
-        case VIR_DOMAIN_EVENT_DEFINED:
-            signal = "DomainDefined";
-            break;
-        case VIR_DOMAIN_EVENT_UNDEFINED:
-            signal = "DomainUndefined";
-            break;
-        case VIR_DOMAIN_EVENT_STARTED:
-            signal = "DomainStarted";
-            break;
-        case VIR_DOMAIN_EVENT_SUSPENDED:
-            signal = "DomainSuspended";
-            break;
-        case VIR_DOMAIN_EVENT_RESUMED:
-            signal = "DomainResumed";
-            break;
-        case VIR_DOMAIN_EVENT_STOPPED:
-            signal = "DomainStopped";
-            break;
-        case VIR_DOMAIN_EVENT_SHUTDOWN:
-            signal = "DomainShutdown";
-            break;
-        case VIR_DOMAIN_EVENT_PMSUSPENDED:
-            signal = "DomainPMSuspended";
-            break;
-        case VIR_DOMAIN_EVENT_CRASHED:
-            signal = "DomainCrashed";
-            break;
-        default:
-            return 0;
-    }
-
-    r = sd_bus_message_new_signal(manager->bus,
-                                  &message,
-                                  "/org/libvirt/Manager",
-                                  "org.libvirt.Manager",
-                                  signal);
-    if (r < 0)
-        return r;
-
-    name = virDomainGetName(domain);
-    path = bus_path_for_domain(domain);
-
-    r = sd_bus_message_append(message, "so", name ? : "", path);
-    if (r < 0)
-        return r;
-
-    return sd_bus_send(manager->bus, message, NULL);
-}
-
-static int
-handle_domain_device_added_event(virConnectPtr connection,
-                                 virDomainPtr domain,
-                                 const char *device,
-                                 void *opaque)
-{
-    VirtManager *manager = opaque;
-    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
-    _cleanup_(freep) char *path = NULL;
-    int r;
-
-    path = bus_path_for_domain(domain);
-
-    r = sd_bus_message_new_signal(manager->bus,
-                                  &message,
-                                  path,
-                                  "org.libvirt.Domain",
-                                  "DeviceAdded");
-    if (r < 0)
-        return r;
-
-    r = sd_bus_message_append(message, "s", device);
-    if (r < 0)
-        return r;
-
-    return sd_bus_send(manager->bus, message, NULL);
-}
-
-static int
-handle_domain_device_removed_event(virConnectPtr connection,
-                                   virDomainPtr domain,
-                                   const char *device,
-                                   void *opaque)
-{
-    VirtManager *manager = opaque;
-    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
-    _cleanup_(freep) char *path = NULL;
-    int r;
-
-    path = bus_path_for_domain(domain);
-
-    r = sd_bus_message_new_signal(manager->bus,
-                                  &message,
-                                  path,
-                                  "org.libvirt.Domain",
-                                  "DeviceRemoved");
-    if (r < 0)
-        return r;
-
-    r = sd_bus_message_append(message, "s", device);
-    if (r < 0)
-        return r;
-
-    return sd_bus_send(manager->bus, message, NULL);
-}
-
-static int
-handle_domain_disk_change_event(virConnectPtr connection,
-                                virDomainPtr domain,
-                                const char *device,
-                                int reason,
-                                void *opaque)
-{
-    VirtManager *manager = opaque;
-    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
-    _cleanup_(freep) char *path = NULL;
-    const char *reasonstr;
-    int r;
-
-    path = bus_path_for_domain(domain);
-
-    r = sd_bus_message_new_signal(manager->bus,
-                                  &message,
-                                  path,
-                                  "org.libvirt.Domain",
-                                  "TrayChange");
-    if (r < 0)
-        return r;
-
-    switch (reason) {
-        case VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN:
-            reasonstr = "open";
-            break;
-        case VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE:
-            reasonstr = "close";
-            break;
-        default:
-            reasonstr = "";
-            break;
-    }
-
-    r = sd_bus_message_append(message, "ssss", device, reasonstr);
-    if (r < 0)
-        return r;
-
-    return sd_bus_send(manager->bus, message, NULL);
-}
-
-static int
-handle_domain_tray_change_event(virConnectPtr connection,
-                                virDomainPtr domain,
-                                const char *old_src_path,
-                                const char *new_src_path,
-                                const char *device,
-                                int reason,
-                                void *opaque)
-{
-    VirtManager *manager = opaque;
-    _cleanup_(sd_bus_message_unrefp) sd_bus_message *message = NULL;
-    _cleanup_(freep) char *path = NULL;
-    const char *reasonstr;
-    int r;
-
-    path = bus_path_for_domain(domain);
-
-    r = sd_bus_message_new_signal(manager->bus,
-                                  &message,
-                                  path,
-                                  "org.libvirt.Domain",
-                                  "DiskChange");
-    if (r < 0)
-        return r;
-
-    switch (reason) {
-        case VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START:
-            reasonstr = "missing-on-start";
-            break;
-        case VIR_DOMAIN_EVENT_DISK_DROP_MISSING_ON_START:
-            reasonstr = "missing-on-start";
-            break;
-        default:
-            reasonstr = "";
-            break;
-    }
-
-    r = sd_bus_message_append(message, "ssss", old_src_path, new_src_path, device, reasonstr);
-    if (r < 0)
-        return r;
-
-    return sd_bus_send(manager->bus, message, NULL);
-}
-
-static void
-virt_manager_register_event(VirtManager *manager,
-                            int id,
-                            virConnectDomainEventGenericCallback callback)
-{
-    assert(manager->callback_ids[id] == -1);
-
-    manager->callback_ids[id] = virConnectDomainEventRegisterAny(manager->connection,
-                                                                 NULL,
-                                                                 id,
-                                                                 VIR_DOMAIN_EVENT_CALLBACK(callback),
-                                                                 manager,
-                                                                 NULL);
-}
-
 static const sd_bus_vtable virt_manager_vtable[] = {
     SD_BUS_VTABLE_START(0),
 
@@ -385,25 +164,7 @@ virt_manager_new(VirtManager **managerp,
     if (!manager->connection)
         return -EINVAL;
 
-    virt_manager_register_event(manager,
-                                VIR_DOMAIN_EVENT_ID_LIFECYCLE,
-                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_lifecycle_event));
-
-    virt_manager_register_event(manager,
-                                VIR_DOMAIN_EVENT_ID_DEVICE_ADDED,
-                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_device_added_event));
-
-    virt_manager_register_event(manager,
-                                VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED,
-                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_device_removed_event));
-
-    virt_manager_register_event(manager,
-                                VIR_DOMAIN_EVENT_ID_DISK_CHANGE,
-                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_tray_change_event));
-
-    virt_manager_register_event(manager,
-                                VIR_DOMAIN_EVENT_ID_TRAY_CHANGE,
-                                VIR_DOMAIN_EVENT_CALLBACK(handle_domain_disk_change_event));
+    virt_manager_register_events(manager);
 
     r = sd_bus_add_object_vtable(manager->bus,
                                  NULL,
-- 
2.13.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]