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.201 by root, Thu Sep 29 09:57:12 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 ((long)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 (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
… …
774 req_submit (req); \ 831 req_submit (req); \
775 SPAGAIN; \ 832 SPAGAIN; \
776 \ 833 \
777 if (GIMME_V != G_VOID) \ 834 if (GIMME_V != G_VOID) \
778 XPUSHs (req_sv (req, aio_req_stash)); 835 XPUSHs (req_sv (req, aio_req_stash));
836
837ecb_inline void
838req_set_path (aio_req req, SV *path, SV **wdsv, SV **pathsv, eio_wd *wd, void **ptr)
839{
840 if (expect_false (SvROK (path)))
841 {
842 AV *av = (AV *)SvRV (path);
843 SV *wdob;
844
845 if (SvTYPE (av) != SVt_PVAV || AvFILLp (av) != 1)
846 croak ("IO::AIO: pathname arguments must be specified as strings or [wd, path] arrayrefs");
847
848 path = AvARRAY (av)[1];
849 wdob = AvARRAY (av)[0];
850
851 if (SvOK (wdob))
852 {
853 *wd = SvAIO_WD (wdob);
854 *wdsv = SvREFCNT_inc_NN (SvRV (wdob));
855 }
856 else
857 *wd = EIO_INVALID_WD;
858 }
859
860 *pathsv = newSVsv (path);
861 *ptr = SvPVbyte_nolen (*pathsv);
862}
863
864static void ecb_noinline
865req_set_path1 (aio_req req, SV *path)
866{
867 req_set_path (req, path, &req->sv1, &req->sv3, &req->wd, &req->ptr1);
868}
869
870static void ecb_noinline
871req_set_fh_or_path (aio_req req, int type_path, int type_fh, SV *fh_or_path)
872{
873 SV *rv = SvROK (fh_or_path) ? SvRV (fh_or_path) : fh_or_path;
874
875 switch (SvTYPE (rv))
876 {
877 case SVt_PVIO:
878 case SVt_PVLV:
879 case SVt_PVGV:
880 req->type = type_fh;
881 req->sv1 = newSVsv (fh_or_path);
882 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
883 break;
884
885 default:
886 req->type = type_path;
887 req_set_path1 (req, fh_or_path);
888 break;
889 }
890}
779 891
780MODULE = IO::AIO PACKAGE = IO::AIO 892MODULE = IO::AIO PACKAGE = IO::AIO
781 893
782PROTOTYPES: ENABLE 894PROTOTYPES: ENABLE
783 895
… …
901 }; 1013 };
902 1014
903 aio_stash = gv_stashpv ("IO::AIO" , 1); 1015 aio_stash = gv_stashpv ("IO::AIO" , 1);
904 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1); 1016 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
905 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1); 1017 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
1018 aio_wd_stash = gv_stashpv ("IO::AIO::WD" , 1);
906 1019
907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1020 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)); 1021 newCONSTSUB (aio_stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
909 1022
910 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE)); 1023 newCONSTSUB (aio_stash, "PAGESIZE", newSViv (PAGESIZE));
911 1024
912 create_respipe (); 1025 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} 1026}
1027
1028void
1029reinit ()
1030 PROTOTYPE:
920 1031
921void 1032void
922max_poll_reqs (unsigned int nreqs) 1033max_poll_reqs (unsigned int nreqs)
923 PROTOTYPE: $ 1034 PROTOTYPE: $
924 CODE: 1035 CODE:
… …
959 PROTOTYPE: $ 1070 PROTOTYPE: $
960 CODE: 1071 CODE:
961 max_outstanding = maxreqs; 1072 max_outstanding = maxreqs;
962 1073
963void 1074void
1075aio_wd (SV8 *pathname, SV *callback=&PL_sv_undef)
1076 PPCODE:
1077{
1078 dREQ;
1079
1080 req->type = EIO_WD_OPEN;
1081 req_set_path1 (req, pathname);
1082
1083 REQ_SEND;
1084}
1085
1086void
964aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) 1087aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef)
965 PPCODE: 1088 PPCODE:
966{ 1089{
967 dREQ; 1090 dREQ;
968 1091
969 req->type = EIO_OPEN; 1092 req->type = EIO_OPEN;
970 req->sv1 = newSVsv (pathname); 1093 req_set_path1 (req, pathname);
971 req->ptr1 = SvPVbyte_nolen (req->sv1);
972 req->int1 = flags; 1094 req->int1 = flags;
973 req->int2 = mode; 1095 req->int2 = mode;
974 1096
975 REQ_SEND; 1097 REQ_SEND;
976} 1098}
… …
978void 1100void
979aio_fsync (SV *fh, SV *callback=&PL_sv_undef) 1101aio_fsync (SV *fh, SV *callback=&PL_sv_undef)
980 ALIAS: 1102 ALIAS:
981 aio_fsync = EIO_FSYNC 1103 aio_fsync = EIO_FSYNC
982 aio_fdatasync = EIO_FDATASYNC 1104 aio_fdatasync = EIO_FDATASYNC
1105 aio_syncfs = EIO_SYNCFS
983 PPCODE: 1106 PPCODE:
984{ 1107{
985 int fd = s_fileno_croak (fh, 0); 1108 int fd = s_fileno_croak (fh, 0);
986 dREQ; 1109 dREQ;
987 1110
… …
1028 1151
1029void 1152void
1030aio_close (SV *fh, SV *callback=&PL_sv_undef) 1153aio_close (SV *fh, SV *callback=&PL_sv_undef)
1031 PPCODE: 1154 PPCODE:
1032{ 1155{
1033 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 1156 static int close_fd = -1; /* dummy fd to close fds via dup2 */
1034 int fd = s_fileno_croak (fh, 0); 1157 int fd = s_fileno_croak (fh, 0);
1035 dREQ; 1158 dREQ;
1036 1159
1037 if (close_pipe < 0) 1160 if (expect_false (close_fd < 0))
1038 { 1161 {
1039 int pipefd [2]; 1162 int pipefd [2];
1040 1163
1164 if (
1165#ifdef _WIN32
1166 _pipe (pipefd, 1, _O_BINARY) < 0
1167#else
1041 if (pipe (pipefd) < 0 1168 pipe (pipefd) < 0
1042 || close (pipefd [1]) < 0
1043 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0) 1169 || fcntl (pipefd [0], F_SETFD, FD_CLOEXEC) < 0
1170#endif
1171 || close (pipefd [1]) < 0
1172 )
1044 abort (); /*D*/ 1173 abort (); /*D*/
1045 1174
1046 close_pipe = pipefd [0]; 1175 close_fd = pipefd [0];
1047 } 1176 }
1048 1177
1049 req->type = EIO_DUP2; 1178 req->type = EIO_DUP2;
1050 req->int1 = close_pipe; 1179 req->int1 = close_fd;
1051 req->sv2 = newSVsv (fh); 1180 req->sv2 = newSVsv (fh);
1052 req->int2 = fd; 1181 req->int2 = fd;
1053 1182
1054 REQ_SEND (req); 1183 REQ_SEND (req);
1055} 1184}
… …
1106 REQ_SEND; 1235 REQ_SEND;
1107 } 1236 }
1108} 1237}
1109 1238
1110void 1239void
1111aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) 1240aio_readlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1112 ALIAS: 1241 ALIAS:
1113 aio_readlink = EIO_READLINK 1242 aio_readlink = EIO_READLINK
1114 aio_realpath = EIO_REALPATH 1243 aio_realpath = EIO_REALPATH
1115 PPCODE: 1244 PPCODE:
1116{ 1245{
1117 SV *data;
1118 dREQ; 1246 dREQ;
1119 1247
1120 req->type = ix; 1248 req->type = ix;
1121 req->sv1 = newSVsv (path); 1249 req_set_path1 (req, pathname);
1122 req->ptr1 = SvPVbyte_nolen (req->sv1);
1123 1250
1124 REQ_SEND; 1251 REQ_SEND;
1125} 1252}
1126 1253
1127void 1254void
… …
1168 PPCODE: 1295 PPCODE:
1169{ 1296{
1170 dREQ; 1297 dREQ;
1171 1298
1172 req->sv1 = newSVsv (fh_or_path); 1299 req->sv1 = newSVsv (fh_or_path);
1173 1300 req_set_fh_or_path (req, ix, ix == EIO_STATVFS ? EIO_FSTATVFS : EIO_FSTAT, fh_or_path);
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
1185 REQ_SEND; 1301 REQ_SEND;
1186} 1302}
1187 1303
1188UV 1304UV
1189major (UV dev) 1305major (UV dev)
… …
1207{ 1323{
1208 dREQ; 1324 dREQ;
1209 1325
1210 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 1326 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
1211 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 1327 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
1212 req->sv1 = newSVsv (fh_or_path); 1328 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 1329
1225 REQ_SEND; 1330 REQ_SEND;
1226} 1331}
1227 1332
1228void 1333void
1229aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef) 1334aio_truncate (SV8 *fh_or_path, SV *offset, SV *callback=&PL_sv_undef)
1230 PPCODE: 1335 PPCODE:
1231{ 1336{
1232 dREQ; 1337 dREQ;
1233 1338
1234 req->sv1 = newSVsv (fh_or_path);
1235 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 1339 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
1236 1340 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 1341
1248 REQ_SEND; 1342 REQ_SEND;
1249} 1343}
1250 1344
1251void 1345void
1252aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 1346aio_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: 1347 PPCODE:
1257{ 1348{
1258 dREQ; 1349 dREQ;
1259 1350
1260 req->int2 = mode; 1351 req->int2 = mode;
1261 req->sv1 = newSVsv (fh_or_path); 1352 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 1353
1274 REQ_SEND; 1354 REQ_SEND;
1275} 1355}
1276 1356
1277void 1357void
… …
1280{ 1360{
1281 dREQ; 1361 dREQ;
1282 1362
1283 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 1363 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
1284 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 1364 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
1285 req->sv1 = newSVsv (fh_or_path); 1365 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 1366
1298 REQ_SEND; 1367 REQ_SEND;
1299} 1368}
1300 1369
1301void 1370void
… …
1303 PPCODE: 1372 PPCODE:
1304{ 1373{
1305 dREQ; 1374 dREQ;
1306 1375
1307 req->type = EIO_READDIR; 1376 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; 1377 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
1311 1378
1312 if (flags & EIO_READDIR_DENTS) 1379 if (flags & EIO_READDIR_DENTS)
1313 req->int1 |= EIO_READDIR_CUSTOM2; 1380 req->int1 |= EIO_READDIR_CUSTOM2;
1314 1381
1382 req_set_path1 (req, pathname);
1383
1315 REQ_SEND; 1384 REQ_SEND;
1385}
1386
1387void
1388aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef)
1389 PPCODE:
1390{
1391 dREQ;
1392
1393 req->type = EIO_MKDIR;
1394 req->int2 = mode;
1395 req_set_path1 (req, pathname);
1396
1397 REQ_SEND;
1316} 1398}
1317 1399
1318void 1400void
1319aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 1401aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
1320 ALIAS: 1402 ALIAS:
… …
1324 PPCODE: 1406 PPCODE:
1325{ 1407{
1326 dREQ; 1408 dREQ;
1327 1409
1328 req->type = ix; 1410 req->type = ix;
1329 req->sv1 = newSVsv (pathname); 1411 req_set_path1 (req, pathname);
1330 req->ptr1 = SvPVbyte_nolen (req->sv1);
1331 1412
1332 REQ_SEND; 1413 REQ_SEND;
1333} 1414}
1334 1415
1335void 1416void
… …
1339 aio_symlink = EIO_SYMLINK 1420 aio_symlink = EIO_SYMLINK
1340 aio_rename = EIO_RENAME 1421 aio_rename = EIO_RENAME
1341 PPCODE: 1422 PPCODE:
1342{ 1423{
1343 dREQ; 1424 dREQ;
1425 eio_wd wd2 = 0;
1344 1426
1345 req->type = ix; 1427 req->type = ix;
1346 req->sv1 = newSVsv (oldpath); 1428 req_set_path1 (req, oldpath);
1347 req->ptr1 = SvPVbyte_nolen (req->sv1); 1429 req_set_path (req, newpath, &req->sv2, &req->sv4, &wd2, &req->ptr2);
1348 req->sv2 = newSVsv (newpath); 1430 req->int3 = (long)wd2;
1349 req->ptr2 = SvPVbyte_nolen (req->sv2);
1350 1431
1351 REQ_SEND; 1432 REQ_SEND;
1352} 1433}
1353 1434
1354void 1435void
… …
1356 PPCODE: 1437 PPCODE:
1357{ 1438{
1358 dREQ; 1439 dREQ;
1359 1440
1360 req->type = EIO_MKNOD; 1441 req->type = EIO_MKNOD;
1361 req->sv1 = newSVsv (pathname);
1362 req->ptr1 = SvPVbyte_nolen (req->sv1);
1363 req->int2 = (mode_t)mode; 1442 req->int2 = (mode_t)mode;
1364 req->offs = dev; 1443 req->offs = dev;
1444 req_set_path1 (req, pathname);
1365 1445
1366 REQ_SEND; 1446 REQ_SEND;
1367} 1447}
1368 1448
1369void 1449void
… …
1569 CODE: 1649 CODE:
1570 RETVAL = posix_fadvise (fh, offset, length, advice); 1650 RETVAL = posix_fadvise (fh, offset, length, advice);
1571 OUTPUT: 1651 OUTPUT:
1572 RETVAL 1652 RETVAL
1573 1653
1574ssize_t 1654IV
1575sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1655sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1576 CODE: 1656 CODE:
1577 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count); 1657 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1578 OUTPUT: 1658 OUTPUT:
1579 RETVAL 1659 RETVAL
… …
1691 SvREFCNT_dec (on_next_submit); 1771 SvREFCNT_dec (on_next_submit);
1692 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1772 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1693 1773
1694PROTOTYPES: DISABLE 1774PROTOTYPES: DISABLE
1695 1775
1776MODULE = IO::AIO PACKAGE = IO::AIO::WD
1777
1778BOOT:
1779{
1780 newCONSTSUB (aio_stash, "CWD" , newSVaio_wd (EIO_CWD ));
1781 newCONSTSUB (aio_stash, "INVALID_WD", newSVaio_wd (EIO_INVALID_WD));
1782}
1783
1784void
1785DESTROY (SV *self)
1786 CODE:
1787{
1788 aio_wd wd = SvAIO_WD (self);
1789#if HAVE_AT
1790 SV *callback = &PL_sv_undef;
1791 dREQ; /* clobbers next_pri :/ */
1792 req->type = EIO_WD_CLOSE;
1793 req->wd = wd;
1794 REQ_SEND;
1795#else
1796 eio_wd_close_sync (wd);
1797#endif
1798}
1799
1696MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1800MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1697 1801
1698void 1802void
1699cancel (aio_req_ornot req) 1803cancel (aio_req_ornot req)
1700 CODE: 1804 CODE:

Diff Legend

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