ffi-libfuse 0.0.1.rctest12 → 0.3.3

data/lib/ffi/libfuse/fuse_common.rb

@@ -13,7 +13,7 @@ module FFI
     attach_function :fuse_get_session, [:fuse], :session
     attach_function :fuse_set_signal_handlers, [:session], :int
     attach_function :fuse_remove_signal_handlers, [:session], :void
-    attach_function :fuse_loop, [:fuse], :int, blocking: false
+    attach_function :fuse_loop, [:fuse], :int
     attach_function :fuse_clean_cache, [:fuse], :int
     attach_function :fuse_exit, [:fuse], :void
     attach_function :fuse_destroy, [:fuse], :void
@@ -42,16 +42,11 @@ module FFI
       def run(native: false, **options)
         return false unless mounted?
 
-        if native
-          run_native(**options)
-        else
-          run_ruby(**options)
-        end
+        native ? run_native(**options) : run_ruby(**options)
       rescue Errno => e
         -e.errno
-      rescue StandardError => e
-        warn e
-        warn e.backtrace.join("\n")
+      rescue StandardError, ScriptError => e
+        warn "#{e}\n#{e.backtrace.join("\n")}"
         -1
       ensure
         teardown
@@ -75,15 +70,14 @@ module FFI
       #
       #    * clone_fd is ignored
       #    * filesystem interrupts probably can't work
-      def run_ruby(foreground: true, single_thread: true, traps: {}, **options)
+      def run_ruby(foreground: true, single_thread: true, traps: {}, remember: false, **options)
         Ackbar.trap(default_traps.merge(traps)) do |signals|
           daemonize unless foreground
 
-          if single_thread
-            fuse_loop(signals: signals, **options)
-          else
-            fuse_loop_mt(signals: signals, **options)
-          end
+          # Monitor for signals (and cache cleaning if required)
+          signals.monitor { fuse_cache_timeout(remember) }
+
+          single_thread ? fuse_loop(**options) : fuse_loop_mt(**options)
           0
         end
       end
@@ -100,43 +94,28 @@ module FFI
       #    * multi-threading will create a new ruby thread for every callback
       #    * cannot daemonize multi-threaded (hangs) TODO: Why - pthread_lock?, GVL?
       #    * cannot pass signals to the filesystem
+      #    * connot use fuse_context (because the ruby thread is not the native thread)
       #
       # @api private
       # @param [Boolean] foreground
       # @param [Boolean] single_thread
-      #
       def run_native(foreground: true, single_thread: true, **options)
-        if !single_thread && !foreground
-          warn 'Cannot run native multi-thread fuse_loop when daemonized. Using single_thread mode'
-          single_thread = true
-        end
+        raise 'Cannot run daemonized native multi-thread fuse_loop' if !single_thread && !foreground
 
         clear_default_traps
         (se = session) && Libfuse.fuse_set_signal_handlers(se)
 
         Libfuse.fuse_daemonize(foreground ? 1 : 0)
-
-        if single_thread
-          Libfuse.fuse_loop(@fuse)
-        else
-          native_fuse_loop_mt(**options)
-        end
+        single_thread ? Libfuse.fuse_loop(@fuse) : native_fuse_loop_mt(**options)
       ensure
         (se = session) && Libfuse.fuse_remove_signal_handlers(se)
       end
 
-      # Tell the processing loop to stop and force unmount the filesystem which is unfortunately required to make
-      # the processing threads, which are mostly blocked on io reads from /dev/fuse fd, to exit.
-      def exit
-        Libfuse.fuse_exit(@fuse) if @fuse
-        # Force threads blocked reading on #io to finish
-        unmount
-      end
-
       # Ruby implementation of fuse default traps
       # @see Ackbar
       def default_traps
-        @default_traps ||= { INT: -> { exit }, HUP: -> { exit }, TERM: -> { exit }, PIPE: 'IGNORE' }
+        exproc = ->(signame) { exit(signame) }
+        @default_traps ||= { INT: exproc, HUP: exproc, TERM: exproc, TSTP: exproc, PIPE: 'IGNORE' }
       end
 
       # @api private
@@ -185,24 +164,8 @@ module FFI
 
       # @api private
       # Ruby implementation of single threaded fuse loop
-      def fuse_loop(signals:, remember: false, **_options)
-        loop do
-          break unless mounted?
-
-          timeout = remember ? fuse_clean_cache : nil
-
-          ready, _ignore_writable, errors = ::IO.select([io, signals.pr], [], [io], timeout)
-
-          next unless ready || errors
-
-          raise 'FUSE error' unless errors.empty?
-
-          break if ready.include?(io) && !process
-
-          break if ready.include?(signals.pr) && !signals.next
-        rescue Errno::EBADF
-          raise if mounted? # This will occur on exit
-        end
+      def fuse_loop(**_options)
+        safe_fuse_process until fuse_exited?
       end
 
       # @api private
@@ -212,24 +175,56 @@ module FFI
       # fuse api.
       #
       # @see ThreadPool ThreadPool for the mechanism that controls creation and termination of worker threads
-      def fuse_loop_mt(signals:, max_idle_threads: 10, max_threads: nil, remember: false, **_options)
-        # Monitor for signals (and cache cleaning if required)
+      def fuse_loop_mt(max_idle_threads: 10, max_threads: nil, **_options)
+        ThreadPool.new(name: 'FuseThread', max_idle: max_idle_threads.to_i, max_active: max_threads&.to_i) do
+          raise StopIteration if fuse_exited?
 
-        signals.monitor { remember ? fuse_clean_cache : nil }
-        ThreadPool.new(name: 'FuseThread', max_idle: max_idle_threads.to_i, max_active: max_threads) { process }.join
+          safe_fuse_process
+        end.join
       end
 
       # @!visibility private
+
+      def safe_fuse_process
+        # sometimes we get null on unmount, and exit needs a chance to finish to avoid hangs
+        fuse_process || (sleep(0.1) && false)
+      end
+
       def teardown
         return unless @fuse
 
-        unmount
-        Libfuse.fuse_destroy(@fuse)
-        ObjectSpace.undefine_finalizer(self)
+        self.exit&.join
+
+        Libfuse.fuse_destroy(@fuse) if @fuse
         @fuse = nil
+      ensure
+        ObjectSpace.undefine_finalizer(self)
+      end
+
+      # Starts a thread to unmount the filesystem and stop the processing loop.
+      # generally expected to be called from a signal handler
+      # @return [Thread] the unmount thread
+      def exit(_signame = nil)
+        return unless @fuse
+
+        # Unmount/exit in a separate thread so the main fuse thread can keep running.
+        @exit ||= Thread.new do
+          unmount
+
+          # without this sleep before exit, MacOS does not complete unmounting
+          sleep 0.2 if mac_fuse?
+
+          Libfuse.fuse_exit(@fuse)
+          true
+        end
+      end
+
+      private
+
+      def fuse_cache_timeout(remember)
+        remember ? fuse_clean_cache : nil
       end
 
-      # @!visibility private
       def session
         return nil unless @fuse
 
@@ -244,6 +239,10 @@ module FFI
           Signal.trap(sig, prev) unless prev == 'DEFAULT'
         end
       end
+
+      def mac_fuse?
+        FFI::Platform::IS_MAC
+      end
     end
   end
 end

data/lib/ffi/libfuse/fuse_config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../accessors'
+require_relative '../boolean_int'
 module FFI
   module Libfuse
     #
@@ -11,195 +12,185 @@ module FFI
     #
     class FuseConfig < FFI::Struct
       include FFI::Accessors
+
       layout(
         {
-          # @!method set_gid?
-          #   @return [Boolean]
           # @!attribute [r] gid
-          #   @return [Integer]
-          # If `set_gid?` is true the st_gid attribute of each file is overwritten with the value of `gid`.
-          #
-          set_gid: :int,
+          # @return [Integer|nil] if set, this value will be used for the :gid attribute of each file
+          set_gid: :bool_int,
           gid: :uint,
 
-          # @!method set_uid?
-          #   @return [Boolean]
           # @!attribute [r] uid
-          #   @return [Integer]
-          # If `set_uid?' is true the st_uid attribute of each file is overwritten with the value of `uid`.
-          #
-          set_uid: :int,
+          # @return [Integer|nil] if set, this value will be used for the :uid attribute of each file
+          set_uid: :bool_int,
           uid: :uint,
 
-          # @!method set_mode?
-          #   @return [Boolean]
-          # @!attribute [r] mode
-          #   @return [Integer]
-          # If `set_mode?` is true, the any permissions bits set in `umask` are unset in the st_mode attribute of each
-          # file.
-          #
-          set_mode: :int,
+          # @!attribute [r] umask
+          # @return [Integer|nil] if set, this mask will be applied to the mode attribute of each file
+          set_mode: :bool_int,
           umask: :uint,
-          #
-          # The timeout in seconds for which name lookups will be
-          # cached.
-          #
+
+          # @!attribute [rw] entry_timeout
+          # The timeout in seconds for which name lookups will be cached.
+          # @return [Float]
           entry_timeout: :double,
+
+          # @!attribute [rw] negative_timeout
+          # The timeout in seconds for which a negative lookup will be cached.
           #
-          # The timeout in seconds for which a negative lookup will be
-          # cached. This means, that if file did not exist (lookup
-          # retuned ENOENT), the lookup will only be redone after the
-          # timeout, and the file/directory will be assumed to not
-          # exist until then. A value of zero means that negative
-          # lookups are not cached.
+          # This means, that if file did not exist (lookup retuned ENOENT), the lookup will only be redone after the
+          # timeout, and the file/directory will be assumed to not exist until then. A value of zero means that
+          # negative lookups are not cached.
           #
+          # @return [Float]
           negative_timeout: :double,
-          #
+
+          # @!attribute [rw] attr_timeout
           # The timeout in seconds for which file/directory attributes
-          # (as returned by e.g. the `getattr` handler) are cached.
           #
-          attr_timeout: :double,
+          #  (as returned by e.g. the `getattr` handler) are cached.
           #
+          # @return [Float]
+          attr_timeout: :double,
+
+          # @!attribute [rw] intr
           # Allow requests to be interrupted
+          # @return [Boolean]
+          intr: :bool_int,
+
+          # @!attribute [rw] intr_signal
+          # Which signal number to send to the filesystem when a request is interrupted.
           #
-          intr: :int,
-          #
-          # Specify which signal number to send to the filesystem when
-          # a request is interrupted.  The default is hardcoded to
-          # USR1.
+          # The default is hardcoded to USR1.
           #
+          # @return [Integer]
           intr_signal: :int,
+
+          # @!attribute [rw] remember
+          # the number of seconds inodes are remembered
           #
-          # Normally, FUSE assigns inodes to paths only for as long as
-          # the kernel is aware of them. With this option inodes are
-          # instead remembered for at least this many seconds.  This
-          # will require more memory, but may be necessary when using
-          # applications that make use of inode numbers.
+          # Normally, FUSE assigns inodes to paths only for as long as the kernel is aware of them. With this option
+          # inodes are instead remembered for at least this many seconds.  This will require more memory, but may be
+          # necessary when using applications that make use of inode numbers.
           #
-          # A number of -1 means that inodes will be remembered for the
-          # entire life-time of the file-system process.
+          # A number of -1 means that inodes will be remembered for the entire life-time of the file-system process.
           #
+          # @return [Integer]
           remember: :int,
+
+          # @!attribute [rw] hard_remove
+          # should open files be removed immediately
           #
-          # The default behavior is that if an open file is deleted,
-          # the file is renamed to a hidden file (.fuse_hiddenXXX), and
-          # only removed when the file is finally released.  This
-          # relieves the filesystem implementation of having to deal
-          # with this problem. This option disables the hiding
-          # behavior, and files are removed immediately in an unlink
-          # operation (or in a rename operation which overwrites an
-          # existing file).
-          #
-          # It is recommended that you not use the hard_remove
-          # option. When hard_remove is set, the following libc
-          # functions fail on unlinked files (returning errno of
-          # ENOENT): read(2), write(2), fsync(2), close(2), f*xattr(2),
-          # ftruncate(2), fstat(2), fchmod(2), fchown(2)
-          #
-          hard_remove: :int,
+          # The default behavior is that if an open file is deleted, the file is renamed to a hidden file
+          # (.fuse_hiddenXXX), and only removed when the file is finally released.  This relieves the filesystem
+          # implementation of having to deal with this problem. This option disables the hiding behavior, and files are
+          # removed immediately in an unlink operation (or in a rename operation which overwrites an existing file).
           #
-          # Honor the st_ino field in the functions getattr() and
-          # fill_dir(). This value is used to fill in the st_ino field
-          # in the stat(2), lstat(2), fstat(2) functions and the d_ino
-          # field in the readdir(2) function. The filesystem does not
-          # have to guarantee uniqueness, however some applications
-          # rely on this value being unique for the whole filesystem.
+          # It is recommended that you not use the hard_remove option. When hard_remove is set, the following libc
+          # functions fail on unlinked files (returning errno of ENOENT): read(2), write(2), fsync(2), close(2),
+          # f*xattr(2), ftruncate(2), fstat(2), fchmod(2), fchown(2)
           #
-          # Note that this does *not* affect the inode that libfuse
-          # and the kernel use internally (also called the "nodeid").
+          # @return [Boolean]
+          hard_remove: :bool_int,
+
+          # @!attribute [rw] use_ino
+          # use filesystem provided inode values
           #
-          use_ino: :int,
+          # Honor the st_ino field in the functions getattr() and fill_dir(). This value is used to fill in the st_ino
+          # field in the stat(2), lstat(2), fstat(2) functions and the d_ino field in the readdir(2) function. The
+          # filesystem does not have to guarantee uniqueness, however some applications rely on this value being unique
+          # for the whole filesystem.
           #
-          # If use_ino option is not given, still try to fill in the
-          # d_ino field in readdir(2). If the name was previously
-          # looked up, and is still in the cache, the inode number
-          # found there will be used.  Otherwise it will be set to -1.
-          # If use_ino option is given, this option is ignored.
+          # Note that this does *not* affect the inode that libfuse and the kernel use internally (also called the
+          # "nodeid").
           #
-          readdir_ino: :int,
+          # @return [Boolean]
+          use_ino: :bool_int,
+
+          # @!attribute [rw] readdir_ino
+          # generate inodes for readdir even if {#use_ino} is set
+          #
+          # If use_ino option is not given, still try to fill in the d_ino field in readdir(2). If the name was
+          # previously looked up, and is still in the cache, the inode number found there will be used.  Otherwise it
+          # will be set to -1. If use_ino option is given, this option is ignored.
+          # @return [Boolean]
+          readdir_ino: :bool_int,
+
+          # @!attribute [rw] direct_io
+          # disables the use of kernel page cache (file content cache) in the kernel for this filesystem.
           #
-          # This option disables the use of page cache (file content cache)
-          # in the kernel for this filesystem. This has several affects:
+          # This has several affects:
           #
-          # 1. Each read(2) or write(2) system call will initiate one
-          #    or more read or write operations, data will not be
+          # 1. Each read(2) or write(2) system call will initiate one or more read or write operations, data will not be
           #    cached in the kernel.
           #
-          # 2. The return value of the read() and write() system calls
-          #    will correspond to the return values of the read and
-          #    write operations. This is useful for example if the
-          #    file size is not known in advance (before reading it).
-          #
-          # Internally, enabling this option causes fuse to set the
-          # `direct_io` field of `struct fuse_file_info` - overwriting
-          # any value that was put there by the file system.
-          #
-          direct_io: :int,
-          #
-          # This option disables flushing the cache of the file
-          # contents on every open(2).  This should only be enabled on
-          # filesystem where the file data is never changed
-          # externally (not through the mounted FUSE filesystem).  Thus
-          # it is not suitable for network filesystem and other
-          # intermediate filesystem.
-          #
-          # NOTE: if this option is not specified (and neither
-          # direct_io) data is still cached after the open(2), so a
-          # read(2) system call will not always initiate a read
-          # operation.
-          #
-          # Internally, enabling this option causes fuse to set the
-          # `keep_cache` field of `struct fuse_file_info` - overwriting
-          # any value that was put there by the file system.
-          #
-          kernel_cache: :int,
+          # 2. The return value of the read() and write() system calls will correspond to the return values of the read
+          #    and write operations. This is useful for example if the file size is not known in advance (before reading
+          #    it).
           #
-          # This option is an alternative to `kernel_cache`. Instead of
-          # unconditionally keeping cached data, the cached data is
-          # invalidated on open(2) if if the modification time or the
-          # size of the file has changed since it was last opened.
+          # Internally, enabling this option causes fuse to set {FuseFileInfo#direct_io} overwriting any value that was
+          # put there by the file system during :open
+          # @return [Boolean]
+          direct_io: :bool_int,
+
+          # @!attribute [rw] kernel_cache
+          # disables flushing the cache of the file contents on every open(2).
           #
-          auto_cache: :int,
+          # This should only be enabled on filesystem where the file data is never changed externally (not through the
+          # mounted FUSE filesystem).  Thus it is not suitable for network filesystem and other intermediate filesystem.
           #
-          # The timeout in seconds for which file attributes are cached
-          # for the purpose of checking if auto_cache should flush the
-          # file data on open.
+          # **Note**:  if neither this option or {#direct_io} is specified data is still cached after the open(2),
+          # so a read(2) system call will not always initiate a read operation.
           #
-          ac_attr_timeout_set: :int,
+          # Internally, enabling this option causes fuse to set {FuseFileInfo#keep_cache} overwriting any value that was
+          # put there by the file system.
+          # @return [Boolean]
+          kernel_cache: :bool_int,
+
+          # @!attribute [rw] auto_cache
+          # invalidate cached data on open based on changes in file attributes
+          #
+          # This option is an alternative to `kernel_cache`. Instead of unconditionally keeping cached data, the cached
+          # data is invalidated on open(2) if if the modification time or the size of the file has changed since it was
+          # last opened.
+          # @return [Boolean]
+          auto_cache: :bool_int,
+
+          # @!attribute [rw] ac_attr_timeout
+          #  if set the timeout in seconds for which file attributes are cached for the purpose of checking if
+          # auto_cache should flush the file data on open.
+          # @return [Float|nil]
+          ac_attr_timeout_set: :bool_int,
           ac_attr_timeout: :double,
+
+          # @!attribute [rw] nullpath_ok
+          # operations on open files and directories are ok to receive nil paths
           #
-          # If this option is given the file-system handlers for the
-          # following operations will not receive path information:
-          # read, write, flush, release, fsync, readdir, releasedir,
-          # fsyncdir, lock, ioctl and poll.
-          #
-          # For the truncate, getattr, chmod, chown and utimens
-          # operations the path will be provided only if the struct
-          # fuse_file_info argument is NULL.
-          #
-          nullpath_ok: :int,
-          #
-          # The remaining options are used by libfuse internally and
-          # should not be touched.
+          # If this option is given the file-system handlers for the following operations will not receive path
+          # information: read, write, flush, release, fsync, readdir, releasedir, fsyncdir, lock, ioctl and poll.
           #
-          show_help: :int,
+          # For the truncate, getattr, chmod, chown and utimens operations the path will be provided only if the
+          # {FuseFileInfo} argument is nil.
+          # @return [Boolean]
+          nullpath_ok: :bool_int,
+
+          # The remaining options are used by libfuse internally and should not be touched.
+          show_help: :bool_int,
           modules: :pointer,
-          debug: :int
+          debug: :bool_int
         }
       )
 
-      BOOL_ATTRS = %i[
-        nullpath_ok ac_attr_timeout_set auto_cache kernel_cache direct_io
-        readdir_ino use_ino hard_remove intr set_mode set_uid set_gid
-      ].freeze
-
-      ffi_attr_reader(*BOOL_ATTRS)
-      ffi_attr_writer(*BOOL_ATTRS) { |v| v && v != 0 ? 1 : 0 }
-      BOOL_ATTRS.each { |a| define_method("#{a}?") { send(a) != 0 } }
+      setters = { gid: :set_gid, uid: :set_uid, umask: :set_mode, ac_attr_timeout: :ac_attr_timeout_set }
+      setters.each do |(attr, setter)|
+        ffi_attr_reader(attr)
+        ffi_attr_writer(attr) do |val|
+          self[setter] = !val.nil?
+          val || 0
+        end
+      end
 
-      OTHER_ATTRS = %i[ac_attr_timeout remember intr_signal attr_timeout negative_timeout entry_timeout umask uid
-                       gid].freeze
-      ffi_attr_accessor(*OTHER_ATTRS)
+      ffi_attr_accessor(*(members - (setters.keys + setters.values)))
     end
   end
 end