Test for fuse_lowlevel_notify_expire_entry.

This test is too simple to check for all functionalities of notify_expire as it always successfully passes when libfuse supports the function (even if kernel does not support it -  it just takes it as notify_inval)

diff --git a/example/notify_inval_entry.c b/example/notify_inval_entry.c
index 9f5099293938f21ea75d96bae28a6d8327dc344f..8af31bc77b4be675cc84816feb0c7c8e8b60a9d3 100644 (file)
--- a/example/notify_inval_entry.c
+++ b/example/notify_inval_entry.c
@@ -11,8 +11,8 @@
  * This example implements a file system with a single file whose
  * file name changes dynamically to reflect the current time.
  *
- * It illustrates the use of the fuse_lowlevel_notify_inval_entry()
- * function.
+ * It illustrates the use of the fuse_lowlevel_notify_inval_entry() and
+ * fuse_lowlevel_notify_expire_entry() functions.
  *
  * To see the effect, first start the file system with the
  * ``--no-notify``
@@ -64,6 +64,9 @@
  *     $ sleep 1; stat mnt/$file
  *     stat: cannot stat ‘mnt/Time_is_20h_42m_11s’: No such file or directory
  *
+ * To use the function fuse_lowlevel_notify_expire_entry() instead of
+ * fuse_lowlevel_notify_inval_entry(), use the command line option --only-expire
+ *
  * ## Compilation ##
  *
  *     gcc -Wall notify_inval_entry.c `pkg-config fuse3 --cflags --libs` -o notify_inval_entry
@@ -96,11 +99,13 @@ struct options {
     int no_notify;
     float timeout;
     int update_interval;
+    int only_expire;
 };
 static struct options options = {
     .timeout = 5,
     .no_notify = 0,
     .update_interval = 1,
+    .only_expire = 0,
 };
 
 #define OPTION(t, p)                           \
@@ -109,6 +114,7 @@ static const struct fuse_opt option_spec[] = {
     OPTION("--no-notify", no_notify),
     OPTION("--update-interval=%d", update_interval),
     OPTION("--timeout=%f", timeout),
+    OPTION("--only-expire", only_expire),
     FUSE_OPT_END
 };
 
@@ -250,9 +256,15 @@ static void* update_fs_loop(void *data) {
     while(1) {
         old_name = strdup(file_name);
         update_fs();
-        if (!options.no_notify && lookup_cnt)
-            assert(fuse_lowlevel_notify_inval_entry
-                   (se, FUSE_ROOT_ID, old_name, strlen(old_name)) == 0);
+        if (!options.no_notify && lookup_cnt) {
+            if(options.only_expire) {
+                assert(fuse_lowlevel_notify_expire_entry
+                   (se, FUSE_ROOT_ID, old_name, strlen(old_name), FUSE_LL_EXPIRE_ONLY) == 0);
+            } else {
+                assert(fuse_lowlevel_notify_inval_entry
+                      (se, FUSE_ROOT_ID, old_name, strlen(old_name)) == 0);
+            }
+        }
         free(old_name);
         sleep(options.update_interval);
     }
@@ -266,6 +278,7 @@ static void show_help(const char *progname)
                "    --timeout=<secs>       Timeout for kernel caches\n"
                "    --update-interval=<secs>  Update-rate of file system contents\n"
                "    --no-notify            Disable kernel notifications\n"
+               "    --only-expire            Expire entries instead of invalidating them\n"
                "\n");
 }
 

diff --git a/test/test_examples.py b/test/test_examples.py
index 97eebfc3b9e6c871ccb8f0577fb758ca14e1e527..cfce57c2317d3f0d837e4dc3c54337005f17cf83 100755 (executable)
--- a/test/test_examples.py
+++ b/test/test_examples.py
@@ -331,8 +331,9 @@ def test_null(tmpdir, output_checker):
 
 @pytest.mark.skipif(fuse_proto < (7,12),
                     reason='not supported by running kernel')
+@pytest.mark.parametrize("only_expire", ("invalidate_entries", "expire_entries"))
 @pytest.mark.parametrize("notify", (True, False))
-def test_notify_inval_entry(tmpdir, notify, output_checker):
+def test_notify_inval_entry(tmpdir, only_expire, notify, output_checker):
     mnt_dir = str(tmpdir)
     cmdline = base_cmdline + \
               [ pjoin(basename, 'example', 'notify_inval_entry'),
@@ -340,6 +341,8 @@ def test_notify_inval_entry(tmpdir, notify, output_checker):
                 '--timeout=5', mnt_dir ]
     if not notify:
         cmdline.append('--no-notify')
+    if only_expire == "expire_entries":
+        cmdline.append('--only-expire')
     mount_process = subprocess.Popen(cmdline, stdout=output_checker.fd,
                                      stderr=output_checker.fd)
     try: