substantially rework file monitors

Remove all event merging and dispatch logic from GFileMonitor.  The only
implementation of GFileMonitor outside of glib is in gvfs and it already
does these things properly.

Get rid of GLocalDirectoryMonitor.  We will use a single class,
GLocalFileMonitor, for both directory and file monitoring.  This will
prevent every single backend from having to create two objects
separately (eg: ginotifydirectorymonitor.c and ginotifyfilemonitor.c).

Introduce GFileMonitorSource as a thread-safe cross-context dispatch
mechanism.  Put it in GLocalFileMonitor.  All backends will be expected
to dispatch via the source and not touch the GFileMonitor object at all
from the worker thread.

Remove all construct properties from GLocalFileMonitor and remove the
"context" construct property from GFileMonitor.  All backends must now
get the information about what file to monitor from the ->start() call
which is mandatory to implement.

Remove the implementation of rate limiting in GFileMonitor and add an
implementation in GLocalFileMonitor.  gvfs never did anything with this
anyway, but if it wanted to, it would have to implement it for itself.
This was done in order to get the rate_limit field into the
GFileMonitorSource so that it could be safely accessed from the worker
thread.

Expose g_local_file_is_remote() internally for NFS detection.

With the "is_remote" functionality exposed, we can now move all
functions for creating local file monitors to a proper location in
glocalfilemonitor.c

Port the inotify backend to adjust to the changes above.  None of the
other backends are ported yet.  Those will come in future commits.

1 files changed, 43 insertions, 15 deletions

diff --git a/gio/glocalfilemonitor.h b/gio/glocalfilemonitor.h
index aed2e9cd1..ced880fd6 100644
--- a/gio/glocalfilemonitor.h
+++ b/gio/glocalfilemonitor.h
@@ -22,6 +22,7 @@
 #define __G_LOCAL_FILE_MONITOR_H__
 
 #include <gio/gfilemonitor.h>
+#include "gunixmounts.h"
 
 G_BEGIN_DECLS
 
@@ -37,13 +38,15 @@ G_BEGIN_DECLS
 
 typedef struct _GLocalFileMonitor      GLocalFileMonitor;
 typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
+typedef struct _GFileMonitorSource     GFileMonitorSource;
 
 struct _GLocalFileMonitor
 {
   GFileMonitor parent_instance;
 
-  gchar *filename;
-  GFileMonitorFlags flags;
+  GFileMonitorSource *source;
+  GUnixMountMonitor  *mount_monitor;
+  gboolean            was_mounted;
 };
 
 struct _GLocalFileMonitorClass
@@ -51,7 +54,13 @@ struct _GLocalFileMonitorClass
   GFileMonitorClass parent_class;
 
   gboolean (* is_supported) (void);
-  void     (* start)        (GLocalFileMonitor *local_monitor);
+  void     (* start)        (GLocalFileMonitor *local_monitor,
+                             const gchar *dirname,
+                             const gchar *basename,
+                             const gchar *filename,
+                             GFileMonitorSource *source);
+
+  gboolean mount_notify;
 };
 
 #ifdef G_OS_UNIX
@@ -59,18 +68,37 @@ GLIB_AVAILABLE_IN_ALL
 #endif
 GType           g_local_file_monitor_get_type (void) G_GNUC_CONST;
 
-GFileMonitor * _g_local_file_monitor_new      (const char         *pathname,
-                                               GFileMonitorFlags   flags,
-                                               GMainContext       *context,
-                                               gboolean            is_remote_fs,
-                                               gboolean            do_start,
-                                               GError            **error);
-void            g_local_file_monitor_start    (GLocalFileMonitor  *local_monitor);
-
-/* Actually in glocalfile.c */
-GLocalFileMonitor *  g_local_file_monitor_new_in_worker (const char         *pathname,
-                                                         GFileMonitorFlags   flags,
-                                                         GError            **error);
+/* for glocalfile.c */
+GFileMonitor *
+g_local_file_monitor_new_for_path (const gchar        *pathname,
+                                   gboolean            is_directory,
+                                   GFileMonitorFlags   flags,
+                                   GError            **error);
+
+/* for various users in glib */
+typedef void (* GFileMonitorCallback) (GFileMonitor      *monitor,
+                                       GFile             *child,
+                                       GFile             *other,
+                                       GFileMonitorEvent  event,
+                                       gpointer           user_data);
+GFileMonitor *
+g_local_file_monitor_new_in_worker (const gchar           *pathname,
+                                    gboolean               is_directory,
+                                    GFileMonitorFlags      flags,
+                                    GFileMonitorCallback   callback,
+                                    gpointer               user_data,
+                                    GError               **error);
+
+/* for implementations of GLocalFileMonitor */
+GLIB_AVAILABLE_IN_2_44
+void
+g_file_monitor_source_handle_event (GFileMonitorSource *fms,
+                                    GFileMonitorEvent   event_type,
+                                    const gchar        *child,
+                                    const gchar        *rename_to,
+                                    GFile              *other,
+                                    gint64              event_time);
+
 
 G_END_DECLS