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.208 by root, Sat Jan 7 18:42:43 2012 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
82 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 #define EIO_STRUCT_STAT struct _stati64
68 #define EIO_STRUCT_STATI64
69
70#else
71
72 #include <sys/time.h>
73 #include <sys/select.h>
74 #include <unistd.h>
75 #include <utime.h>
76 #include <signal.h>
77
83#define EIO_STRUCT_STAT Stat_t 78 #define EIO_STRUCT_STAT Stat_t
79
80#endif
84 81
85/* use NV for 32 bit perls as it allows larger offsets */ 82/* use NV for 32 bit perls as it allows larger offsets */
86#if IVSIZE >= 8 83#if IVSIZE >= 8
87# define VAL64 IV 84# define VAL64 IV
88# define SvVAL64 SvIV 85# define SvVAL64 SvIV
… …
108 105
109typedef SV SV8; /* byte-sv, used for argument-checking */ 106typedef SV SV8; /* byte-sv, used for argument-checking */
110typedef int aio_rfd; /* read file desriptor */ 107typedef int aio_rfd; /* read file desriptor */
111typedef int aio_wfd; /* write file descriptor */ 108typedef int aio_wfd; /* write file descriptor */
112 109
113static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 110static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
114 111
115#define EIO_REQ_MEMBERS \ 112#define EIO_REQ_MEMBERS \
116 SV *callback; \ 113 SV *callback; \
117 SV *sv1, *sv2; \ 114 SV *sv1, *sv2; \
115 SV *sv3, *sv4; \
118 STRLEN stroffset; \ 116 STRLEN stroffset; \
119 SV *self; 117 SV *self;
120 118
121#define EIO_NO_WRAPPERS 1 119#define EIO_NO_WRAPPERS 1
122 120
123#include "libeio/config.h" 121#include "libeio/config.h"
124#include "libeio/eio.h" 122#include "libeio/eio.h"
123
124static int req_invoke (eio_req *req);
125#define EIO_FINISH(req) req_invoke (req)
126static void req_destroy (eio_req *grp);
127#define EIO_DESTROY(req) req_destroy (req)
128
129#include "libeio/eio.c"
125 130
126/* Linux/others */ 131/* Linux/others */
127#ifndef O_ASYNC 132#ifndef O_ASYNC
128# define O_ASYNC 0 133# define O_ASYNC 0
129#endif 134#endif
… …
223#endif 228#endif
224#ifndef PROT_EXEC 229#ifndef PROT_EXEC
225# define PROT_EXEC 0 230# define PROT_EXEC 0
226#endif 231#endif
227 232
233#ifndef ST_RDONLY
234# define ST_RDONLY 0
235#endif
236#ifndef ST_NOSUID
237# define ST_NOSUID 0
238#endif
228#ifndef ST_NODEV 239#ifndef ST_NODEV
229# define ST_NODEV 0 240# define ST_NODEV 0
230#endif 241#endif
231#ifndef ST_NOEXEC 242#ifndef ST_NOEXEC
232# define ST_NOEXEC 0 243# define ST_NOEXEC 0
… …
316 327
317#ifndef PAGESIZE 328#ifndef PAGESIZE
318# define PAGESIZE sysconf (_SC_PAGESIZE) 329# define PAGESIZE sysconf (_SC_PAGESIZE)
319#endif 330#endif
320 331
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 { 332enum {
327 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 333 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
328}; 334};
329 335
330#include "libeio/eio.c"
331
332typedef eio_req *aio_req; 336typedef eio_req *aio_req;
333typedef eio_req *aio_req_ornot; 337typedef eio_req *aio_req_ornot;
338typedef eio_wd aio_wd;
334 339
335static SV *on_next_submit; 340static SV *on_next_submit;
336static int next_pri = EIO_PRI_DEFAULT; 341static int next_pri = EIO_PRI_DEFAULT;
337static int max_outstanding; 342static int max_outstanding;
338 343
339static s_epipe respipe; 344static s_epipe respipe;
340 345
341static void req_destroy (aio_req req); 346static void req_destroy (aio_req req);
342static void req_cancel (aio_req req); 347static void req_cancel (aio_req req);
343 348
344static void want_poll (void) 349static void
350want_poll (void)
345{ 351{
346 /* write a dummy byte to the pipe so fh becomes ready */ 352 /* write a dummy byte to the pipe so fh becomes ready */
347 s_epipe_signal (&respipe); 353 s_epipe_signal (&respipe);
348} 354}
349 355
350static void done_poll (void) 356static void
357done_poll (void)
351{ 358{
352 /* read any signals sent by the worker threads */ 359 /* read any signals sent by the worker threads */
353 s_epipe_drain (&respipe); 360 s_epipe_drain (&respipe);
354} 361}
355 362
356/* must be called at most once */ 363/* must be called at most once */
364static SV *
357static SV *req_sv (aio_req req, HV *stash) 365req_sv (aio_req req, HV *stash)
358{ 366{
359 if (!req->self) 367 if (!req->self)
360 { 368 {
361 req->self = (SV *)newHV (); 369 req->self = (SV *)newHV ();
362 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 370 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
363 } 371 }
364 372
365 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 373 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
366} 374}
367 375
368static aio_req SvAIO_REQ (SV *sv) 376static SV *
377newSVaio_wd (aio_wd wd)
378{
379 return sv_bless (newRV_noinc (newSViv ((IV)wd)), aio_wd_stash);
380}
381
382static aio_req
383SvAIO_REQ (SV *sv)
369{ 384{
370 MAGIC *mg; 385 MAGIC *mg;
371 386
372 if (!SvROK (sv) 387 if (!SvROK (sv)
388 /* for speed reasons, we do not verify that SvROK actually has a stash ptr */
373 || (SvSTASH (SvRV (sv)) != aio_grp_stash 389 || (SvSTASH (SvRV (sv)) != aio_grp_stash
374 && SvSTASH (SvRV (sv)) != aio_req_stash 390 && SvSTASH (SvRV (sv)) != aio_req_stash
375 && !sv_derived_from (sv, "IO::AIO::REQ"))) 391 && !sv_derived_from (sv, "IO::AIO::REQ")))
376 croak ("object of class IO::AIO::REQ expected"); 392 croak ("object of class IO::AIO::REQ expected");
377 393
378 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 394 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
379 395
380 return mg ? (aio_req)mg->mg_ptr : 0; 396 return mg ? (aio_req)mg->mg_ptr : 0;
381} 397}
382 398
399static aio_wd
400SvAIO_WD (SV *sv)
401{
402 if (!SvROK (sv)
403 || SvTYPE (SvRV (sv)) != SVt_PVMG
404 || SvSTASH (SvRV (sv)) != aio_wd_stash)
405 croak ("IO::AIO: expected a working directory object as returned by aio_wd");
406
407 return (aio_wd)(long)SvIVX (SvRV (sv));
408}
409
410static void
383static void aio_grp_feed (aio_req grp) 411aio_grp_feed (aio_req grp)
384{ 412{
385 if (grp->sv2 && SvOK (grp->sv2)) 413 if (grp->sv2 && SvOK (grp->sv2))
386 { 414 {
387 dSP; 415 dSP;
388 416
… …
396 FREETMPS; 424 FREETMPS;
397 LEAVE; 425 LEAVE;
398 } 426 }
399} 427}
400 428
429static void
401static void req_submit (eio_req *req) 430req_submit (eio_req *req)
402{ 431{
403 eio_submit (req); 432 eio_submit (req);
404 433
405 if (expect_false (on_next_submit)) 434 if (expect_false (on_next_submit))
406 { 435 {
… …
413 PUTBACK; 442 PUTBACK;
414 call_sv (cb, G_DISCARD | G_EVAL); 443 call_sv (cb, G_DISCARD | G_EVAL);
415 } 444 }
416} 445}
417 446
447static int
418static int req_invoke (eio_req *req) 448req_invoke (eio_req *req)
419{ 449{
420 if (req->flags & FLAG_SV2_RO_OFF) 450 if (req->flags & FLAG_SV2_RO_OFF)
421 SvREADONLY_off (req->sv2); 451 SvREADONLY_off (req->sv2);
422 452
423 if (!EIO_CANCELLED (req) && req->callback) 453 if (!EIO_CANCELLED (req) && req->callback)
… …
444 SvREADONLY_on (sv_result); 474 SvREADONLY_on (sv_result);
445 } 475 }
446 476
447 switch (req->type) 477 switch (req->type)
448 { 478 {
479 case EIO_WD_OPEN:
480 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
481 break;
482
449 case EIO_READDIR: 483 case EIO_READDIR:
450 { 484 {
451 SV *rv = &PL_sv_undef; 485 SV *rv = &PL_sv_undef;
452 486
453 if (req->result >= 0) 487 if (req->result >= 0)
… …
541 case EIO_STATVFS: 575 case EIO_STATVFS:
542 case EIO_FSTATVFS: 576 case EIO_FSTATVFS:
543 { 577 {
544 SV *rv = &PL_sv_undef; 578 SV *rv = &PL_sv_undef;
545 579
580#ifndef _WIN32
546 if (req->result >= 0) 581 if (req->result >= 0)
547 { 582 {
548 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 583 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
549 HV *hv = newHV (); 584 HV *hv = newHV ();
550 585
… …
560 hv_store (hv, "favail" , sizeof ("favail" ) - 1, newSVval64 (f->f_favail ), 0); 595 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); 596 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); 597 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); 598 hv_store (hv, "namemax", sizeof ("namemax") - 1, newSVval64 (f->f_namemax), 0);
564 } 599 }
600#endif
565 601
566 PUSHs (rv); 602 PUSHs (rv);
567 } 603 }
568 604
569 break; 605 break;
… …
593 break; 629 break;
594 630
595 case EIO_STAT: 631 case EIO_STAT:
596 case EIO_LSTAT: 632 case EIO_LSTAT:
597 case EIO_FSTAT: 633 case EIO_FSTAT:
598 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 634 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
635
599 PL_laststatval = req->result; 636 if (!(PL_laststatval = req->result))
637 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
600 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 638 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
639
601 PUSHs (sv_result); 640 PUSHs (sv_result);
602 break; 641 break;
603 642
604 case EIO_READ: 643 case EIO_READ:
605 { 644 {
… …
639 } 678 }
640 679
641 return !!SvTRUE (ERRSV); 680 return !!SvTRUE (ERRSV);
642} 681}
643 682
683static void
644static void req_destroy (aio_req req) 684req_destroy (aio_req req)
645{ 685{
646 if (req->self) 686 if (req->self)
647 { 687 {
648 sv_unmagic (req->self, PERL_MAGIC_ext); 688 sv_unmagic (req->self, PERL_MAGIC_ext);
649 SvREFCNT_dec (req->self); 689 SvREFCNT_dec (req->self);
650 } 690 }
651 691
652 SvREFCNT_dec (req->sv1); 692 SvREFCNT_dec (req->sv1);
653 SvREFCNT_dec (req->sv2); 693 SvREFCNT_dec (req->sv2);
694 SvREFCNT_dec (req->sv3);
695 SvREFCNT_dec (req->sv4);
654 SvREFCNT_dec (req->callback); 696 SvREFCNT_dec (req->callback);
655 697
656 Safefree (req); 698 free (req);
657} 699}
658 700
701static void
659static void req_cancel_subs (aio_req grp) 702req_cancel_subs (aio_req grp)
660{ 703{
661 aio_req sub;
662
663 if (grp->type != EIO_GROUP) 704 if (grp->type != EIO_GROUP)
664 return; 705 return;
665 706
666 SvREFCNT_dec (grp->sv2); 707 SvREFCNT_dec (grp->sv2);
667 grp->sv2 = 0; 708 grp->sv2 = 0;
668 709
669 eio_grp_cancel (grp); 710 eio_grp_cancel (grp);
670} 711}
671 712
713static void ecb_cold
672static void create_respipe (void) 714create_respipe (void)
673{ 715{
674 if (s_epipe_renew (&respipe)) 716 if (s_epipe_renew (&respipe))
675 croak ("IO::AIO: unable to initialize result pipe"); 717 croak ("IO::AIO: unable to initialize result pipe");
676} 718}
677 719
678static void poll_wait (void) 720static void
721poll_wait (void)
679{ 722{
680 while (eio_nreqs ()) 723 while (eio_nreqs ())
681 { 724 {
682 int size; 725 int size;
683 726
… …
692 735
693 s_epipe_wait (&respipe); 736 s_epipe_wait (&respipe);
694 } 737 }
695} 738}
696 739
697static int poll_cb (void) 740static int
741poll_cb (void)
698{ 742{
699 for (;;) 743 for (;;)
700 { 744 {
701 int res = eio_poll (); 745 int res = eio_poll ();
702 746
… …
708 752
709 poll_wait (); 753 poll_wait ();
710 } 754 }
711} 755}
712 756
713static void atfork_child (void) 757static void ecb_cold
758reinit (void)
714{ 759{
715 create_respipe (); 760 create_respipe ();
761
762 if (eio_init (want_poll, done_poll) < 0)
763 croak ("IO::AIO: unable to initialise eio library");
716} 764}
717 765
718/*****************************************************************************/ 766/*****************************************************************************/
719 767
720#if !_POSIX_MAPPED_FILES 768#if !_POSIX_MAPPED_FILES
… …
731# define MAP_FIXED 0 779# define MAP_FIXED 0
732#endif 780#endif
733 781
734#define MMAP_MAGIC PERL_MAGIC_ext 782#define MMAP_MAGIC PERL_MAGIC_ext
735 783
784static int ecb_cold
736static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 785mmap_free (pTHX_ SV *sv, MAGIC *mg)
737{ 786{
738 int old_errno = errno; 787 int old_errno = errno;
739 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 788 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
740 errno = old_errno; 789 errno = old_errno;
741 790
… …
757 0, 0, 0, 0, mmap_free 806 0, 0, 0, 0, mmap_free
758}; 807};
759 808
760/*****************************************************************************/ 809/*****************************************************************************/
761 810
811static SV *
762static SV * get_cb (SV *cb_sv) 812get_cb (SV *cb_sv)
763{ 813{
764 SvGETMAGIC (cb_sv); 814 SvGETMAGIC (cb_sv);
765 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 815 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
766} 816}
767 817
818static aio_req ecb_noinline
819dreq (SV *callback)
820{
821 SV *cb_cv;
822 aio_req req;
823 int req_pri = next_pri;
824 next_pri = EIO_PRI_DEFAULT;
825
826 cb_cv = get_cb (callback);
827
828 req = calloc (sizeof (*req), 1);
829 if (!req)
830 croak ("out of memory during eio_req allocation");
831
832 req->callback = SvREFCNT_inc (cb_cv);
833 req->pri = req_pri;
834
835 return req;
836}
837
768#define dREQ \ 838#define dREQ \
769 SV *cb_cv; \ 839 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 840
783#define REQ_SEND \ 841#define REQ_SEND \
784 PUTBACK; \ 842 PUTBACK; \
785 req_submit (req); \ 843 req_submit (req); \
786 SPAGAIN; \ 844 SPAGAIN; \
787 \ 845 \
788 if (GIMME_V != G_VOID) \ 846 if (GIMME_V != G_VOID) \
789 XPUSHs (req_sv (req, aio_req_stash)); 847 XPUSHs (req_sv (req, aio_req_stash));
848
849ecb_inline void
850req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
851{
852 if (expect_false (SvROK (path)))
853 {
854 SV *rv = SvRV (path);
855 SV *wdob;
856
857 if (SvTYPE (rv) == SVt_PVAV && AvFILLp (rv) == 1)
858 {
859 path = AvARRAY (rv)[1];
860 wdob = AvARRAY (rv)[0];
861
862 if (SvOK (wdob))
863 {
864 *wd = SvAIO_WD (wdob);
865 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
866 }
867 else
868 *wd = EIO_INVALID_WD;
869 }
870 else if (SvTYPE (rv) == SVt_PVMG && SvSTASH (rv) == aio_wd_stash)
871 {
872 *wd = (aio_wd)(long)SvIVX (rv);
873 *wdsv = SvREFCNT_inc_NN (rv);
874 *ptr = ".";
875 return; /* path set to "." */
876 }
877 else
878 croak ("IO::AIO: pathname arguments must be specified as a string, an IO::AIO::WD object or a [IO::AIO::WD, path] pair");
879 }
880
881 *pathsv = newSVsv (path);
882 *ptr = SvPVbyte_nolen (*pathsv);
883}
884
885static void ecb_noinline
886req_set_path1 (aio_req req, SV *path)
887{
888 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
889}
890
891static void ecb_noinline
892req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
893{
894 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
895
896 switch (SvTYPE (rv))
897 {
898 case SVt_PVIO:
899 case SVt_PVLV:
900 case SVt_PVGV:
901 req->type = type_fh;
902 req->sv1 = newSVsv (fh_or_path);
903 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
904 break;
905
906 default:
907 req->type = type_path;
908 req_set_path1 (req, fh_or_path);
909 break;
910 }
911}
912
913XS(boot_IO__AIO) ecb_cold;
790 914
791MODULE = IO::AIO PACKAGE = IO::AIO 915MODULE = IO::AIO PACKAGE = IO::AIO
792 916
793PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
794 918
… …
912 }; 1036 };
913 1037
914 aio_stash = gv_stashpv ("IO::AIO" , 1); 1038 aio_stash = gv_stashpv ("IO::AIO" , 1);
915 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1039 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
916 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1040 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1041 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
917 1042
918 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1043 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)); 1044 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
920 1045
921 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1046 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
922 1047
923 create_respipe (); 1048 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} 1049}
1050
1051void
1052reinit ()
1053 PROTOTYPE:
931 1054
932void 1055void
933max_poll_reqs (unsigned int nreqs) 1056max_poll_reqs (unsigned int nreqs)
934 PROTOTYPE: $ 1057 PROTOTYPE: $
935 CODE: 1058 CODE:
… …
970 PROTOTYPE: $ 1093 PROTOTYPE: $
971 CODE: 1094 CODE:
972 max_outstanding = maxreqs; 1095 max_outstanding = maxreqs;
973 1096
974void 1097void
1098aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1099 PPCODE:
1100{
1101 dREQ;
1102
1103 req->type = EIO_WD_OPEN;
1104 req_set_path1 (req, pathname);
1105
1106 REQ_SEND;
1107}
1108
1109void
975aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1110aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
976 PPCODE: 1111 PPCODE:
977{ 1112{
978 dREQ; 1113 dREQ;
979 1114
980 req->type = EIO_OPEN; 1115 req->type = EIO_OPEN;
981 req->sv1 = newSVsv (pathname); 1116 req_set_path1 (req, pathname);
982 req->ptr1 = SvPVbyte_nolen (req->sv1);
983 req->int1 = flags; 1117 req->int1 = flags;
984 req->int2 = mode; 1118 req->int2 = mode;
985 1119
986 REQ_SEND; 1120 REQ_SEND;
987} 1121}
… …
989void 1123void
990aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1124aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
991 ALIAS: 1125 ALIAS:
992 aio_fsync = EIO_FSYNC 1126 aio_fsync = EIO_FSYNC
993 aio_fdatasync = EIO_FDATASYNC 1127 aio_fdatasync = EIO_FDATASYNC
1128 aio_syncfs = EIO_SYNCFS
994 PPCODE: 1129 PPCODE:
995{ 1130{
996 int fd = s_fileno_croak (fh, 0); 1131 int fd = s_fileno_croak (fh, 0);
997 dREQ; 1132 dREQ;
998 1133
… …
1039 1174
1040void 1175void
1041aio_close (SV *fh, SV *callback=&PL_sv_undef) 1176aio_close (SV *fh, SV *callback=&PL_sv_undef)
1042 PPCODE: 1177 PPCODE:
1043{ 1178{
1044 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1179 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1045 int fd = s_fileno_croak (fh, 0); 1180 int fd = s_fileno_croak (fh, 0);
1046 dREQ; 1181 dREQ;
1047 1182
1048 if (close_pipe < 0) 1183 if (expect_false (close_fd < 0))
1049 { 1184 {
1050 int pipefd [2]; 1185 int pipefd [2];
1051 1186
1187 if (
1188#ifdef _WIN32
1189 _pipe (pipefd, 1, _O_BINARY) < 0
1190#else
1052 if (pipe (pipefd) < 0 1191 pipe (pipefd) < 0
1053 || close (pipefd [1]) < 0
1054 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1192 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1193#endif
1194 || close (pipefd [1]) < 0
1195 )
1055 abort (); /*D*/ 1196 abort (); /*D*/
1056 1197
1057 close_pipe = pipefd [0]; 1198 close_fd = pipefd [0];
1058 } 1199 }
1059 1200
1060 req->type = EIO_DUP2; 1201 req->type = EIO_DUP2;
1061 req->int1 = close_pipe; 1202 req->int1 = close_fd;
1062 req->sv2 = newSVsv (fh); 1203 req->sv2 = newSVsv (fh);
1063 req->int2 = fd; 1204 req->int2 = fd;
1064 1205
1065 REQ_SEND (req); 1206 REQ_SEND (req);
1066} 1207}
… …
1117 REQ_SEND; 1258 REQ_SEND;
1118 } 1259 }
1119} 1260}
1120 1261
1121void 1262void
1122aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1263aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1123 ALIAS: 1264 ALIAS:
1124 aio_readlink = EIO_READLINK 1265 aio_readlink = EIO_READLINK
1125 aio_realpath = EIO_REALPATH 1266 aio_realpath = EIO_REALPATH
1126 PPCODE: 1267 PPCODE:
1127{ 1268{
1128 SV *data;
1129 dREQ; 1269 dREQ;
1130 1270
1131 req->type = ix; 1271 req->type = ix;
1132 req->sv1 = newSVsv (path); 1272 req_set_path1 (req, pathname);
1133 req->ptr1 = SvPVbyte_nolen (req->sv1);
1134 1273
1135 REQ_SEND; 1274 REQ_SEND;
1136} 1275}
1137 1276
1138void 1277void
… …
1178 aio_statvfs = EIO_STATVFS 1317 aio_statvfs = EIO_STATVFS
1179 PPCODE: 1318 PPCODE:
1180{ 1319{
1181 dREQ; 1320 dREQ;
1182 1321
1183 req->sv1 = newSVsv (fh_or_path); 1322 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 1323
1196 REQ_SEND; 1324 REQ_SEND;
1197} 1325}
1198 1326
1199UV 1327UV
… …
1218{ 1346{
1219 dREQ; 1347 dREQ;
1220 1348
1221 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1349 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1222 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1350 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1223 req->sv1 = newSVsv (fh_or_path); 1351 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 1352
1236 REQ_SEND; 1353 REQ_SEND;
1237} 1354}
1238 1355
1239void 1356void
1240aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1357aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1241 PPCODE: 1358 PPCODE:
1242{ 1359{
1243 dREQ; 1360 dREQ;
1244 1361
1245 req->sv1 = newSVsv (fh_or_path);
1246 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1362 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1247 1363 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 1364
1259 REQ_SEND; 1365 REQ_SEND;
1260} 1366}
1261 1367
1262void 1368void
1263aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1369aio_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: 1370 PPCODE:
1268{ 1371{
1269 dREQ; 1372 dREQ;
1270 1373
1271 req->int2 = mode; 1374 req->int2 = mode;
1272 req->sv1 = newSVsv (fh_or_path); 1375 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 1376
1285 REQ_SEND; 1377 REQ_SEND;
1286} 1378}
1287 1379
1288void 1380void
… …
1291{ 1383{
1292 dREQ; 1384 dREQ;
1293 1385
1294 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1386 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1295 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1387 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1296 req->sv1 = newSVsv (fh_or_path); 1388 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 1389
1309 REQ_SEND; 1390 REQ_SEND;
1310} 1391}
1311 1392
1312void 1393void
… …
1314 PPCODE: 1395 PPCODE:
1315{ 1396{
1316 dREQ; 1397 dREQ;
1317 1398
1318 req->type = EIO_READDIR; 1399 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; 1400 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1322 1401
1323 if (flags & EIO_READDIR_DENTS) 1402 if (flags & EIO_READDIR_DENTS)
1324 req->int1 |= EIO_READDIR_CUSTOM2; 1403 req->int1 |= EIO_READDIR_CUSTOM2;
1325 1404
1405 req_set_path1 (req, pathname);
1406
1326 REQ_SEND; 1407 REQ_SEND;
1408}
1409
1410void
1411aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1412 PPCODE:
1413{
1414 dREQ;
1415
1416 req->type = EIO_MKDIR;
1417 req->int2 = mode;
1418 req_set_path1 (req, pathname);
1419
1420 REQ_SEND;
1327} 1421}
1328 1422
1329void 1423void
1330aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1424aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1331 ALIAS: 1425 ALIAS:
… …
1335 PPCODE: 1429 PPCODE:
1336{ 1430{
1337 dREQ; 1431 dREQ;
1338 1432
1339 req->type = ix; 1433 req->type = ix;
1340 req->sv1 = newSVsv (pathname); 1434 req_set_path1 (req, pathname);
1341 req->ptr1 = SvPVbyte_nolen (req->sv1);
1342 1435
1343 REQ_SEND; 1436 REQ_SEND;
1344} 1437}
1345 1438
1346void 1439void
… …
1349 aio_link = EIO_LINK 1442 aio_link = EIO_LINK
1350 aio_symlink = EIO_SYMLINK 1443 aio_symlink = EIO_SYMLINK
1351 aio_rename = EIO_RENAME 1444 aio_rename = EIO_RENAME
1352 PPCODE: 1445 PPCODE:
1353{ 1446{
1447 eio_wd wd2 = 0;
1354 dREQ; 1448 dREQ;
1355 1449
1356 req->type = ix; 1450 req->type = ix;
1357 req->sv1 = newSVsv (oldpath); 1451 req_set_path1 (req, oldpath);
1358 req->ptr1 = SvPVbyte_nolen (req->sv1); 1452 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1359 req->sv2 = newSVsv (newpath); 1453 req->int3 = (long)wd2;
1360 req->ptr2 = SvPVbyte_nolen (req->sv2);
1361 1454
1362 REQ_SEND; 1455 REQ_SEND;
1363} 1456}
1364 1457
1365void 1458void
… …
1367 PPCODE: 1460 PPCODE:
1368{ 1461{
1369 dREQ; 1462 dREQ;
1370 1463
1371 req->type = EIO_MKNOD; 1464 req->type = EIO_MKNOD;
1372 req->sv1 = newSVsv (pathname);
1373 req->ptr1 = SvPVbyte_nolen (req->sv1);
1374 req->int2 = (mode_t)mode; 1465 req->int2 = (mode_t)mode;
1375 req->offs = dev; 1466 req->offs = dev;
1467 req_set_path1 (req, pathname);
1376 1468
1377 REQ_SEND; 1469 REQ_SEND;
1378} 1470}
1379 1471
1380void 1472void
… …
1580 CODE: 1672 CODE:
1581 RETVAL = posix_fadvise (fh, offset, length, advice); 1673 RETVAL = posix_fadvise (fh, offset, length, advice);
1582 OUTPUT: 1674 OUTPUT:
1583 RETVAL 1675 RETVAL
1584 1676
1585ssize_t 1677IV
1586sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1678sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1587 CODE: 1679 CODE:
1588 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1680 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1589 OUTPUT: 1681 OUTPUT:
1590 RETVAL 1682 RETVAL
… …
1702 SvREFCNT_dec (on_next_submit); 1794 SvREFCNT_dec (on_next_submit);
1703 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1795 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1704 1796
1705PROTOTYPES: DISABLE 1797PROTOTYPES: DISABLE
1706 1798
1799MODULE = IO::AIO PACKAGE = IO::AIO::WD
1800
1801BOOT:
1802{
1803 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1804 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1805}
1806
1807void
1808DESTROY (SV *self)
1809 CODE:
1810{
1811 aio_wd wd = SvAIO_WD (self);
1812#if HAVE_AT
1813 {
1814 SV *callback = &PL_sv_undef;
1815 dREQ; /* clobbers next_pri :/ */
1816 next_pri = req->pri; /* restore next_pri */
1817 req->pri = EIO_PRI_MAX; /* better use max. priority to conserve fds */
1818 req->type = EIO_WD_CLOSE;
1819 req->wd = wd;
1820 REQ_SEND;
1821 }
1822#else
1823 eio_wd_close_sync (wd);
1824#endif
1825}
1826
1707MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1827MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1708 1828
1709void 1829void
1710cancel (aio_req_ornot req) 1830cancel (aio_req_ornot req)
1711 CODE: 1831 CODE:

Diff Legend

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