X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Fuse.xs;h=5c19b92bf74408efb8ce7a5ca228f6f3e68e7622;hb=59be515b2d0d982c08816ec8c9c6d67aa674c194;hp=26b80e070ab233ede506c20c85944938f339d44d;hpb=83a53bb0cf47e91a5935a09d94545134c1a35b65;p=perl-fuse.git diff --git a/Fuse.xs b/Fuse.xs index 26b80e0..5c19b92 100755 --- a/Fuse.xs +++ b/Fuse.xs @@ -5,13 +5,45 @@ #include -#if (defined(__FreeBSD__) && __FreeBSD__ < 10) || defined(__NetBSD__) +#if (defined(__FreeBSD__) && !defined(__APPLE__)) || defined(__NetBSD__) # define XATTR_CREATE 1 # define XATTR_REPLACE 2 #else # include #endif +#if defined(__linux__) +# define STAT_NSEC(st, st_xtim) ((st)->st_xtim.tv_nsec) +#else +# define STAT_NSEC(st, st_xtim) ((st)->st_xtim##espec.tv_nsec) +#endif + +/* Implement a macro to handle multiple formats (integer, float, and array + * containing seconds and nanoseconds). */ +#define PULL_TIME(st, st_xtim, svp) \ +{ \ + SV *sv = svp; \ + if (SvROK(sv)) { \ + AV *av = (AV *)SvRV(sv); \ + if (SvTYPE((SV *)av) != SVt_PVAV) { \ + Perl_croak_nocontext("Reference was not array ref"); \ + } \ + if (av_len(av) != 1) { \ + Perl_croak_nocontext("Array of incorrect dimension"); \ + } \ + (st)->st_xtim##e = SvIV(*(av_fetch(av, 0, FALSE))); \ + STAT_NSEC(st, st_xtim) = SvIV(*(av_fetch(av, 1, FALSE))); \ + } \ + else if (SvNOK(sv) || SvIOK(sv)) { \ + double tm = SvNV(sv); \ + (st)->st_xtim##e = (int)tm; \ + STAT_NSEC(st, st_xtim) = (tm - (int)tm) * 1000000000; \ + } \ + else { \ + Perl_croak_nocontext("Invalid data type passed"); \ + } \ +} + /* Determine if threads support should be included */ #ifdef USE_ITHREADS # ifdef I_PTHREAD @@ -33,16 +65,9 @@ #define MY_CXT_KEY "Fuse::_guts" XS_VERSION #if FUSE_VERSION >= 28 -# define N_CALLBACKS 40 -/* # define N_CALLBACKS 41 */ -#elif FUSE_VERSION >= 26 -# define N_CALLBACKS 38 -#elif FUSE_VERSION >= 25 -# define N_CALLBACKS 35 -#elif FUSE_VERSION >= 23 -# define N_CALLBACKS 31 +# define N_CALLBACKS 41 #else -# define N_CALLBACKS 25 +# define N_CALLBACKS 38 #endif typedef struct { @@ -55,6 +80,7 @@ typedef struct { #ifdef USE_ITHREADS perl_mutex mutex; #endif + int utimens_as_array; } my_cxt_t; START_MY_CXT; @@ -130,8 +156,10 @@ void S_fh_store_handle(pTHX_ pMY_CXT_ struct fuse_file_info *fi, SV *sv) { SvSHARE(sv); } #endif - MAGIC *mg = (SvTYPE(sv) == SVt_PVMG) ? mg_find(sv, PERL_MAGIC_shared_scalar) : NULL; - fi->fh = mg ? PTR2IV(mg->mg_ptr) : PTR2IV(sv); + /* This seems to be screwing things up... */ + // MAGIC *mg = (SvTYPE(sv) == SVt_PVMG) ? mg_find(sv, PERL_MAGIC_shared_scalar) : NULL; + // fi->fh = mg ? PTR2IV(mg->mg_ptr) : PTR2IV(sv); + fi->fh = PTR2IV(sv); if(hv_store_ent(MY_CXT.handles, FH_KEY(fi), SvREFCNT_inc(sv), 0) == NULL) { SvREFCNT_dec(sv); } @@ -161,9 +189,9 @@ int _PLfuse_getattr(const char *file, struct stat *result) { } else { result->st_blocks = POPi; result->st_blksize = POPi; - result->st_ctime = POPi; - result->st_mtime = POPi; - result->st_atime = POPi; + PULL_TIME(result, st_ctim, POPs); + PULL_TIME(result, st_mtim, POPs); + PULL_TIME(result, st_atim, POPs); result->st_size = POPn; // we pop double here to support files larger than 4Gb (long limit) result->st_rdev = POPi; result->st_gid = POPi; @@ -507,10 +535,8 @@ int _PLfuse_open (const char *file, struct fuse_file_info *fi) { */ fi->fh = 0; /* Ensure it starts with 0 - important if they don't set it */ fihash = newHV(); -#if FUSE_VERSION >= 24 (void) hv_store(fihash, "direct_io", 9, newSViv(fi->direct_io), 0); (void) hv_store(fihash, "keep_cache", 10, newSViv(fi->keep_cache), 0); -#endif #if FUSE_VERSION >= 28 (void) hv_store(fihash, "nonseekable", 11, newSViv(fi->nonseekable), 0); #endif @@ -532,13 +558,11 @@ int _PLfuse_open (const char *file, struct fuse_file_info *fi) { if (rv == 0) { /* Success, so copy the file handle which they returned */ -#if FUSE_VERSION >= 24 SV **svp; if ((svp = hv_fetch(fihash, "direct_io", 9, 0)) != NULL) fi->direct_io = SvIV(*svp); if ((svp = hv_fetch(fihash, "keep_cache", 10, 0)) != NULL) fi->keep_cache = SvIV(*svp); -#endif #if FUSE_VERSION >= 28 if ((svp = hv_fetch(fihash, "nonseekable", 11, 0)) != NULL) fi->nonseekable = SvIV(*svp); @@ -749,7 +773,7 @@ int _PLfuse_fsync (const char *file, int datasync, struct fuse_file_info *fi) { return rv; } -#if __FreeBSD__ >= 10 +#ifdef __APPLE__ int _PLfuse_setxattr (const char *file, const char *name, const char *buf, size_t buflen, int flags, uint32_t position) { #else int _PLfuse_setxattr (const char *file, const char *name, const char *buf, size_t buflen, int flags) { @@ -776,7 +800,7 @@ int _PLfuse_setxattr (const char *file, const char *name, const char *buf, size_ return rv; } -#if __FreeBSD__ >= 10 +#ifdef __APPLE__ int _PLfuse_getxattr (const char *file, const char *name, char *buf, size_t buflen, uint32_t position) { #else int _PLfuse_getxattr (const char *file, const char *name, char *buf, size_t buflen) { @@ -908,7 +932,6 @@ int _PLfuse_removexattr (const char *file, const char *name) { return rv; } -#if FUSE_VERSION >= 23 int _PLfuse_opendir(const char *file, struct fuse_file_info *fi) { int rv; FUSE_CONTEXT_PRE; @@ -996,9 +1019,9 @@ int _PLfuse_readdir(const char *file, void *dirh, fuse_fill_dir_t dirfil, st.st_gid = SvIV(*(av_fetch(av2, 5, FALSE))); st.st_rdev = SvIV(*(av_fetch(av2, 6, FALSE))); st.st_size = SvNV(*(av_fetch(av2, 7, FALSE))); - st.st_atime = SvIV(*(av_fetch(av2, 8, FALSE))); - st.st_mtime = SvIV(*(av_fetch(av2, 9, FALSE))); - st.st_ctime = SvIV(*(av_fetch(av2, 10, FALSE))); + PULL_TIME(&st, st_atim, *(av_fetch(av2, 8, FALSE))); + PULL_TIME(&st, st_mtim, *(av_fetch(av2, 9, FALSE))); + PULL_TIME(&st, st_ctim, *(av_fetch(av2, 10, FALSE))); st.st_blksize = SvIV(*(av_fetch(av2, 11, FALSE))); st.st_blocks = SvIV(*(av_fetch(av2, 12, FALSE))); st_filled = 1; @@ -1078,11 +1101,7 @@ int _PLfuse_fsyncdir(const char *file, int datasync, return rv; } -#if FUSE_VERSION >= 26 void *_PLfuse_init(struct fuse_conn_info *fc) -#else /* FUSE_VERSION < 26 */ -void *_PLfuse_init(void) -#endif /* FUSE_VERSION >= 26 */ { void *rv = NULL; int prv; @@ -1127,9 +1146,7 @@ void _PLfuse_destroy(void *private_data) { DEBUGf("init end\n"); FUSE_CONTEXT_POST; } -#endif /* FUSE_VERSION >= 23 */ -#if FUSE_VERSION >= 25 int _PLfuse_access(const char *file, int mask) { int rv; FUSE_CONTEXT_PRE; @@ -1264,9 +1281,9 @@ int _PLfuse_fgetattr(const char *file, struct stat *result, } else { result->st_blocks = POPi; result->st_blksize = POPi; - result->st_ctime = POPi; - result->st_mtime = POPi; - result->st_atime = POPi; + PULL_TIME(result, st_ctim, POPs); + PULL_TIME(result, st_mtim, POPs); + PULL_TIME(result, st_atim, POPs); result->st_size = POPn; // we pop double here to support files larger than 4Gb (long limit) result->st_rdev = POPi; result->st_gid = POPi; @@ -1284,9 +1301,7 @@ int _PLfuse_fgetattr(const char *file, struct stat *result, FUSE_CONTEXT_POST; return rv; } -#endif /* FUSE_VERSION >= 25 */ -#if FUSE_VERSION >= 26 int _PLfuse_lock(const char *file, struct fuse_file_info *fi, int cmd, struct flock *lockinfo) { int rv; @@ -1364,8 +1379,30 @@ int _PLfuse_utimens(const char *file, const struct timespec tv[2]) { SAVETMPS; PUSHMARK(SP); XPUSHs(sv_2mortal(newSVpv(file,0))); - XPUSHs(tv ? sv_2mortal(newSVnv(tv[0].tv_sec + (tv[0].tv_nsec / 1000000000.0))) : &PL_sv_undef); - XPUSHs(tv ? sv_2mortal(newSVnv(tv[1].tv_sec + (tv[1].tv_nsec / 1000000000.0))) : &PL_sv_undef); + if (MY_CXT.utimens_as_array) { + /* Pushing timespecs as 2-element arrays (if tv is present). */ + AV *av; + if (tv) { + av = newAV(); + av_push(av, newSViv(tv[0].tv_sec)); + av_push(av, newSViv(tv[0].tv_nsec)); + XPUSHs(sv_2mortal(newRV_noinc((SV *)av))); + av = newAV(); + av_push(av, newSViv(tv[1].tv_sec)); + av_push(av, newSViv(tv[1].tv_nsec)); + XPUSHs(sv_2mortal(newRV_noinc((SV *)av))); + } + else { + XPUSHs(&PL_sv_undef); + XPUSHs(&PL_sv_undef); + } + + } + else { + /* Pushing timespecs as floating point (double) values. */ + XPUSHs(tv ? sv_2mortal(newSVnv(tv[0].tv_sec + (tv[0].tv_nsec / 1000000000.0))) : &PL_sv_undef); + XPUSHs(tv ? sv_2mortal(newSVnv(tv[1].tv_sec + (tv[1].tv_nsec / 1000000000.0))) : &PL_sv_undef); + } PUTBACK; rv = call_sv(MY_CXT.callback[36],G_SCALAR); SPAGAIN; @@ -1417,9 +1454,13 @@ int _PLfuse_bmap(const char *file, size_t blocksize, uint64_t *idx) { FUSE_CONTEXT_POST; return rv; } -#endif /* FUSE_VERSION >= 26 */ #if FUSE_VERSION >= 28 + +# ifndef __linux__ +# define _IOC_SIZE(n) IOCPARM_LEN(n) +# endif + int _PLfuse_ioctl(const char *file, int cmd, void *arg, struct fuse_file_info *fi, unsigned int flags, void *data) { int rv; @@ -1433,9 +1474,9 @@ int _PLfuse_ioctl(const char *file, int cmd, void *arg, /* I don't know why cmd is a signed int in the first place; * casting as unsigned so stupid tricks don't have to be done on * the perl side */ - XPUSHs(sv_2mortal(newSViv((unsigned int)cmd))); + XPUSHs(sv_2mortal(newSVuv((unsigned int)cmd))); XPUSHs(sv_2mortal(newSViv(flags))); - if (_IOC_DIR(cmd) & _IOC_WRITE) + if (cmd & IOC_IN) XPUSHs(sv_2mortal(newSVpvn(data, _IOC_SIZE(cmd)))); else XPUSHs(&PL_sv_undef); @@ -1443,7 +1484,7 @@ int _PLfuse_ioctl(const char *file, int cmd, void *arg, PUTBACK; rv = call_sv(MY_CXT.callback[39],G_ARRAY); SPAGAIN; - if ((_IOC_DIR(cmd) & _IOC_READ) && (rv == 2)) { + if ((cmd & IOC_OUT) && (rv == 2)) { sv = POPs; rv--; } @@ -1451,7 +1492,7 @@ int _PLfuse_ioctl(const char *file, int cmd, void *arg, if (rv > 0) rv = POPi; - if ((_IOC_DIR(cmd) & _IOC_READ) && !rv) { + if ((cmd & IOC_OUT) && !rv) { if (sv) { size_t len; char *rdata = SvPV(sv, len); @@ -1478,64 +1519,86 @@ int _PLfuse_ioctl(const char *file, int cmd, void *arg, return rv; } -#if 0 int _PLfuse_poll(const char *file, struct fuse_file_info *fi, struct fuse_pollhandle *ph, unsigned *reventsp) { - + int rv; + SV *sv = NULL; + FUSE_CONTEXT_PRE; + DEBUGf("poll begin\n"); + ENTER; + SAVETMPS; + PUSHMARK(SP); + XPUSHs(sv_2mortal(newSVpv(file,0))); + if (ph) { + /* Still gotta figure out how to do this right... */ + sv = newSViv(PTR2IV(ph)); + SvREADONLY_on(sv); + SvSHARE(sv); + XPUSHs(sv); + } + else + XPUSHs(&PL_sv_undef); + XPUSHs(sv_2mortal(newSViv(*reventsp))); + XPUSHs(FH_GETHANDLE(fi)); + PUTBACK; + rv = call_sv(MY_CXT.callback[40],G_ARRAY); + SPAGAIN; + if (rv > 1) { + *reventsp = POPi; + rv--; + } + rv = (rv ? POPi : 0); + FREETMPS; + LEAVE; + PUTBACK; + DEBUGf("poll end: %i\n", rv); + FUSE_CONTEXT_POST; + return rv; } -#endif #endif /* FUSE_VERSION >= 28 */ struct fuse_operations _available_ops = { -getattr: _PLfuse_getattr, -readlink: _PLfuse_readlink, -getdir: _PLfuse_getdir, -mknod: _PLfuse_mknod, -mkdir: _PLfuse_mkdir, -unlink: _PLfuse_unlink, -rmdir: _PLfuse_rmdir, -symlink: _PLfuse_symlink, -rename: _PLfuse_rename, -link: _PLfuse_link, -chmod: _PLfuse_chmod, -chown: _PLfuse_chown, -truncate: _PLfuse_truncate, -utime: _PLfuse_utime, -open: _PLfuse_open, -read: _PLfuse_read, -write: _PLfuse_write, -statfs: _PLfuse_statfs, -flush: _PLfuse_flush, -release: _PLfuse_release, -fsync: _PLfuse_fsync, -setxattr: _PLfuse_setxattr, -getxattr: _PLfuse_getxattr, -listxattr: _PLfuse_listxattr, -removexattr: _PLfuse_removexattr, -#if FUSE_VERSION >= 23 -opendir: _PLfuse_opendir, -readdir: _PLfuse_readdir, -releasedir: _PLfuse_releasedir, -fsyncdir: _PLfuse_fsyncdir, -init: _PLfuse_init, -destroy: _PLfuse_destroy, -#endif /* FUSE_VERSION >= 23 */ -#if FUSE_VERSION >= 25 -access: _PLfuse_access, -create: _PLfuse_create, -ftruncate: _PLfuse_ftruncate, -fgetattr: _PLfuse_fgetattr, -#endif /* FUSE_VERSION >= 25 */ -#if FUSE_VERSION >= 26 -lock: _PLfuse_lock, -utimens: _PLfuse_utimens, -bmap: _PLfuse_bmap, -#endif /* FUSE_VERSION >= 26 */ +.getattr = _PLfuse_getattr, +.readlink = _PLfuse_readlink, +.getdir = _PLfuse_getdir, +.mknod = _PLfuse_mknod, +.mkdir = _PLfuse_mkdir, +.unlink = _PLfuse_unlink, +.rmdir = _PLfuse_rmdir, +.symlink = _PLfuse_symlink, +.rename = _PLfuse_rename, +.link = _PLfuse_link, +.chmod = _PLfuse_chmod, +.chown = _PLfuse_chown, +.truncate = _PLfuse_truncate, +.utime = _PLfuse_utime, +.open = _PLfuse_open, +.read = _PLfuse_read, +.write = _PLfuse_write, +.statfs = _PLfuse_statfs, +.flush = _PLfuse_flush, +.release = _PLfuse_release, +.fsync = _PLfuse_fsync, +.setxattr = _PLfuse_setxattr, +.getxattr = _PLfuse_getxattr, +.listxattr = _PLfuse_listxattr, +.removexattr = _PLfuse_removexattr, +.opendir = _PLfuse_opendir, +.readdir = _PLfuse_readdir, +.releasedir = _PLfuse_releasedir, +.fsyncdir = _PLfuse_fsyncdir, +.init = _PLfuse_init, +.destroy = _PLfuse_destroy, +.access = _PLfuse_access, +.create = _PLfuse_create, +.ftruncate = _PLfuse_ftruncate, +.fgetattr = _PLfuse_fgetattr, +.lock = _PLfuse_lock, +.utimens = _PLfuse_utimens, +.bmap = _PLfuse_bmap, #if FUSE_VERSION >= 28 -ioctl: _PLfuse_ioctl, -#if 0 -poll: _PLfuse_poll, -#endif +.ioctl = _PLfuse_ioctl, +.poll = _PLfuse_poll, #endif /* FUSE_VERSION >= 28 */ }; @@ -1645,7 +1708,7 @@ perl_fuse_main(...) struct fuse_chan *fc; dMY_CXT; INIT: - if(items != N_CALLBACKS + 5) { + if(items != N_CALLBACKS + 6) { fprintf(stderr,"Perl<->C inconsistency or internal error\n"); XSRETURN_UNDEF; } @@ -1671,8 +1734,9 @@ perl_fuse_main(...) #if FUSE_VERSION >= 28 fops.flag_nullpath_ok = SvIV(ST(4)); #endif /* FUSE_VERSION >= 28 */ + MY_CXT.utimens_as_array = SvIV(ST(5)); for(i=0;i= 28 + +void +pollhandle_destroy(...) + PREINIT: + struct fuse_pollhandle *ph; + INIT: + if (items != 1) { + fprintf(stderr, "No pollhandle passed?\n"); + XSRETURN_UNDEF; + } + CODE: + ph = INT2PTR(struct fuse_pollhandle*, SvIV(ST(0))); + fuse_pollhandle_destroy(ph); + +int +notify_poll(...) + PREINIT: + struct fuse_pollhandle *ph; + INIT: + if (items != 1) { + fprintf(stderr, "No pollhandle passed?\n"); + XSRETURN_UNDEF; + } + CODE: + ph = INT2PTR(struct fuse_pollhandle*, SvIV(ST(0))); + RETVAL = fuse_notify_poll(ph); + OUTPUT: + RETVAL + +#endif