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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.130 by root, Thu Oct 2 11:35:03 2008 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 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
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 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
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
90 111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
… …
105 126
106typedef eio_req *aio_req; 127typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 128typedef eio_req *aio_req_ornot;
108 129
109static SV *on_next_submit; 130static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 131static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 132static int max_outstanding;
112 133
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 134static int respipe_osf [2], respipe [2] = { -1, -1 };
114 135
115static void req_destroy (aio_req req); 136static void req_destroy (aio_req req);
… …
173 194
174static void req_submit (eio_req *req) 195static void req_submit (eio_req *req)
175{ 196{
176 eio_submit (req); 197 eio_submit (req);
177 198
178 if (on_next_submit) 199 if (expect_false (on_next_submit))
179 { 200 {
180 dSP; 201 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 202 SV *cb = sv_2mortal (on_next_submit);
182 203
183 on_next_submit = 0; 204 on_next_submit = 0;
… …
193 dSP; 214 dSP;
194 215
195 if (req->flags & FLAG_SV2_RO_OFF) 216 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 217 SvREADONLY_off (req->sv2);
197 218
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 219 if (!EIO_CANCELLED (req) && req->callback)
199 { 220 {
200 ENTER; 221 ENTER;
201 SAVETMPS; 222 SAVETMPS;
202 PUSHMARK (SP); 223 PUSHMARK (SP);
203 EXTEND (SP, 1); 224 EXTEND (SP, 1);
… …
280 case EIO_BUSY: 301 case EIO_BUSY:
281 break; 302 break;
282 303
283 case EIO_READLINK: 304 case EIO_READLINK:
284 if (req->result > 0) 305 if (req->result > 0)
285 { 306 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 307 break;
291 308
292 case EIO_STAT: 309 case EIO_STAT:
293 case EIO_LSTAT: 310 case EIO_LSTAT:
294 case EIO_FSTAT: 311 case EIO_FSTAT:
… …
414 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
415 432
416 if (size) 433 if (size)
417 return; 434 return;
418 435
419 maybe_start_thread (); 436 etp_maybe_start_thread ();
420 437
421 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
423 440
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 442 }
426} 443}
427 444
428static int poll_cb (void) 445static int poll_cb (void)
429{ 446{
430 int res; 447 for (;;)
431
432 do
433 { 448 {
434 res = eio_poll (); 449 int res = eio_poll ();
435 450
436 if (res > 0) 451 if (res > 0)
437 croak (0); 452 croak (0);
453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
455 return res;
456
457 poll_wait ();
438 } 458 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 459}
443 460
444static void atfork_child (void) 461static void atfork_child (void)
445{ 462{
446 create_respipe (); 463 create_respipe ();
447} 464}
448 465
466static SV *
467get_cb (SV *cb_sv)
468{
469 HV *st;
470 GV *gvp;
471 CV *cv;
472
473 if (!SvOK (cb_sv))
474 return 0;
475
476 cv = sv_2cv (cb_sv, &st, &gvp, 0);
477
478 if (!cv)
479 croak ("IO::AIO callback must be undef or a CODE reference");
480
481 return (SV *)cv;
482}
483
449#define dREQ \ 484#define dREQ \
485 SV *cb_cv; \
450 aio_req req; \ 486 aio_req req; \
451 int req_pri = next_pri; \ 487 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 488 next_pri = EIO_PRI_DEFAULT; \
453 \ 489 \
454 if (SvOK (callback) && !SvROK (callback)) \ 490 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 491 \
457 Newz (0, req, 1, eio_req); \ 492 Newz (0, req, 1, eio_req); \
458 if (!req) \ 493 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 494 croak ("out of memory during eio_req allocation"); \
460 \ 495 \
461 req->callback = newSVsv (callback); \ 496 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 497 req->pri = req_pri
463 498
464#define REQ_SEND \ 499#define REQ_SEND \
500 PUTBACK; \
465 req_submit (req); \ 501 req_submit (req); \
502 SPAGAIN; \
466 \ 503 \
467 if (GIMME_V != G_VOID) \ 504 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 505 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 506
470MODULE = IO::AIO PACKAGE = IO::AIO 507MODULE = IO::AIO PACKAGE = IO::AIO
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 520#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock);
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 522#endif
495 523
496 create_respipe (); 524 create_respipe ();
497 525
… …
642 req->sv1 = newSVsv (fh); 670 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 671 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh))
644 : IoOFP (sv_2io (fh))); 672 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 673 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 674 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 675 req->sv2 = SvREFCNT_inc_NN (data);
648 req->ptr2 = (char *)svptr + dataoffset; 676 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 677 req->stroffset = dataoffset;
650 678
651 if (!SvREADONLY (data)) 679 if (!SvREADONLY (data))
652 { 680 {
… …
664 PPCODE: 692 PPCODE:
665{ 693{
666 SV *data; 694 SV *data;
667 dREQ; 695 dREQ;
668 696
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 697 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 698 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 699 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 700
678 REQ_SEND; 701 REQ_SEND;
679} 702}
680 703
681void 704void
… …
719 aio_lstat = EIO_LSTAT 742 aio_lstat = EIO_LSTAT
720 PPCODE: 743 PPCODE:
721{ 744{
722 dREQ; 745 dREQ;
723 746
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 747 req->sv1 = newSVsv (fh_or_path);
733 748
734 if (SvPOK (fh_or_path)) 749 if (SvPOK (req->sv1))
735 { 750 {
736 req->type = ix; 751 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 752 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 753 }
739 else 754 else
… …
753 768
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 769 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 770 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 771 req->sv1 = newSVsv (fh_or_path);
757 772
758 if (SvPOK (fh_or_path)) 773 if (SvPOK (req->sv1))
759 { 774 {
760 req->type = EIO_UTIME; 775 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 776 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 777 }
763 else 778 else
… …
776 dREQ; 791 dREQ;
777 792
778 req->sv1 = newSVsv (fh_or_path); 793 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 794 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 795
781 if (SvPOK (fh_or_path)) 796 if (SvPOK (req->sv1))
782 { 797 {
783 req->type = EIO_TRUNCATE; 798 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 799 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 800 }
786 else 801 else
… …
794 809
795void 810void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 811aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 812 ALIAS:
798 aio_chmod = EIO_CHMOD 813 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 814 aio_mkdir = EIO_MKDIR
801 PPCODE: 815 PPCODE:
802{ 816{
803 dREQ; 817 dREQ;
804 818
805 req->type = ix;
806 req->int2 = mode; 819 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 820 req->sv1 = newSVsv (fh_or_path);
808 821
809 if (ix == EIO_FCHMOD) 822 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 823 {
824 req->type = ix;
825 req->ptr1 = SvPVbyte_nolen (req->sv1);
826 }
811 else 827 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 828 {
829 req->type = EIO_FCHMOD;
830 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
831 }
813 832
814 REQ_SEND; 833 REQ_SEND;
815} 834}
816 835
817void 836void
… …
822 841
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 842 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 843 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 844 req->sv1 = newSVsv (fh_or_path);
826 845
827 if (SvPOK (fh_or_path)) 846 if (SvPOK (req->sv1))
828 { 847 {
829 req->type = EIO_CHOWN; 848 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 849 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 850 }
832 else 851 else
… …
908{ 927{
909 dREQ; 928 dREQ;
910 929
911 req->type = EIO_GROUP; 930 req->type = EIO_GROUP;
912 931
913 eio_submit (req); 932 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 933 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 934}
916 935
917void 936void
918aio_nop (SV *callback=&PL_sv_undef) 937aio_nop (SV *callback=&PL_sv_undef)
… …
930 949
931int 950int
932aioreq_pri (int pri = 0) 951aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 952 PROTOTYPE: ;$
934 CODE: 953 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 954 RETVAL = next_pri;
936 if (items > 0) 955 if (items > 0)
937 { 956 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 957 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 958 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 959 next_pri = pri;
941 } 960 }
942 OUTPUT: 961 OUTPUT:
943 RETVAL 962 RETVAL
944 963
945void 964void
946aioreq_nice (int nice = 0) 965aioreq_nice (int nice = 0)
947 CODE: 966 CODE:
948 nice = next_pri - nice; 967 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 968 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 969 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 970 next_pri = nice;
952 971
953void 972void
954flush () 973flush ()
955 PROTOTYPE: 974 PROTOTYPE:
956 CODE: 975 CODE:
… …
1017 1036
1018int 1037int
1019nthreads() 1038nthreads()
1020 PROTOTYPE: 1039 PROTOTYPE:
1021 CODE: 1040 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1041 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1042 OUTPUT:
1026 RETVAL 1043 RETVAL
1027 1044
1028void _on_next_submit (SV *cb) 1045void _on_next_submit (SV *cb)
1029 CODE: 1046 CODE:
… …
1039 CODE: 1056 CODE:
1040 eio_cancel (req); 1057 eio_cancel (req);
1041 1058
1042void 1059void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1060cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1061 PPCODE:
1062{
1063 if (GIMME_V != G_VOID)
1064 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1065
1066 if (items > 1)
1067 {
1068 SV *cb_cv = get_cb (callback);
1069
1045 SvREFCNT_dec (req->callback); 1070 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1071 req->callback = SvREFCNT_inc (cb_cv);
1072 }
1073}
1047 1074
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1075MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1076
1050void 1077void
1051add (aio_req grp, ...) 1078add (aio_req grp, ...)

Diff Legend

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