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.186 by root, Thu Jul 14 22:36:17 2011 UTC vs.
Revision 1.203 by root, Thu Sep 29 23:06:24 2011 UTC

… …
22#endif 22#endif
23 23
24/* perl namespace pollution */ 24/* perl namespace pollution */
25#undef VERSION 25#undef VERSION
26 26
27#ifdef _WIN32
28
29# define EIO_STRUCT_DIRENT Direntry_t
30# undef malloc
31# undef free
32
33// perl overrides all those nice win32 functions
34# undef open
35# undef read
36# undef write
37# undef send
38# undef recv
39# undef stat
40# undef fstat
41# define lstat stat
42# undef truncate
43# undef ftruncate
44# undef open
45# undef close
46# undef unlink
47# undef rmdir
48# undef rename
49# undef lseek
50
51# define opendir(fd) (errno = ENOSYS, 0)
52# define readdir(fd) (errno = ENOSYS, -1)
53# define closedir(fd) (errno = ENOSYS, -1)
54
55#else
56
57# include <sys/time.h>
58# include <sys/select.h>
59# include <unistd.h>
60# include <utime.h>
61# include <signal.h>
62# define EIO_STRUCT_DIRENT struct dirent
63
64#endif
65
66/* perl stupidly overrides readdir and maybe others */ 27/* perl stupidly overrides readdir and maybe others */
67/* with thread-unsafe versions, imagine that :( */ 28/* with thread-unsafe versions, imagine that :( */
68#undef readdir 29#undef readdir
69#undef opendir 30#undef opendir
70#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
71 76
72#define EIO_STRUCT_STAT Stat_t 77#define EIO_STRUCT_STAT Stat_t
73 78
74/* use NV for 32 bit perls as it allows larger offsets */ 79/* use NV for 32 bit perls as it allows larger offsets */
75#if IVSIZE >= 8 80#if IVSIZE >= 8
… …
97 102
98typedef SV SV8; /* byte-sv, used for argument-checking */ 103typedef SV SV8; /* byte-sv, used for argument-checking */
99typedef int aio_rfd; /* read file desriptor */ 104typedef int aio_rfd; /* read file desriptor */
100typedef int aio_wfd; /* write file descriptor */ 105typedef int aio_wfd; /* write file descriptor */
101 106
102static HV *aio_stash, *aio_req_stash, *aio_grp_stash; 107static HV *aio_stash, *aio_req_stash, *aio_grp_stash, *aio_wd_stash;
103 108
104#define EIO_REQ_MEMBERS \ 109#define EIO_REQ_MEMBERS \
105 SV *callback; \ 110 SV *callback; \
106 SV *sv1, *sv2; \ 111 SV *sv1, *sv2; \
112 SV *sv3, *sv4; \
107 STRLEN stroffset; \ 113 STRLEN stroffset; \
108 SV *self; 114 SV *self;
109 115
110#define EIO_NO_WRAPPERS 1 116#define EIO_NO_WRAPPERS 1
111 117
112#include "libeio/config.h" 118#include "libeio/config.h"
113#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"
114 127
115/* Linux/others */ 128/* Linux/others */
116#ifndef O_ASYNC 129#ifndef O_ASYNC
117# define O_ASYNC 0 130# define O_ASYNC 0
118#endif 131#endif
… …
212#endif 225#endif
213#ifndef PROT_EXEC 226#ifndef PROT_EXEC
214# define PROT_EXEC 0 227# define PROT_EXEC 0
215#endif 228#endif
216 229
230#ifndef ST_RDONLY
231# define ST_RDONLY 0
232#endif
233#ifndef ST_NOSUID
234# define ST_NOSUID 0
235#endif
217#ifndef ST_NODEV 236#ifndef ST_NODEV
218# define ST_NODEV 0 237# define ST_NODEV 0
219#endif 238#endif
220#ifndef ST_NOEXEC 239#ifndef ST_NOEXEC
221# define ST_NOEXEC 0 240# define ST_NOEXEC 0
… …
305 324
306#ifndef PAGESIZE 325#ifndef PAGESIZE
307# define PAGESIZE sysconf (_SC_PAGESIZE) 326# define PAGESIZE sysconf (_SC_PAGESIZE)
308#endif 327#endif
309 328
310static int req_invoke (eio_req *req);
311#define EIO_FINISH(req) req_invoke (req)
312static void req_destroy (eio_req *grp);
313#define EIO_DESTROY(req) req_destroy (req)
314
315enum { 329enum {
316 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 330 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
317}; 331};
318 332
319#include "libeio/eio.c"
320
321typedef eio_req *aio_req; 333typedef eio_req *aio_req;
322typedef eio_req *aio_req_ornot; 334typedef eio_req *aio_req_ornot;
335typedef eio_wd aio_wd;
323 336
324static SV *on_next_submit; 337static SV *on_next_submit;
325static int next_pri = EIO_PRI_DEFAULT; 338static int next_pri = EIO_PRI_DEFAULT;
326static int max_outstanding; 339static int max_outstanding;
327 340
328static s_epipe respipe; 341static s_epipe respipe;
329 342
330static void req_destroy (aio_req req); 343static void req_destroy (aio_req req);
331static void req_cancel (aio_req req); 344static void req_cancel (aio_req req);
332 345
333static void want_poll (void) 346static void
347want_poll (void)
334{ 348{
335 /* write a dummy byte to the pipe so fh becomes ready */ 349 /* write a dummy byte to the pipe so fh becomes ready */
336 s_epipe_signal (&respipe); 350 s_epipe_signal (&respipe);
337} 351}
338 352
339static void done_poll (void) 353static void
354done_poll (void)
340{ 355{
341 /* read any signals sent by the worker threads */ 356 /* read any signals sent by the worker threads */
342 s_epipe_drain (&respipe); 357 s_epipe_drain (&respipe);
343} 358}
344 359
345/* must be called at most once */ 360/* must be called at most once */
361static SV *
346static SV *req_sv (aio_req req, HV *stash) 362req_sv (aio_req req, HV *stash)
347{ 363{
348 if (!req->self) 364 if (!req->self)
349 { 365 {
350 req->self = (SV *)newHV (); 366 req->self = (SV *)newHV ();
351 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 367 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
352 } 368 }
353 369
354 return sv_2mortal (sv_bless (newRV_inc (req->self), stash)); 370 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
355} 371}
356 372
357static 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)
358{ 381{
359 MAGIC *mg; 382 MAGIC *mg;
360 383
361 if (!SvROK (sv) 384 if (!SvROK (sv)
362 || (SvSTASH (SvRV (sv)) != aio_grp_stash 385 || (SvSTASH (SvRV (sv)) != aio_grp_stash
… …
367 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 390 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
368 391
369 return mg ? (aio_req)mg->mg_ptr : 0; 392 return mg ? (aio_req)mg->mg_ptr : 0;
370} 393}
371 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
372static void aio_grp_feed (aio_req grp) 407aio_grp_feed (aio_req grp)
373{ 408{
374 if (grp->sv2 && SvOK (grp->sv2)) 409 if (grp->sv2 && SvOK (grp->sv2))
375 { 410 {
376 dSP; 411 dSP;
377 412
… …
385 FREETMPS; 420 FREETMPS;
386 LEAVE; 421 LEAVE;
387 } 422 }
388} 423}
389 424
425static void
390static void req_submit (eio_req *req) 426req_submit (eio_req *req)
391{ 427{
392 eio_submit (req); 428 eio_submit (req);
393 429
394 if (expect_false (on_next_submit)) 430 if (expect_false (on_next_submit))
395 { 431 {
… …
402 PUTBACK; 438 PUTBACK;
403 call_sv (cb, G_DISCARD | G_EVAL); 439 call_sv (cb, G_DISCARD | G_EVAL);
404 } 440 }
405} 441}
406 442
443static int
407static int req_invoke (eio_req *req) 444req_invoke (eio_req *req)
408{ 445{
409 if (req->flags & FLAG_SV2_RO_OFF) 446 if (req->flags & FLAG_SV2_RO_OFF)
410 SvREADONLY_off (req->sv2); 447 SvREADONLY_off (req->sv2);
411 448
412 if (!EIO_CANCELLED (req) && req->callback) 449 if (!EIO_CANCELLED (req) && req->callback)
… …
433 SvREADONLY_on (sv_result); 470 SvREADONLY_on (sv_result);
434 } 471 }
435 472
436 switch (req->type) 473 switch (req->type)
437 { 474 {
475 case EIO_WD_OPEN:
476 PUSHs (req->result ? &PL_sv_undef : sv_2mortal (newSVaio_wd (req->wd)));
477 break;
478
438 case EIO_READDIR: 479 case EIO_READDIR:
439 { 480 {
440 SV *rv = &PL_sv_undef; 481 SV *rv = &PL_sv_undef;
441 482
442 if (req->result >= 0) 483 if (req->result >= 0)
… …
530 case EIO_STATVFS: 571 case EIO_STATVFS:
531 case EIO_FSTATVFS: 572 case EIO_FSTATVFS:
532 { 573 {
533 SV *rv = &PL_sv_undef; 574 SV *rv = &PL_sv_undef;
534 575
576#ifndef _WIN32
535 if (req->result >= 0) 577 if (req->result >= 0)
536 { 578 {
537 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req); 579 EIO_STRUCT_STATVFS *f = EIO_STATVFS_BUF (req);
538 HV *hv = newHV (); 580 HV *hv = newHV ();
539 581
… …
549 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);
550 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);
551 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);
552 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);
553 } 595 }
596#endif
554 597
555 PUSHs (rv); 598 PUSHs (rv);
556 } 599 }
557 600
558 break; 601 break;
… …
582 break; 625 break;
583 626
584 case EIO_STAT: 627 case EIO_STAT:
585 case EIO_LSTAT: 628 case EIO_LSTAT:
586 case EIO_FSTAT: 629 case EIO_FSTAT:
587 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT; 630 PL_laststype = req->type == EIO_LSTAT ? OP_LSTAT : OP_STAT;
631
588 PL_laststatval = req->result; 632 if (!(PL_laststatval = req->result))
633 /* if compilation fails here then perl's Stat_t is not struct _stati64 */
589 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 634 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
635
590 PUSHs (sv_result); 636 PUSHs (sv_result);
591 break; 637 break;
592 638
593 case EIO_READ: 639 case EIO_READ:
594 { 640 {
… …
628 } 674 }
629 675
630 return !!SvTRUE (ERRSV); 676 return !!SvTRUE (ERRSV);
631} 677}
632 678
679static void
633static void req_destroy (aio_req req) 680req_destroy (aio_req req)
634{ 681{
635 if (req->self) 682 if (req->self)
636 { 683 {
637 sv_unmagic (req->self, PERL_MAGIC_ext); 684 sv_unmagic (req->self, PERL_MAGIC_ext);
638 SvREFCNT_dec (req->self); 685 SvREFCNT_dec (req->self);
639 } 686 }
640 687
641 SvREFCNT_dec (req->sv1); 688 SvREFCNT_dec (req->sv1);
642 SvREFCNT_dec (req->sv2); 689 SvREFCNT_dec (req->sv2);
690 SvREFCNT_dec (req->sv3);
691 SvREFCNT_dec (req->sv4);
643 SvREFCNT_dec (req->callback); 692 SvREFCNT_dec (req->callback);
644 693
645 Safefree (req); 694 Safefree (req);
646} 695}
647 696
697static void
648static void req_cancel_subs (aio_req grp) 698req_cancel_subs (aio_req grp)
649{ 699{
650 aio_req sub;
651
652 if (grp->type != EIO_GROUP) 700 if (grp->type != EIO_GROUP)
653 return; 701 return;
654 702
655 SvREFCNT_dec (grp->sv2); 703 SvREFCNT_dec (grp->sv2);
656 grp->sv2 = 0; 704 grp->sv2 = 0;
657 705
658 eio_grp_cancel (grp); 706 eio_grp_cancel (grp);
659} 707}
660 708
709static void ecb_cold
661static void create_respipe (void) 710create_respipe (void)
662{ 711{
663 if (s_epipe_renew (&respipe)) 712 if (s_epipe_renew (&respipe))
664 croak ("IO::AIO: unable to initialize result pipe"); 713 croak ("IO::AIO: unable to initialize result pipe");
665} 714}
666 715
667static void poll_wait (void) 716static void
717poll_wait (void)
668{ 718{
669 while (eio_nreqs ()) 719 while (eio_nreqs ())
670 { 720 {
671 int size; 721 int size;
672 722
… …
681 731
682 s_epipe_wait (&respipe); 732 s_epipe_wait (&respipe);
683 } 733 }
684} 734}
685 735
686static int poll_cb (void) 736static int
737poll_cb (void)
687{ 738{
688 for (;;) 739 for (;;)
689 { 740 {
690 int res = eio_poll (); 741 int res = eio_poll ();
691 742
… …
697 748
698 poll_wait (); 749 poll_wait ();
699 } 750 }
700} 751}
701 752
702static void atfork_child (void) 753static void ecb_cold
754reinit (void)
703{ 755{
704 create_respipe (); 756 create_respipe ();
757
758 if (eio_init (want_poll, done_poll) < 0)
759 croak ("IO::AIO: unable to initialise eio library");
705} 760}
706 761
707/*****************************************************************************/ 762/*****************************************************************************/
708 763
709#if !_POSIX_MAPPED_FILES 764#if !_POSIX_MAPPED_FILES
… …
720# define MAP_FIXED 0 775# define MAP_FIXED 0
721#endif 776#endif
722 777
723#define MMAP_MAGIC PERL_MAGIC_ext 778#define MMAP_MAGIC PERL_MAGIC_ext
724 779
780static int ecb_cold
725static int mmap_free (pTHX_ SV *sv, MAGIC *mg) 781mmap_free (pTHX_ SV *sv, MAGIC *mg)
726{ 782{
727 int old_errno = errno; 783 int old_errno = errno;
728 munmap (mg->mg_ptr, (size_t)mg->mg_obj); 784 munmap (mg->mg_ptr, (size_t)mg->mg_obj);
729 errno = old_errno; 785 errno = old_errno;
730 786
… …
746 0, 0, 0, 0, mmap_free 802 0, 0, 0, 0, mmap_free
747}; 803};
748 804
749/*****************************************************************************/ 805/*****************************************************************************/
750 806
807static SV *
751static SV * get_cb (SV *cb_sv) 808get_cb (SV *cb_sv)
752{ 809{
753 SvGETMAGIC (cb_sv); 810 SvGETMAGIC (cb_sv);
754 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0; 811 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
755} 812}
756 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
757#define dREQ \ 834#define dREQ \
758 SV *cb_cv; \ 835 aio_req req = dreq (callback); \
759 aio_req req; \
760 int req_pri = next_pri; \
761 next_pri = EIO_PRI_DEFAULT; \
762 \
763 cb_cv = get_cb (callback); \
764 \
765 Newz (0, req, 1, eio_req); \
766 if (!req) \
767 croak ("out of memory during eio_req allocation"); \
768 \
769 req->callback = SvREFCNT_inc (cb_cv); \
770 req->pri = req_pri
771 836
772#define REQ_SEND \ 837#define REQ_SEND \
773 PUTBACK; \ 838 PUTBACK; \
774 req_submit (req); \ 839 req_submit (req); \
775 SPAGAIN; \ 840 SPAGAIN; \
776 \ 841 \
777 if (GIMME_V != G_VOID) \ 842 if (GIMME_V != G_VOID) \
778 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;
779 901
780MODULE = IO::AIO PACKAGE = IO::AIO 902MODULE = IO::AIO PACKAGE = IO::AIO
781 903
782PROTOTYPES: ENABLE 904PROTOTYPES: ENABLE
783 905
… …
901 }; 1023 };
902 1024
903 aio_stash = gv_stashpv ("IO::AIO" , 1); 1025 aio_stash = gv_stashpv ("IO::AIO" , 1);
904 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1026 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
905 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);
906 1029
907 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--)
908 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv)); 1031 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
909 1032
910 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1033 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
911 1034
912 create_respipe (); 1035 reinit ();
913
914 if (eio_init (want_poll, done_poll) < 0)
915 croak ("IO::AIO: unable to initialise eio library");
916
917 /* atfork child called in fifo order, so before eio's handler */
918 X_THREAD_ATFORK (0, 0, atfork_child);
919} 1036}
1037
1038void
1039reinit ()
1040 PROTOTYPE:
920 1041
921void 1042void
922max_poll_reqs (unsigned int nreqs) 1043max_poll_reqs (unsigned int nreqs)
923 PROTOTYPE: $ 1044 PROTOTYPE: $
924 CODE: 1045 CODE:
… …
959 PROTOTYPE: $ 1080 PROTOTYPE: $
960 CODE: 1081 CODE:
961 max_outstanding = maxreqs; 1082 max_outstanding = maxreqs;
962 1083
963void 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
964aio_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)
965 PPCODE: 1098 PPCODE:
966{ 1099{
967 dREQ; 1100 dREQ;
968 1101
969 req->type = EIO_OPEN; 1102 req->type = EIO_OPEN;
970 req->sv1 = newSVsv (pathname); 1103 req_set_path1 (req, pathname);
971 req->ptr1 = SvPVbyte_nolen (req->sv1);
972 req->int1 = flags; 1104 req->int1 = flags;
973 req->int2 = mode; 1105 req->int2 = mode;
974 1106
975 REQ_SEND; 1107 REQ_SEND;
976} 1108}
… …
978void 1110void
979aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1111aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
980 ALIAS: 1112 ALIAS:
981 aio_fsync = EIO_FSYNC 1113 aio_fsync = EIO_FSYNC
982 aio_fdatasync = EIO_FDATASYNC 1114 aio_fdatasync = EIO_FDATASYNC
1115 aio_syncfs = EIO_SYNCFS
983 PPCODE: 1116 PPCODE:
984{ 1117{
985 int fd = s_fileno_croak (fh, 0); 1118 int fd = s_fileno_croak (fh, 0);
986 dREQ; 1119 dREQ;
987 1120
… …
1028 1161
1029void 1162void
1030aio_close (SV *fh, SV *callback=&PL_sv_undef) 1163aio_close (SV *fh, SV *callback=&PL_sv_undef)
1031 PPCODE: 1164 PPCODE:
1032{ 1165{
1033 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 */
1034 int fd = s_fileno_croak (fh, 0); 1167 int fd = s_fileno_croak (fh, 0);
1035 dREQ; 1168 dREQ;
1036 1169
1037 if (close_pipe < 0) 1170 if (expect_false (close_fd < 0))
1038 { 1171 {
1039 int pipefd [2]; 1172 int pipefd [2];
1040 1173
1174 if (
1175#ifdef _WIN32
1176 _pipe (pipefd, 1, _O_BINARY) < 0
1177#else
1041 if (pipe (pipefd) < 0 1178 pipe (pipefd) < 0
1042 || close (pipefd [1]) < 0
1043 || 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 )
1044 abort (); /*D*/ 1183 abort (); /*D*/
1045 1184
1046 close_pipe = pipefd [0]; 1185 close_fd = pipefd [0];
1047 } 1186 }
1048 1187
1049 req->type = EIO_DUP2; 1188 req->type = EIO_DUP2;
1050 req->int1 = close_pipe; 1189 req->int1 = close_fd;
1051 req->sv2 = newSVsv (fh); 1190 req->sv2 = newSVsv (fh);
1052 req->int2 = fd; 1191 req->int2 = fd;
1053 1192
1054 REQ_SEND (req); 1193 REQ_SEND (req);
1055} 1194}
… …
1106 REQ_SEND; 1245 REQ_SEND;
1107 } 1246 }
1108} 1247}
1109 1248
1110void 1249void
1111aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1250aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1112 ALIAS: 1251 ALIAS:
1113 aio_readlink = EIO_READLINK 1252 aio_readlink = EIO_READLINK
1114 aio_realpath = EIO_REALPATH 1253 aio_realpath = EIO_REALPATH
1115 PPCODE: 1254 PPCODE:
1116{ 1255{
1117 SV *data;
1118 dREQ; 1256 dREQ;
1119 1257
1120 req->type = ix; 1258 req->type = ix;
1121 req->sv1 = newSVsv (path); 1259 req_set_path1 (req, pathname);
1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
1123 1260
1124 REQ_SEND; 1261 REQ_SEND;
1125} 1262}
1126 1263
1127void 1264void
… …
1167 aio_statvfs = EIO_STATVFS 1304 aio_statvfs = EIO_STATVFS
1168 PPCODE: 1305 PPCODE:
1169{ 1306{
1170 dREQ; 1307 dREQ;
1171 1308
1172 req->sv1 = newSVsv (fh_or_path); 1309 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
1173
1174 if (SvPOK (req->sv1))
1175 {
1176 req->type = ix;
1177 req->ptr1 = SvPVbyte_nolen (req->sv1);
1178 }
1179 else
1180 {
1181 req->type = ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT;
1182 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1183 }
1184 1310
1185 REQ_SEND; 1311 REQ_SEND;
1186} 1312}
1187 1313
1188UV 1314UV
… …
1207{ 1333{
1208 dREQ; 1334 dREQ;
1209 1335
1210 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1336 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1211 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1337 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1212 req->sv1 = newSVsv (fh_or_path); 1338 req_set_fh_or_path (req, EIO_UTIME, EIO_FUTIME, fh_or_path);
1213
1214 if (SvPOK (req->sv1))
1215 {
1216 req->type = EIO_UTIME;
1217 req->ptr1 = SvPVbyte_nolen (req->sv1);
1218 }
1219 else
1220 {
1221 req->type = EIO_FUTIME;
1222 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1223 }
1224 1339
1225 REQ_SEND; 1340 REQ_SEND;
1226} 1341}
1227 1342
1228void 1343void
1229aio_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)
1230 PPCODE: 1345 PPCODE:
1231{ 1346{
1232 dREQ; 1347 dREQ;
1233 1348
1234 req->sv1 = newSVsv (fh_or_path);
1235 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1349 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1236 1350 req_set_fh_or_path (req, EIO_TRUNCATE, EIO_FTRUNCATE, fh_or_path);
1237 if (SvPOK (req->sv1))
1238 {
1239 req->type = EIO_TRUNCATE;
1240 req->ptr1 = SvPVbyte_nolen (req->sv1);
1241 }
1242 else
1243 {
1244 req->type = EIO_FTRUNCATE;
1245 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1246 }
1247 1351
1248 REQ_SEND; 1352 REQ_SEND;
1249} 1353}
1250 1354
1251void 1355void
1252aio_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)
1253 ALIAS:
1254 aio_chmod = EIO_CHMOD
1255 aio_mkdir = EIO_MKDIR
1256 PPCODE: 1357 PPCODE:
1257{ 1358{
1258 dREQ; 1359 dREQ;
1259 1360
1260 req->int2 = mode; 1361 req->int2 = mode;
1261 req->sv1 = newSVsv (fh_or_path); 1362 req_set_fh_or_path (req, EIO_CHMOD, EIO_FCHMOD, fh_or_path);
1262
1263 if (SvPOK (req->sv1))
1264 {
1265 req->type = ix;
1266 req->ptr1 = SvPVbyte_nolen (req->sv1);
1267 }
1268 else
1269 {
1270 req->type = EIO_FCHMOD;
1271 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1272 }
1273 1363
1274 REQ_SEND; 1364 REQ_SEND;
1275} 1365}
1276 1366
1277void 1367void
… …
1280{ 1370{
1281 dREQ; 1371 dREQ;
1282 1372
1283 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1373 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1284 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1374 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1285 req->sv1 = newSVsv (fh_or_path); 1375 req_set_fh_or_path (req, EIO_CHOWN, EIO_FCHOWN, fh_or_path);
1286
1287 if (SvPOK (req->sv1))
1288 {
1289 req->type = EIO_CHOWN;
1290 req->ptr1 = SvPVbyte_nolen (req->sv1);
1291 }
1292 else
1293 {
1294 req->type = EIO_FCHOWN;
1295 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
1296 }
1297 1376
1298 REQ_SEND; 1377 REQ_SEND;
1299} 1378}
1300 1379
1301void 1380void
… …
1303 PPCODE: 1382 PPCODE:
1304{ 1383{
1305 dREQ; 1384 dREQ;
1306 1385
1307 req->type = EIO_READDIR; 1386 req->type = EIO_READDIR;
1308 req->sv1 = newSVsv (pathname);
1309 req->ptr1 = SvPVbyte_nolen (req->sv1);
1310 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1; 1387 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1311 1388
1312 if (flags & EIO_READDIR_DENTS) 1389 if (flags & EIO_READDIR_DENTS)
1313 req->int1 |= EIO_READDIR_CUSTOM2; 1390 req->int1 |= EIO_READDIR_CUSTOM2;
1314 1391
1392 req_set_path1 (req, pathname);
1393
1315 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;
1316} 1408}
1317 1409
1318void 1410void
1319aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1411aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1320 ALIAS: 1412 ALIAS:
… …
1324 PPCODE: 1416 PPCODE:
1325{ 1417{
1326 dREQ; 1418 dREQ;
1327 1419
1328 req->type = ix; 1420 req->type = ix;
1329 req->sv1 = newSVsv (pathname); 1421 req_set_path1 (req, pathname);
1330 req->ptr1 = SvPVbyte_nolen (req->sv1);
1331 1422
1332 REQ_SEND; 1423 REQ_SEND;
1333} 1424}
1334 1425
1335void 1426void
… …
1339 aio_symlink = EIO_SYMLINK 1430 aio_symlink = EIO_SYMLINK
1340 aio_rename = EIO_RENAME 1431 aio_rename = EIO_RENAME
1341 PPCODE: 1432 PPCODE:
1342{ 1433{
1343 dREQ; 1434 dREQ;
1435 eio_wd wd2 = 0;
1344 1436
1345 req->type = ix; 1437 req->type = ix;
1346 req->sv1 = newSVsv (oldpath); 1438 req_set_path1 (req, oldpath);
1347 req->ptr1 = SvPVbyte_nolen (req->sv1); 1439 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1348 req->sv2 = newSVsv (newpath); 1440 req->int3 = (long)wd2;
1349 req->ptr2 = SvPVbyte_nolen (req->sv2);
1350 1441
1351 REQ_SEND; 1442 REQ_SEND;
1352} 1443}
1353 1444
1354void 1445void
… …
1356 PPCODE: 1447 PPCODE:
1357{ 1448{
1358 dREQ; 1449 dREQ;
1359 1450
1360 req->type = EIO_MKNOD; 1451 req->type = EIO_MKNOD;
1361 req->sv1 = newSVsv (pathname);
1362 req->ptr1 = SvPVbyte_nolen (req->sv1);
1363 req->int2 = (mode_t)mode; 1452 req->int2 = (mode_t)mode;
1364 req->offs = dev; 1453 req->offs = dev;
1454 req_set_path1 (req, pathname);
1365 1455
1366 REQ_SEND; 1456 REQ_SEND;
1367} 1457}
1368 1458
1369void 1459void
… …
1569 CODE: 1659 CODE:
1570 RETVAL = posix_fadvise (fh, offset, length, advice); 1660 RETVAL = posix_fadvise (fh, offset, length, advice);
1571 OUTPUT: 1661 OUTPUT:
1572 RETVAL 1662 RETVAL
1573 1663
1574ssize_t 1664IV
1575sendfile (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)
1576 CODE: 1666 CODE:
1577 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1667 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1578 OUTPUT: 1668 OUTPUT:
1579 RETVAL 1669 RETVAL
… …
1691 SvREFCNT_dec (on_next_submit); 1781 SvREFCNT_dec (on_next_submit);
1692 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1782 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1693 1783
1694PROTOTYPES: DISABLE 1784PROTOTYPES: DISABLE
1695 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
1696MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1814MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1697 1815
1698void 1816void
1699cancel (aio_req_ornot req) 1817cancel (aio_req_ornot req)
1700 CODE: 1818 CODE:

Diff Legend

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