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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.133 by root, Wed Oct 22 18:15:36 2008 UTC

… …
12#include <sys/types.h> 12#include <sys/types.h>
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <limits.h> 14#include <limits.h>
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17
18/* perl namespace pollution */
19#undef VERSION
17 20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20# define EIO_STRUCT_DIRENT Direntry_t 23# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 24# undef malloc
… …
62# include <signal.h> 65# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
64 67
65#endif 68#endif
66 69
70/* perl stupidly overrides readdir and maybe others */
71/* with thread-unsafe versions, imagine that :( */
72#undef readdir
73#undef opendir
74#undef closedir
75
67#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
68 77
69/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 79#if IVSIZE >= 8
71# define SvVAL64 SvIV 80# define SvVAL64 SvIV
72#else 81#else
73# define SvVAL64 SvNV 82# define SvVAL64 SvNV
74#endif 83#endif
75 84
85/*****************************************************************************/
86
87#if __GNUC__ >= 3
88# define expect(expr,value) __builtin_expect ((expr),(value))
89#else
90# define expect(expr,value) (expr)
91#endif
92
93#define expect_false(expr) expect ((expr) != 0, 0)
94#define expect_true(expr) expect ((expr) != 0, 1)
95
96/*****************************************************************************/
97
76static HV *stash; 98static HV *stash;
77typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
78 100
79#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
81 103
82#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
83 SV *callback; \ 105 SV *callback; \
84 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 107 STRLEN stroffset; \
86 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
87 111
88#include "libeio/eio.h" 112#include "libeio/eio.h"
89 113
90static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
96 118
97enum { 119enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
102 124
103typedef eio_req *aio_req; 125typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
105 127
106static SV *on_next_submit; 128static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 130static int max_outstanding;
109 131
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
111 133
112static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
… …
170 192
171static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
172{ 194{
173 eio_submit (req); 195 eio_submit (req);
174 196
175 if (on_next_submit) 197 if (expect_false (on_next_submit))
176 { 198 {
177 dSP; 199 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
179 201
180 on_next_submit = 0; 202 on_next_submit = 0;
… …
190 dSP; 212 dSP;
191 213
192 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
194 216
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
196 { 218 {
197 ENTER; 219 ENTER;
198 SAVETMPS; 220 SAVETMPS;
199 PUSHMARK (SP); 221 PUSHMARK (SP);
200 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
277 case EIO_BUSY: 299 case EIO_BUSY:
278 break; 300 break;
279 301
280 case EIO_READLINK: 302 case EIO_READLINK:
281 if (req->result > 0) 303 if (req->result > 0)
282 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
283 SvCUR_set (req->sv2, req->result);
284 *SvEND (req->sv2) = 0;
285 PUSHs (req->sv2);
286 }
287 break; 305 break;
288 306
289 case EIO_STAT: 307 case EIO_STAT:
290 case EIO_LSTAT: 308 case EIO_LSTAT:
291 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
411 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
412 430
413 if (size) 431 if (size)
414 return; 432 return;
415 433
416 maybe_start_thread (); 434 etp_maybe_start_thread ();
417 435
418 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
419 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
420 438
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 440 }
423} 441}
424 442
425static int poll_cb (void) 443static int poll_cb (void)
426{ 444{
427 int res; 445 for (;;)
428
429 do
430 { 446 {
431 res = eio_poll (); 447 int res = eio_poll ();
432 448
433 if (res > 0) 449 if (res > 0)
434 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
435 } 456 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 457}
440 458
441static void atfork_child (void) 459static void atfork_child (void)
442{ 460{
443 create_respipe (); 461 create_respipe ();
444} 462}
445 463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
446#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
447 aio_req req; \ 484 aio_req req; \
448 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
450 \ 487 \
451 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 489 \
454 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
455 if (!req) \ 491 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
457 \ 493 \
458 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 495 req->pri = req_pri
460 496
461#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
462 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
463 \ 501 \
464 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 504
467MODULE = IO::AIO PACKAGE = IO::AIO 505MODULE = IO::AIO PACKAGE = IO::AIO
… …
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
480#ifdef _WIN32 518#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock);
482 X_MUTEX_CHECK (reslock);
483 X_MUTEX_CHECK (reqlock);
484 X_MUTEX_CHECK (reqwait);
485 X_MUTEX_CHECK (preadwritelock);
486 X_MUTEX_CHECK (readdirlock);
487
488 X_COND_CHECK (reqwait);
489#else
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#endif 520#endif
521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
522 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
523 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
524 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
492 525
493 create_respipe (); 526 create_respipe ();
494 527
495 if (eio_init (want_poll, done_poll) < 0) 528 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 529 croak ("IO::AIO: unable to initialise eio library");
… …
562 dREQ; 595 dREQ;
563 596
564 req->type = ix; 597 req->type = ix;
565 req->sv1 = newSVsv (fh); 598 req->sv1 = newSVsv (fh);
566 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 599 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
600
601 REQ_SEND (req);
602}
603
604void
605aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
606 PROTOTYPE: $$$$;$
607 PPCODE:
608{
609 dREQ;
610
611 req->type = EIO_SYNC_FILE_RANGE;
612 req->sv1 = newSVsv (fh);
613 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh)));
614 req->offs = SvVAL64 (offset);
615 req->size = SvVAL64 (nbytes);
616 req->int2 = flags;
567 617
568 REQ_SEND (req); 618 REQ_SEND (req);
569} 619}
570 620
571void 621void
… …
661 PPCODE: 711 PPCODE:
662{ 712{
663 SV *data; 713 SV *data;
664 dREQ; 714 dREQ;
665 715
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 716 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 717 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 718 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 719
675 REQ_SEND; 720 REQ_SEND;
676} 721}
677 722
678void 723void
… …
716 aio_lstat = EIO_LSTAT 761 aio_lstat = EIO_LSTAT
717 PPCODE: 762 PPCODE:
718{ 763{
719 dREQ; 764 dREQ;
720 765
721 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
722 if (!req->ptr2)
723 {
724 req_destroy (req);
725 croak ("out of memory during aio_stat statdata allocation");
726 }
727
728 req->flags |= EIO_FLAG_PTR2_FREE;
729 req->sv1 = newSVsv (fh_or_path); 766 req->sv1 = newSVsv (fh_or_path);
730 767
731 if (SvPOK (fh_or_path)) 768 if (SvPOK (req->sv1))
732 { 769 {
733 req->type = ix; 770 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 771 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 772 }
736 else 773 else
… …
750 787
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 788 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 789 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 790 req->sv1 = newSVsv (fh_or_path);
754 791
755 if (SvPOK (fh_or_path)) 792 if (SvPOK (req->sv1))
756 { 793 {
757 req->type = EIO_UTIME; 794 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 795 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 796 }
760 else 797 else
… …
773 dREQ; 810 dREQ;
774 811
775 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 813 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 814
778 if (SvPOK (fh_or_path)) 815 if (SvPOK (req->sv1))
779 { 816 {
780 req->type = EIO_TRUNCATE; 817 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 818 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 819 }
783 else 820 else
… …
791 828
792void 829void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 830aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 831 ALIAS:
795 aio_chmod = EIO_CHMOD 832 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 833 aio_mkdir = EIO_MKDIR
798 PPCODE: 834 PPCODE:
799{ 835{
800 dREQ; 836 dREQ;
801 837
802 req->type = ix;
803 req->int2 = mode; 838 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 839 req->sv1 = newSVsv (fh_or_path);
805 840
806 if (ix == EIO_FCHMOD) 841 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 842 {
843 req->type = ix;
844 req->ptr1 = SvPVbyte_nolen (req->sv1);
845 }
808 else 846 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 {
848 req->type = EIO_FCHMOD;
849 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
850 }
810 851
811 REQ_SEND; 852 REQ_SEND;
812} 853}
813 854
814void 855void
… …
819 860
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 861 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 862 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 863 req->sv1 = newSVsv (fh_or_path);
823 864
824 if (SvPOK (fh_or_path)) 865 if (SvPOK (req->sv1))
825 { 866 {
826 req->type = EIO_CHOWN; 867 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 868 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 869 }
829 else 870 else
… …
905{ 946{
906 dREQ; 947 dREQ;
907 948
908 req->type = EIO_GROUP; 949 req->type = EIO_GROUP;
909 950
910 eio_submit (req); 951 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 952 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 953}
913 954
914void 955void
915aio_nop (SV *callback=&PL_sv_undef) 956aio_nop (SV *callback=&PL_sv_undef)
… …
927 968
928int 969int
929aioreq_pri (int pri = 0) 970aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 971 PROTOTYPE: ;$
931 CODE: 972 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 973 RETVAL = next_pri;
933 if (items > 0) 974 if (items > 0)
934 { 975 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 976 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 977 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 978 next_pri = pri;
938 } 979 }
939 OUTPUT: 980 OUTPUT:
940 RETVAL 981 RETVAL
941 982
942void 983void
943aioreq_nice (int nice = 0) 984aioreq_nice (int nice = 0)
944 CODE: 985 CODE:
945 nice = next_pri - nice; 986 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 987 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 988 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 989 next_pri = nice;
949 990
950void 991void
951flush () 992flush ()
952 PROTOTYPE: 993 PROTOTYPE:
953 CODE: 994 CODE:
… …
1014 1055
1015int 1056int
1016nthreads() 1057nthreads()
1017 PROTOTYPE: 1058 PROTOTYPE:
1018 CODE: 1059 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1060 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1061 OUTPUT:
1023 RETVAL 1062 RETVAL
1024 1063
1025void _on_next_submit (SV *cb) 1064void _on_next_submit (SV *cb)
1026 CODE: 1065 CODE:
… …
1036 CODE: 1075 CODE:
1037 eio_cancel (req); 1076 eio_cancel (req);
1038 1077
1039void 1078void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1079cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 CODE: 1080 PPCODE:
1081{
1082 if (GIMME_V != G_VOID)
1083 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1084
1085 if (items > 1)
1086 {
1087 SV *cb_cv = get_cb (callback);
1088
1042 SvREFCNT_dec (req->callback); 1089 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1090 req->callback = SvREFCNT_inc (cb_cv);
1091 }
1092}
1044 1093
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1094MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1095
1047void 1096void
1048add (aio_req grp, ...) 1097add (aio_req grp, ...)
… …
1103void 1152void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1153feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1154 CODE:
1106{ 1155{
1107 SvREFCNT_dec (grp->sv2); 1156 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1157 grp->sv2 = newSVsv (callback);
1158 grp->feed = aio_grp_feed;
1109 1159
1110 if (grp->int2 <= 0) 1160 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1161 grp->int2 = 2;
1112 1162
1113 eio_grp_limit (grp, grp->int2); 1163 eio_grp_limit (grp, grp->int2);

Diff Legend

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