Add Block.OpenForBenchmark() method

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

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index a75bc81..d4925e9 100644 (file)
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -869,6 +869,27 @@
       <arg name="fd" direction="out" type="h"/>
     </method>
 
+    <!--
+        OpenForBenchmark:
+        @options: Options (currently unused except for <link linkend="udisks-std-options">standard options</link>).
+        @fd: An index for the returned file descriptor.
+
+        Gets a file descriptor for the device that is suitable to be
+        used for benchmarking the device (transfer rate, access time
+        etc.). Note that the file descriptor may be opened with the
+        <literal>O_DIRECT</literal> and <literal>O_SYNC</literal>
+        flags so care must be taken to only perform page-aligned I/O.
+
+        If the <parameter>writable</parameter> in @options is %TRUE
+        then the returned file descriptor will be writable. This only
+        works if the device is not already in use.
+    -->
+    <method name="OpenForBenchmark">
+      <annotation name="org.gtk.GDBus.C.UnixFD" value="1"/>
+      <arg name="options" direction="in" type="a{sv}"/>
+      <arg name="fd" direction="out" type="h"/>
+    </method>
+
   </interface>
 
   <!-- ********************************************************************** -->

diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index 17e1fb2..5b281df 100644 (file)
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -18,6 +18,8 @@
  *
  */
 
+#define _GNU_SOURCE /* for O_DIRECT */
+
 #include "config.h"
 #include <glib/gi18n-lib.h>
 
@@ -2337,6 +2339,80 @@ handle_open_for_restore (UDisksBlock           *block,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gboolean
+handle_open_for_benchmark (UDisksBlock           *block,
+                           GDBusMethodInvocation *invocation,
+                           GUnixFDList           *fd_list,
+                           GVariant              *options)
+{
+  UDisksObject *object;
+  UDisksDaemon *daemon;
+  const gchar *action_id;
+  const gchar *device;
+  GUnixFDList *out_fd_list = NULL;
+  gboolean opt_writable = FALSE;
+  GError *error;
+  gint fd;
+  gint open_flags;
+
+  error = NULL;
+  object = udisks_daemon_util_dup_object (block, &error);
+  if (object == NULL)
+    {
+      g_dbus_method_invocation_take_error (invocation, error);
+      goto out;
+    }
+
+  daemon = udisks_linux_block_object_get_daemon (UDISKS_LINUX_BLOCK_OBJECT (object));
+
+  action_id = "org.freedesktop.udisks2.open-device";
+  if (udisks_block_get_hint_system (block))
+    action_id = "org.freedesktop.udisks2.open-device-system";
+
+  if (!udisks_daemon_util_check_authorization_sync (daemon,
+                                                    object,
+                                                    action_id,
+                                                    options,
+                                                    /* Translators: Shown in authentication dialog when an application
+                                                     * wants to benchmark a device.
+                                                     *
+                                                     * Do not translate $(drive), it's a placeholder and will
+                                                     * be replaced by the name of the drive/device in question
+                                                     */
+                                                    N_("Authentication is required to open $(drive) for benchmarking"),
+                                                    invocation))
+    goto out;
+
+  g_variant_lookup (options, "writable", "b", &opt_writable);
+
+  if (opt_writable)
+    open_flags = O_RDWR  | O_EXCL;
+  else
+    open_flags = O_RDONLY;
+
+  open_flags |= O_DIRECT | O_SYNC | O_CLOEXEC;
+
+  device = udisks_block_get_device (UDISKS_BLOCK (block));
+
+  fd = open (device, open_flags);
+  if (fd == -1)
+    {
+      g_dbus_method_invocation_return_error (invocation, UDISKS_ERROR, UDISKS_ERROR_FAILED,
+                                             "Error opening %s: %m", device);
+      goto out;
+    }
+
+  out_fd_list = g_unix_fd_list_new_from_array (&fd, 1);
+  udisks_block_complete_open_for_backup (block, invocation, out_fd_list, g_variant_new_handle (0));
+
+ out:
+  g_clear_object (&out_fd_list);
+  g_clear_object (&object);
+  return TRUE; /* returning true means that we handled the method invocation */
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
 static void
 block_iface_init (UDisksBlockIface *iface)
 {
@@ -2347,4 +2423,5 @@ block_iface_init (UDisksBlockIface *iface)
   iface->handle_format                    = handle_format;
   iface->handle_open_for_backup           = handle_open_for_backup;
   iface->handle_open_for_restore          = handle_open_for_restore;
+  iface->handle_open_for_benchmark        = handle_open_for_benchmark;
 }