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.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.129 by root, Tue Sep 30 17:03:53 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)
… …
101#include "libeio/eio.c" 125#include "libeio/eio.c"
102 126
103typedef eio_req *aio_req; 127typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 128typedef eio_req *aio_req_ornot;
105 129
106static unsigned int max_outstanding = 0x7fffffff; 130static SV *on_next_submit;
107 131static int next_pri = EIO_PRI_DEFAULT;
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 132static int max_outstanding;
109 133
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 134static int respipe_osf [2], respipe [2] = { -1, -1 };
111 135
112static void req_destroy (aio_req req); 136static void req_destroy (aio_req req);
113static void req_cancel (aio_req req); 137static void req_cancel (aio_req req);
… …
166 FREETMPS; 190 FREETMPS;
167 LEAVE; 191 LEAVE;
168 } 192 }
169} 193}
170 194
195static void req_submit (eio_req *req)
196{
197 eio_submit (req);
198
199 if (expect_false (on_next_submit))
200 {
201 dSP;
202 SV *cb = sv_2mortal (on_next_submit);
203
204 on_next_submit = 0;
205
206 PUSHMARK (SP);
207 PUTBACK;
208 call_sv (cb, G_DISCARD | G_EVAL);
209 }
210}
211
171static int req_invoke (eio_req *req) 212static int req_invoke (eio_req *req)
172{ 213{
173 dSP; 214 dSP;
174 215
175 if (req->flags & FLAG_SV2_RO_OFF) 216 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 217 SvREADONLY_off (req->sv2);
177 218
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 219 if (!EIO_CANCELLED (req) && req->callback)
179 { 220 {
180 ENTER; 221 ENTER;
181 SAVETMPS; 222 SAVETMPS;
182 PUSHMARK (SP); 223 PUSHMARK (SP);
183 EXTEND (SP, 1); 224 EXTEND (SP, 1);
… …
260 case EIO_BUSY: 301 case EIO_BUSY:
261 break; 302 break;
262 303
263 case EIO_READLINK: 304 case EIO_READLINK:
264 if (req->result > 0) 305 if (req->result > 0)
265 { 306 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; 307 break;
271 308
272 case EIO_STAT: 309 case EIO_STAT:
273 case EIO_LSTAT: 310 case EIO_LSTAT:
274 case EIO_FSTAT: 311 case EIO_FSTAT:
… …
394 X_UNLOCK (reslock); 431 X_UNLOCK (reslock);
395 432
396 if (size) 433 if (size)
397 return; 434 return;
398 435
399 maybe_start_thread (); 436 etp_maybe_start_thread ();
400 437
401 FD_ZERO (&rfd); 438 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 439 FD_SET (respipe [0], &rfd);
403 440
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 441 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 442 }
406} 443}
407 444
408static int poll_cb (void) 445static int poll_cb (void)
409{ 446{
447 for (;;)
448 {
410 int res = eio_poll (); 449 int res = eio_poll ();
411 450
412 if (res > 0) 451 if (res > 0)
413 croak (0); 452 croak (0);
414 453
454 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 455 return res;
456
457 poll_wait ();
458 }
459}
460
461static void atfork_child (void)
462{
463 create_respipe ();
464}
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;
416} 482}
417 483
418#define dREQ \ 484#define dREQ \
485 SV *cb_cv; \
419 aio_req req; \ 486 aio_req req; \
420 int req_pri = next_pri; \ 487 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 488 next_pri = EIO_PRI_DEFAULT; \
422 \ 489 \
423 if (SvOK (callback) && !SvROK (callback)) \ 490 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 491 \
426 Newz (0, req, 1, eio_req); \ 492 Newz (0, req, 1, eio_req); \
427 if (!req) \ 493 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 494 croak ("out of memory during eio_req allocation"); \
429 \ 495 \
430 req->callback = newSVsv (callback); \ 496 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 497 req->pri = req_pri
432 498
433#define REQ_SEND \ 499#define REQ_SEND \
500 PUTBACK; \
434 eio_submit (req); \ 501 req_submit (req); \
502 SPAGAIN; \
435 \ 503 \
436 if (GIMME_V != G_VOID) \ 504 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 505 XPUSHs (req_sv (req, AIO_REQ_KLASS));
438 506
439MODULE = IO::AIO PACKAGE = IO::AIO 507MODULE = IO::AIO PACKAGE = IO::AIO
… …
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 515 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 516 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 517 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 518 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 519 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452#ifdef _WIN32 520#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock);
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 521 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#endif 522#endif
464 523
465 create_respipe (); 524 create_respipe ();
466 525
467 if (eio_init (want_poll, done_poll) < 0) 526 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 527 croak ("IO::AIO: unable to initialise eio library");
528
529 /* atfork child called in fifo order, so before eio's handler */
530 X_THREAD_ATFORK (0, 0, atfork_child);
469} 531}
470 532
471void 533void
472max_poll_reqs (int nreqs) 534max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 535 PROTOTYPE: $
… …
630 PPCODE: 692 PPCODE:
631{ 693{
632 SV *data; 694 SV *data;
633 dREQ; 695 dREQ;
634 696
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 697 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 698 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 699 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 700
644 REQ_SEND; 701 REQ_SEND;
645} 702}
646 703
647void 704void
… …
685 aio_lstat = EIO_LSTAT 742 aio_lstat = EIO_LSTAT
686 PPCODE: 743 PPCODE:
687{ 744{
688 dREQ; 745 dREQ;
689 746
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 747 req->sv1 = newSVsv (fh_or_path);
699 748
700 if (SvPOK (fh_or_path)) 749 if (SvPOK (req->sv1))
701 { 750 {
702 req->type = ix; 751 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 752 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 753 }
705 else 754 else
… …
719 768
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 769 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 770 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 771 req->sv1 = newSVsv (fh_or_path);
723 772
724 if (SvPOK (fh_or_path)) 773 if (SvPOK (req->sv1))
725 { 774 {
726 req->type = EIO_UTIME; 775 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 776 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 777 }
729 else 778 else
… …
742 dREQ; 791 dREQ;
743 792
744 req->sv1 = newSVsv (fh_or_path); 793 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 794 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 795
747 if (SvPOK (fh_or_path)) 796 if (SvPOK (req->sv1))
748 { 797 {
749 req->type = EIO_TRUNCATE; 798 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 799 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 800 }
752 else 801 else
… …
760 809
761void 810void
762aio_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)
763 ALIAS: 812 ALIAS:
764 aio_chmod = EIO_CHMOD 813 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 814 aio_mkdir = EIO_MKDIR
767 PPCODE: 815 PPCODE:
768{ 816{
769 dREQ; 817 dREQ;
770 818
771 req->type = ix;
772 req->int2 = mode; 819 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 820 req->sv1 = newSVsv (fh_or_path);
774 821
775 if (ix == EIO_FCHMOD) 822 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 823 {
824 req->type = ix;
825 req->ptr1 = SvPVbyte_nolen (req->sv1);
826 }
777 else 827 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 828 {
829 req->type = EIO_FCHMOD;
830 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
831 }
779 832
780 REQ_SEND; 833 REQ_SEND;
781} 834}
782 835
783void 836void
… …
788 841
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 842 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 843 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 844 req->sv1 = newSVsv (fh_or_path);
792 845
793 if (SvPOK (fh_or_path)) 846 if (SvPOK (req->sv1))
794 { 847 {
795 req->type = EIO_CHOWN; 848 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 849 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 850 }
798 else 851 else
… …
874{ 927{
875 dREQ; 928 dREQ;
876 929
877 req->type = EIO_GROUP; 930 req->type = EIO_GROUP;
878 931
879 eio_submit (req); 932 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 933 XPUSHs (req_sv (req, AIO_GRP_KLASS));
881} 934}
882 935
883void 936void
884aio_nop (SV *callback=&PL_sv_undef) 937aio_nop (SV *callback=&PL_sv_undef)
… …
896 949
897int 950int
898aioreq_pri (int pri = 0) 951aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 952 PROTOTYPE: ;$
900 CODE: 953 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 954 RETVAL = next_pri;
902 if (items > 0) 955 if (items > 0)
903 { 956 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 957 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 958 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 959 next_pri = pri;
907 } 960 }
908 OUTPUT: 961 OUTPUT:
909 RETVAL 962 RETVAL
910 963
911void 964void
912aioreq_nice (int nice = 0) 965aioreq_nice (int nice = 0)
913 CODE: 966 CODE:
914 nice = next_pri - nice; 967 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 968 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 969 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 970 next_pri = nice;
918 971
919void 972void
920flush () 973flush ()
921 PROTOTYPE: 974 PROTOTYPE:
922 CODE: 975 CODE:
923 while (nreqs) 976 while (eio_nreqs ())
924 { 977 {
925 poll_wait (); 978 poll_wait ();
926 poll_cb (); 979 poll_cb ();
927 } 980 }
928 981
… …
983 1036
984int 1037int
985nthreads() 1038nthreads()
986 PROTOTYPE: 1039 PROTOTYPE:
987 CODE: 1040 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1041 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1042 OUTPUT:
992 RETVAL 1043 RETVAL
993 1044
1045void _on_next_submit (SV *cb)
1046 CODE:
1047 SvREFCNT_dec (on_next_submit);
1048 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1049
994PROTOTYPES: DISABLE 1050PROTOTYPES: DISABLE
995 1051
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1052MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1053
998void 1054void
… …
1000 CODE: 1056 CODE:
1001 eio_cancel (req); 1057 eio_cancel (req);
1002 1058
1003void 1059void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1060cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 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
1006 SvREFCNT_dec (req->callback); 1070 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1071 req->callback = SvREFCNT_inc (cb_cv);
1072 }
1073}
1008 1074
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1075MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1076
1011void 1077void
1012add (aio_req grp, ...) 1078add (aio_req grp, ...)

Diff Legend

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