Add MDRaid:SyncCompleted property

We update this by polling every second (on the second) for a subset of
states that are not 'idle'.

http://people.freedesktop.org/~david/gnome-disks-mdraid-20120913-2.png

Signed-off-by: David Zeuthen <zeuthen@gmail.com>

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index 5c5a294..c6f3fb2 100644 (file)
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -1629,6 +1629,16 @@
     -->
     <property name="SyncAction" type="s" access="read"/>
 
+    <!-- SyncCompleted:
+         The fraction or sectors completed (always between <constant>0.0</constant> and <constant>1.0</constant>) in the sync operation or 0.0 if no operation is in progress.
+
+         This property corresponds to the
+         <literal>sync_completed</literal> sysfs file, see the
+         <filename><ulink url="http://www.kernel.org/doc/Documentation/md.txt">Documentation/md.txt</ulink></filename>
+         file shipped with the kernel sources.
+    -->
+    <property name="SyncCompleted" type="d" access="read"/>
+
     <!-- Degraded:
          Number of devices by which the array is degraded (0 if not degraded).
 

diff --git a/src/udiskslinuxmdraid.c b/src/udiskslinuxmdraid.c
index bdebec6..3e0fcac 100644 (file)
--- a/src/udiskslinuxmdraid.c
+++ b/src/udiskslinuxmdraid.c
@@ -61,6 +61,7 @@ struct _UDisksLinuxMDRaid
 {
   UDisksMDRaidSkeleton parent_instance;
 
+  guint polling_timeout;
 };
 
 struct _UDisksLinuxMDRaidClass
@@ -68,6 +69,9 @@ struct _UDisksLinuxMDRaidClass
   UDisksMDRaidSkeletonClass parent_class;
 };
 
+static void ensure_polling (UDisksLinuxMDRaid  *mdraid,
+                            gboolean            polling_on);
+
 static void mdraid_iface_init (UDisksMDRaidIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (UDisksLinuxMDRaid, udisks_linux_mdraid, UDISKS_TYPE_MDRAID_SKELETON,
@@ -78,7 +82,9 @@ G_DEFINE_TYPE_WITH_CODE (UDisksLinuxMDRaid, udisks_linux_mdraid, UDISKS_TYPE_MDR
 static void
 udisks_linux_mdraid_finalize (GObject *object)
 {
-  /* UDisksLinuxMDRaid *mdraid = UDISKS_LINUX_MDRAID (object); */
+  UDisksLinuxMDRaid *mdraid = UDISKS_LINUX_MDRAID (object);
+
+  ensure_polling (mdraid, FALSE);
 
   if (G_OBJECT_CLASS (udisks_linux_mdraid_parent_class)->finalize != NULL)
     G_OBJECT_CLASS (udisks_linux_mdraid_parent_class)->finalize (object);
@@ -160,6 +166,50 @@ read_sysfs_attr_as_int (GUdevDevice *device,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gboolean
+on_polling_timout (gpointer user_data)
+{
+  UDisksLinuxMDRaid *mdraid = UDISKS_LINUX_MDRAID (user_data);
+  UDisksLinuxMDRaidObject *object = NULL;
+
+  udisks_debug ("polling timeout");
+
+  object = udisks_daemon_util_dup_object (mdraid, NULL);
+  if (object == NULL)
+    goto out;
+
+  /* synthesize uevent */
+  udisks_linux_mdraid_object_uevent (object, "change", NULL);
+
+ out:
+  g_clear_object (&object);
+  return TRUE; /* keep timeout around */
+}
+
+static void
+ensure_polling (UDisksLinuxMDRaid  *mdraid,
+                gboolean            polling_on)
+{
+  if (polling_on)
+    {
+      if (mdraid->polling_timeout == 0)
+        {
+          mdraid->polling_timeout = g_timeout_add_seconds (1,
+                                                           on_polling_timout,
+                                                           mdraid);
+        }
+    }
+  else
+    {
+      if (mdraid->polling_timeout != 0)
+        {
+          g_source_remove (mdraid->polling_timeout);
+          mdraid->polling_timeout = 0;
+        }
+    }
+}
+
+
 /**
  * udisks_linux_mdraid_update:
  * @mdraid: A #UDisksLinuxMDRaid.
@@ -182,7 +232,9 @@ udisks_linux_mdraid_update (UDisksLinuxMDRaid       *mdraid,
   GUdevDevice *device = NULL;
   const gchar *level = NULL;
   gchar *sync_action = NULL;
+  gchar *sync_completed = NULL;
   guint degraded = 0;
+  gdouble sync_completed_val = 0.0;
 
   member_devices = udisks_linux_mdraid_object_get_members (object);
   raid_device = udisks_linux_mdraid_object_get_device (object);
@@ -228,13 +280,42 @@ udisks_linux_mdraid_update (UDisksLinuxMDRaid       *mdraid,
       degraded = read_sysfs_attr_as_int (raid_device, "md/degraded");
       sync_action = read_sysfs_attr (raid_device, "md/sync_action");
       g_strstrip (sync_action);
+      sync_completed = read_sysfs_attr (raid_device, "md/sync_completed");
+      g_strstrip (sync_completed);
     }
   udisks_mdraid_set_degraded (iface, degraded);
   udisks_mdraid_set_sync_action (iface, sync_action);
 
+  if (sync_completed != NULL && g_strcmp0 (sync_completed, "none") != 0)
+    {
+      guint64 completed_sectors = 0;
+      guint64 num_sectors = 1;
+      if (sscanf (sync_completed, "%" G_GUINT64_FORMAT " / %" G_GUINT64_FORMAT,
+                  &completed_sectors, &num_sectors) == 2)
+        {
+          if (num_sectors != 0)
+            sync_completed_val = ((gdouble) completed_sectors) / ((gdouble) num_sectors);
+        }
+    }
+  udisks_mdraid_set_sync_completed (iface, sync_completed_val);
+
+  /* ensure we poll, exactly when we need to */
+  if (g_strcmp0 (sync_action, "resync") == 0 ||
+      g_strcmp0 (sync_action, "recover") == 0 ||
+      g_strcmp0 (sync_action, "check") == 0 ||
+      g_strcmp0 (sync_action, "repair") == 0)
+    {
+      ensure_polling (mdraid, TRUE);
+    }
+  else
+    {
+      ensure_polling (mdraid, FALSE);
+    }
+
   /* TODO: set other stuff */
 
  out:
+  g_free (sync_completed);
   g_free (sync_action);
   g_list_free_full (member_devices, g_object_unref);
   g_clear_object (&raid_device);