Updated example code to work with new API (#547)

diff --git a/example/hello_ll.c b/example/hello_ll.c
index 668d81b2e6a0463363a207ac5a41caed047ed5b4..1db5eff8f00099a798fefecf7fc312dd9ac91411 100644 (file)
--- a/example/hello_ll.c
+++ b/example/hello_ll.c
@@ -18,7 +18,7 @@
  * \include hello_ll.c
  */
 
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include <fuse_lowlevel.h>
 #include <stdio.h>
@@ -166,6 +166,7 @@ int main(int argc, char *argv[])
        struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
        struct fuse_session *se;
        struct fuse_cmdline_opts opts;
+       struct fuse_loop_config config;
        int ret = -1;
 
        if (fuse_parse_cmdline(&args, &opts) != 0)
@@ -206,8 +207,11 @@ int main(int argc, char *argv[])
        /* Block until ctrl+c or fusermount -u */
        if (opts.singlethread)
                ret = fuse_session_loop(se);
-       else
-               ret = fuse_session_loop_mt(se, opts.clone_fd);
+       else {
+               config.clone_fd = opts.clone_fd;
+               config.max_idle_threads = opts.max_idle_threads;
+               ret = fuse_session_loop_mt(se, &config);
+       }
 
        fuse_session_unmount(se);
 err_out3:

diff --git a/example/invalidate_path.c b/example/invalidate_path.c
index 09df178eb5db60c7f63b67fcbe6e3037182c8ea5..61ec351217f1a41b5a0865e2a196985fbf57cd90 100644 (file)
--- a/example/invalidate_path.c
+++ b/example/invalidate_path.c
@@ -25,7 +25,7 @@
  * \include @file
  */
 
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include <fuse.h>
 #include <fuse_lowlevel.h>  /* for fuse_cmdline_opts */
@@ -212,6 +212,7 @@ int main(int argc, char *argv[]) {
        struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
        struct fuse *fuse;
        struct fuse_cmdline_opts opts;
+       struct fuse_loop_config config;
        int res;
 
        /* Initialize the files */
@@ -271,8 +272,11 @@ int main(int argc, char *argv[]) {
 
        if (opts.singlethread)
                res = fuse_loop(fuse);
-       else
-               res = fuse_loop_mt(fuse, opts.clone_fd);
+       else {
+               config.clone_fd = opts.clone_fd;
+               config.max_idle_threads = opts.max_idle_threads;
+               res = fuse_loop_mt(fuse, &config);
+       }
        if (res)
                res = 1;
 

diff --git a/example/notify_inval_entry.c b/example/notify_inval_entry.c
index 00a1c09c3cd3b923439a9daa0fa2b1a5b94305ff..9f5099293938f21ea75d96bae28a6d8327dc344f 100644 (file)
--- a/example/notify_inval_entry.c
+++ b/example/notify_inval_entry.c
@@ -73,7 +73,7 @@
  */
 
 
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include <fuse_lowlevel.h>
 #include <stdio.h>
@@ -273,6 +273,7 @@ int main(int argc, char *argv[]) {
     struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
     struct fuse_session *se;
     struct fuse_cmdline_opts opts;
+    struct fuse_loop_config config;
     pthread_t updater;
     int ret = -1;
 
@@ -321,8 +322,11 @@ int main(int argc, char *argv[]) {
     /* Block until ctrl+c or fusermount -u */
     if (opts.singlethread)
         ret = fuse_session_loop(se);
-    else
-        ret = fuse_session_loop_mt(se, opts.clone_fd);
+    else {
+        config.clone_fd = opts.clone_fd;
+        config.max_idle_threads = opts.max_idle_threads;
+        ret = fuse_session_loop_mt(se, &config);
+    }
 
     fuse_session_unmount(se);
 err_out3:

diff --git a/example/notify_inval_inode.c b/example/notify_inval_inode.c
index 6f34b8fac152d96fd51c26e91f9f50ec059f17a6..b3b50aab3952d1b5cfc6b7470e9b160a238e2383 100644 (file)
--- a/example/notify_inval_inode.c
+++ b/example/notify_inval_inode.c
@@ -59,7 +59,7 @@
  */
 
 
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include <fuse_lowlevel.h>
 #include <stdio.h>
@@ -289,6 +289,7 @@ int main(int argc, char *argv[]) {
     struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
     struct fuse_session *se;
     struct fuse_cmdline_opts opts;
+    struct fuse_loop_config config;
     pthread_t updater;
     int ret = -1;
 
@@ -340,8 +341,11 @@ int main(int argc, char *argv[]) {
     /* Block until ctrl+c or fusermount -u */
     if (opts.singlethread)
         ret = fuse_session_loop(se);
-    else
-        ret = fuse_session_loop_mt(se, opts.clone_fd);
+    else {
+        config.clone_fd = opts.clone_fd;
+        config.max_idle_threads = opts.max_idle_threads;
+        ret = fuse_session_loop_mt(se, &config);
+    }
 
     fuse_session_unmount(se);
 err_out3:

diff --git a/example/notify_store_retrieve.c b/example/notify_store_retrieve.c
index 2cffacc886a157f2e72cf5d7379aabbf89db3818..0a165c59305e4796d28fb104763b1abde4765bfa 100644 (file)
--- a/example/notify_store_retrieve.c
+++ b/example/notify_store_retrieve.c
@@ -58,7 +58,7 @@
  */
 
 
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include <fuse_lowlevel.h>
 #include <stdio.h>
@@ -350,6 +350,7 @@ int main(int argc, char *argv[]) {
     struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
     struct fuse_session *se;
     struct fuse_cmdline_opts opts;
+    struct fuse_loop_config config;
     pthread_t updater;
     int ret = -1;
 
@@ -398,8 +399,11 @@ int main(int argc, char *argv[]) {
     /* Block until ctrl+c or fusermount -u */
     if (opts.singlethread)
         ret = fuse_session_loop(se);
-    else
-        ret = fuse_session_loop_mt(se, opts.clone_fd);
+    else {
+        config.clone_fd = opts.clone_fd;
+        config.max_idle_threads = opts.max_idle_threads;
+        ret = fuse_session_loop_mt(se, &config);
+    }
 
     assert(retrieve_status != 1);
     fuse_session_unmount(se);

diff --git a/example/passthrough_ll.c b/example/passthrough_ll.c
index 06bb50f1c339f7e955c897d3e0385797a972ae6d..0e7535cd6715322a8f530351006bcf9606b79354 100644 (file)
--- a/example/passthrough_ll.c
+++ b/example/passthrough_ll.c
@@ -35,7 +35,7 @@
  */
 
 #define _GNU_SOURCE
-#define FUSE_USE_VERSION 31
+#define FUSE_USE_VERSION 34
 
 #include "config.h"
 
@@ -1156,6 +1156,7 @@ int main(int argc, char *argv[])
        struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
        struct fuse_session *se;
        struct fuse_cmdline_opts opts;
+       struct fuse_loop_config config;
        struct lo_data lo = { .debug = 0,
                              .writeback = 0 };
        int ret = -1;
@@ -1255,8 +1256,11 @@ int main(int argc, char *argv[])
        /* Block until ctrl+c or fusermount -u */
        if (opts.singlethread)
                ret = fuse_session_loop(se);
-       else
-               ret = fuse_session_loop_mt(se, opts.clone_fd);
+       else {
+               config.clone_fd = opts.clone_fd;
+               config.max_idle_threads = opts.max_idle_threads;
+               ret = fuse_session_loop_mt(se, &config);
+       }
 
        fuse_session_unmount(se);
 err_out3: