added support for utimens and bmap methods

Author: dzsekijo

README.new_fusepy_api

@@ -287,7 +287,8 @@ Complete support for hi-lib
 
 The Python bindings support all highlevel (pathname based) methods of
 the Fuse library as of API revision 26, including `create`, `access`,
-`flush` and *extended attributes*.
+`flush`, extended attributes, advisory file locking, nanosec precise
+setting of acces/modify times, and `bmap`.
 
 
 Reflection

example/xmp.py

@@ -114,6 +114,13 @@ def mkdir(self, path, mode):
     def utime(self, path, times):
         os.utime("." + path, times)
 
+#    The following utimens method would do the same as the above utime method.
+#    We can't make it better though as the Python stdlib doesn't know of
+#    subsecond preciseness in acces/modify times.
+#  
+#    def utimens(self, path, ts_acc, ts_mod):
+#      os.utime("." + path, (ts_acc.tv_sec, ts_mod.tv_sec))
+
     def access(self, path, mode):
         if not os.access("." + path, mode):
             return -EACCES

fuse.py

@@ -450,6 +450,15 @@ class Flock(FuseStruct):
     pass
 
 
+class Timespec(FuseStruct):
+    """
+    Cf. struct timespec in time.h:
+    http://www.opengroup.org/onlinepubs/009695399/basedefs/time.h.html
+    """
+
+    pass
+
+
 class FuseFileInfo(FuseStruct):
 
     def __init__(self, **kw):
@@ -514,6 +523,8 @@ def feature_needs(*feas):
             'has_fsinit':     ('has_init'),
             'has_fsdestroy':  ('has_destroy'),
             'has_lock':       26,
+            'has_utimens':    26,
+            'has_bmap':       26,
             'has_init':       23,
             'has_destroy':    23,
             '*':              '!re:^\*$'}
@@ -606,8 +617,8 @@ class Fuse(object):
               'chown', 'truncate', 'utime', 'open', 'read', 'write', 'release',
               'statfs', 'fsync', 'create', 'opendir', 'releasedir', 'fsyncdir',
               'flush', 'fgetattr', 'ftruncate', 'getxattr', 'listxattr',
-              'setxattr', 'removexattr', 'access', 'lock', 'fsinit',
-              'fsdestroy']
+              'setxattr', 'removexattr', 'access', 'lock', 'utimens', 'bmap',
+              'fsinit', 'fsdestroy']
 
     fusage = "%prog [mountpoint] [options]"
 
@@ -700,15 +711,20 @@ def lowwrap(self, fname):
         """
         fun = getattr(self, fname)
 
-        if not fname in ('open', 'create'):
-            return fun
-
-        def wrap(*a, **kw):
-            res = fun(*a, **kw)
-            if not res or type(res) == type(0):
-                return res
-            else:
-                return (res, type(res) != FuseFileInfo)
+        if fname in ('open', 'create'):
+            def wrap(*a, **kw):
+                res = fun(*a, **kw)
+                if not res or type(res) == type(0):
+                    return res
+                else:
+                    return (res, type(res) != FuseFileInfo)
+        elif fname == 'utimens':
+            def wrap(path, acc_sec, acc_nsec, mod_sec, mod_nsec):
+                ts_acc = Timespec(tv_sec = acc_sec, tv_nsec = acc_nsec)
+                ts_mod = Timespec(tv_sec = mod_sec, tv_nsec = mod_nsec)
+                return fun(path, ts_acc, ts_mod)
+        else:
+            wrap = fun
 
         return wrap
 

fuseparts/_fusemodule.c

@@ -43,8 +43,8 @@ static PyObject *getattr_cb=NULL, *readlink_cb=NULL, *readdir_cb=NULL,
   *statfs_cb=NULL, *fsync_cb=NULL, *create_cb=NULL, *opendir_cb=NULL,
   *releasedir_cb=NULL, *fsyncdir_cb=NULL, *flush_cb=NULL, *ftruncate_cb=NULL,
   *fgetattr_cb=NULL, *getxattr_cb=NULL, *listxattr_cb=NULL, *setxattr_cb=NULL,
-  *removexattr_cb=NULL, *access_cb=NULL, *lock_cb = NULL, *fsinit_cb=NULL,
-  *fsdestroy_cb = NULL;
+  *removexattr_cb=NULL, *access_cb=NULL, *lock_cb = NULL, *utimens_cb = NULL,
+  *bmap_cb = NULL, *fsinit_cb=NULL, *fsdestroy_cb = NULL;
 
 static PyObject *Py_FuseError;
 static PyInterpreterState *interp;
@@ -792,6 +792,7 @@ fsdestroy_func(void *param)
 }
 #endif
 
+#if FUSE_VERSION >= 26
 static inline PyObject *
 lock_func_i(const char *path, struct fuse_file_info *fi, int cmd,
             struct flock *lock)
@@ -841,6 +842,48 @@ lock_func(const char *path, struct fuse_file_info *fi, int cmd,
 	EPILOGUE
 }
 
+static int
+utimens_func(const char *path, const struct timespec ts[2])
+{
+	PROLOGUE(
+	  PyObject_CallFunction(utimens_cb, "siiii", path,
+	                        ts[0].tv_sec, ts[0].tv_nsec,
+	                        ts[1].tv_sec, ts[1].tv_nsec)
+	)
+
+	EPILOGUE
+}
+
+static int
+bmap_func(const char *path, size_t blocksize, uint64_t *idx)
+{
+	PyObject *pytmp;
+	unsigned long long ctmp;
+	struct { uint64_t idx; } idxwrapper;
+
+	PROLOGUE(
+#if PY_VERSION_HEX < 0x02050000
+	  PyObject_CallFunction(bmap_cb, "siK", path, blocksize, *idx)
+#else
+	  PyObject_CallFunction(bmap_cb, "snK", path, blocksize, *idx)
+#endif
+	)
+
+	/*
+	 * We can make use of our py -> C numeric conversion macro with some
+	 * customization of the parameters...
+	 */
+	pytmp = v;
+	Py_INCREF(pytmp);
+	py2attr(&idxwrapper, idx);
+
+	*idx = idxwrapper.idx;
+	ret = 0;
+
+	EPILOGUE
+}
+#endif
+
 static int
 pyfuse_loop_mt(struct fuse *f)
 {
@@ -882,14 +925,14 @@ Fuse_main(PyObject *self, PyObject *args, PyObject *kw)
 		"open", "read", "write", "release", "statfs", "fsync",
 		"create", "opendir", "releasedir", "fsyncdir", "flush",
 	        "ftruncate", "fgetattr", "getxattr", "listxattr", "setxattr",
-	        "removexattr", "access", "lock", "fsinit", "fsdestroy",
-		"fuse_args", "multithreaded", NULL
+	        "removexattr", "access", "lock", "utimens", "bmap",
+		"fsinit", "fsdestroy", "fuse_args", "multithreaded", NULL
 	};
 
 	memset(&op, 0, sizeof(op));
 
 	if (!PyArg_ParseTupleAndKeywords(args, kw,
-	                                 "|OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOi", 
+	                                 "|OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOi", 
 	                                 kwlist, &getattr_cb, &readlink_cb,
 	                                 &readdir_cb, &mknod_cb, &mkdir_cb,
 	                                 &unlink_cb, &rmdir_cb, &symlink_cb,
@@ -902,7 +945,8 @@ Fuse_main(PyObject *self, PyObject *args, PyObject *kw)
 	                                 &flush_cb, &ftruncate_cb,
 	                                 &fgetattr_cb, &getxattr_cb,
 	                                 &listxattr_cb, &setxattr_cb,
-	                                 &removexattr_cb, &access_cb, &lock_cb,
+	                                 &removexattr_cb, &access_cb,
+	                                 &lock_cb, &utimens_cb, &bmap_cb,
 	                                 &fsinit_cb, &fsdestroy_cb,
 	                                 &fargseq, &multithreaded))
 		return NULL;
@@ -957,6 +1001,8 @@ Fuse_main(PyObject *self, PyObject *args, PyObject *kw)
 #endif
 #if FUSE_VERSION >= 26
 	DO_ONE_ATTR(lock);
+	DO_ONE_ATTR(utimens);
+	DO_ONE_ATTR(bmap);
 #endif
 #if FUSE_VERSION >= 23
 	DO_ONE_ATTR_AS(init, fsinit);