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.156 by root, Thu Nov 12 00:01:52 2009 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
… …
628 const_eio (DT_LNK) 565 const_eio (DT_LNK)
629 const_eio (DT_SOCK) 566 const_eio (DT_SOCK)
630 const_eio (DT_WHT) 567 const_eio (DT_WHT)
631 }; 568 };
632 569
633 stash = gv_stashpv ("IO::AIO", 1); 570 aio_stash = gv_stashpv ("IO::AIO" , 1);
571 aio_req_stash = gv_stashpv ("IO::AIO::REQ", 1);
572 aio_grp_stash = gv_stashpv ("IO::AIO::GRP", 1);
634 573
635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 574 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 575 newCONSTSUB (aio_stash, (char *)civ->name, newSViv (civ->iv));
637 576
638 create_respipe (); 577 create_respipe ();
639 578
640 if (eio_init (want_poll, done_poll) < 0) 579 if (eio_init (want_poll, done_poll) < 0)
641 croak ("IO::AIO: unable to initialise eio library"); 580 croak ("IO::AIO: unable to initialise eio library");
… …
702 ALIAS: 641 ALIAS:
703 aio_fsync = EIO_FSYNC 642 aio_fsync = EIO_FSYNC
704 aio_fdatasync = EIO_FDATASYNC 643 aio_fdatasync = EIO_FDATASYNC
705 PPCODE: 644 PPCODE:
706{ 645{
707 int fd = extract_fd (fh, 0); 646 int fd = s_fileno_croak (fh, 0);
708 dREQ; 647 dREQ;
709 648
710 req->type = ix; 649 req->type = ix;
711 req->sv1 = newSVsv (fh); 650 req->sv1 = newSVsv (fh);
712 req->int1 = fd; 651 req->int1 = fd;
… …
717void 656void
718aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef) 657aio_sync_file_range (SV *fh, off_t offset, size_t nbytes, UV flags, SV *callback=&PL_sv_undef)
719 PROTOTYPE: $$$$;$ 658 PROTOTYPE: $$$$;$
720 PPCODE: 659 PPCODE:
721{ 660{
722 int fd = extract_fd (fh, 0); 661 int fd = s_fileno_croak (fh, 0);
723 dREQ; 662 dREQ;
724 663
725 req->type = EIO_SYNC_FILE_RANGE; 664 req->type = EIO_SYNC_FILE_RANGE;
726 req->sv1 = newSVsv (fh); 665 req->sv1 = newSVsv (fh);
727 req->int1 = fd; 666 req->int1 = fd;
… …
736aio_close (SV *fh, SV *callback=&PL_sv_undef) 675aio_close (SV *fh, SV *callback=&PL_sv_undef)
737 PROTOTYPE: $;$ 676 PROTOTYPE: $;$
738 PPCODE: 677 PPCODE:
739{ 678{
740 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 679 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
741 int fd = extract_fd (fh, 0); 680 int fd = s_fileno_croak (fh, 0);
742 dREQ; 681 dREQ;
743 682
744 if (close_pipe < 0) 683 if (close_pipe < 0)
745 { 684 {
746 int pipefd [2]; 685 int pipefd [2];
… …
768 aio_write = EIO_WRITE 707 aio_write = EIO_WRITE
769 PROTOTYPE: $$$$$;$ 708 PROTOTYPE: $$$$$;$
770 PPCODE: 709 PPCODE:
771{ 710{
772 STRLEN svlen; 711 STRLEN svlen;
773 int fd = extract_fd (fh, ix == EIO_WRITE); 712 int fd = s_fileno_croak (fh, ix == EIO_WRITE);
774 char *svptr = SvPVbyte (data, svlen); 713 char *svptr = SvPVbyte (data, svlen);
775 UV len = SvUV (length); 714 UV len = SvUV (length);
776 715
777 if (dataoffset < 0) 716 if (dataoffset < 0)
778 dataoffset += svlen; 717 dataoffset += svlen;
… …
833void 772void
834aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef) 773aio_sendfile (SV *out_fh, SV *in_fh, off_t in_offset, size_t length, SV *callback=&PL_sv_undef)
835 PROTOTYPE: $$$$;$ 774 PROTOTYPE: $$$$;$
836 PPCODE: 775 PPCODE:
837{ 776{
838 int ifd = extract_fd (in_fh , 0); 777 int ifd = s_fileno_croak (in_fh , 0);
839 int ofd = extract_fd (out_fh, 0); 778 int ofd = s_fileno_croak (out_fh, 1);
840 dREQ; 779 dREQ;
841 780
842 req->type = EIO_SENDFILE; 781 req->type = EIO_SENDFILE;
843 req->sv1 = newSVsv (out_fh); 782 req->sv1 = newSVsv (out_fh);
844 req->int1 = ofd; 783 req->int1 = ofd;
… …
853void 792void
854aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef) 793aio_readahead (SV *fh, off_t offset, size_t length, SV *callback=&PL_sv_undef)
855 PROTOTYPE: $$$;$ 794 PROTOTYPE: $$$;$
856 PPCODE: 795 PPCODE:
857{ 796{
858 int fd = extract_fd (fh, 0); 797 int fd = s_fileno_croak (fh, 0);
859 dREQ; 798 dREQ;
860 799
861 req->type = EIO_READAHEAD; 800 req->type = EIO_READAHEAD;
862 req->sv1 = newSVsv (fh); 801 req->sv1 = newSVsv (fh);
863 req->int1 = fd; 802 req->int1 = fd;
… …
1077 dREQ; 1016 dREQ;
1078 1017
1079 req->type = EIO_GROUP; 1018 req->type = EIO_GROUP;
1080 1019
1081 req_submit (req); 1020 req_submit (req);
1082 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1021 XPUSHs (req_sv (req, aio_grp_stash));
1083} 1022}
1084 1023
1085void 1024void
1086aio_nop (SV *callback=&PL_sv_undef) 1025aio_nop (SV *callback=&PL_sv_undef)
1087 ALIAS: 1026 ALIAS:
… …
1139 1078
1140int 1079int
1141poll_fileno() 1080poll_fileno()
1142 PROTOTYPE: 1081 PROTOTYPE:
1143 CODE: 1082 CODE:
1144 RETVAL = respipe [0]; 1083 RETVAL = s_epipe_fd (&respipe);
1145 OUTPUT: 1084 OUTPUT:
1146 RETVAL 1085 RETVAL
1147 1086
1148int 1087int
1149poll_cb(...) 1088poll_cb(...)
… …
1230 if (GIMME_V != G_VOID) 1169 if (GIMME_V != G_VOID)
1231 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef); 1170 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1232 1171
1233 if (items > 1) 1172 if (items > 1)
1234 { 1173 {
1235 SV *cb_cv = get_cb (callback); 1174 SV *cb_cv =get_cb (callback);
1236 1175
1237 SvREFCNT_dec (req->callback); 1176 SvREFCNT_dec (req->callback);
1238 req->callback = SvREFCNT_inc (cb_cv); 1177 req->callback = SvREFCNT_inc (cb_cv);
1239 } 1178 }
1240} 1179}

Diff Legend

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