ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/IO-AIO/AIO.xs
(Generate patch)

Comparing IO-AIO/AIO.xs (file contents):
Revision 1.182 by root, Thu May 19 22:57:04 2011 UTC vs.
Revision 1.195 by root, Mon Sep 26 20:19:08 2011 UTC

… …
11#include <stddef.h> 11#include <stddef.h>
12#include <stdlib.h> 12#include <stdlib.h>
13#include <errno.h> 13#include <errno.h>
14#include <sys/types.h> 14#include <sys/types.h>
15#include <sys/stat.h> 15#include <sys/stat.h>
16#include <sys/statvfs.h>
17#include <limits.h> 16#include <limits.h>
18#include <fcntl.h> 17#include <fcntl.h>
19#include <sched.h> 18#include <sched.h>
20 19
21#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES 20#if _POSIX_MEMLOCK || _POSIX_MEMLOCK_RANGE || _POSIX_MAPPED_FILES
22# include <sys/mman.h> 21# include <sys/mman.h>
23#endif 22#endif
24 23
25/* perl namespace pollution */ 24/* perl namespace pollution */
26#undef VERSION 25#undef VERSION
27
28#ifdef _WIN32
29
30# define EIO_STRUCT_DIRENT Direntry_t
31# undef malloc
32# undef free
33
34// perl overrides all those nice win32 functions
35# undef open
36# undef read
37# undef write
38# undef send
39# undef recv
40# undef stat
41# undef fstat
42# define lstat stat
43# undef truncate
44# undef ftruncate
45# undef open
46# undef close
47# undef unlink
48# undef rmdir
49# undef rename
50# undef lseek
51
52# define chown(a,b,c) (errno = ENOSYS, -1)
53# define fchown(a,b,c) (errno = ENOSYS, -1)
54# define fchmod(a,b) (errno = ENOSYS, -1)
55# define symlink(a,b) (errno = ENOSYS, -1)
56# define readlink(a,b,c) (errno = ENOSYS, -1)
57# define mknod(a,b,c) (errno = ENOSYS, -1)
58# define truncate(a,b) (errno = ENOSYS, -1)
59# define ftruncate(fd,o) chsize ((fd), (o))
60# define fsync(fd) _commit (fd)
61# define opendir(fd) (errno = ENOSYS, 0)
62# define readdir(fd) (errno = ENOSYS, -1)
63# define closedir(fd) (errno = ENOSYS, -1)
64# define mkdir(a,b) mkdir (a)
65
66#else
67
68# include <sys/time.h>
69# include <sys/select.h>
70# include <unistd.h>
71# include <utime.h>
72# include <signal.h>
73# define EIO_STRUCT_DIRENT struct dirent
74
75#endif
76 26
77/* perl stupidly overrides readdir and maybe others */ 27/* perl stupidly overrides readdir and maybe others */
78/* with thread-unsafe versions, imagine that :( */ 28/* with thread-unsafe versions, imagine that :( */
79#undef readdir 29#undef readdir
80#undef opendir 30#undef opendir
81#undef closedir 31#undef closedir
32
33#ifdef _WIN32
34
35 // perl overrides all those nice libc functions
36
37 #undef malloc
38 #undef free
39 #undef open
40 #undef read
41 #undef write
42 #undef send
43 #undef recv
44 #undef stat
45 #undef lstat
46 #undef fstat
47 #undef truncate
48 #undef ftruncate
49 #undef open
50 #undef link
51 #undef close
52 #undef unlink
53 #undef mkdir
54 #undef rmdir
55 #undef rename
56 #undef lseek
57 #undef opendir
58 #undef readdir
59 #undef closedir
60 #undef chmod
61 #undef fchmod
62 #undef dup
63 #undef dup2
64 #undef abort
65 #undef pipe
66
67#else
68
69 #include <sys/time.h>
70 #include <sys/select.h>
71 #include <unistd.h>
72 #include <utime.h>
73 #include <signal.h>
74
75#endif
82 76
83#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
84 78
85/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8 80#if IVSIZE >= 8
… …
108 102
109typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
112 106
113static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
114 108
115#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
116 SV *callback; \ 110 SV *callback; \
117 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
118 STRLEN stroffset; \ 113 STRLEN stroffset; \
119 SV *self; 114 SV *self;
120 115
121#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
122 117
123#include "libeio/config.h" 118#include "libeio/config.h"
124#include "libeio/eio.h" 119#include "libeio/eio.h"
120
121static int req_invoke (eio_req *req);
122#define EIO_FINISH(req) req_invoke (req)
123static void req_destroy (eio_req *grp);
124#define EIO_DESTROY(req) req_destroy (req)
125
126#include "libeio/eio.c"
125 127
126/* Linux/others */ 128/* Linux/others */
127#ifndef O_ASYNC 129#ifndef O_ASYNC
128# define O_ASYNC 0 130# define O_ASYNC 0
129#endif 131#endif
… …
223#endif 225#endif
224#ifndef PROT_EXEC 226#ifndef PROT_EXEC
225# define PROT_EXEC 0 227# define PROT_EXEC 0
226#endif 228#endif
227 229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
228#ifndef ST_NODEV 236#ifndef ST_NODEV
229# define ST_NODEV 0 237# define ST_NODEV 0
230#endif 238#endif
231#ifndef ST_NOEXEC 239#ifndef ST_NOEXEC
232# define ST_NOEXEC 0 240# define ST_NOEXEC 0
… …
316 324
317#ifndef PAGESIZE 325#ifndef PAGESIZE
318# define PAGESIZE sysconf (_SC_PAGESIZE) 326# define PAGESIZE sysconf (_SC_PAGESIZE)
319#endif 327#endif
320 328
321static int req_invoke (eio_req *req);
322#define EIO_FINISH(req) req_invoke (req)
323static void req_destroy (eio_req *grp);
324#define EIO_DESTROY(req) req_destroy (req)
325
326enum { 329enum {
327 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
328}; 331};
329 332
330#include "libeio/eio.c"
331
332typedef eio_req *aio_req; 333typedef eio_req *aio_req;
333typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd *aio_wd;
334 336
335static SV *on_next_submit; 337static SV *on_next_submit;
336static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
337static int max_outstanding; 339static int max_outstanding;
338 340
… …
376 croak ("object of class IO::AIO::REQ expected"); 378 croak ("object of class IO::AIO::REQ expected");
377 379
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 380 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 381
380 return mg ? (aio_req)mg->mg_ptr : 0; 382 return mg ? (aio_req)mg->mg_ptr : 0;
383}
384
385static aio_wd SvAIO_WD (SV *sv)
386{
387 if (!SvROK (sv)
388 || SvSTASH (SvRV (sv)) != aio_wd_stash
389 || SvTYPE (SvRV (sv)) != SVt_PVMG)
390 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
391
392 return (aio_wd)(long)SvIVX (SvRV (sv));
381} 393}
382 394
383static void aio_grp_feed (aio_req grp) 395static void aio_grp_feed (aio_req grp)
384{ 396{
385 if (grp->sv2 && SvOK (grp->sv2)) 397 if (grp->sv2 && SvOK (grp->sv2))
… …
444 SvREADONLY_on (sv_result); 456 SvREADONLY_on (sv_result);
445 } 457 }
446 458
447 switch (req->type) 459 switch (req->type)
448 { 460 {
461 case EIO_WD_OPEN:
462 PUSHs (sv_2mortal (sv_bless (newRV_noinc (newSViv (((long)req->wd))), aio_wd_stash)));
463 break;
464
449 case EIO_READDIR: 465 case EIO_READDIR:
450 { 466 {
451 SV *rv = &PL_sv_undef; 467 SV *rv = &PL_sv_undef;
452 468
453 if (req->result >= 0) 469 if (req->result >= 0)
… …
541 case EIO_STATVFS: 557 case EIO_STATVFS:
542 case EIO_FSTATVFS: 558 case EIO_FSTATVFS:
543 { 559 {
544 SV *rv = &PL_sv_undef; 560 SV *rv = &PL_sv_undef;
545 561
562#ifndef _WIN32
546 if (req->result >= 0) 563 if (req->result >= 0)
547 { 564 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 565 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 566 HV *hv = newHV ();
550 567
… …
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 577 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0);
561 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0); 578 hv_store (hv, "fsid" , sizeof ("fsid" ) - 1, newSVval64 (f->f_fsid ), 0);
562 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0); 579 hv_store (hv, "flag" , sizeof ("flag" ) - 1, newSVval64 (f->f_flag ), 0);
563 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0); 580 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 581 }
582#endif
565 583
566 PUSHs (rv); 584 PUSHs (rv);
567 } 585 }
568 586
569 break; 587 break;
… …
585 case EIO_NOP: 603 case EIO_NOP:
586 case EIO_BUSY: 604 case EIO_BUSY:
587 break; 605 break;
588 606
589 case EIO_READLINK: 607 case EIO_READLINK:
608 case EIO_REALPATH:
590 if (req->result > 0) 609 if (req->result > 0)
591 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result))); 610 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
592 break; 611 break;
593 612
594 case EIO_STAT: 613 case EIO_STAT:
595 case EIO_LSTAT: 614 case EIO_LSTAT:
596 case EIO_FSTAT: 615 case EIO_FSTAT:
597 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 616 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
598 PL_laststatval = req->result; 617 PL_laststatval = req->result;
618 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
599 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 619 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
600 PUSHs (sv_result); 620 PUSHs (sv_result);
601 break; 621 break;
602 622
603 case EIO_READ: 623 case EIO_READ:
… …
648 SvREFCNT_dec (req->self); 668 SvREFCNT_dec (req->self);
649 } 669 }
650 670
651 SvREFCNT_dec (req->sv1); 671 SvREFCNT_dec (req->sv1);
652 SvREFCNT_dec (req->sv2); 672 SvREFCNT_dec (req->sv2);
673 SvREFCNT_dec (req->sv3);
674 SvREFCNT_dec (req->sv4);
653 SvREFCNT_dec (req->callback); 675 SvREFCNT_dec (req->callback);
654 676
655 Safefree (req); 677 Safefree (req);
656} 678}
657 679
658static void req_cancel_subs (aio_req grp) 680static void req_cancel_subs (aio_req grp)
659{ 681{
660 aio_req sub;
661
662 if (grp->type != EIO_GROUP) 682 if (grp->type != EIO_GROUP)
663 return; 683 return;
664 684
665 SvREFCNT_dec (grp->sv2); 685 SvREFCNT_dec (grp->sv2);
666 grp->sv2 = 0; 686 grp->sv2 = 0;
667 687
668 eio_grp_cancel (grp); 688 eio_grp_cancel (grp);
669} 689}
670 690
671static void
672create_respipe (void) 691static void create_respipe (void)
673{ 692{
674 if (s_epipe_renew (&respipe)) 693 if (s_epipe_renew (&respipe))
675 croak ("IO::AIO: unable to initialize result pipe"); 694 croak ("IO::AIO: unable to initialize result pipe");
676} 695}
677 696
… …
708 727
709 poll_wait (); 728 poll_wait ();
710 } 729 }
711} 730}
712 731
713static void atfork_child (void) 732static void ecb_cold
733reinit (void)
714{ 734{
715 create_respipe (); 735 create_respipe ();
736
737 if (eio_init (want_poll, done_poll) < 0)
738 croak ("IO::AIO: unable to initialise eio library");
716} 739}
717 740
718/*****************************************************************************/ 741/*****************************************************************************/
719 742
720#if !_POSIX_MAPPED_FILES 743#if !_POSIX_MAPPED_FILES
… …
731# define MAP_FIXED 0 754# define MAP_FIXED 0
732#endif 755#endif
733 756
734#define MMAP_MAGIC PERL_MAGIC_ext 757#define MMAP_MAGIC PERL_MAGIC_ext
735 758
736static int
737mmap_free (pTHX_ SV *sv, MAGIC *mg) 759static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
738{ 760{
739 int old_errno = errno; 761 int old_errno = errno;
740 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 762 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
741 errno = old_errno; 763 errno = old_errno;
742 764
… …
758 0, 0, 0, 0, mmap_free 780 0, 0, 0, 0, mmap_free
759}; 781};
760 782
761/*****************************************************************************/ 783/*****************************************************************************/
762 784
763static SV *
764get_cb (SV *cb_sv) 785static SV * get_cb (SV *cb_sv)
765{ 786{
766 SvGETMAGIC (cb_sv); 787 SvGETMAGIC (cb_sv);
767 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 788 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
768} 789}
769 790
… …
787 req_submit (req); \ 808 req_submit (req); \
788 SPAGAIN; \ 809 SPAGAIN; \
789 \ 810 \
790 if (GIMME_V != G_VOID) \ 811 if (GIMME_V != G_VOID) \
791 XPUSHs (req_sv (req, aio_req_stash)); 812 XPUSHs (req_sv (req, aio_req_stash));
813
814static void
815req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
816{
817 if (SvROK (path))
818 {
819 AV *av = (AV *)SvRV (path);
820 SV *wdob;
821
822 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
823 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
824
825 path = AvARRAY (av)[1];
826 wdob = AvARRAY (av)[0];
827
828 *wd = SvAIO_WD (wdob);
829 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
830 }
831
832 *pathsv = newSVsv (path);
833 *ptr = SvPVbyte_nolen (*pathsv);
834}
835
836static void
837req_set_path1 (aio_req req, SV *path)
838{
839 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
840}
841
842static void
843req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
844{
845 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
846
847 switch (SvTYPE (rv))
848 {
849 case SVt_PVIO:
850 case SVt_PVLV:
851 case SVt_PVGV:
852 req->type = type_fh;
853 req->sv1 = newSVsv (fh_or_path);
854 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
855 break;
856
857 default:
858 req->type = type_path;
859 req_set_path1 (req, fh_or_path);
860 break;
861 }
862
863}
792 864
793MODULE = IO::AIO PACKAGE = IO::AIO 865MODULE = IO::AIO PACKAGE = IO::AIO
794 866
795PROTOTYPES: ENABLE 867PROTOTYPES: ENABLE
796 868
… …
893 965
894 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 966 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
895 const_eio (SYNC_FILE_RANGE_WRITE) 967 const_eio (SYNC_FILE_RANGE_WRITE)
896 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 968 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
897 969
970 const_eio (FALLOC_FL_KEEP_SIZE)
971
898 const_eio (READDIR_DENTS) 972 const_eio (READDIR_DENTS)
899 const_eio (READDIR_DIRS_FIRST) 973 const_eio (READDIR_DIRS_FIRST)
900 const_eio (READDIR_STAT_ORDER) 974 const_eio (READDIR_STAT_ORDER)
901 const_eio (READDIR_FOUND_UNKNOWN) 975 const_eio (READDIR_FOUND_UNKNOWN)
902 976
… …
912 }; 986 };
913 987
914 aio_stash = gv_stashpv ("IO::AIO" , 1); 988 aio_stash = gv_stashpv ("IO::AIO" , 1);
915 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 989 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
916 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 990 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
991 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
917 992
918 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 993 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
919 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 994 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
920 995
921 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 996 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
922 997
923 create_respipe (); 998 reinit ();
924
925 if (eio_init (want_poll, done_poll) < 0)
926 croak ("IO::AIO: unable to initialise eio library");
927
928 /* atfork child called in fifo order, so before eio's handler */
929 X_THREAD_ATFORK (0, 0, atfork_child);
930} 999}
1000
1001void
1002reinit ()
1003 PROTOTYPE:
931 1004
932void 1005void
933max_poll_reqs (unsigned int nreqs) 1006max_poll_reqs (unsigned int nreqs)
934 PROTOTYPE: $ 1007 PROTOTYPE: $
935 CODE: 1008 CODE:
… …
970 PROTOTYPE: $ 1043 PROTOTYPE: $
971 CODE: 1044 CODE:
972 max_outstanding = maxreqs; 1045 max_outstanding = maxreqs;
973 1046
974void 1047void
1048aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1049 PPCODE:
1050{
1051 dREQ;
1052
1053 req->type = EIO_WD_OPEN;
1054 req_set_path1 (req, pathname);
1055
1056 REQ_SEND;
1057}
1058
1059void
975aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1060aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
976 PPCODE: 1061 PPCODE:
977{ 1062{
978 dREQ; 1063 dREQ;
979 1064
980 req->type = EIO_OPEN; 1065 req->type = EIO_OPEN;
981 req->sv1 = newSVsv (pathname); 1066 req_set_path1 (req, pathname);
982 req->ptr1 = SvPVbyte_nolen (req->sv1);
983 req->int1 = flags; 1067 req->int1 = flags;
984 req->int2 = mode; 1068 req->int2 = mode;
985 1069
986 REQ_SEND; 1070 REQ_SEND;
987} 1071}
… …
989void 1073void
990aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1074aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
991 ALIAS: 1075 ALIAS:
992 aio_fsync = EIO_FSYNC 1076 aio_fsync = EIO_FSYNC
993 aio_fdatasync = EIO_FDATASYNC 1077 aio_fdatasync = EIO_FDATASYNC
1078 aio_syncfs = EIO_SYNCFS
994 PPCODE: 1079 PPCODE:
995{ 1080{
996 int fd = s_fileno_croak (fh, 0); 1081 int fd = s_fileno_croak (fh, 0);
997 dREQ; 1082 dREQ;
998 1083
… …
1019 1104
1020 REQ_SEND (req); 1105 REQ_SEND (req);
1021} 1106}
1022 1107
1023void 1108void
1109aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1110 PPCODE:
1111{
1112 int fd = s_fileno_croak (fh, 0);
1113 dREQ;
1114
1115 req->type = EIO_FALLOCATE;
1116 req->sv1 = newSVsv (fh);
1117 req->int1 = fd;
1118 req->int2 = mode;
1119 req->offs = offset;
1120 req->size = len;
1121
1122 REQ_SEND (req);
1123}
1124
1125void
1024aio_close (SV *fh, SV *callback=&PL_sv_undef) 1126aio_close (SV *fh, SV *callback=&PL_sv_undef)
1025 PPCODE: 1127 PPCODE:
1026{ 1128{
1027 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1129 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1028 int fd = s_fileno_croak (fh, 0); 1130 int fd = s_fileno_croak (fh, 0);
1029 dREQ; 1131 dREQ;
1030 1132
1031 if (close_pipe < 0) 1133 if (expect_false (close_fd < 0))
1032 { 1134 {
1033 int pipefd [2]; 1135 int pipefd [2];
1034 1136
1137 if (
1138#ifdef _WIN32
1139 _pipe (pipefd, 1, _O_BINARY) < 0
1140#else
1035 if (pipe (pipefd) < 0 1141 pipe (pipefd) < 0
1036 || close (pipefd [1]) < 0
1037 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1142 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1143#endif
1144 || close (pipefd [1]) < 0
1145 )
1038 abort (); /*D*/ 1146 abort (); /*D*/
1039 1147
1040 close_pipe = pipefd [0]; 1148 close_fd = pipefd [0];
1041 } 1149 }
1042 1150
1043 req->type = EIO_DUP2; 1151 req->type = EIO_DUP2;
1044 req->int1 = close_pipe; 1152 req->int1 = close_fd;
1045 req->sv2 = newSVsv (fh); 1153 req->sv2 = newSVsv (fh);
1046 req->int2 = fd; 1154 req->int2 = fd;
1047 1155
1048 REQ_SEND (req); 1156 REQ_SEND (req);
1049} 1157}
… …
1100 REQ_SEND; 1208 REQ_SEND;
1101 } 1209 }
1102} 1210}
1103 1211
1104void 1212void
1105aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1213aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1214 ALIAS:
1215 aio_readlink = EIO_READLINK
1216 aio_realpath = EIO_REALPATH
1106 PPCODE: 1217 PPCODE:
1107{ 1218{
1108 SV *data;
1109 dREQ; 1219 dREQ;
1110 1220
1111 req->type = EIO_READLINK; 1221 req->type = ix;
1112 req->sv1 = newSVsv (path); 1222 req_set_path1 (req, pathname);
1113 req->ptr1 = SvPVbyte_nolen (req->sv1);
1114 1223
1115 REQ_SEND; 1224 REQ_SEND;
1116} 1225}
1117 1226
1118void 1227void
… …
1159 PPCODE: 1268 PPCODE:
1160{ 1269{
1161 dREQ; 1270 dREQ;
1162 1271
1163 req->sv1 = newSVsv (fh_or_path); 1272 req->sv1 = newSVsv (fh_or_path);
1164 1273 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1165 if (SvPOK (req->sv1))
1166 {
1167 req->type = ix;
1168 req->ptr1 = SvPVbyte_nolen (req->sv1);
1169 }
1170 else
1171 {
1172 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1173 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1174 }
1175
1176 REQ_SEND; 1274 REQ_SEND;
1177} 1275}
1178 1276
1179UV 1277UV
1180major (UV dev) 1278major (UV dev)
… …
1198{ 1296{
1199 dREQ; 1297 dREQ;
1200 1298
1201 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1299 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1202 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1300 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1203 req->sv1 = newSVsv (fh_or_path); 1301 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1204
1205 if (SvPOK (req->sv1))
1206 {
1207 req->type = EIO_UTIME;
1208 req->ptr1 = SvPVbyte_nolen (req->sv1);
1209 }
1210 else
1211 {
1212 req->type = EIO_FUTIME;
1213 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1214 }
1215 1302
1216 REQ_SEND; 1303 REQ_SEND;
1217} 1304}
1218 1305
1219void 1306void
1220aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1307aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1221 PPCODE: 1308 PPCODE:
1222{ 1309{
1223 dREQ; 1310 dREQ;
1224 1311
1225 req->sv1 = newSVsv (fh_or_path);
1226 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1312 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1227 1313 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1228 if (SvPOK (req->sv1))
1229 {
1230 req->type = EIO_TRUNCATE;
1231 req->ptr1 = SvPVbyte_nolen (req->sv1);
1232 }
1233 else
1234 {
1235 req->type = EIO_FTRUNCATE;
1236 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1237 }
1238 1314
1239 REQ_SEND; 1315 REQ_SEND;
1240} 1316}
1241 1317
1242void 1318void
… …
1247 PPCODE: 1323 PPCODE:
1248{ 1324{
1249 dREQ; 1325 dREQ;
1250 1326
1251 req->int2 = mode; 1327 req->int2 = mode;
1252 req->sv1 = newSVsv (fh_or_path); 1328 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1253
1254 if (SvPOK (req->sv1))
1255 {
1256 req->type = ix;
1257 req->ptr1 = SvPVbyte_nolen (req->sv1);
1258 }
1259 else
1260 {
1261 req->type = EIO_FCHMOD;
1262 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1263 }
1264 1329
1265 REQ_SEND; 1330 REQ_SEND;
1266} 1331}
1267 1332
1268void 1333void
… …
1271{ 1336{
1272 dREQ; 1337 dREQ;
1273 1338
1274 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1339 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1275 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1340 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1276 req->sv1 = newSVsv (fh_or_path); 1341 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1277
1278 if (SvPOK (req->sv1))
1279 {
1280 req->type = EIO_CHOWN;
1281 req->ptr1 = SvPVbyte_nolen (req->sv1);
1282 }
1283 else
1284 {
1285 req->type = EIO_FCHOWN;
1286 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1287 }
1288 1342
1289 REQ_SEND; 1343 REQ_SEND;
1290} 1344}
1291 1345
1292void 1346void
… …
1315 PPCODE: 1369 PPCODE:
1316{ 1370{
1317 dREQ; 1371 dREQ;
1318 1372
1319 req->type = ix; 1373 req->type = ix;
1320 req->sv1 = newSVsv (pathname); 1374 req_set_path1 (req, pathname);
1321 req->ptr1 = SvPVbyte_nolen (req->sv1);
1322 1375
1323 REQ_SEND; 1376 REQ_SEND;
1324} 1377}
1325 1378
1326void 1379void
… …
1330 aio_symlink = EIO_SYMLINK 1383 aio_symlink = EIO_SYMLINK
1331 aio_rename = EIO_RENAME 1384 aio_rename = EIO_RENAME
1332 PPCODE: 1385 PPCODE:
1333{ 1386{
1334 dREQ; 1387 dREQ;
1388 eio_wd wd2;
1335 1389
1336 req->type = ix; 1390 req->type = ix;
1337 req->sv1 = newSVsv (oldpath); 1391 req_set_path1 (req, oldpath);
1338 req->ptr1 = SvPVbyte_nolen (req->sv1); 1392 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1339 req->sv2 = newSVsv (newpath); 1393 req->int3 = (long)wd2;
1340 req->ptr2 = SvPVbyte_nolen (req->sv2);
1341 1394
1342 REQ_SEND; 1395 REQ_SEND;
1343} 1396}
1344 1397
1345void 1398void
… …
1347 PPCODE: 1400 PPCODE:
1348{ 1401{
1349 dREQ; 1402 dREQ;
1350 1403
1351 req->type = EIO_MKNOD; 1404 req->type = EIO_MKNOD;
1352 req->sv1 = newSVsv (pathname);
1353 req->ptr1 = SvPVbyte_nolen (req->sv1);
1354 req->int2 = (mode_t)mode; 1405 req->int2 = (mode_t)mode;
1355 req->offs = dev; 1406 req->offs = dev;
1407 req_set_path1 (req, pathname);
1356 1408
1357 REQ_SEND; 1409 REQ_SEND;
1358} 1410}
1359 1411
1360void 1412void
… …
1560 CODE: 1612 CODE:
1561 RETVAL = posix_fadvise (fh, offset, length, advice); 1613 RETVAL = posix_fadvise (fh, offset, length, advice);
1562 OUTPUT: 1614 OUTPUT:
1563 RETVAL 1615 RETVAL
1564 1616
1565ssize_t 1617IV
1566sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1618sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1567 CODE: 1619 CODE:
1568 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1620 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1569 OUTPUT: 1621 OUTPUT:
1570 RETVAL 1622 RETVAL
… …
1682 SvREFCNT_dec (on_next_submit); 1734 SvREFCNT_dec (on_next_submit);
1683 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1735 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1684 1736
1685PROTOTYPES: DISABLE 1737PROTOTYPES: DISABLE
1686 1738
1739MODULE = IO::AIO PACKAGE = IO::AIO::WD
1740
1741void
1742DESTROY (SV *self)
1743 CODE:
1744{
1745 aio_wd wd = SvAIO_WD (self);
1746#if HAVE_AT
1747 SV *callback = &PL_sv_undef;
1748 dREQ; /* clobbers next_pri :/ */
1749 req->type = EIO_WD_CLOSE;
1750 req->wd = wd;
1751 REQ_SEND;
1752#else
1753 eio_wd_close_sync (wd);
1754#endif
1755}
1756
1687MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1757MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1688 1758
1689void 1759void
1690cancel (aio_req_ornot req) 1760cancel (aio_req_ornot req)
1691 CODE: 1761 CODE:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines