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.203 by root, Thu Sep 29 23:06: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
339static s_epipe respipe; 341static s_epipe respipe;
340 342
341static void req_destroy (aio_req req); 343static void req_destroy (aio_req req);
342static void req_cancel (aio_req req); 344static void req_cancel (aio_req req);
343 345
344static void want_poll (void) 346static void
347want_poll (void)
345{ 348{
346 /* write a dummy byte to the pipe so fh becomes ready */ 349 /* write a dummy byte to the pipe so fh becomes ready */
347 s_epipe_signal (&respipe); 350 s_epipe_signal (&respipe);
348} 351}
349 352
350static void done_poll (void) 353static void
354done_poll (void)
351{ 355{
352 /* read any signals sent by the worker threads */ 356 /* read any signals sent by the worker threads */
353 s_epipe_drain (&respipe); 357 s_epipe_drain (&respipe);
354} 358}
355 359
356/* must be called at most once */ 360/* must be called at most once */
361static SV *
357static SV *req_sv (aio_req req, HV *stash) 362req_sv (aio_req req, HV *stash)
358{ 363{
359 if (!req->self) 364 if (!req->self)
360 { 365 {
361 req->self = (SV *)newHV (); 366 req->self = (SV *)newHV ();
362 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 367 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
363 } 368 }
364 369
365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 370 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366} 371}
367 372
368static aio_req SvAIO_REQ (SV *sv) 373static SV *
374newSVaio_wd (aio_wd wd)
375{
376 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
377}
378
379static aio_req
380SvAIO_REQ (SV *sv)
369{ 381{
370 MAGIC *mg; 382 MAGIC *mg;
371 383
372 if (!SvROK (sv) 384 if (!SvROK (sv)
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash 385 || (SvSTASH (SvRV (sv)) != aio_grp_stash
… …
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 390 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 391
380 return mg ? (aio_req)mg->mg_ptr : 0; 392 return mg ? (aio_req)mg->mg_ptr : 0;
381} 393}
382 394
395static aio_wd
396SvAIO_WD (SV *sv)
397{
398 if (!SvROK (sv)
399 || SvSTASH (SvRV (sv)) != aio_wd_stash
400 || SvTYPE (SvRV (sv)) != SVt_PVMG)
401 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
402
403 return (aio_wd)(long)SvIVX (SvRV (sv));
404}
405
406static void
383static void aio_grp_feed (aio_req grp) 407aio_grp_feed (aio_req grp)
384{ 408{
385 if (grp->sv2 && SvOK (grp->sv2)) 409 if (grp->sv2 && SvOK (grp->sv2))
386 { 410 {
387 dSP; 411 dSP;
388 412
… …
396 FREETMPS; 420 FREETMPS;
397 LEAVE; 421 LEAVE;
398 } 422 }
399} 423}
400 424
425static void
401static void req_submit (eio_req *req) 426req_submit (eio_req *req)
402{ 427{
403 eio_submit (req); 428 eio_submit (req);
404 429
405 if (expect_false (on_next_submit)) 430 if (expect_false (on_next_submit))
406 { 431 {
… …
413 PUTBACK; 438 PUTBACK;
414 call_sv (cb, G_DISCARD | G_EVAL); 439 call_sv (cb, G_DISCARD | G_EVAL);
415 } 440 }
416} 441}
417 442
443static int
418static int req_invoke (eio_req *req) 444req_invoke (eio_req *req)
419{ 445{
420 if (req->flags & FLAG_SV2_RO_OFF) 446 if (req->flags & FLAG_SV2_RO_OFF)
421 SvREADONLY_off (req->sv2); 447 SvREADONLY_off (req->sv2);
422 448
423 if (!EIO_CANCELLED (req) && req->callback) 449 if (!EIO_CANCELLED (req) && req->callback)
… …
444 SvREADONLY_on (sv_result); 470 SvREADONLY_on (sv_result);
445 } 471 }
446 472
447 switch (req->type) 473 switch (req->type)
448 { 474 {
475 case EIO_WD_OPEN:
476 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
477 break;
478
449 case EIO_READDIR: 479 case EIO_READDIR:
450 { 480 {
451 SV *rv = &PL_sv_undef; 481 SV *rv = &PL_sv_undef;
452 482
453 if (req->result >= 0) 483 if (req->result >= 0)
… …
541 case EIO_STATVFS: 571 case EIO_STATVFS:
542 case EIO_FSTATVFS: 572 case EIO_FSTATVFS:
543 { 573 {
544 SV *rv = &PL_sv_undef; 574 SV *rv = &PL_sv_undef;
545 575
576#ifndef _WIN32
546 if (req->result >= 0) 577 if (req->result >= 0)
547 { 578 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 579 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 580 HV *hv = newHV ();
550 581
… …
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 591 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); 592 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); 593 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); 594 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 595 }
596#endif
565 597
566 PUSHs (rv); 598 PUSHs (rv);
567 } 599 }
568 600
569 break; 601 break;
… …
593 break; 625 break;
594 626
595 case EIO_STAT: 627 case EIO_STAT:
596 case EIO_LSTAT: 628 case EIO_LSTAT:
597 case EIO_FSTAT: 629 case EIO_FSTAT:
598 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 630 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
631
599 PL_laststatval = req->result; 632 if (!(PL_laststatval = req->result))
633 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
600 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 634 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
635
601 PUSHs (sv_result); 636 PUSHs (sv_result);
602 break; 637 break;
603 638
604 case EIO_READ: 639 case EIO_READ:
605 { 640 {
… …
639 } 674 }
640 675
641 return !!SvTRUE (ERRSV); 676 return !!SvTRUE (ERRSV);
642} 677}
643 678
679static void
644static void req_destroy (aio_req req) 680req_destroy (aio_req req)
645{ 681{
646 if (req->self) 682 if (req->self)
647 { 683 {
648 sv_unmagic (req->self, PERL_MAGIC_ext); 684 sv_unmagic (req->self, PERL_MAGIC_ext);
649 SvREFCNT_dec (req->self); 685 SvREFCNT_dec (req->self);
650 } 686 }
651 687
652 SvREFCNT_dec (req->sv1); 688 SvREFCNT_dec (req->sv1);
653 SvREFCNT_dec (req->sv2); 689 SvREFCNT_dec (req->sv2);
690 SvREFCNT_dec (req->sv3);
691 SvREFCNT_dec (req->sv4);
654 SvREFCNT_dec (req->callback); 692 SvREFCNT_dec (req->callback);
655 693
656 Safefree (req); 694 Safefree (req);
657} 695}
658 696
697static void
659static void req_cancel_subs (aio_req grp) 698req_cancel_subs (aio_req grp)
660{ 699{
661 aio_req sub;
662
663 if (grp->type != EIO_GROUP) 700 if (grp->type != EIO_GROUP)
664 return; 701 return;
665 702
666 SvREFCNT_dec (grp->sv2); 703 SvREFCNT_dec (grp->sv2);
667 grp->sv2 = 0; 704 grp->sv2 = 0;
668 705
669 eio_grp_cancel (grp); 706 eio_grp_cancel (grp);
670} 707}
671 708
672static void 709static void ecb_cold
673create_respipe (void) 710create_respipe (void)
674{ 711{
675 if (s_epipe_renew (&respipe)) 712 if (s_epipe_renew (&respipe))
676 croak ("IO::AIO: unable to initialize result pipe"); 713 croak ("IO::AIO: unable to initialize result pipe");
677} 714}
678 715
679static void poll_wait (void) 716static void
717poll_wait (void)
680{ 718{
681 while (eio_nreqs ()) 719 while (eio_nreqs ())
682 { 720 {
683 int size; 721 int size;
684 722
… …
693 731
694 s_epipe_wait (&respipe); 732 s_epipe_wait (&respipe);
695 } 733 }
696} 734}
697 735
698static int poll_cb (void) 736static int
737poll_cb (void)
699{ 738{
700 for (;;) 739 for (;;)
701 { 740 {
702 int res = eio_poll (); 741 int res = eio_poll ();
703 742
… …
709 748
710 poll_wait (); 749 poll_wait ();
711 } 750 }
712} 751}
713 752
714static void atfork_child (void) 753static void ecb_cold
754reinit (void)
715{ 755{
716 create_respipe (); 756 create_respipe ();
757
758 if (eio_init (want_poll, done_poll) < 0)
759 croak ("IO::AIO: unable to initialise eio library");
717} 760}
718 761
719/*****************************************************************************/ 762/*****************************************************************************/
720 763
721#if !_POSIX_MAPPED_FILES 764#if !_POSIX_MAPPED_FILES
… …
732# define MAP_FIXED 0 775# define MAP_FIXED 0
733#endif 776#endif
734 777
735#define MMAP_MAGIC PERL_MAGIC_ext 778#define MMAP_MAGIC PERL_MAGIC_ext
736 779
737static int 780static int ecb_cold
738mmap_free (pTHX_ SV *sv, MAGIC *mg) 781mmap_free (pTHX_ SV *sv, MAGIC *mg)
739{ 782{
740 int old_errno = errno; 783 int old_errno = errno;
741 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 784 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
742 errno = old_errno; 785 errno = old_errno;
… …
766{ 809{
767 SvGETMAGIC (cb_sv); 810 SvGETMAGIC (cb_sv);
768 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
769} 812}
770 813
814static aio_req ecb_noinline
815dreq (SV *callback)
816{
817 SV *cb_cv;
818 aio_req req;
819 int req_pri = next_pri;
820 next_pri = EIO_PRI_DEFAULT;
821
822 cb_cv = get_cb (callback);
823
824 Newz (0, req, 1, eio_req);
825 if (!req)
826 croak ("out of memory during eio_req allocation");
827
828 req->callback = SvREFCNT_inc (cb_cv);
829 req->pri = req_pri;
830
831 return req;
832}
833
771#define dREQ \ 834#define dREQ \
772 SV *cb_cv; \ 835 aio_req req = dreq (callback); \
773 aio_req req; \
774 int req_pri = next_pri; \
775 next_pri = EIO_PRI_DEFAULT; \
776 \
777 cb_cv = get_cb (callback); \
778 \
779 Newz (0, req, 1, eio_req); \
780 if (!req) \
781 croak ("out of memory during eio_req allocation"); \
782 \
783 req->callback = SvREFCNT_inc (cb_cv); \
784 req->pri = req_pri
785 836
786#define REQ_SEND \ 837#define REQ_SEND \
787 PUTBACK; \ 838 PUTBACK; \
788 req_submit (req); \ 839 req_submit (req); \
789 SPAGAIN; \ 840 SPAGAIN; \
790 \ 841 \
791 if (GIMME_V != G_VOID) \ 842 if (GIMME_V != G_VOID) \
792 XPUSHs (req_sv (req, aio_req_stash)); 843 XPUSHs (req_sv (req, aio_req_stash));
844
845ecb_inline void
846req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
847{
848 if (expect_false (SvROK (path)))
849 {
850 AV *av = (AV *)SvRV (path);
851 SV *wdob;
852
853 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
854 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
855
856 path = AvARRAY (av)[1];
857 wdob = AvARRAY (av)[0];
858
859 if (SvOK (wdob))
860 {
861 *wd = SvAIO_WD (wdob);
862 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
863 }
864 else
865 *wd = EIO_INVALID_WD;
866 }
867
868 *pathsv = newSVsv (path);
869 *ptr = SvPVbyte_nolen (*pathsv);
870}
871
872static void ecb_noinline
873req_set_path1 (aio_req req, SV *path)
874{
875 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
876}
877
878static void ecb_noinline
879req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
880{
881 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
882
883 switch (SvTYPE (rv))
884 {
885 case SVt_PVIO:
886 case SVt_PVLV:
887 case SVt_PVGV:
888 req->type = type_fh;
889 req->sv1 = newSVsv (fh_or_path);
890 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
891 break;
892
893 default:
894 req->type = type_path;
895 req_set_path1 (req, fh_or_path);
896 break;
897 }
898}
899
900XS(boot_IO__AIO) ecb_cold;
793 901
794MODULE = IO::AIO PACKAGE = IO::AIO 902MODULE = IO::AIO PACKAGE = IO::AIO
795 903
796PROTOTYPES: ENABLE 904PROTOTYPES: ENABLE
797 905
… …
894 1002
895 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 1003 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
896 const_eio (SYNC_FILE_RANGE_WRITE) 1004 const_eio (SYNC_FILE_RANGE_WRITE)
897 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 1005 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
898 1006
1007 const_eio (FALLOC_FL_KEEP_SIZE)
1008
899 const_eio (READDIR_DENTS) 1009 const_eio (READDIR_DENTS)
900 const_eio (READDIR_DIRS_FIRST) 1010 const_eio (READDIR_DIRS_FIRST)
901 const_eio (READDIR_STAT_ORDER) 1011 const_eio (READDIR_STAT_ORDER)
902 const_eio (READDIR_FOUND_UNKNOWN) 1012 const_eio (READDIR_FOUND_UNKNOWN)
903 1013
… …
913 }; 1023 };
914 1024
915 aio_stash = gv_stashpv ("IO::AIO" , 1); 1025 aio_stash = gv_stashpv ("IO::AIO" , 1);
916 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1026 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
917 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1027 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1028 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
918 1029
919 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1030 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)); 1031 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
921 1032
922 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1033 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
923 1034
924 create_respipe (); 1035 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} 1036}
1037
1038void
1039reinit ()
1040 PROTOTYPE:
932 1041
933void 1042void
934max_poll_reqs (unsigned int nreqs) 1043max_poll_reqs (unsigned int nreqs)
935 PROTOTYPE: $ 1044 PROTOTYPE: $
936 CODE: 1045 CODE:
… …
971 PROTOTYPE: $ 1080 PROTOTYPE: $
972 CODE: 1081 CODE:
973 max_outstanding = maxreqs; 1082 max_outstanding = maxreqs;
974 1083
975void 1084void
1085aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1086 PPCODE:
1087{
1088 dREQ;
1089
1090 req->type = EIO_WD_OPEN;
1091 req_set_path1 (req, pathname);
1092
1093 REQ_SEND;
1094}
1095
1096void
976aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1097aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
977 PPCODE: 1098 PPCODE:
978{ 1099{
979 dREQ; 1100 dREQ;
980 1101
981 req->type = EIO_OPEN; 1102 req->type = EIO_OPEN;
982 req->sv1 = newSVsv (pathname); 1103 req_set_path1 (req, pathname);
983 req->ptr1 = SvPVbyte_nolen (req->sv1);
984 req->int1 = flags; 1104 req->int1 = flags;
985 req->int2 = mode; 1105 req->int2 = mode;
986 1106
987 REQ_SEND; 1107 REQ_SEND;
988} 1108}
… …
990void 1110void
991aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1111aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
992 ALIAS: 1112 ALIAS:
993 aio_fsync = EIO_FSYNC 1113 aio_fsync = EIO_FSYNC
994 aio_fdatasync = EIO_FDATASYNC 1114 aio_fdatasync = EIO_FDATASYNC
1115 aio_syncfs = EIO_SYNCFS
995 PPCODE: 1116 PPCODE:
996{ 1117{
997 int fd = s_fileno_croak (fh, 0); 1118 int fd = s_fileno_croak (fh, 0);
998 dREQ; 1119 dREQ;
999 1120
… …
1020 1141
1021 REQ_SEND (req); 1142 REQ_SEND (req);
1022} 1143}
1023 1144
1024void 1145void
1146aio_fallocate (SV *fh, int mode, off_t offset, size_t len, SV *callback=&PL_sv_undef)
1147 PPCODE:
1148{
1149 int fd = s_fileno_croak (fh, 0);
1150 dREQ;
1151
1152 req->type = EIO_FALLOCATE;
1153 req->sv1 = newSVsv (fh);
1154 req->int1 = fd;
1155 req->int2 = mode;
1156 req->offs = offset;
1157 req->size = len;
1158
1159 REQ_SEND (req);
1160}
1161
1162void
1025aio_close (SV *fh, SV *callback=&PL_sv_undef) 1163aio_close (SV *fh, SV *callback=&PL_sv_undef)
1026 PPCODE: 1164 PPCODE:
1027{ 1165{
1028 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1166 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1029 int fd = s_fileno_croak (fh, 0); 1167 int fd = s_fileno_croak (fh, 0);
1030 dREQ; 1168 dREQ;
1031 1169
1032 if (close_pipe < 0) 1170 if (expect_false (close_fd < 0))
1033 { 1171 {
1034 int pipefd [2]; 1172 int pipefd [2];
1035 1173
1174 if (
1175#ifdef _WIN32
1176 _pipe (pipefd, 1, _O_BINARY) < 0
1177#else
1036 if (pipe (pipefd) < 0 1178 pipe (pipefd) < 0
1037 || close (pipefd [1]) < 0
1038 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1179 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1180#endif
1181 || close (pipefd [1]) < 0
1182 )
1039 abort (); /*D*/ 1183 abort (); /*D*/
1040 1184
1041 close_pipe = pipefd [0]; 1185 close_fd = pipefd [0];
1042 } 1186 }
1043 1187
1044 req->type = EIO_DUP2; 1188 req->type = EIO_DUP2;
1045 req->int1 = close_pipe; 1189 req->int1 = close_fd;
1046 req->sv2 = newSVsv (fh); 1190 req->sv2 = newSVsv (fh);
1047 req->int2 = fd; 1191 req->int2 = fd;
1048 1192
1049 REQ_SEND (req); 1193 REQ_SEND (req);
1050} 1194}
… …
1101 REQ_SEND; 1245 REQ_SEND;
1102 } 1246 }
1103} 1247}
1104 1248
1105void 1249void
1106aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1250aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1107 ALIAS: 1251 ALIAS:
1108 aio_readlink = EIO_READLINK 1252 aio_readlink = EIO_READLINK
1109 aio_realpath = EIO_REALPATH 1253 aio_realpath = EIO_REALPATH
1110 PPCODE: 1254 PPCODE:
1111{ 1255{
1112 SV *data;
1113 dREQ; 1256 dREQ;
1114 1257
1115 req->type = ix; 1258 req->type = ix;
1116 req->sv1 = newSVsv (path); 1259 req_set_path1 (req, pathname);
1117 req->ptr1 = SvPVbyte_nolen (req->sv1);
1118 1260
1119 REQ_SEND; 1261 REQ_SEND;
1120} 1262}
1121 1263
1122void 1264void
… …
1162 aio_statvfs = EIO_STATVFS 1304 aio_statvfs = EIO_STATVFS
1163 PPCODE: 1305 PPCODE:
1164{ 1306{
1165 dREQ; 1307 dREQ;
1166 1308
1167 req->sv1 = newSVsv (fh_or_path); 1309 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1168
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 1310
1180 REQ_SEND; 1311 REQ_SEND;
1181} 1312}
1182 1313
1183UV 1314UV
… …
1202{ 1333{
1203 dREQ; 1334 dREQ;
1204 1335
1205 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1336 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1206 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1337 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1207 req->sv1 = newSVsv (fh_or_path); 1338 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 1339
1220 REQ_SEND; 1340 REQ_SEND;
1221} 1341}
1222 1342
1223void 1343void
1224aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1344aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1225 PPCODE: 1345 PPCODE:
1226{ 1346{
1227 dREQ; 1347 dREQ;
1228 1348
1229 req->sv1 = newSVsv (fh_or_path);
1230 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1349 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1231 1350 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 1351
1243 REQ_SEND; 1352 REQ_SEND;
1244} 1353}
1245 1354
1246void 1355void
1247aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1356aio_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: 1357 PPCODE:
1252{ 1358{
1253 dREQ; 1359 dREQ;
1254 1360
1255 req->int2 = mode; 1361 req->int2 = mode;
1256 req->sv1 = newSVsv (fh_or_path); 1362 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 1363
1269 REQ_SEND; 1364 REQ_SEND;
1270} 1365}
1271 1366
1272void 1367void
… …
1275{ 1370{
1276 dREQ; 1371 dREQ;
1277 1372
1278 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1373 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1279 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1374 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1280 req->sv1 = newSVsv (fh_or_path); 1375 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 1376
1293 REQ_SEND; 1377 REQ_SEND;
1294} 1378}
1295 1379
1296void 1380void
… …
1298 PPCODE: 1382 PPCODE:
1299{ 1383{
1300 dREQ; 1384 dREQ;
1301 1385
1302 req->type = EIO_READDIR; 1386 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; 1387 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1306 1388
1307 if (flags & EIO_READDIR_DENTS) 1389 if (flags & EIO_READDIR_DENTS)
1308 req->int1 |= EIO_READDIR_CUSTOM2; 1390 req->int1 |= EIO_READDIR_CUSTOM2;
1309 1391
1392 req_set_path1 (req, pathname);
1393
1310 REQ_SEND; 1394 REQ_SEND;
1395}
1396
1397void
1398aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1399 PPCODE:
1400{
1401 dREQ;
1402
1403 req->type = EIO_MKDIR;
1404 req->int2 = mode;
1405 req_set_path1 (req, pathname);
1406
1407 REQ_SEND;
1311} 1408}
1312 1409
1313void 1410void
1314aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1411aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1315 ALIAS: 1412 ALIAS:
… …
1319 PPCODE: 1416 PPCODE:
1320{ 1417{
1321 dREQ; 1418 dREQ;
1322 1419
1323 req->type = ix; 1420 req->type = ix;
1324 req->sv1 = newSVsv (pathname); 1421 req_set_path1 (req, pathname);
1325 req->ptr1 = SvPVbyte_nolen (req->sv1);
1326 1422
1327 REQ_SEND; 1423 REQ_SEND;
1328} 1424}
1329 1425
1330void 1426void
… …
1334 aio_symlink = EIO_SYMLINK 1430 aio_symlink = EIO_SYMLINK
1335 aio_rename = EIO_RENAME 1431 aio_rename = EIO_RENAME
1336 PPCODE: 1432 PPCODE:
1337{ 1433{
1338 dREQ; 1434 dREQ;
1435 eio_wd wd2 = 0;
1339 1436
1340 req->type = ix; 1437 req->type = ix;
1341 req->sv1 = newSVsv (oldpath); 1438 req_set_path1 (req, oldpath);
1342 req->ptr1 = SvPVbyte_nolen (req->sv1); 1439 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1343 req->sv2 = newSVsv (newpath); 1440 req->int3 = (long)wd2;
1344 req->ptr2 = SvPVbyte_nolen (req->sv2);
1345 1441
1346 REQ_SEND; 1442 REQ_SEND;
1347} 1443}
1348 1444
1349void 1445void
… …
1351 PPCODE: 1447 PPCODE:
1352{ 1448{
1353 dREQ; 1449 dREQ;
1354 1450
1355 req->type = EIO_MKNOD; 1451 req->type = EIO_MKNOD;
1356 req->sv1 = newSVsv (pathname);
1357 req->ptr1 = SvPVbyte_nolen (req->sv1);
1358 req->int2 = (mode_t)mode; 1452 req->int2 = (mode_t)mode;
1359 req->offs = dev; 1453 req->offs = dev;
1454 req_set_path1 (req, pathname);
1360 1455
1361 REQ_SEND; 1456 REQ_SEND;
1362} 1457}
1363 1458
1364void 1459void
… …
1564 CODE: 1659 CODE:
1565 RETVAL = posix_fadvise (fh, offset, length, advice); 1660 RETVAL = posix_fadvise (fh, offset, length, advice);
1566 OUTPUT: 1661 OUTPUT:
1567 RETVAL 1662 RETVAL
1568 1663
1569ssize_t 1664IV
1570sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1665sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1571 CODE: 1666 CODE:
1572 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1667 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1573 OUTPUT: 1668 OUTPUT:
1574 RETVAL 1669 RETVAL
… …
1686 SvREFCNT_dec (on_next_submit); 1781 SvREFCNT_dec (on_next_submit);
1687 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1782 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1688 1783
1689PROTOTYPES: DISABLE 1784PROTOTYPES: DISABLE
1690 1785
1786MODULE = IO::AIO PACKAGE = IO::AIO::WD
1787
1788BOOT:
1789{
1790 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1791 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1792}
1793
1794void
1795DESTROY (SV *self)
1796 CODE:
1797{
1798 aio_wd wd = SvAIO_WD (self);
1799#if HAVE_AT
1800 {
1801 SV *callback = &PL_sv_undef;
1802 dREQ; /* clobbers next_pri :/ */
1803 next_pri = req->pri; /* restore next_pri */
1804 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1805 req->type = EIO_WD_CLOSE;
1806 req->wd = wd;
1807 REQ_SEND;
1808 }
1809#else
1810 eio_wd_close_sync (wd);
1811#endif
1812}
1813
1691MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1814MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1692 1815
1693void 1816void
1694cancel (aio_req_ornot req) 1817cancel (aio_req_ornot req)
1695 CODE: 1818 CODE:

Diff Legend

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