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.116 by root, Sat May 10 19:25:33 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 */
… …
101#include "libeio/eio.c" 123#include "libeio/eio.c"
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
128static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 130static int max_outstanding;
107
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
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);
113static void req_cancel (aio_req req); 135static void req_cancel (aio_req req);
… …
166 FREETMPS; 188 FREETMPS;
167 LEAVE; 189 LEAVE;
168 } 190 }
169} 191}
170 192
193static void req_submit (eio_req *req)
194{
195 eio_submit (req);
196
197 if (expect_false (on_next_submit))
198 {
199 dSP;
200 SV *cb = sv_2mortal (on_next_submit);
201
202 on_next_submit = 0;
203
204 PUSHMARK (SP);
205 PUTBACK;
206 call_sv (cb, G_DISCARD | G_EVAL);
207 }
208}
209
171static int req_invoke (eio_req *req) 210static int req_invoke (eio_req *req)
172{ 211{
173 dSP; 212 dSP;
174 213
175 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
177 216
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
179 { 218 {
180 ENTER; 219 ENTER;
181 SAVETMPS; 220 SAVETMPS;
182 PUSHMARK (SP); 221 PUSHMARK (SP);
183 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
260 case EIO_BUSY: 299 case EIO_BUSY:
261 break; 300 break;
262 301
263 case EIO_READLINK: 302 case EIO_READLINK:
264 if (req->result > 0) 303 if (req->result > 0)
265 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 305 break;
271 306
272 case EIO_STAT: 307 case EIO_STAT:
273 case EIO_LSTAT: 308 case EIO_LSTAT:
274 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
394 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
395 430
396 if (size) 431 if (size)
397 return; 432 return;
398 433
399 maybe_start_thread (); 434 etp_maybe_start_thread ();
400 435
401 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
403 438
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 440 }
406} 441}
407 442
408static int poll_cb (void) 443static int poll_cb (void)
409{ 444{
410 int res; 445 for (;;)
411
412 do
413 { 446 {
414 res = eio_poll (); 447 int res = eio_poll ();
415 448
416 if (res > 0) 449 if (res > 0)
417 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
418 } 456 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 457}
423 458
424static void atfork_child (void) 459static void atfork_child (void)
425{ 460{
426 create_respipe (); 461 create_respipe ();
427} 462}
428 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
429#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
430 aio_req req; \ 484 aio_req req; \
431 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
433 \ 487 \
434 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 489 \
437 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
438 if (!req) \ 491 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
440 \ 493 \
441 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 495 req->pri = req_pri
443 496
444#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
445 eio_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
446 \ 501 \
447 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
449 504
450MODULE = IO::AIO PACKAGE = IO::AIO 505MODULE = IO::AIO PACKAGE = IO::AIO
… …
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 513 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 514 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 515 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 516 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
462 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 517 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
463#ifdef _WIN32 518#ifndef _WIN32
464 X_MUTEX_CHECK (wrklock);
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470
471 X_COND_CHECK (reqwait);
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 519 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#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));
475 525
476 create_respipe (); 526 create_respipe ();
477 527
478 if (eio_init (want_poll, done_poll) < 0) 528 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library"); 529 croak ("IO::AIO: unable to initialise eio library");
… …
545 dREQ; 595 dREQ;
546 596
547 req->type = ix; 597 req->type = ix;
548 req->sv1 = newSVsv (fh); 598 req->sv1 = newSVsv (fh);
549 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;
550 617
551 REQ_SEND (req); 618 REQ_SEND (req);
552} 619}
553 620
554void 621void
… …
644 PPCODE: 711 PPCODE:
645{ 712{
646 SV *data; 713 SV *data;
647 dREQ; 714 dREQ;
648 715
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 716 req->type = EIO_READLINK;
653 req->sv1 = newSVsv (path); 717 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 718 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 719
658 REQ_SEND; 720 REQ_SEND;
659} 721}
660 722
661void 723void
… …
699 aio_lstat = EIO_LSTAT 761 aio_lstat = EIO_LSTAT
700 PPCODE: 762 PPCODE:
701{ 763{
702 dREQ; 764 dREQ;
703 765
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 766 req->sv1 = newSVsv (fh_or_path);
713 767
714 if (SvPOK (fh_or_path)) 768 if (SvPOK (req->sv1))
715 { 769 {
716 req->type = ix; 770 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 771 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 772 }
719 else 773 else
… …
733 787
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 788 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 789 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 790 req->sv1 = newSVsv (fh_or_path);
737 791
738 if (SvPOK (fh_or_path)) 792 if (SvPOK (req->sv1))
739 { 793 {
740 req->type = EIO_UTIME; 794 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 795 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 796 }
743 else 797 else
… …
756 dREQ; 810 dREQ;
757 811
758 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 813 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 814
761 if (SvPOK (fh_or_path)) 815 if (SvPOK (req->sv1))
762 { 816 {
763 req->type = EIO_TRUNCATE; 817 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 818 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 819 }
766 else 820 else
… …
774 828
775void 829void
776aio_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)
777 ALIAS: 831 ALIAS:
778 aio_chmod = EIO_CHMOD 832 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 833 aio_mkdir = EIO_MKDIR
781 PPCODE: 834 PPCODE:
782{ 835{
783 dREQ; 836 dREQ;
784 837
785 req->type = ix;
786 req->int2 = mode; 838 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 839 req->sv1 = newSVsv (fh_or_path);
788 840
789 if (ix == EIO_FCHMOD) 841 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 842 {
843 req->type = ix;
844 req->ptr1 = SvPVbyte_nolen (req->sv1);
845 }
791 else 846 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 847 {
848 req->type = EIO_FCHMOD;
849 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
850 }
793 851
794 REQ_SEND; 852 REQ_SEND;
795} 853}
796 854
797void 855void
… …
802 860
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 861 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 862 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 863 req->sv1 = newSVsv (fh_or_path);
806 864
807 if (SvPOK (fh_or_path)) 865 if (SvPOK (req->sv1))
808 { 866 {
809 req->type = EIO_CHOWN; 867 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 868 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 869 }
812 else 870 else
… …
888{ 946{
889 dREQ; 947 dREQ;
890 948
891 req->type = EIO_GROUP; 949 req->type = EIO_GROUP;
892 950
893 eio_submit (req); 951 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 952 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 953}
896 954
897void 955void
898aio_nop (SV *callback=&PL_sv_undef) 956aio_nop (SV *callback=&PL_sv_undef)
… …
910 968
911int 969int
912aioreq_pri (int pri = 0) 970aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$ 971 PROTOTYPE: ;$
914 CODE: 972 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 973 RETVAL = next_pri;
916 if (items > 0) 974 if (items > 0)
917 { 975 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 976 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 977 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 978 next_pri = pri;
921 } 979 }
922 OUTPUT: 980 OUTPUT:
923 RETVAL 981 RETVAL
924 982
925void 983void
926aioreq_nice (int nice = 0) 984aioreq_nice (int nice = 0)
927 CODE: 985 CODE:
928 nice = next_pri - nice; 986 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 987 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 988 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 989 next_pri = nice;
932 990
933void 991void
934flush () 992flush ()
935 PROTOTYPE: 993 PROTOTYPE:
936 CODE: 994 CODE:
… …
997 1055
998int 1056int
999nthreads() 1057nthreads()
1000 PROTOTYPE: 1058 PROTOTYPE:
1001 CODE: 1059 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1060 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1061 OUTPUT:
1006 RETVAL 1062 RETVAL
1007 1063
1064void _on_next_submit (SV *cb)
1065 CODE:
1066 SvREFCNT_dec (on_next_submit);
1067 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1068
1008PROTOTYPES: DISABLE 1069PROTOTYPES: DISABLE
1009 1070
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1071MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1072
1012void 1073void
… …
1014 CODE: 1075 CODE:
1015 eio_cancel (req); 1076 eio_cancel (req);
1016 1077
1017void 1078void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1079cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 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
1020 SvREFCNT_dec (req->callback); 1089 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1090 req->callback = SvREFCNT_inc (cb_cv);
1091 }
1092}
1022 1093
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1094MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1095
1025void 1096void
1026add (aio_req grp, ...) 1097add (aio_req grp, ...)
… …
1081void 1152void
1082feed (aio_req grp, SV *callback=&PL_sv_undef) 1153feed (aio_req grp, SV *callback=&PL_sv_undef)
1083 CODE: 1154 CODE:
1084{ 1155{
1085 SvREFCNT_dec (grp->sv2); 1156 SvREFCNT_dec (grp->sv2);
1086 grp->sv2 = newSVsv (callback); 1157 grp->sv2 = newSVsv (callback);
1158 grp->feed = aio_grp_feed;
1087 1159
1088 if (grp->int2 <= 0) 1160 if (grp->int2 <= 0)
1089 grp->int2 = 2; 1161 grp->int2 = 2;
1090 1162
1091 eio_grp_limit (grp, grp->int2); 1163 eio_grp_limit (grp, grp->int2);

Diff Legend

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