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.121 by root, Tue May 13 18:50:27 2008 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 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"
… …
86 SV *callback; \ 105 SV *callback; \
87 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
88 STRLEN stroffset; \ 107 STRLEN stroffset; \
89 SV *self; 108 SV *self;
90 109
110#define EIO_NO_WRAPPERS 1
111
91#include "libeio/eio.h" 112#include "libeio/eio.h"
92 113
93static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
94#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
95static void aio_grp_feed (eio_req *grp);
96#define EIO_FEED(req) aio_grp_feed (req)
97static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
98#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
99 118
100enum { 119enum {
101 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
173 192
174static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
175{ 194{
176 eio_submit (req); 195 eio_submit (req);
177 196
178 if (on_next_submit) 197 if (expect_false (on_next_submit))
179 { 198 {
180 dSP; 199 dSP;
181 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
182 201
183 on_next_submit = 0; 202 on_next_submit = 0;
… …
193 dSP; 212 dSP;
194 213
195 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
196 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
197 216
198 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
199 { 218 {
200 ENTER; 219 ENTER;
201 SAVETMPS; 220 SAVETMPS;
202 PUSHMARK (SP); 221 PUSHMARK (SP);
203 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
410 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
411 430
412 if (size) 431 if (size)
413 return; 432 return;
414 433
415 maybe_start_thread (); 434 etp_maybe_start_thread ();
416 435
417 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
419 438
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 440 }
422} 441}
423 442
424static int poll_cb (void) 443static int poll_cb (void)
425{ 444{
426 int res; 445 for (;;)
427
428 do
429 { 446 {
430 res = eio_poll (); 447 int res = eio_poll ();
431 448
432 if (res > 0) 449 if (res > 0)
433 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
434 } 456 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 457}
439 458
440static void atfork_child (void) 459static void atfork_child (void)
441{ 460{
442 create_respipe (); 461 create_respipe ();
443} 462}
444 463
464static SV *
465get_cb (SV *cb_sv)
466{
467 HV *st;
468 GV *gvp;
469 CV *cv;
470
471 if (!SvOK (cb_sv))
472 return 0;
473
474 cv = sv_2cv (cb_sv, &st, &gvp, 0);
475
476 if (!cv)
477 croak ("IO::AIO callback must be undef or a CODE reference");
478
479 return (SV *)cv;
480}
481
445#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
446 aio_req req; \ 484 aio_req req; \
447 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
448 next_pri = EIO_PRI_DEFAULT; \ 486 next_pri = EIO_PRI_DEFAULT; \
449 \ 487 \
450 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 489 \
453 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
454 if (!req) \ 491 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
456 \ 493 \
457 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 495 req->pri = req_pri
459 496
460#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
461 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
462 \ 501 \
463 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 504
505static int
506extract_fd (SV *fh, int wr)
507{
508 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
509
510 if (fd < 0)
511 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
512
513 return fd;
514}
515
466MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
467 517
468PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
469 519
470BOOT: 520BOOT:
… …
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
479#ifdef _WIN32 529#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock);
481 X_MUTEX_CHECK (reslock);
482 X_MUTEX_CHECK (reqlock);
483 X_MUTEX_CHECK (reqwait);
484 X_MUTEX_CHECK (preadwritelock);
485 X_MUTEX_CHECK (readdirlock);
486
487 X_COND_CHECK (reqwait);
488#else
489 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
490#endif 531#endif
532 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
533 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
534 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
535 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
491 536
492 create_respipe (); 537 create_respipe ();
493 538
494 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
556 ALIAS: 601 ALIAS:
557 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 604 PPCODE:
560{ 605{
606 int fd = extract_fd (fh, 0);
561 dREQ; 607 dREQ;
562 608
563 req->type = ix; 609 req->type = ix;
564 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 611 req->int1 = fd;
612
613 REQ_SEND (req);
614}
615
616void
617aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
618 PROTOTYPE: $$$$;$
619 PPCODE:
620{
621 int fd = extract_fd (fh, 0);
622 dREQ;
623
624 req->type = EIO_SYNC_FILE_RANGE;
625 req->sv1 = newSVsv (fh);
626 req->int1 = fd;
627 req->offs = SvVAL64 (offset);
628 req->size = SvVAL64 (nbytes);
629 req->int2 = flags;
566 630
567 REQ_SEND (req); 631 REQ_SEND (req);
568} 632}
569 633
570void 634void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
573 PPCODE: 637 PPCODE:
574{ 638{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 639 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
640 int fd = extract_fd (fh, 0);
576 dREQ; 641 dREQ;
577 642
578 if (close_pipe < 0) 643 if (close_pipe < 0)
579 { 644 {
580 int pipefd [2]; 645 int pipefd [2];
… …
588 } 653 }
589 654
590 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 656 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
594 659
595 REQ_SEND (req); 660 REQ_SEND (req);
596} 661}
597 662
598void 663void
… …
604 PPCODE: 669 PPCODE:
605{ 670{
606 STRLEN svlen; 671 STRLEN svlen;
607 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 673 UV len = SvUV (length);
674 int fd;
675
676 if (SvTYPE (data) > SVt_PVMG)
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
609 678
610 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data); 680 SvPOK_only (data);
612 681
613 if (dataoffset < 0) 682 if (dataoffset < 0)
614 dataoffset += svlen; 683 dataoffset += svlen;
615 684
616 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
629 } 698 }
630 699
631 if (len < 0) 700 if (len < 0)
632 croak ("length must not be negative"); 701 croak ("length must not be negative");
633 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
634 { 705 {
635 dREQ; 706 dREQ;
636 707
637 req->type = ix; 708 req->type = ix;
638 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 712 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
672void 742void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 743aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
675 PPCODE: 745 PPCODE:
676{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
677 dREQ; 749 dREQ;
678 750
679 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
685 req->size = length; 757 req->size = length;
686 758
687 REQ_SEND; 759 REQ_SEND;
688} 760}
… …
690void 762void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 763aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
693 PPCODE: 765 PPCODE:
694{ 766{
767 int fd = extract_fd (fh, 0);
695 dREQ; 768 dREQ;
696 769
697 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
701 req->size = length; 774 req->size = length;
702 775
703 REQ_SEND; 776 REQ_SEND;
704} 777}
… …
895{ 968{
896 dREQ; 969 dREQ;
897 970
898 req->type = EIO_GROUP; 971 req->type = EIO_GROUP;
899 972
900 eio_submit (req); 973 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 974 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 975}
903 976
904void 977void
905aio_nop (SV *callback=&PL_sv_undef) 978aio_nop (SV *callback=&PL_sv_undef)
… …
1004 1077
1005int 1078int
1006nthreads() 1079nthreads()
1007 PROTOTYPE: 1080 PROTOTYPE:
1008 CODE: 1081 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1082 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1083 OUTPUT:
1013 RETVAL 1084 RETVAL
1014 1085
1015void _on_next_submit (SV *cb) 1086void _on_next_submit (SV *cb)
1016 CODE: 1087 CODE:
… …
1026 CODE: 1097 CODE:
1027 eio_cancel (req); 1098 eio_cancel (req);
1028 1099
1029void 1100void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1102 PPCODE:
1103{
1104 if (GIMME_V != G_VOID)
1105 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1106
1107 if (items > 1)
1108 {
1109 SV *cb_cv = get_cb (callback);
1110
1032 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1034 1115
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1117
1037void 1118void
1038add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1093void 1174void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1176 CODE:
1096{ 1177{
1097 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1099 1181
1100 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1183 grp->int2 = 2;
1102 1184
1103 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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