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.185 by root, Thu Jul 7 22:36:18 2011 UTC vs.
Revision 1.206 by root, Tue Oct 4 18:22:37 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)
385 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash 386 || (SvSTASH (SvRV (sv)) != aio_grp_stash
374 && SvSTASH (SvRV (sv)) != aio_req_stash 387 && SvSTASH (SvRV (sv)) != aio_req_stash
375 && !sv_derived_from (sv, "IO::AIO::REQ"))) 388 && !sv_derived_from (sv, "IO::AIO::REQ")))
376 croak ("object of class IO::AIO::REQ expected"); 389 croak ("object of class IO::AIO::REQ expected");
377 390
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 391 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 392
380 return mg ? (aio_req)mg->mg_ptr : 0; 393 return mg ? (aio_req)mg->mg_ptr : 0;
381} 394}
382 395
396static aio_wd
397SvAIO_WD (SV *sv)
398{
399 if (!SvROK (sv)
400 || SvTYPE (SvRV (sv)) != SVt_PVMG
401 || SvSTASH (SvRV (sv)) != aio_wd_stash)
402 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
403
404 return (aio_wd)(long)SvIVX (SvRV (sv));
405}
406
407static void
383static void aio_grp_feed (aio_req grp) 408aio_grp_feed (aio_req grp)
384{ 409{
385 if (grp->sv2 && SvOK (grp->sv2)) 410 if (grp->sv2 && SvOK (grp->sv2))
386 { 411 {
387 dSP; 412 dSP;
388 413
… …
396 FREETMPS; 421 FREETMPS;
397 LEAVE; 422 LEAVE;
398 } 423 }
399} 424}
400 425
426static void
401static void req_submit (eio_req *req) 427req_submit (eio_req *req)
402{ 428{
403 eio_submit (req); 429 eio_submit (req);
404 430
405 if (expect_false (on_next_submit)) 431 if (expect_false (on_next_submit))
406 { 432 {
… …
413 PUTBACK; 439 PUTBACK;
414 call_sv (cb, G_DISCARD | G_EVAL); 440 call_sv (cb, G_DISCARD | G_EVAL);
415 } 441 }
416} 442}
417 443
444static int
418static int req_invoke (eio_req *req) 445req_invoke (eio_req *req)
419{ 446{
420 if (req->flags & FLAG_SV2_RO_OFF) 447 if (req->flags & FLAG_SV2_RO_OFF)
421 SvREADONLY_off (req->sv2); 448 SvREADONLY_off (req->sv2);
422 449
423 if (!EIO_CANCELLED (req) && req->callback) 450 if (!EIO_CANCELLED (req) && req->callback)
… …
444 SvREADONLY_on (sv_result); 471 SvREADONLY_on (sv_result);
445 } 472 }
446 473
447 switch (req->type) 474 switch (req->type)
448 { 475 {
476 case EIO_WD_OPEN:
477 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
478 break;
479
449 case EIO_READDIR: 480 case EIO_READDIR:
450 { 481 {
451 SV *rv = &PL_sv_undef; 482 SV *rv = &PL_sv_undef;
452 483
453 if (req->result >= 0) 484 if (req->result >= 0)
… …
541 case EIO_STATVFS: 572 case EIO_STATVFS:
542 case EIO_FSTATVFS: 573 case EIO_FSTATVFS:
543 { 574 {
544 SV *rv = &PL_sv_undef; 575 SV *rv = &PL_sv_undef;
545 576
577#ifndef _WIN32
546 if (req->result >= 0) 578 if (req->result >= 0)
547 { 579 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 580 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 581 HV *hv = newHV ();
550 582
… …
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 592 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); 593 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); 594 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); 595 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 596 }
597#endif
565 598
566 PUSHs (rv); 599 PUSHs (rv);
567 } 600 }
568 601
569 break; 602 break;
… …
593 break; 626 break;
594 627
595 case EIO_STAT: 628 case EIO_STAT:
596 case EIO_LSTAT: 629 case EIO_LSTAT:
597 case EIO_FSTAT: 630 case EIO_FSTAT:
598 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 631 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
632
599 PL_laststatval = req->result; 633 if (!(PL_laststatval = req->result))
634 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
600 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 635 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
636
601 PUSHs (sv_result); 637 PUSHs (sv_result);
602 break; 638 break;
603 639
604 case EIO_READ: 640 case EIO_READ:
605 { 641 {
… …
639 } 675 }
640 676
641 return !!SvTRUE (ERRSV); 677 return !!SvTRUE (ERRSV);
642} 678}
643 679
680static void
644static void req_destroy (aio_req req) 681req_destroy (aio_req req)
645{ 682{
646 if (req->self) 683 if (req->self)
647 { 684 {
648 sv_unmagic (req->self, PERL_MAGIC_ext); 685 sv_unmagic (req->self, PERL_MAGIC_ext);
649 SvREFCNT_dec (req->self); 686 SvREFCNT_dec (req->self);
650 } 687 }
651 688
652 SvREFCNT_dec (req->sv1); 689 SvREFCNT_dec (req->sv1);
653 SvREFCNT_dec (req->sv2); 690 SvREFCNT_dec (req->sv2);
691 SvREFCNT_dec (req->sv3);
692 SvREFCNT_dec (req->sv4);
654 SvREFCNT_dec (req->callback); 693 SvREFCNT_dec (req->callback);
655 694
656 Safefree (req); 695 free (req);
657} 696}
658 697
698static void
659static void req_cancel_subs (aio_req grp) 699req_cancel_subs (aio_req grp)
660{ 700{
661 aio_req sub;
662
663 if (grp->type != EIO_GROUP) 701 if (grp->type != EIO_GROUP)
664 return; 702 return;
665 703
666 SvREFCNT_dec (grp->sv2); 704 SvREFCNT_dec (grp->sv2);
667 grp->sv2 = 0; 705 grp->sv2 = 0;
668 706
669 eio_grp_cancel (grp); 707 eio_grp_cancel (grp);
670} 708}
671 709
710static void ecb_cold
672static void create_respipe (void) 711create_respipe (void)
673{ 712{
674 if (s_epipe_renew (&respipe)) 713 if (s_epipe_renew (&respipe))
675 croak ("IO::AIO: unable to initialize result pipe"); 714 croak ("IO::AIO: unable to initialize result pipe");
676} 715}
677 716
678static void poll_wait (void) 717static void
718poll_wait (void)
679{ 719{
680 while (eio_nreqs ()) 720 while (eio_nreqs ())
681 { 721 {
682 int size; 722 int size;
683 723
… …
692 732
693 s_epipe_wait (&respipe); 733 s_epipe_wait (&respipe);
694 } 734 }
695} 735}
696 736
697static int poll_cb (void) 737static int
738poll_cb (void)
698{ 739{
699 for (;;) 740 for (;;)
700 { 741 {
701 int res = eio_poll (); 742 int res = eio_poll ();
702 743
… …
708 749
709 poll_wait (); 750 poll_wait ();
710 } 751 }
711} 752}
712 753
713static void atfork_child (void) 754static void ecb_cold
755reinit (void)
714{ 756{
715 create_respipe (); 757 create_respipe ();
758
759 if (eio_init (want_poll, done_poll) < 0)
760 croak ("IO::AIO: unable to initialise eio library");
716} 761}
717 762
718/*****************************************************************************/ 763/*****************************************************************************/
719 764
720#if !_POSIX_MAPPED_FILES 765#if !_POSIX_MAPPED_FILES
… …
731# define MAP_FIXED 0 776# define MAP_FIXED 0
732#endif 777#endif
733 778
734#define MMAP_MAGIC PERL_MAGIC_ext 779#define MMAP_MAGIC PERL_MAGIC_ext
735 780
781static int ecb_cold
736static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 782mmap_free (pTHX_ SV *sv, MAGIC *mg)
737{ 783{
738 int old_errno = errno; 784 int old_errno = errno;
739 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 785 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
740 errno = old_errno; 786 errno = old_errno;
741 787
… …
757 0, 0, 0, 0, mmap_free 803 0, 0, 0, 0, mmap_free
758}; 804};
759 805
760/*****************************************************************************/ 806/*****************************************************************************/
761 807
808static SV *
762static SV * get_cb (SV *cb_sv) 809get_cb (SV *cb_sv)
763{ 810{
764 SvGETMAGIC (cb_sv); 811 SvGETMAGIC (cb_sv);
765 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 812 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
766} 813}
767 814
815static aio_req ecb_noinline
816dreq (SV *callback)
817{
818 SV *cb_cv;
819 aio_req req;
820 int req_pri = next_pri;
821 next_pri = EIO_PRI_DEFAULT;
822
823 cb_cv = get_cb (callback);
824
825 req = calloc (sizeof (*req), 1);
826 if (!req)
827 croak ("out of memory during eio_req allocation");
828
829 req->callback = SvREFCNT_inc (cb_cv);
830 req->pri = req_pri;
831
832 return req;
833}
834
768#define dREQ \ 835#define dREQ \
769 SV *cb_cv; \ 836 aio_req req = dreq (callback); \
770 aio_req req; \
771 int req_pri = next_pri; \
772 next_pri = EIO_PRI_DEFAULT; \
773 \
774 cb_cv = get_cb (callback); \
775 \
776 Newz (0, req, 1, eio_req); \
777 if (!req) \
778 croak ("out of memory during eio_req allocation"); \
779 \
780 req->callback = SvREFCNT_inc (cb_cv); \
781 req->pri = req_pri
782 837
783#define REQ_SEND \ 838#define REQ_SEND \
784 PUTBACK; \ 839 PUTBACK; \
785 req_submit (req); \ 840 req_submit (req); \
786 SPAGAIN; \ 841 SPAGAIN; \
787 \ 842 \
788 if (GIMME_V != G_VOID) \ 843 if (GIMME_V != G_VOID) \
789 XPUSHs (req_sv (req, aio_req_stash)); 844 XPUSHs (req_sv (req, aio_req_stash));
845
846ecb_inline void
847req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
848{
849 if (expect_false (SvROK (path)))
850 {
851 SV *rv = SvRV (path);
852 SV *wdob;
853
854 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
855 {
856 path = AvARRAY (rv)[1];
857 wdob = AvARRAY (rv)[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 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
868 {
869 *wd = (aio_wd)(long)SvIVX (rv);
870 *wdsv = SvREFCNT_inc_NN (rv);
871 *ptr = ".";
872 return; /* path set to "." */
873 }
874 else
875 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
876 }
877
878 *pathsv = newSVsv (path);
879 *ptr = SvPVbyte_nolen (*pathsv);
880}
881
882static void ecb_noinline
883req_set_path1 (aio_req req, SV *path)
884{
885 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
886}
887
888static void ecb_noinline
889req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
890{
891 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
892
893 switch (SvTYPE (rv))
894 {
895 case SVt_PVIO:
896 case SVt_PVLV:
897 case SVt_PVGV:
898 req->type = type_fh;
899 req->sv1 = newSVsv (fh_or_path);
900 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
901 break;
902
903 default:
904 req->type = type_path;
905 req_set_path1 (req, fh_or_path);
906 break;
907 }
908}
909
910XS(boot_IO__AIO) ecb_cold;
790 911
791MODULE = IO::AIO PACKAGE = IO::AIO 912MODULE = IO::AIO PACKAGE = IO::AIO
792 913
793PROTOTYPES: ENABLE 914PROTOTYPES: ENABLE
794 915
… …
912 }; 1033 };
913 1034
914 aio_stash = gv_stashpv ("IO::AIO" , 1); 1035 aio_stash = gv_stashpv ("IO::AIO" , 1);
915 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1036 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
916 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1037 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1038 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
917 1039
918 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1040 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)); 1041 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
920 1042
921 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1043 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
922 1044
923 create_respipe (); 1045 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} 1046}
1047
1048void
1049reinit ()
1050 PROTOTYPE:
931 1051
932void 1052void
933max_poll_reqs (unsigned int nreqs) 1053max_poll_reqs (unsigned int nreqs)
934 PROTOTYPE: $ 1054 PROTOTYPE: $
935 CODE: 1055 CODE:
… …
970 PROTOTYPE: $ 1090 PROTOTYPE: $
971 CODE: 1091 CODE:
972 max_outstanding = maxreqs; 1092 max_outstanding = maxreqs;
973 1093
974void 1094void
1095aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1096 PPCODE:
1097{
1098 dREQ;
1099
1100 req->type = EIO_WD_OPEN;
1101 req_set_path1 (req, pathname);
1102
1103 REQ_SEND;
1104}
1105
1106void
975aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1107aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
976 PPCODE: 1108 PPCODE:
977{ 1109{
978 dREQ; 1110 dREQ;
979 1111
980 req->type = EIO_OPEN; 1112 req->type = EIO_OPEN;
981 req->sv1 = newSVsv (pathname); 1113 req_set_path1 (req, pathname);
982 req->ptr1 = SvPVbyte_nolen (req->sv1);
983 req->int1 = flags; 1114 req->int1 = flags;
984 req->int2 = mode; 1115 req->int2 = mode;
985 1116
986 REQ_SEND; 1117 REQ_SEND;
987} 1118}
… …
989void 1120void
990aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1121aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
991 ALIAS: 1122 ALIAS:
992 aio_fsync = EIO_FSYNC 1123 aio_fsync = EIO_FSYNC
993 aio_fdatasync = EIO_FDATASYNC 1124 aio_fdatasync = EIO_FDATASYNC
1125 aio_syncfs = EIO_SYNCFS
994 PPCODE: 1126 PPCODE:
995{ 1127{
996 int fd = s_fileno_croak (fh, 0); 1128 int fd = s_fileno_croak (fh, 0);
997 dREQ; 1129 dREQ;
998 1130
… …
1039 1171
1040void 1172void
1041aio_close (SV *fh, SV *callback=&PL_sv_undef) 1173aio_close (SV *fh, SV *callback=&PL_sv_undef)
1042 PPCODE: 1174 PPCODE:
1043{ 1175{
1044 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1176 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1045 int fd = s_fileno_croak (fh, 0); 1177 int fd = s_fileno_croak (fh, 0);
1046 dREQ; 1178 dREQ;
1047 1179
1048 if (close_pipe < 0) 1180 if (expect_false (close_fd < 0))
1049 { 1181 {
1050 int pipefd [2]; 1182 int pipefd [2];
1051 1183
1184 if (
1185#ifdef _WIN32
1186 _pipe (pipefd, 1, _O_BINARY) < 0
1187#else
1052 if (pipe (pipefd) < 0 1188 pipe (pipefd) < 0
1053 || close (pipefd [1]) < 0
1054 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1189 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1190#endif
1191 || close (pipefd [1]) < 0
1192 )
1055 abort (); /*D*/ 1193 abort (); /*D*/
1056 1194
1057 close_pipe = pipefd [0]; 1195 close_fd = pipefd [0];
1058 } 1196 }
1059 1197
1060 req->type = EIO_DUP2; 1198 req->type = EIO_DUP2;
1061 req->int1 = close_pipe; 1199 req->int1 = close_fd;
1062 req->sv2 = newSVsv (fh); 1200 req->sv2 = newSVsv (fh);
1063 req->int2 = fd; 1201 req->int2 = fd;
1064 1202
1065 REQ_SEND (req); 1203 REQ_SEND (req);
1066} 1204}
… …
1117 REQ_SEND; 1255 REQ_SEND;
1118 } 1256 }
1119} 1257}
1120 1258
1121void 1259void
1122aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1260aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1123 ALIAS: 1261 ALIAS:
1124 aio_readlink = EIO_READLINK 1262 aio_readlink = EIO_READLINK
1125 aio_realpath = EIO_REALPATH 1263 aio_realpath = EIO_REALPATH
1126 PPCODE: 1264 PPCODE:
1127{ 1265{
1128 SV *data;
1129 dREQ; 1266 dREQ;
1130 1267
1131 req->type = ix; 1268 req->type = ix;
1132 req->sv1 = newSVsv (path); 1269 req_set_path1 (req, pathname);
1133 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 1270
1135 REQ_SEND; 1271 REQ_SEND;
1136} 1272}
1137 1273
1138void 1274void
… …
1178 aio_statvfs = EIO_STATVFS 1314 aio_statvfs = EIO_STATVFS
1179 PPCODE: 1315 PPCODE:
1180{ 1316{
1181 dREQ; 1317 dREQ;
1182 1318
1183 req->sv1 = newSVsv (fh_or_path); 1319 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1184
1185 if (SvPOK (req->sv1))
1186 {
1187 req->type = ix;
1188 req->ptr1 = SvPVbyte_nolen (req->sv1);
1189 }
1190 else
1191 {
1192 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1193 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1194 }
1195 1320
1196 REQ_SEND; 1321 REQ_SEND;
1197} 1322}
1198 1323
1199UV 1324UV
… …
1218{ 1343{
1219 dREQ; 1344 dREQ;
1220 1345
1221 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1346 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1222 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1347 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1223 req->sv1 = newSVsv (fh_or_path); 1348 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1224
1225 if (SvPOK (req->sv1))
1226 {
1227 req->type = EIO_UTIME;
1228 req->ptr1 = SvPVbyte_nolen (req->sv1);
1229 }
1230 else
1231 {
1232 req->type = EIO_FUTIME;
1233 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1234 }
1235 1349
1236 REQ_SEND; 1350 REQ_SEND;
1237} 1351}
1238 1352
1239void 1353void
1240aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1354aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1241 PPCODE: 1355 PPCODE:
1242{ 1356{
1243 dREQ; 1357 dREQ;
1244 1358
1245 req->sv1 = newSVsv (fh_or_path);
1246 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1359 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1247 1360 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1248 if (SvPOK (req->sv1))
1249 {
1250 req->type = EIO_TRUNCATE;
1251 req->ptr1 = SvPVbyte_nolen (req->sv1);
1252 }
1253 else
1254 {
1255 req->type = EIO_FTRUNCATE;
1256 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1257 }
1258 1361
1259 REQ_SEND; 1362 REQ_SEND;
1260} 1363}
1261 1364
1262void 1365void
1263aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1366aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
1264 ALIAS:
1265 aio_chmod = EIO_CHMOD
1266 aio_mkdir = EIO_MKDIR
1267 PPCODE: 1367 PPCODE:
1268{ 1368{
1269 dREQ; 1369 dREQ;
1270 1370
1271 req->int2 = mode; 1371 req->int2 = mode;
1272 req->sv1 = newSVsv (fh_or_path); 1372 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1273
1274 if (SvPOK (req->sv1))
1275 {
1276 req->type = ix;
1277 req->ptr1 = SvPVbyte_nolen (req->sv1);
1278 }
1279 else
1280 {
1281 req->type = EIO_FCHMOD;
1282 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1283 }
1284 1373
1285 REQ_SEND; 1374 REQ_SEND;
1286} 1375}
1287 1376
1288void 1377void
… …
1291{ 1380{
1292 dREQ; 1381 dREQ;
1293 1382
1294 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1383 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1295 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1384 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1296 req->sv1 = newSVsv (fh_or_path); 1385 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1297
1298 if (SvPOK (req->sv1))
1299 {
1300 req->type = EIO_CHOWN;
1301 req->ptr1 = SvPVbyte_nolen (req->sv1);
1302 }
1303 else
1304 {
1305 req->type = EIO_FCHOWN;
1306 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1307 }
1308 1386
1309 REQ_SEND; 1387 REQ_SEND;
1310} 1388}
1311 1389
1312void 1390void
… …
1314 PPCODE: 1392 PPCODE:
1315{ 1393{
1316 dREQ; 1394 dREQ;
1317 1395
1318 req->type = EIO_READDIR; 1396 req->type = EIO_READDIR;
1319 req->sv1 = newSVsv (pathname);
1320 req->ptr1 = SvPVbyte_nolen (req->sv1);
1321 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1397 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1322 1398
1323 if (flags & EIO_READDIR_DENTS) 1399 if (flags & EIO_READDIR_DENTS)
1324 req->int1 |= EIO_READDIR_CUSTOM2; 1400 req->int1 |= EIO_READDIR_CUSTOM2;
1325 1401
1402 req_set_path1 (req, pathname);
1403
1326 REQ_SEND; 1404 REQ_SEND;
1405}
1406
1407void
1408aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1409 PPCODE:
1410{
1411 dREQ;
1412
1413 req->type = EIO_MKDIR;
1414 req->int2 = mode;
1415 req_set_path1 (req, pathname);
1416
1417 REQ_SEND;
1327} 1418}
1328 1419
1329void 1420void
1330aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1421aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1331 ALIAS: 1422 ALIAS:
… …
1335 PPCODE: 1426 PPCODE:
1336{ 1427{
1337 dREQ; 1428 dREQ;
1338 1429
1339 req->type = ix; 1430 req->type = ix;
1340 req->sv1 = newSVsv (pathname); 1431 req_set_path1 (req, pathname);
1341 req->ptr1 = SvPVbyte_nolen (req->sv1);
1342 1432
1343 REQ_SEND; 1433 REQ_SEND;
1344} 1434}
1345 1435
1346void 1436void
… …
1350 aio_symlink = EIO_SYMLINK 1440 aio_symlink = EIO_SYMLINK
1351 aio_rename = EIO_RENAME 1441 aio_rename = EIO_RENAME
1352 PPCODE: 1442 PPCODE:
1353{ 1443{
1354 dREQ; 1444 dREQ;
1445 eio_wd wd2 = 0;
1355 1446
1356 req->type = ix; 1447 req->type = ix;
1357 req->sv1 = newSVsv (oldpath); 1448 req_set_path1 (req, oldpath);
1358 req->ptr1 = SvPVbyte_nolen (req->sv1); 1449 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1359 req->sv2 = newSVsv (newpath); 1450 req->int3 = (long)wd2;
1360 req->ptr2 = SvPVbyte_nolen (req->sv2);
1361 1451
1362 REQ_SEND; 1452 REQ_SEND;
1363} 1453}
1364 1454
1365void 1455void
… …
1367 PPCODE: 1457 PPCODE:
1368{ 1458{
1369 dREQ; 1459 dREQ;
1370 1460
1371 req->type = EIO_MKNOD; 1461 req->type = EIO_MKNOD;
1372 req->sv1 = newSVsv (pathname);
1373 req->ptr1 = SvPVbyte_nolen (req->sv1);
1374 req->int2 = (mode_t)mode; 1462 req->int2 = (mode_t)mode;
1375 req->offs = dev; 1463 req->offs = dev;
1464 req_set_path1 (req, pathname);
1376 1465
1377 REQ_SEND; 1466 REQ_SEND;
1378} 1467}
1379 1468
1380void 1469void
… …
1580 CODE: 1669 CODE:
1581 RETVAL = posix_fadvise (fh, offset, length, advice); 1670 RETVAL = posix_fadvise (fh, offset, length, advice);
1582 OUTPUT: 1671 OUTPUT:
1583 RETVAL 1672 RETVAL
1584 1673
1585ssize_t 1674IV
1586sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1675sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1587 CODE: 1676 CODE:
1588 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1677 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1589 OUTPUT: 1678 OUTPUT:
1590 RETVAL 1679 RETVAL
… …
1702 SvREFCNT_dec (on_next_submit); 1791 SvREFCNT_dec (on_next_submit);
1703 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1792 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1704 1793
1705PROTOTYPES: DISABLE 1794PROTOTYPES: DISABLE
1706 1795
1796MODULE = IO::AIO PACKAGE = IO::AIO::WD
1797
1798BOOT:
1799{
1800 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1801 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1802}
1803
1804void
1805DESTROY (SV *self)
1806 CODE:
1807{
1808 aio_wd wd = SvAIO_WD (self);
1809#if HAVE_AT
1810 {
1811 SV *callback = &PL_sv_undef;
1812 dREQ; /* clobbers next_pri :/ */
1813 next_pri = req->pri; /* restore next_pri */
1814 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1815 req->type = EIO_WD_CLOSE;
1816 req->wd = wd;
1817 REQ_SEND;
1818 }
1819#else
1820 eio_wd_close_sync (wd);
1821#endif
1822}
1823
1707MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1824MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1708 1825
1709void 1826void
1710cancel (aio_req_ornot req) 1827cancel (aio_req_ornot req)
1711 CODE: 1828 CODE:

Diff Legend

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