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.183 by root, Tue Jul 5 09:24:11 2011 UTC vs.
Revision 1.200 by root, Thu Sep 29 09:51:24 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
… …
363 } 365 }
364 366
365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 367 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366} 368}
367 369
370static SV *
371newSVaio_wd (aio_wd wd)
372{
373 return sv_bless (newRV_noinc (newSViv ((long)wd)), aio_wd_stash);
374}
375
368static aio_req SvAIO_REQ (SV *sv) 376static aio_req SvAIO_REQ (SV *sv)
369{ 377{
370 MAGIC *mg; 378 MAGIC *mg;
371 379
372 if (!SvROK (sv) 380 if (!SvROK (sv)
… …
376 croak ("object of class IO::AIO::REQ expected"); 384 croak ("object of class IO::AIO::REQ expected");
377 385
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 386 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 387
380 return mg ? (aio_req)mg->mg_ptr : 0; 388 return mg ? (aio_req)mg->mg_ptr : 0;
389}
390
391static aio_wd SvAIO_WD (SV *sv)
392{
393 if (!SvROK (sv)
394 || SvSTASH (SvRV (sv)) != aio_wd_stash
395 || SvTYPE (SvRV (sv)) != SVt_PVMG)
396 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
397
398 return (aio_wd)(long)SvIVX (SvRV (sv));
381} 399}
382 400
383static void aio_grp_feed (aio_req grp) 401static void aio_grp_feed (aio_req grp)
384{ 402{
385 if (grp->sv2 && SvOK (grp->sv2)) 403 if (grp->sv2 && SvOK (grp->sv2))
… …
444 SvREADONLY_on (sv_result); 462 SvREADONLY_on (sv_result);
445 } 463 }
446 464
447 switch (req->type) 465 switch (req->type)
448 { 466 {
467 case EIO_WD_OPEN:
468 PUSHs (sv_2mortal (newSVaio_wd (req->wd)));
469 break;
470
449 case EIO_READDIR: 471 case EIO_READDIR:
450 { 472 {
451 SV *rv = &PL_sv_undef; 473 SV *rv = &PL_sv_undef;
452 474
453 if (req->result >= 0) 475 if (req->result >= 0)
… …
541 case EIO_STATVFS: 563 case EIO_STATVFS:
542 case EIO_FSTATVFS: 564 case EIO_FSTATVFS:
543 { 565 {
544 SV *rv = &PL_sv_undef; 566 SV *rv = &PL_sv_undef;
545 567
568#ifndef _WIN32
546 if (req->result >= 0) 569 if (req->result >= 0)
547 { 570 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 571 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 572 HV *hv = newHV ();
550 573
… …
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 583 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); 584 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); 585 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); 586 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 587 }
588#endif
565 589
566 PUSHs (rv); 590 PUSHs (rv);
567 } 591 }
568 592
569 break; 593 break;
… …
593 break; 617 break;
594 618
595 case EIO_STAT: 619 case EIO_STAT:
596 case EIO_LSTAT: 620 case EIO_LSTAT:
597 case EIO_FSTAT: 621 case EIO_FSTAT:
598 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 622 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
623
599 PL_laststatval = req->result; 624 if (!(PL_laststatval = req->result))
625 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
600 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 626 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
627
601 PUSHs (sv_result); 628 PUSHs (sv_result);
602 break; 629 break;
603 630
604 case EIO_READ: 631 case EIO_READ:
605 { 632 {
… …
649 SvREFCNT_dec (req->self); 676 SvREFCNT_dec (req->self);
650 } 677 }
651 678
652 SvREFCNT_dec (req->sv1); 679 SvREFCNT_dec (req->sv1);
653 SvREFCNT_dec (req->sv2); 680 SvREFCNT_dec (req->sv2);
681 SvREFCNT_dec (req->sv3);
682 SvREFCNT_dec (req->sv4);
654 SvREFCNT_dec (req->callback); 683 SvREFCNT_dec (req->callback);
655 684
656 Safefree (req); 685 Safefree (req);
657} 686}
658 687
659static void req_cancel_subs (aio_req grp) 688static void req_cancel_subs (aio_req grp)
660{ 689{
661 aio_req sub;
662
663 if (grp->type != EIO_GROUP) 690 if (grp->type != EIO_GROUP)
664 return; 691 return;
665 692
666 SvREFCNT_dec (grp->sv2); 693 SvREFCNT_dec (grp->sv2);
667 grp->sv2 = 0; 694 grp->sv2 = 0;
668 695
669 eio_grp_cancel (grp); 696 eio_grp_cancel (grp);
670} 697}
671 698
672static void
673create_respipe (void) 699static void create_respipe (void)
674{ 700{
675 if (s_epipe_renew (&respipe)) 701 if (s_epipe_renew (&respipe))
676 croak ("IO::AIO: unable to initialize result pipe"); 702 croak ("IO::AIO: unable to initialize result pipe");
677} 703}
678 704
… …
709 735
710 poll_wait (); 736 poll_wait ();
711 } 737 }
712} 738}
713 739
714static void atfork_child (void) 740static void ecb_cold
741reinit (void)
715{ 742{
716 create_respipe (); 743 create_respipe ();
744
745 if (eio_init (want_poll, done_poll) < 0)
746 croak ("IO::AIO: unable to initialise eio library");
717} 747}
718 748
719/*****************************************************************************/ 749/*****************************************************************************/
720 750
721#if !_POSIX_MAPPED_FILES 751#if !_POSIX_MAPPED_FILES
… …
732# define MAP_FIXED 0 762# define MAP_FIXED 0
733#endif 763#endif
734 764
735#define MMAP_MAGIC PERL_MAGIC_ext 765#define MMAP_MAGIC PERL_MAGIC_ext
736 766
737static int
738mmap_free (pTHX_ SV *sv, MAGIC *mg) 767static int mmap_free (pTHX_ SV *sv, MAGIC *mg)
739{ 768{
740 int old_errno = errno; 769 int old_errno = errno;
741 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 770 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
742 errno = old_errno; 771 errno = old_errno;
743 772
… …
759 0, 0, 0, 0, mmap_free 788 0, 0, 0, 0, mmap_free
760}; 789};
761 790
762/*****************************************************************************/ 791/*****************************************************************************/
763 792
764static SV *
765get_cb (SV *cb_sv) 793static SV * get_cb (SV *cb_sv)
766{ 794{
767 SvGETMAGIC (cb_sv); 795 SvGETMAGIC (cb_sv);
768 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 796 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
769} 797}
770 798
… …
788 req_submit (req); \ 816 req_submit (req); \
789 SPAGAIN; \ 817 SPAGAIN; \
790 \ 818 \
791 if (GIMME_V != G_VOID) \ 819 if (GIMME_V != G_VOID) \
792 XPUSHs (req_sv (req, aio_req_stash)); 820 XPUSHs (req_sv (req, aio_req_stash));
821
822static void
823req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
824{
825 if (expect_false (SvROK (path)))
826 {
827 AV *av = (AV *)SvRV (path);
828 SV *wdob;
829
830 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
831 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
832
833 path = AvARRAY (av)[1];
834 wdob = AvARRAY (av)[0];
835
836 if (SvOK (wdob))
837 {
838 *wd = SvAIO_WD (wdob);
839 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
840 }
841 else
842 *wd = EIO_INVALID_WD;
843 }
844
845 *pathsv = newSVsv (path);
846 *ptr = SvPVbyte_nolen (*pathsv);
847}
848
849static void
850req_set_path1 (aio_req req, SV *path)
851{
852 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
853}
854
855static void
856req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
857{
858 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
859
860 switch (SvTYPE (rv))
861 {
862 case SVt_PVIO:
863 case SVt_PVLV:
864 case SVt_PVGV:
865 req->type = type_fh;
866 req->sv1 = newSVsv (fh_or_path);
867 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
868 break;
869
870 default:
871 req->type = type_path;
872 req_set_path1 (req, fh_or_path);
873 break;
874 }
875
876}
793 877
794MODULE = IO::AIO PACKAGE = IO::AIO 878MODULE = IO::AIO PACKAGE = IO::AIO
795 879
796PROTOTYPES: ENABLE 880PROTOTYPES: ENABLE
797 881
… …
894 978
895 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 979 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
896 const_eio (SYNC_FILE_RANGE_WRITE) 980 const_eio (SYNC_FILE_RANGE_WRITE)
897 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 981 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
898 982
983 const_eio (FALLOC_FL_KEEP_SIZE)
984
899 const_eio (READDIR_DENTS) 985 const_eio (READDIR_DENTS)
900 const_eio (READDIR_DIRS_FIRST) 986 const_eio (READDIR_DIRS_FIRST)
901 const_eio (READDIR_STAT_ORDER) 987 const_eio (READDIR_STAT_ORDER)
902 const_eio (READDIR_FOUND_UNKNOWN) 988 const_eio (READDIR_FOUND_UNKNOWN)
903 989
… …
913 }; 999 };
914 1000
915 aio_stash = gv_stashpv ("IO::AIO" , 1); 1001 aio_stash = gv_stashpv ("IO::AIO" , 1);
916 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1002 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
917 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1003 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1004 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
918 1005
919 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1006 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
920 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 1007 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
921 1008
922 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1009 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
923 1010
924 create_respipe (); 1011 reinit ();
925
926 if (eio_init (want_poll, done_poll) < 0)
927 croak ("IO::AIO: unable to initialise eio library");
928
929 /* atfork child called in fifo order, so before eio's handler */
930 X_THREAD_ATFORK (0, 0, atfork_child);
931} 1012}
1013
1014void
1015reinit ()
1016 PROTOTYPE:
932 1017
933void 1018void
934max_poll_reqs (unsigned int nreqs) 1019max_poll_reqs (unsigned int nreqs)
935 PROTOTYPE: $ 1020 PROTOTYPE: $
936 CODE: 1021 CODE:
… …
971 PROTOTYPE: $ 1056 PROTOTYPE: $
972 CODE: 1057 CODE:
973 max_outstanding = maxreqs; 1058 max_outstanding = maxreqs;
974 1059
975void 1060void
1061aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1062 PPCODE:
1063{
1064 dREQ;
1065
1066 req->type = EIO_WD_OPEN;
1067 req_set_path1 (req, pathname);
1068
1069 REQ_SEND;
1070}
1071
1072void
976aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1073aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
977 PPCODE: 1074 PPCODE:
978{ 1075{
979 dREQ; 1076 dREQ;
980 1077
981 req->type = EIO_OPEN; 1078 req->type = EIO_OPEN;
982 req->sv1 = newSVsv (pathname); 1079 req_set_path1 (req, pathname);
983 req->ptr1 = SvPVbyte_nolen (req->sv1);
984 req->int1 = flags; 1080 req->int1 = flags;
985 req->int2 = mode; 1081 req->int2 = mode;
986 1082
987 REQ_SEND; 1083 REQ_SEND;
988} 1084}
… …
990void 1086void
991aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1087aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
992 ALIAS: 1088 ALIAS:
993 aio_fsync = EIO_FSYNC 1089 aio_fsync = EIO_FSYNC
994 aio_fdatasync = EIO_FDATASYNC 1090 aio_fdatasync = EIO_FDATASYNC
1091 aio_syncfs = EIO_SYNCFS
995 PPCODE: 1092 PPCODE:
996{ 1093{
997 int fd = s_fileno_croak (fh, 0); 1094 int fd = s_fileno_croak (fh, 0);
998 dREQ; 1095 dREQ;
999 1096
… …
1020 1117
1021 REQ_SEND (req); 1118 REQ_SEND (req);
1022} 1119}
1023 1120
1024void 1121void
1025aio_close (SV *fh, SV *callback=&PL_sv_undef) 1122aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1026 PPCODE: 1123 PPCODE:
1027{ 1124{
1028 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
1029 int fd = s_fileno_croak (fh, 0); 1125 int fd = s_fileno_croak (fh, 0);
1030 dREQ; 1126 dREQ;
1031 1127
1032 if (close_pipe < 0) 1128 req->type = EIO_FALLOCATE;
1129 req->sv1 = newSVsv (fh);
1130 req->int1 = fd;
1131 req->int2 = mode;
1132 req->offs = offset;
1133 req->size = len;
1134
1135 REQ_SEND (req);
1136}
1137
1138void
1139aio_close (SV *fh, SV *callback=&PL_sv_undef)
1140 PPCODE:
1141{
1142 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1143 int fd = s_fileno_croak (fh, 0);
1144 dREQ;
1145
1146 if (expect_false (close_fd < 0))
1033 { 1147 {
1034 int pipefd [2]; 1148 int pipefd [2];
1035 1149
1150 if (
1151#ifdef _WIN32
1152 _pipe (pipefd, 1, _O_BINARY) < 0
1153#else
1036 if (pipe (pipefd) < 0 1154 pipe (pipefd) < 0
1037 || close (pipefd [1]) < 0
1038 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1155 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1156#endif
1157 || close (pipefd [1]) < 0
1158 )
1039 abort (); /*D*/ 1159 abort (); /*D*/
1040 1160
1041 close_pipe = pipefd [0]; 1161 close_fd = pipefd [0];
1042 } 1162 }
1043 1163
1044 req->type = EIO_DUP2; 1164 req->type = EIO_DUP2;
1045 req->int1 = close_pipe; 1165 req->int1 = close_fd;
1046 req->sv2 = newSVsv (fh); 1166 req->sv2 = newSVsv (fh);
1047 req->int2 = fd; 1167 req->int2 = fd;
1048 1168
1049 REQ_SEND (req); 1169 REQ_SEND (req);
1050} 1170}
… …
1101 REQ_SEND; 1221 REQ_SEND;
1102 } 1222 }
1103} 1223}
1104 1224
1105void 1225void
1106aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1226aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1107 ALIAS: 1227 ALIAS:
1108 aio_readlink = EIO_READLINK 1228 aio_readlink = EIO_READLINK
1109 aio_realpath = EIO_REALPATH 1229 aio_realpath = EIO_REALPATH
1110 PPCODE: 1230 PPCODE:
1111{ 1231{
1112 SV *data;
1113 dREQ; 1232 dREQ;
1114 1233
1115 req->type = ix; 1234 req->type = ix;
1116 req->sv1 = newSVsv (path); 1235 req_set_path1 (req, pathname);
1117 req->ptr1 = SvPVbyte_nolen (req->sv1);
1118 1236
1119 REQ_SEND; 1237 REQ_SEND;
1120} 1238}
1121 1239
1122void 1240void
… …
1163 PPCODE: 1281 PPCODE:
1164{ 1282{
1165 dREQ; 1283 dREQ;
1166 1284
1167 req->sv1 = newSVsv (fh_or_path); 1285 req->sv1 = newSVsv (fh_or_path);
1168 1286 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1169 if (SvPOK (req->sv1))
1170 {
1171 req->type = ix;
1172 req->ptr1 = SvPVbyte_nolen (req->sv1);
1173 }
1174 else
1175 {
1176 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1177 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1178 }
1179
1180 REQ_SEND; 1287 REQ_SEND;
1181} 1288}
1182 1289
1183UV 1290UV
1184major (UV dev) 1291major (UV dev)
… …
1202{ 1309{
1203 dREQ; 1310 dREQ;
1204 1311
1205 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1312 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1206 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1313 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1207 req->sv1 = newSVsv (fh_or_path); 1314 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1208
1209 if (SvPOK (req->sv1))
1210 {
1211 req->type = EIO_UTIME;
1212 req->ptr1 = SvPVbyte_nolen (req->sv1);
1213 }
1214 else
1215 {
1216 req->type = EIO_FUTIME;
1217 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1218 }
1219 1315
1220 REQ_SEND; 1316 REQ_SEND;
1221} 1317}
1222 1318
1223void 1319void
1224aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1320aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1225 PPCODE: 1321 PPCODE:
1226{ 1322{
1227 dREQ; 1323 dREQ;
1228 1324
1229 req->sv1 = newSVsv (fh_or_path);
1230 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1325 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1231 1326 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1232 if (SvPOK (req->sv1))
1233 {
1234 req->type = EIO_TRUNCATE;
1235 req->ptr1 = SvPVbyte_nolen (req->sv1);
1236 }
1237 else
1238 {
1239 req->type = EIO_FTRUNCATE;
1240 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1241 }
1242 1327
1243 REQ_SEND; 1328 REQ_SEND;
1244} 1329}
1245 1330
1246void 1331void
1247aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1332aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1248 ALIAS:
1249 aio_chmod = EIO_CHMOD
1250 aio_mkdir = EIO_MKDIR
1251 PPCODE: 1333 PPCODE:
1252{ 1334{
1253 dREQ; 1335 dREQ;
1254 1336
1255 req->int2 = mode; 1337 req->int2 = mode;
1256 req->sv1 = newSVsv (fh_or_path); 1338 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1257
1258 if (SvPOK (req->sv1))
1259 {
1260 req->type = ix;
1261 req->ptr1 = SvPVbyte_nolen (req->sv1);
1262 }
1263 else
1264 {
1265 req->type = EIO_FCHMOD;
1266 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1267 }
1268 1339
1269 REQ_SEND; 1340 REQ_SEND;
1270} 1341}
1271 1342
1272void 1343void
… …
1275{ 1346{
1276 dREQ; 1347 dREQ;
1277 1348
1278 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1349 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1279 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1350 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1280 req->sv1 = newSVsv (fh_or_path); 1351 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1281
1282 if (SvPOK (req->sv1))
1283 {
1284 req->type = EIO_CHOWN;
1285 req->ptr1 = SvPVbyte_nolen (req->sv1);
1286 }
1287 else
1288 {
1289 req->type = EIO_FCHOWN;
1290 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1291 }
1292 1352
1293 REQ_SEND; 1353 REQ_SEND;
1294} 1354}
1295 1355
1296void 1356void
… …
1298 PPCODE: 1358 PPCODE:
1299{ 1359{
1300 dREQ; 1360 dREQ;
1301 1361
1302 req->type = EIO_READDIR; 1362 req->type = EIO_READDIR;
1303 req->sv1 = newSVsv (pathname);
1304 req->ptr1 = SvPVbyte_nolen (req->sv1);
1305 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1363 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1306 1364
1307 if (flags & EIO_READDIR_DENTS) 1365 if (flags & EIO_READDIR_DENTS)
1308 req->int1 |= EIO_READDIR_CUSTOM2; 1366 req->int1 |= EIO_READDIR_CUSTOM2;
1309 1367
1368 req_set_path1 (req, pathname);
1369
1310 REQ_SEND; 1370 REQ_SEND;
1371}
1372
1373void
1374aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1375 PPCODE:
1376{
1377 dREQ;
1378
1379 req->type = EIO_MKDIR;
1380 req->int2 = mode;
1381 req_set_path1 (req, pathname);
1382
1383 REQ_SEND;
1311} 1384}
1312 1385
1313void 1386void
1314aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1387aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1315 ALIAS: 1388 ALIAS:
… …
1319 PPCODE: 1392 PPCODE:
1320{ 1393{
1321 dREQ; 1394 dREQ;
1322 1395
1323 req->type = ix; 1396 req->type = ix;
1324 req->sv1 = newSVsv (pathname); 1397 req_set_path1 (req, pathname);
1325 req->ptr1 = SvPVbyte_nolen (req->sv1);
1326 1398
1327 REQ_SEND; 1399 REQ_SEND;
1328} 1400}
1329 1401
1330void 1402void
… …
1334 aio_symlink = EIO_SYMLINK 1406 aio_symlink = EIO_SYMLINK
1335 aio_rename = EIO_RENAME 1407 aio_rename = EIO_RENAME
1336 PPCODE: 1408 PPCODE:
1337{ 1409{
1338 dREQ; 1410 dREQ;
1411 eio_wd wd2 = 0;
1339 1412
1340 req->type = ix; 1413 req->type = ix;
1341 req->sv1 = newSVsv (oldpath); 1414 req_set_path1 (req, oldpath);
1342 req->ptr1 = SvPVbyte_nolen (req->sv1); 1415 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1343 req->sv2 = newSVsv (newpath); 1416 req->int3 = (long)wd2;
1344 req->ptr2 = SvPVbyte_nolen (req->sv2);
1345 1417
1346 REQ_SEND; 1418 REQ_SEND;
1347} 1419}
1348 1420
1349void 1421void
… …
1351 PPCODE: 1423 PPCODE:
1352{ 1424{
1353 dREQ; 1425 dREQ;
1354 1426
1355 req->type = EIO_MKNOD; 1427 req->type = EIO_MKNOD;
1356 req->sv1 = newSVsv (pathname);
1357 req->ptr1 = SvPVbyte_nolen (req->sv1);
1358 req->int2 = (mode_t)mode; 1428 req->int2 = (mode_t)mode;
1359 req->offs = dev; 1429 req->offs = dev;
1430 req_set_path1 (req, pathname);
1360 1431
1361 REQ_SEND; 1432 REQ_SEND;
1362} 1433}
1363 1434
1364void 1435void
… …
1564 CODE: 1635 CODE:
1565 RETVAL = posix_fadvise (fh, offset, length, advice); 1636 RETVAL = posix_fadvise (fh, offset, length, advice);
1566 OUTPUT: 1637 OUTPUT:
1567 RETVAL 1638 RETVAL
1568 1639
1569ssize_t 1640IV
1570sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1641sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1571 CODE: 1642 CODE:
1572 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1643 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1573 OUTPUT: 1644 OUTPUT:
1574 RETVAL 1645 RETVAL
… …
1686 SvREFCNT_dec (on_next_submit); 1757 SvREFCNT_dec (on_next_submit);
1687 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1758 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1688 1759
1689PROTOTYPES: DISABLE 1760PROTOTYPES: DISABLE
1690 1761
1762MODULE = IO::AIO PACKAGE = IO::AIO::WD
1763
1764BOOT:
1765{
1766 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1767 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1768}
1769
1770void
1771DESTROY (SV *self)
1772 CODE:
1773{
1774 aio_wd wd = SvAIO_WD (self);
1775#if HAVE_AT
1776 SV *callback = &PL_sv_undef;
1777 dREQ; /* clobbers next_pri :/ */
1778 req->type = EIO_WD_CLOSE;
1779 req->wd = wd;
1780 REQ_SEND;
1781#else
1782 eio_wd_close_sync (wd);
1783#endif
1784}
1785
1691MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1786MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1692 1787
1693void 1788void
1694cancel (aio_req_ornot req) 1789cancel (aio_req_ornot req)
1695 CODE: 1790 CODE:

Diff Legend

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