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.122 by root, Tue May 13 19:35:16 2008 UTC vs.
Revision 1.140 by root, Wed Jun 3 12:24:49 2009 UTC

… …
65# include <signal.h> 65# include <signal.h>
66# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
67 67
68#endif 68#endif
69 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
70#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
71 77
72/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
73#if IVSIZE >= 8 79#if IVSIZE >= 8
74# define SvVAL64 SvIV 80# define SvVAL64 SvIV
75#else 81#else
76# define SvVAL64 SvNV 82# define SvVAL64 SvNV
77#endif 83#endif
78 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
79static HV *stash; 98static HV *stash;
80typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
81 100
82#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
83#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
… …
92 111
93#include "libeio/eio.h" 112#include "libeio/eio.h"
94 113
95static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
96#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
97static void aio_grp_feed (eio_req *grp);
98#define EIO_FEED(req) aio_grp_feed (req)
99static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
100#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
101 118
102enum { 119enum {
103 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
175 192
176static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
177{ 194{
178 eio_submit (req); 195 eio_submit (req);
179 196
180 if (on_next_submit) 197 if (expect_false (on_next_submit))
181 { 198 {
182 dSP; 199 dSP;
183 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
184 201
185 on_next_submit = 0; 202 on_next_submit = 0;
… …
195 dSP; 212 dSP;
196 213
197 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
198 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
199 216
200 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
201 { 218 {
202 ENTER; 219 ENTER;
203 SAVETMPS; 220 SAVETMPS;
204 PUSHMARK (SP); 221 PUSHMARK (SP);
205 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
295 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
296 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
297 break; 314 break;
298 315
299 case EIO_READ: 316 case EIO_READ:
317 {
300 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
301 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
302 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
303 break; 324 break;
304 325
305 case EIO_DUP2: 326 case EIO_DUP2:
306 if (req->result > 0) 327 if (req->result > 0)
307 req->result = 0; 328 req->result = 0;
… …
412 X_UNLOCK (reslock); 433 X_UNLOCK (reslock);
413 434
414 if (size) 435 if (size)
415 return; 436 return;
416 437
417 maybe_start_thread (); 438 etp_maybe_start_thread ();
418 439
419 FD_ZERO (&rfd); 440 FD_ZERO (&rfd);
420 FD_SET (respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
421 442
422 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
423 } 444 }
424} 445}
425 446
426static int poll_cb (void) 447static int poll_cb (void)
427{ 448{
428 int res; 449 for (;;)
429
430 do
431 { 450 {
432 res = eio_poll (); 451 int res = eio_poll ();
433 452
434 if (res > 0) 453 if (res > 0)
435 croak (0); 454 croak (0);
455
456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
458
459 poll_wait ();
436 } 460 }
437 while (max_outstanding && max_outstanding <= eio_nreqs ());
438
439 return res;
440} 461}
441 462
442static void atfork_child (void) 463static void atfork_child (void)
443{ 464{
444 create_respipe (); 465 create_respipe ();
445} 466}
446 467
468static SV *
469get_cb (SV *cb_sv)
470{
471 HV *st;
472 GV *gvp;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484}
485
447#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
448 aio_req req; \ 488 aio_req req; \
449 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
450 next_pri = EIO_PRI_DEFAULT; \ 490 next_pri = EIO_PRI_DEFAULT; \
451 \ 491 \
452 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
453 croak ("callback must be undef or of reference type"); \
454 \ 493 \
455 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
456 if (!req) \ 495 if (!req) \
457 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
458 \ 497 \
459 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
460 req->pri = req_pri 499 req->pri = req_pri
461 500
462#define REQ_SEND \ 501#define REQ_SEND \
502 PUTBACK; \
463 req_submit (req); \ 503 req_submit (req); \
504 SPAGAIN; \
464 \ 505 \
465 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
466 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
467 508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519
468MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
469 521
470PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
471 523
472BOOT: 524BOOT:
473{ 525{
474 stash = gv_stashpv ("IO::AIO", 1); 526 stash = gv_stashpv ("IO::AIO", 1);
475 527
476 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
529 newCONSTSUB (stash, "ENOSYS", newSViv (ENOSYS));
477 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 530 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
478 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 531 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
479 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 532 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
480 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 533 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
481#ifndef _WIN32 534#ifndef _WIN32
482 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 535 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
483#endif 536#endif
537 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
540 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
484 541
485 create_respipe (); 542 create_respipe ();
486 543
487 if (eio_init (want_poll, done_poll) < 0) 544 if (eio_init (want_poll, done_poll) < 0)
488 croak ("IO::AIO: unable to initialise eio library"); 545 croak ("IO::AIO: unable to initialise eio library");
… …
549 ALIAS: 606 ALIAS:
550 aio_fsync = EIO_FSYNC 607 aio_fsync = EIO_FSYNC
551 aio_fdatasync = EIO_FDATASYNC 608 aio_fdatasync = EIO_FDATASYNC
552 PPCODE: 609 PPCODE:
553{ 610{
611 int fd = extract_fd (fh, 0);
554 dREQ; 612 dREQ;
555 613
556 req->type = ix; 614 req->type = ix;
557 req->sv1 = newSVsv (fh); 615 req->sv1 = newSVsv (fh);
558 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 616 req->int1 = fd;
617
618 REQ_SEND (req);
619}
620
621void
622aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
623 PROTOTYPE: $$$$;$
624 PPCODE:
625{
626 int fd = extract_fd (fh, 0);
627 dREQ;
628
629 req->type = EIO_SYNC_FILE_RANGE;
630 req->sv1 = newSVsv (fh);
631 req->int1 = fd;
632 req->offs = SvVAL64 (offset);
633 req->size = SvVAL64 (nbytes);
634 req->int2 = flags;
559 635
560 REQ_SEND (req); 636 REQ_SEND (req);
561} 637}
562 638
563void 639void
564aio_close (SV *fh, SV *callback=&PL_sv_undef) 640aio_close (SV *fh, SV *callback=&PL_sv_undef)
565 PROTOTYPE: $;$ 641 PROTOTYPE: $;$
566 PPCODE: 642 PPCODE:
567{ 643{
568 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 644 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
645 int fd = extract_fd (fh, 0);
569 dREQ; 646 dREQ;
570 647
571 if (close_pipe < 0) 648 if (close_pipe < 0)
572 { 649 {
573 int pipefd [2]; 650 int pipefd [2];
… …
581 } 658 }
582 659
583 req->type = EIO_DUP2; 660 req->type = EIO_DUP2;
584 req->int1 = close_pipe; 661 req->int1 = close_pipe;
585 req->sv2 = newSVsv (fh); 662 req->sv2 = newSVsv (fh);
586 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 663 req->int2 = fd;
587 664
588 REQ_SEND (req); 665 REQ_SEND (req);
589} 666}
590 667
591void 668void
… …
595 aio_write = EIO_WRITE 672 aio_write = EIO_WRITE
596 PROTOTYPE: $$$$$;$ 673 PROTOTYPE: $$$$$;$
597 PPCODE: 674 PPCODE:
598{ 675{
599 STRLEN svlen; 676 STRLEN svlen;
677 int fd = extract_fd (fh, ix == EIO_WRITE);
600 char *svptr = SvPVbyte (data, svlen); 678 char *svptr = SvPVbyte (data, svlen);
601 UV len = SvUV (length); 679 UV len = SvUV (length);
602
603 SvUPGRADE (data, SVt_PV);
604 SvPOK_on (data);
605 680
606 if (dataoffset < 0) 681 if (dataoffset < 0)
607 dataoffset += svlen; 682 dataoffset += svlen;
608 683
609 if (dataoffset < 0 || dataoffset > svlen) 684 if (dataoffset < 0 || dataoffset > svlen)
… …
615 if (!SvOK (length) || len + dataoffset > svlen) 690 if (!SvOK (length) || len + dataoffset > svlen)
616 len = svlen - dataoffset; 691 len = svlen - dataoffset;
617 } 692 }
618 else 693 else
619 { 694 {
620 /* read: grow scalar as necessary */ 695 /* read: check type and grow scalar as necessary */
696 SvUPGRADE (data, SVt_PV);
621 svptr = SvGROW (data, len + dataoffset + 1); 697 svptr = SvGROW (data, len + dataoffset + 1);
622 } 698 }
623
624 if (len < 0)
625 croak ("length must not be negative");
626 699
627 { 700 {
628 dREQ; 701 dREQ;
629 702
630 req->type = ix; 703 req->type = ix;
631 req->sv1 = newSVsv (fh); 704 req->sv1 = newSVsv (fh);
632 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 705 req->int1 = fd;
633 : IoOFP (sv_2io (fh)));
634 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 706 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
635 req->size = len; 707 req->size = len;
636 req->sv2 = SvREFCNT_inc (data); 708 req->sv2 = SvREFCNT_inc (data);
637 req->ptr2 = (char *)svptr + dataoffset; 709 req->ptr2 = (char *)svptr + dataoffset;
638 req->stroffset = dataoffset; 710 req->stroffset = dataoffset;
… …
665void 737void
666aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 738aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$$;$ 739 PROTOTYPE: $$$$;$
668 PPCODE: 740 PPCODE:
669{ 741{
742 int ifd = extract_fd (in_fh , 0);
743 int ofd = extract_fd (out_fh, 0);
670 dREQ; 744 dREQ;
671 745
672 req->type = EIO_SENDFILE; 746 req->type = EIO_SENDFILE;
673 req->sv1 = newSVsv (out_fh); 747 req->sv1 = newSVsv (out_fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 748 req->int1 = ofd;
675 req->sv2 = newSVsv (in_fh); 749 req->sv2 = newSVsv (in_fh);
676 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 750 req->int2 = ifd;
677 req->offs = SvVAL64 (in_offset); 751 req->offs = SvVAL64 (in_offset);
678 req->size = length; 752 req->size = length;
679 753
680 REQ_SEND; 754 REQ_SEND;
681} 755}
… …
683void 757void
684aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 758aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
685 PROTOTYPE: $$$;$ 759 PROTOTYPE: $$$;$
686 PPCODE: 760 PPCODE:
687{ 761{
762 int fd = extract_fd (fh, 0);
688 dREQ; 763 dREQ;
689 764
690 req->type = EIO_READAHEAD; 765 req->type = EIO_READAHEAD;
691 req->sv1 = newSVsv (fh); 766 req->sv1 = newSVsv (fh);
692 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 767 req->int1 = fd;
693 req->offs = SvVAL64 (offset); 768 req->offs = SvVAL64 (offset);
694 req->size = length; 769 req->size = length;
695 770
696 REQ_SEND; 771 REQ_SEND;
697} 772}
… …
888{ 963{
889 dREQ; 964 dREQ;
890 965
891 req->type = EIO_GROUP; 966 req->type = EIO_GROUP;
892 967
893 eio_submit (req); 968 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 969 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 970}
896 971
897void 972void
898aio_nop (SV *callback=&PL_sv_undef) 973aio_nop (SV *callback=&PL_sv_undef)
… …
1017 CODE: 1092 CODE:
1018 eio_cancel (req); 1093 eio_cancel (req);
1019 1094
1020void 1095void
1021cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1096cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1022 CODE: 1097 PPCODE:
1098{
1099 if (GIMME_V != G_VOID)
1100 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1101
1102 if (items > 1)
1103 {
1104 SV *cb_cv = get_cb (callback);
1105
1023 SvREFCNT_dec (req->callback); 1106 SvREFCNT_dec (req->callback);
1024 req->callback = newSVsv (callback); 1107 req->callback = SvREFCNT_inc (cb_cv);
1108 }
1109}
1025 1110
1026MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1111MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1027 1112
1028void 1113void
1029add (aio_req grp, ...) 1114add (aio_req grp, ...)
… …
1084void 1169void
1085feed (aio_req grp, SV *callback=&PL_sv_undef) 1170feed (aio_req grp, SV *callback=&PL_sv_undef)
1086 CODE: 1171 CODE:
1087{ 1172{
1088 SvREFCNT_dec (grp->sv2); 1173 SvREFCNT_dec (grp->sv2);
1089 grp->sv2 = newSVsv (callback); 1174 grp->sv2 = newSVsv (callback);
1175 grp->feed = aio_grp_feed;
1090 1176
1091 if (grp->int2 <= 0) 1177 if (grp->int2 <= 0)
1092 grp->int2 = 2; 1178 grp->int2 = 2;
1093 1179
1094 eio_grp_limit (grp, grp->int2); 1180 eio_grp_limit (grp, grp->int2);

Diff Legend

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