[gvfs/wip/oholy/fuse-readdir-plus] fuse: Prefill the inode cache during readdir

[Ondrej Holy <oholy src gnome org>]

commit ac34f4ef1bf5677f1d1ec7ac8d52b615498cc45b
Author: Ondrej Holy <oholy redhat com>
Date:   Wed Nov 6 13:54:45 2019 +0100

    fuse: Prefill the inode cache during readdir
    
    Fuse allows to prefill the inode cache during readdir(). This should prevent
    the consequent gettattr() calls, which should significantly improve performance
    in various cases...
    
    Relates: https://gitlab.gnome.org/GNOME/gvfs/issues/306

 client/gvfsfusedaemon.c | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 00bd9129..de247216 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -763,18 +763,18 @@ set_attributes_from_info (GFileInfo *file_info, struct stat *sbuf)
   sbuf->st_nlink = 1;
 }
 
-static const char *query_attributes = G_FILE_ATTRIBUTE_STANDARD_TYPE ","
-                                      G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK ","
-                                      G_FILE_ATTRIBUTE_STANDARD_SIZE ","
-                                      G_FILE_ATTRIBUTE_UNIX_MODE ","
-                                      G_FILE_ATTRIBUTE_TIME_CHANGED ","
-                                      G_FILE_ATTRIBUTE_TIME_MODIFIED ","
-                                      G_FILE_ATTRIBUTE_TIME_ACCESS ","
-                                      G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE ","
-                                      G_FILE_ATTRIBUTE_UNIX_BLOCKS ","
-                                      G_FILE_ATTRIBUTE_ACCESS_CAN_READ ","
-                                      G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ","
-                                      G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE;
+#define QUERY_ATTRIBTUES G_FILE_ATTRIBUTE_STANDARD_TYPE "," \
+                         G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "," \
+                         G_FILE_ATTRIBUTE_STANDARD_SIZE "," \
+                         G_FILE_ATTRIBUTE_UNIX_MODE "," \
+                         G_FILE_ATTRIBUTE_TIME_CHANGED "," \
+                         G_FILE_ATTRIBUTE_TIME_MODIFIED "," \
+                         G_FILE_ATTRIBUTE_TIME_ACCESS "," \
+                         G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "," \
+                         G_FILE_ATTRIBUTE_UNIX_BLOCKS "," \
+                         G_FILE_ATTRIBUTE_ACCESS_CAN_READ "," \
+                         G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "," \
+                         G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE
 
 static gint
 getattr_for_file (GFile *file, struct stat *sbuf)
@@ -783,7 +783,7 @@ getattr_for_file (GFile *file, struct stat *sbuf)
   GError    *error  = NULL;
   gint       result = 0;
 
-  file_info = g_file_query_info (file, query_attributes, 0, NULL, &error);
+  file_info = g_file_query_info (file, QUERY_ATTRIBTUES, 0, NULL, &error);
 
   if (file_info)
     {
@@ -820,12 +820,12 @@ getattr_for_file_handle (FileHandle *fh, struct stat *sbuf)
     {
     case FILE_OP_READ:
       file_info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (fh->stream),
-                                                  query_attributes,
+                                                  QUERY_ATTRIBTUES,
                                                   NULL, &error);
       break;
     case FILE_OP_WRITE:
       file_info = g_file_output_stream_query_info (G_FILE_OUTPUT_STREAM (fh->stream),
-                                                  query_attributes,
+                                                  QUERY_ATTRIBTUES,
                                                   NULL, &error);
       break;
     default:
@@ -1550,7 +1550,9 @@ readdir_for_file (GFile *base_file, gpointer buf, fuse_fill_dir_t filler)
 
   g_assert (base_file != NULL);
 
-  enumerator = g_file_enumerate_children (base_file, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, &error);
+  enumerator = g_file_enumerate_children (base_file,
+                                          G_FILE_ATTRIBUTE_STANDARD_NAME "," QUERY_ATTRIBTUES,
+                                          0, NULL, &error);
   if (!enumerator)
     {
       gint result;
@@ -1575,7 +1577,11 @@ readdir_for_file (GFile *base_file, gpointer buf, fuse_fill_dir_t filler)
 
   while ((file_info = g_file_enumerator_next_file (enumerator, NULL, &error)) != NULL)
     {
-      filler (buf, g_file_info_get_name (file_info), NULL, 0, 0);
+      struct stat sbuf = {0};
+
+      set_attributes_from_info (file_info, &sbuf);
+
+      filler (buf, g_file_info_get_name (file_info), &sbuf, 0, FUSE_FILL_DIR_PLUS);
       g_object_unref (file_info);
     }
 
@@ -1592,6 +1598,7 @@ vfs_readdir (const gchar *path, gpointer buf, fuse_fill_dir_t filler, off_t offs
   gint         result = 0;
 
   g_debug ("vfs_readdir: %s\n", path);
+  g_debug ("vfs_readdir: flags=%o\n", fl);
 
   if (path_is_mount_list (path))
     {