10:20 a.m.
This commit adds guestfs_int_fadvise_normal, but it's not enabled
since nothing calls it.
It also documents what Linux actually does, which is a bit different
from what I thought these settings did. Note this is for Linux 4.6.0rc3
and may change in future.
This updates commit 83e92b4a972a4dafdcc42388f4a5394e804dd7bf.
---
src/guestfs-internal-frontend.h | 1 +
src/utils.c | 57 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h
index 5f16647..b52b584 100644
--- a/src/guestfs-internal-frontend.h
+++ b/src/guestfs-internal-frontend.h
@@ -87,6 +87,7 @@ extern int guestfs_int_is_true (const char *str);
extern const char *guestfs_int_ovmf_i386_firmware[];
extern const char *guestfs_int_ovmf_x86_64_firmware[];
extern const char *guestfs_int_aavmf_firmware[];
+//extern void guestfs_int_fadvise_normal (int fd);
extern void guestfs_int_fadvise_sequential (int fd);
extern void guestfs_int_fadvise_random (int fd);
extern void guestfs_int_fadvise_noreuse (int fd);
diff --git a/src/utils.c b/src/utils.c
index 241e745..79adf20 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -388,9 +388,36 @@ guestfs_int_aavmf_firmware[] = {
NULL
};
+#if 0 /* not used yet */
+/**
+ * Hint that we will read or write the file descriptor normally.
+ *
+ * On Linux, this clears the C<FMODE_RANDOM> flag on the file [see
+ * below] and sets the per-file number of readahead pages to equal the
+ * block device readahead setting.
+ *
+ * It's OK to call this on a non-file since we ignore failure as it is
+ * only a hint.
+ */
+void
+guestfs_int_fadvise_normal (int fd)
+{
+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_NORMAL)
+ /* It's not clear from the man page, but the 'advice' parameter is
+ * NOT a bitmask. You can only pass one parameter with each call.
+ */
+ ignore_value (posix_fadvise (fd, 0, 0, POSIX_FADV_NORMAL));
+#endif
+}
+#endif
+
/**
* Hint that we will read or write the file descriptor sequentially.
*
+ * On Linux, this clears the C<FMODE_RANDOM> flag on the file [see
+ * below] and sets the per-file number of readahead pages to twice the
+ * block device readahead setting.
+ *
* It's OK to call this on a non-file since we ignore failure as it is
* only a hint.
*/
@@ -408,6 +435,23 @@ guestfs_int_fadvise_sequential (int fd)
/**
* Hint that we will read or write the file descriptor randomly.
*
+ * On Linux, this sets the C<FMODE_RANDOM> flag on the file. The
+ * effect of this flag is to:
+ *
+ * =over 4
+ *
+ * =item *
+ *
+ * Disable normal sequential file readahead.
+ *
+ * =item *
+ *
+ * If any read of the file is done which misses in the page cache, 2MB
+ * are read into the page cache. [I think - I'm not sure I totally
+ * understand what this is doing]
+ *
+ * =back
+ *
* It's OK to call this on a non-file since we ignore failure as it is
* only a hint.
*/
@@ -425,6 +469,8 @@ guestfs_int_fadvise_random (int fd)
/**
* Hint that we will access the data only once.
*
+ * On Linux, this does nothing.
+ *
* It's OK to call this on a non-file since we ignore failure as it is
* only a hint.
*/
@@ -443,6 +489,13 @@ guestfs_int_fadvise_noreuse (int fd)
/**
* Hint that we will not access the data in the near future.
*
+ * On Linux, this immediately writes out any dirty pages in the page
+ * cache and then invalidates (drops) all pages associated with this
+ * file from the page cache. Apparently it does this even if the file
+ * is opened or being used by other processes. This setting is not
+ * persistent; if you subsequently read the file it will be cached in
+ * the page cache as normal.
+ *
* It's OK to call this on a non-file since we ignore failure as it is
* only a hint.
*/
@@ -461,6 +514,10 @@ guestfs_int_fadvise_dontneed (int fd)
/**
* Hint that we will access the data in the near future.
*
+ * On Linux, this immediately reads the whole file into the page
+ * cache. This setting is not persistent; subsequently pages may be
+ * dropped from the page cache as normal.
+ *
* It's OK to call this on a non-file since we ignore failure as it is
* only a hint.
*/
--
2.7.4