StTextureCache: use right event to detect file changes

StTextureCache installs file monitors that invalidate caches when
contents of the underlying file change.
At the moment, the cache uses the Gio.FileMonitorEvent.CHANGED event
type to make that determination.

However, that is suboptimal for at least two reasons:
- while a file is being written to disk, many CHANGED events will be
  emitted in sequence. That will cause needless cache invalidations,
  and we will risk loading the file before it's fully loaded.
- if an existing file is replaced, e.g. with g_file_replace(), we may
  not get a CHANGED event but a CREATED one instead, so the cache ends
  up never getting invalidated.

The good news is that in both of those cases GFileMonitor will send a
CHANGES_DONE_HINT event after changes have settled, or after the file
is replaced.

This commit fixes both cases by switching from the CHANGED event to
CHANGES_DONE_HINT to determine that a file has in fact changed.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/286

(cherry picked from commit ca3f4cfb41)
This commit is contained in:
Cosimo Cecchi 2018-11-09 13:55:53 -08:00 committed by Marco Trevisan (Treviño)
parent b29e243fec
commit 128a501b9a

View File

@ -984,7 +984,7 @@ file_changed_cb (GFileMonitor *monitor,
char *key; char *key;
guint file_hash; guint file_hash;
if (event_type != G_FILE_MONITOR_EVENT_CHANGED) if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
return; return;
file_hash = g_file_hash (file); file_hash = g_file_hash (file);