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.150 by root, Wed Jul 1 08:11:24 2009 UTC vs.
Revision 1.158 by root, Sat Jan 2 14:11:32 2010 UTC

… …
3#include <errno.h> 3#include <errno.h>
4 4
5#include "EXTERN.h" 5#include "EXTERN.h"
6#include "perl.h" 6#include "perl.h"
7#include "XSUB.h" 7#include "XSUB.h"
8
9#include "schmorp.h"
8 10
9#include <stddef.h> 11#include <stddef.h>
10#include <stdlib.h> 12#include <stdlib.h>
11#include <errno.h> 13#include <errno.h>
12#include <sys/types.h> 14#include <sys/types.h>
… …
97#define expect_false(expr) expect ((expr) != 0, 0) 99#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1) 100#define expect_true(expr) expect ((expr) != 0, 1)
99 101
100/*****************************************************************************/ 102/*****************************************************************************/
101 103
102static HV *stash;
103typedef SV SV8; /* byte-sv, used for argument-checking */ 104typedef SV SV8; /* byte-sv, used for argument-checking */
104typedef int aio_rfd; /* read file desriptor */ 105typedef int aio_rfd; /* read file desriptor */
105typedef int aio_wfd; /* write file descriptor */ 106typedef int aio_wfd; /* write file descriptor */
106 107
107#define AIO_REQ_KLASS "IO::AIO::REQ" 108static HV *aio_stash, *aio_req_stash, *aio_grp_stash;
108#define AIO_GRP_KLASS "IO::AIO::GRP"
109 109
110#define EIO_REQ_MEMBERS \ 110#define EIO_REQ_MEMBERS \
111 SV *callback; \ 111 SV *callback; \
112 SV *sv1, *sv2; \ 112 SV *sv1, *sv2; \
113 STRLEN stroffset; \ 113 STRLEN stroffset; \
… …
158 158
159static SV *on_next_submit; 159static SV *on_next_submit;
160static int next_pri = EIO_PRI_DEFAULT; 160static int next_pri = EIO_PRI_DEFAULT;
161static int max_outstanding; 161static int max_outstanding;
162 162
163static int respipe_osf [2], respipe [2] = { -1, -1 }; 163static s_epipe respipe;
164 164
165static void req_destroy (aio_req req); 165static void req_destroy (aio_req req);
166static void req_cancel (aio_req req); 166static void req_cancel (aio_req req);
167 167
168static void want_poll (void) 168static void want_poll (void)
169{ 169{
170 /* write a dummy byte to the pipe so fh becomes ready */ 170 /* write a dummy byte to the pipe so fh becomes ready */
171 respipe_write (respipe_osf [1], (const void *)&respipe_osf, 1); 171 s_epipe_signal (&respipe);
172} 172}
173 173
174static void done_poll (void) 174static void done_poll (void)
175{ 175{
176 /* read any signals sent by the worker threads */ 176 /* read any signals sent by the worker threads */
177 char buf [4]; 177 s_epipe_drain (&respipe);
178 while (respipe_read (respipe [0], buf, 4) == 4)
179 ;
180} 178}
181 179
182/* must be called at most once */ 180/* must be called at most once */
183static SV *req_sv (aio_req req, const char *klass) 181static SV *req_sv (aio_req req, HV *stash)
184{ 182{
185 if (!req->self) 183 if (!req->self)
186 { 184 {
187 req->self = (SV *)newHV (); 185 req->self = (SV *)newHV ();
188 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0); 186 sv_magic (req->self, 0, PERL_MAGIC_ext, (char *)req, 0);
189 } 187 }
190 188
191 return sv_2mortal (sv_bless (newRV_inc (req->self), gv_stashpv (klass, 1))); 189 return sv_2mortal (sv_bless (newRV_inc (req->self), stash));
192} 190}
193 191
194static aio_req SvAIO_REQ (SV *sv) 192static aio_req SvAIO_REQ (SV *sv)
195{ 193{
196 MAGIC *mg; 194 MAGIC *mg;
197 195
198 if (!sv_derived_from (sv, AIO_REQ_KLASS) || !SvROK (sv)) 196 if (!SvROK (sv)
197 || (SvSTASH (SvRV (sv)) != aio_grp_stash
198 && SvSTASH (SvRV (sv)) != aio_req_stash
199 && !sv_derived_from (sv, "IO::AIO::REQ")))
199 croak ("object of class " AIO_REQ_KLASS " expected"); 200 croak ("object of class IO::AIO::REQ expected");
200 201
201 mg = mg_find (SvRV (sv), PERL_MAGIC_ext); 202 mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
202 203
203 return mg ? (aio_req)mg->mg_ptr : 0; 204 return mg ? (aio_req)mg->mg_ptr : 0;
204} 205}
… …
210 dSP; 211 dSP;
211 212
212 ENTER; 213 ENTER;
213 SAVETMPS; 214 SAVETMPS;
214 PUSHMARK (SP); 215 PUSHMARK (SP);
215 XPUSHs (req_sv (grp, AIO_GRP_KLASS)); 216 XPUSHs (req_sv (grp, aio_grp_stash));
216 PUTBACK; 217 PUTBACK;
217 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR); 218 call_sv (grp->sv2, G_VOID | G_EVAL | G_KEEPERR);
218 SPAGAIN; 219 SPAGAIN;
219 FREETMPS; 220 FREETMPS;
220 LEAVE; 221 LEAVE;
… …
326 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR); 327 int flags = req->int1 & (O_RDONLY | O_WRONLY | O_RDWR);
327 char sym [64]; 328 char sym [64];
328 int symlen; 329 int symlen;
329 330
330 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result); 331 symlen = snprintf (sym, sizeof (sym), "fd#%d", (int)req->result);
331 gv_init (gv, stash, sym, symlen, 0); 332 gv_init (gv, aio_stash, sym, symlen, 0);
332 333
333 symlen = snprintf ( 334 symlen = snprintf (
334 sym, 335 sym,
335 sizeof (sym), 336 sizeof (sym),
336 "%s&=%d", 337 "%s&=%d",
… …
439 grp->sv2 = 0; 440 grp->sv2 = 0;
440 441
441 eio_grp_cancel (grp); 442 eio_grp_cancel (grp);
442} 443}
443 444
444#ifdef USE_SOCKETS_AS_HANDLES
445# define TO_SOCKET(x) (win32_get_osfhandle (x))
446#else
447# define TO_SOCKET(x) (x)
448#endif
449
450static void 445static void
451create_respipe (void) 446create_respipe (void)
452{ 447{
453 int old_readfd = respipe [0];
454
455 if (respipe [1] >= 0)
456 respipe_close (TO_SOCKET (respipe [1]));
457
458#ifdef _WIN32
459 if (PerlSock_socketpair (AF_UNIX, SOCK_STREAM, 0, respipe))
460#else
461 if (pipe (respipe)) 448 if (s_epipe_renew (&respipe))
462#endif
463 croak ("unable to initialize result pipe"); 449 croak ("IO::AIO: unable to initialize result pipe");
464
465 if (old_readfd >= 0)
466 {
467 if (dup2 (TO_SOCKET (respipe [0]), TO_SOCKET (old_readfd)) < 0)
468 croak ("unable to initialize result pipe(2)");
469
470 respipe_close (respipe [0]);
471 respipe [0] = old_readfd;
472 }
473
474#ifdef _WIN32
475 int arg = 1;
476 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
477 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
478#else
479 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
480 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
481#endif
482 croak ("unable to initialize result pipe(3)");
483
484 respipe_osf [0] = TO_SOCKET (respipe [0]);
485 respipe_osf [1] = TO_SOCKET (respipe [1]);
486} 450}
487 451
488static void poll_wait (void) 452static void poll_wait (void)
489{ 453{
490 fd_set rfd;
491
492 while (eio_nreqs ()) 454 while (eio_nreqs ())
493 { 455 {
494 int size; 456 int size;
495 457
496 X_LOCK (reslock); 458 X_LOCK (reslock);
… …
500 if (size) 462 if (size)
501 return; 463 return;
502 464
503 etp_maybe_start_thread (); 465 etp_maybe_start_thread ();
504 466
505 FD_ZERO (&rfd); 467 s_epipe_wait (&respipe);
506 FD_SET (respipe [0], &rfd);
507
508 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
509 } 468 }
510} 469}
511 470
512static int poll_cb (void) 471static int poll_cb (void)
513{ 472{
… …
531} 490}
532 491
533static SV * 492static SV *
534get_cb (SV *cb_sv) 493get_cb (SV *cb_sv)
535{ 494{
536 HV *st; 495 SvGETMAGIC (cb_sv);
537 GV *gvp; 496 return SvOK (cb_sv) ? s_get_cv_croak (cb_sv) : 0;
538 CV *cv;
539
540 if (!SvOK (cb_sv))
541 return 0;
542
543 cv = sv_2cv (cb_sv, &st, &gvp, 0);
544
545 if (!cv)
546 croak ("IO::AIO callback must be undef or a CODE reference");
547
548 return (SV *)cv;
549} 497}
550 498
551#define dREQ \ 499#define dREQ \
552 SV *cb_cv; \ 500 SV *cb_cv; \
553 aio_req req; \ 501 aio_req req; \
… …
567 PUTBACK; \ 515 PUTBACK; \
568 req_submit (req); \ 516 req_submit (req); \
569 SPAGAIN; \ 517 SPAGAIN; \
570 \ 518 \
571 if (GIMME_V != G_VOID) \ 519 if (GIMME_V != G_VOID) \
572 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 520 XPUSHs (req_sv (req, aio_req_stash));
573
574static int
575extract_fd (SV *fh, int wr)
576{
577 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
578
579 if (fd < 0)
580 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
581
582 return fd;
583}
584 521
585MODULE = IO::AIO PACKAGE = IO::AIO 522MODULE = IO::AIO PACKAGE = IO::AIO
586 523
587PROTOTYPES: ENABLE 524PROTOTYPES: ENABLE
588 525
… …
608 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM) 545 const_iv (FADV_RANDOM , POSIX_FADV_RANDOM)
609 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE) 546 const_iv (FADV_NOREUSE , POSIX_FADV_NOREUSE)
610 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED) 547 const_iv (FADV_WILLNEED , POSIX_FADV_WILLNEED)
611 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED) 548 const_iv (FADV_DONTNEED , POSIX_FADV_DONTNEED)
612 549
550 const_eio (MS_ASYNC)
551 const_eio (MS_INVALIDATE)
552 const_eio (MS_SYNC)
553
554 const_eio (MT_MODIFY)
555
613 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE) 556 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
614 const_eio (SYNC_FILE_RANGE_WRITE) 557 const_eio (SYNC_FILE_RANGE_WRITE)
615 const_eio (SYNC_FILE_RANGE_WAIT_AFTER) 558 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
616 559
617 const_eio (READDIR_DENTS) 560 const_eio (READDIR_DENTS)
… …
628 const_eio (DT_LNK) 571 const_eio (DT_LNK)
629 const_eio (DT_SOCK) 572 const_eio (DT_SOCK)
630 const_eio (DT_WHT) 573 const_eio (DT_WHT)
631 }; 574 };
632 575
633 stash = gv_stashpv ("IO::AIO", 1); 576 aio_stash = gv_stashpv ("IO::AIO" , 1);
577 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
578 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
634 579
635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 580 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 581 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
637 582
638 create_respipe (); 583 create_respipe ();
639 584
640 if (eio_init (want_poll, done_poll) < 0) 585 if (eio_init (want_poll, done_poll) < 0)
641 croak ("IO::AIO: unable to initialise eio library"); 586 croak ("IO::AIO: unable to initialise eio library");
… …
702 ALIAS: 647 ALIAS:
703 aio_fsync = EIO_FSYNC 648 aio_fsync = EIO_FSYNC
704 aio_fdatasync = EIO_FDATASYNC 649 aio_fdatasync = EIO_FDATASYNC
705 PPCODE: 650 PPCODE:
706{ 651{
707 int fd = extract_fd (fh, 0); 652 int fd = s_fileno_croak (fh, 0);
708 dREQ; 653 dREQ;
709 654
710 req->type = ix; 655 req->type = ix;
711 req->sv1 = newSVsv (fh); 656 req->sv1 = newSVsv (fh);
712 req->int1 = fd; 657 req->int1 = fd;
… …
717void 662void
718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 663aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
719 PROTOTYPE: $$$$;$ 664 PROTOTYPE: $$$$;$
720 PPCODE: 665 PPCODE:
721{ 666{
722 int fd = extract_fd (fh, 0); 667 int fd = s_fileno_croak (fh, 0);
723 dREQ; 668 dREQ;
724 669
725 req->type = EIO_SYNC_FILE_RANGE; 670 req->type = EIO_SYNC_FILE_RANGE;
726 req->sv1 = newSVsv (fh); 671 req->sv1 = newSVsv (fh);
727 req->int1 = fd; 672 req->int1 = fd;
… …
736aio_close (SV *fh, SV *callback=&PL_sv_undef) 681aio_close (SV *fh, SV *callback=&PL_sv_undef)
737 PROTOTYPE: $;$ 682 PROTOTYPE: $;$
738 PPCODE: 683 PPCODE:
739{ 684{
740 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 685 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
741 int fd = extract_fd (fh, 0); 686 int fd = s_fileno_croak (fh, 0);
742 dREQ; 687 dREQ;
743 688
744 if (close_pipe < 0) 689 if (close_pipe < 0)
745 { 690 {
746 int pipefd [2]; 691 int pipefd [2];
… …
768 aio_write = EIO_WRITE 713 aio_write = EIO_WRITE
769 PROTOTYPE: $$$$$;$ 714 PROTOTYPE: $$$$$;$
770 PPCODE: 715 PPCODE:
771{ 716{
772 STRLEN svlen; 717 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE); 718 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
774 char *svptr = SvPVbyte (data, svlen); 719 char *svptr = SvPVbyte (data, svlen);
775 UV len = SvUV (length); 720 UV len = SvUV (length);
776 721
777 if (dataoffset < 0) 722 if (dataoffset < 0)
778 dataoffset += svlen; 723 dataoffset += svlen;
… …
833void 778void
834aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 779aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
835 PROTOTYPE: $$$$;$ 780 PROTOTYPE: $$$$;$
836 PPCODE: 781 PPCODE:
837{ 782{
838 int ifd = extract_fd (in_fh , 0); 783 int ifd = s_fileno_croak (in_fh , 0);
839 int ofd = extract_fd (out_fh, 0); 784 int ofd = s_fileno_croak (out_fh, 1);
840 dREQ; 785 dREQ;
841 786
842 req->type = EIO_SENDFILE; 787 req->type = EIO_SENDFILE;
843 req->sv1 = newSVsv (out_fh); 788 req->sv1 = newSVsv (out_fh);
844 req->int1 = ofd; 789 req->int1 = ofd;
… …
853void 798void
854aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 799aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
855 PROTOTYPE: $$$;$ 800 PROTOTYPE: $$$;$
856 PPCODE: 801 PPCODE:
857{ 802{
858 int fd = extract_fd (fh, 0); 803 int fd = s_fileno_croak (fh, 0);
859 dREQ; 804 dREQ;
860 805
861 req->type = EIO_READAHEAD; 806 req->type = EIO_READAHEAD;
862 req->sv1 = newSVsv (fh); 807 req->sv1 = newSVsv (fh);
863 req->int1 = fd; 808 req->int1 = fd;
… …
1056 1001
1057 REQ_SEND; 1002 REQ_SEND;
1058} 1003}
1059 1004
1060void 1005void
1006aio_mtouch (SV8 *data, IV offset = 0, SV *length = &PL_sv_undef, int flags = 0, SV *callback=&PL_sv_undef)
1007 ALIAS:
1008 aio_mtouch = EIO_MTOUCH
1009 aio_msync = EIO_MSYNC
1010 PROTOTYPE: $$$$;$
1011 PPCODE:
1012{
1013 STRLEN svlen;
1014 UV len = SvUV (length);
1015 char *svptr = SvPVbyte (data, svlen);
1016
1017 if (offset < 0)
1018 offset += svlen;
1019
1020 if (offset < 0 || offset > svlen)
1021 croak ("offset outside of scalar");
1022
1023 if (!SvOK (length) || len + offset > svlen)
1024 len = svlen - offset;
1025
1026 {
1027 dREQ;
1028
1029 req->type = ix;
1030 req->size = len;
1031 req->sv2 = SvREFCNT_inc (data);
1032 req->ptr2 = (char *)svptr + offset;
1033 req->int1 = flags;
1034
1035 REQ_SEND;
1036 }
1037}
1038
1039void
1061aio_busy (double delay, SV *callback=&PL_sv_undef) 1040aio_busy (double delay, SV *callback=&PL_sv_undef)
1062 PPCODE: 1041 PPCODE:
1063{ 1042{
1064 dREQ; 1043 dREQ;
1065 1044
… …
1077 dREQ; 1056 dREQ;
1078 1057
1079 req->type = EIO_GROUP; 1058 req->type = EIO_GROUP;
1080 1059
1081 req_submit (req); 1060 req_submit (req);
1082 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1061 XPUSHs (req_sv (req, aio_grp_stash));
1083} 1062}
1084 1063
1085void 1064void
1086aio_nop (SV *callback=&PL_sv_undef) 1065aio_nop (SV *callback=&PL_sv_undef)
1087 ALIAS: 1066 ALIAS:
… …
1139 1118
1140int 1119int
1141poll_fileno() 1120poll_fileno()
1142 PROTOTYPE: 1121 PROTOTYPE:
1143 CODE: 1122 CODE:
1144 RETVAL = respipe [0]; 1123 RETVAL = s_epipe_fd (&respipe);
1145 OUTPUT: 1124 OUTPUT:
1146 RETVAL 1125 RETVAL
1147 1126
1148int 1127int
1149poll_cb(...) 1128poll_cb(...)
… …
1205 1184
1206ssize_t 1185ssize_t
1207sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count) 1186sendfile (aio_wfd ofh, aio_rfd ifh, off_t offset, size_t count)
1208 PROTOTYPE: $$$$ 1187 PROTOTYPE: $$$$
1209 CODE: 1188 CODE:
1210 eio_sendfile_sync (ofh, ifh, offset, count); 1189 RETVAL = eio_sendfile_sync (ofh, ifh, offset, count);
1190 OUTPUT:
1191 RETVAL
1211 1192
1212void _on_next_submit (SV *cb) 1193void _on_next_submit (SV *cb)
1213 CODE: 1194 CODE:
1214 SvREFCNT_dec (on_next_submit); 1195 SvREFCNT_dec (on_next_submit);
1215 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0; 1196 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
… …
1230 if (GIMME_V != G_VOID) 1211 if (GIMME_V != G_VOID)
1231 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1212 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1232 1213
1233 if (items > 1) 1214 if (items > 1)
1234 { 1215 {
1235 SV *cb_cv = get_cb (callback); 1216 SV *cb_cv =get_cb (callback);
1236 1217
1237 SvREFCNT_dec (req->callback); 1218 SvREFCNT_dec (req->callback);
1238 req->callback = SvREFCNT_inc (cb_cv); 1219 req->callback = SvREFCNT_inc (cb_cv);
1239 } 1220 }
1240} 1221}

Diff Legend

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