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

Diff Legend

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