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.117 by root, Sat May 10 20:02:09 2008 UTC vs.
Revision 1.136 by root, Sun Apr 19 13:15:55 2009 UTC

… …
12#include <sys/types.h> 12#include <sys/types.h>
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <limits.h> 14#include <limits.h>
15#include <fcntl.h> 15#include <fcntl.h>
16#include <sched.h> 16#include <sched.h>
17
18/* perl namespace pollution */
19#undef VERSION
17 20
18#ifdef _WIN32 21#ifdef _WIN32
19 22
20# define EIO_STRUCT_DIRENT Direntry_t 23# define EIO_STRUCT_DIRENT Direntry_t
21# undef malloc 24# undef malloc
… …
62# include <signal.h> 65# include <signal.h>
63# define EIO_STRUCT_DIRENT struct dirent 66# define EIO_STRUCT_DIRENT struct dirent
64 67
65#endif 68#endif
66 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
67#define EIO_STRUCT_STAT Stat_t 76#define EIO_STRUCT_STAT Stat_t
68 77
69/* use NV for 32 bit perls as it allows larger offsets */ 78/* use NV for 32 bit perls as it allows larger offsets */
70#if IVSIZE >= 8 79#if IVSIZE >= 8
71# define SvVAL64 SvIV 80# define SvVAL64 SvIV
72#else 81#else
73# define SvVAL64 SvNV 82# define SvVAL64 SvNV
74#endif 83#endif
75 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
76static HV *stash; 98static HV *stash;
77typedef SV SV8; /* byte-sv, used for argument-checking */ 99typedef SV SV8; /* byte-sv, used for argument-checking */
78 100
79#define AIO_REQ_KLASS "IO::AIO::REQ" 101#define AIO_REQ_KLASS "IO::AIO::REQ"
80#define AIO_GRP_KLASS "IO::AIO::GRP" 102#define AIO_GRP_KLASS "IO::AIO::GRP"
81 103
82#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
83 SV *callback; \ 105 SV *callback; \
84 SV *sv1, *sv2; \ 106 SV *sv1, *sv2; \
85 STRLEN stroffset; \ 107 STRLEN stroffset; \
86 SV *self 108 SV *self;
109
110#define EIO_NO_WRAPPERS 1
87 111
88#include "libeio/eio.h" 112#include "libeio/eio.h"
89 113
90static int req_invoke (eio_req *req); 114static int req_invoke (eio_req *req);
91#define EIO_FINISH(req) req_invoke (req) 115#define EIO_FINISH(req) req_invoke (req)
92static void aio_grp_feed (eio_req *grp);
93#define EIO_FEED(req) aio_grp_feed (req)
94static void req_destroy (eio_req *grp); 116static void req_destroy (eio_req *grp);
95#define EIO_DESTROY(req) req_destroy (req) 117#define EIO_DESTROY(req) req_destroy (req)
96 118
97enum { 119enum {
98 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ 120 FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */
… …
102 124
103typedef eio_req *aio_req; 125typedef eio_req *aio_req;
104typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
105 127
106static SV *on_next_submit; 128static SV *on_next_submit;
107static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
108static int max_outstanding; 130static int max_outstanding;
109 131
110static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
111 133
112static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
… …
170 192
171static void req_submit (eio_req *req) 193static void req_submit (eio_req *req)
172{ 194{
173 eio_submit (req); 195 eio_submit (req);
174 196
175 if (on_next_submit) 197 if (expect_false (on_next_submit))
176 { 198 {
177 dSP; 199 dSP;
178 SV *cb = sv_2mortal (on_next_submit); 200 SV *cb = sv_2mortal (on_next_submit);
179 201
180 on_next_submit = 0; 202 on_next_submit = 0;
… …
190 dSP; 212 dSP;
191 213
192 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
193 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
194 216
195 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
196 { 218 {
197 ENTER; 219 ENTER;
198 SAVETMPS; 220 SAVETMPS;
199 PUSHMARK (SP); 221 PUSHMARK (SP);
200 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
277 case EIO_BUSY: 299 case EIO_BUSY:
278 break; 300 break;
279 301
280 case EIO_READLINK: 302 case EIO_READLINK:
281 if (req->result > 0) 303 if (req->result > 0)
282 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
283 SvCUR_set (req->sv2, req->result);
284 *SvEND (req->sv2) = 0;
285 PUSHs (req->sv2);
286 }
287 break; 305 break;
288 306
289 case EIO_STAT: 307 case EIO_STAT:
290 case EIO_LSTAT: 308 case EIO_LSTAT:
291 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
411 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
412 430
413 if (size) 431 if (size)
414 return; 432 return;
415 433
416 maybe_start_thread (); 434 etp_maybe_start_thread ();
417 435
418 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
419 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
420 438
421 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
422 } 440 }
423} 441}
424 442
425static int poll_cb (void) 443static int poll_cb (void)
426{ 444{
427 int res; 445 for (;;)
428
429 do
430 { 446 {
431 res = eio_poll (); 447 int res = eio_poll ();
432 448
433 if (res > 0) 449 if (res > 0)
434 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
435 } 456 }
436 while (max_outstanding && max_outstanding <= eio_nreqs ());
437
438 return res;
439} 457}
440 458
441static void atfork_child (void) 459static void atfork_child (void)
442{ 460{
443 create_respipe (); 461 create_respipe ();
444} 462}
445 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
446#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
447 aio_req req; \ 484 aio_req req; \
448 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
449 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
450 \ 487 \
451 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
452 croak ("callback must be undef or of reference type"); \
453 \ 489 \
454 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
455 if (!req) \ 491 if (!req) \
456 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
457 \ 493 \
458 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
459 req->pri = req_pri 495 req->pri = req_pri
460 496
461#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
462 req_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
463 \ 501 \
464 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
465 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
466 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
467MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
468 517
469PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
470 519
471BOOT: 520BOOT:
… …
475 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
476 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
477 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
478 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
479 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
480#ifdef _WIN32 529#ifndef _WIN32
481 X_MUTEX_CHECK (wrklock);
482 X_MUTEX_CHECK (reslock);
483 X_MUTEX_CHECK (reqlock);
484 X_MUTEX_CHECK (reqwait);
485 X_MUTEX_CHECK (preadwritelock);
486 X_MUTEX_CHECK (readdirlock);
487
488 X_COND_CHECK (reqwait);
489#else
490 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
491#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));
492 536
493 create_respipe (); 537 create_respipe ();
494 538
495 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
496 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
557 ALIAS: 601 ALIAS:
558 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
559 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
560 PPCODE: 604 PPCODE:
561{ 605{
606 int fd = extract_fd (fh, 0);
562 dREQ; 607 dREQ;
563 608
564 req->type = ix; 609 req->type = ix;
565 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
566 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;
567 630
568 REQ_SEND (req); 631 REQ_SEND (req);
569} 632}
570 633
571void 634void
572aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
573 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
574 PPCODE: 637 PPCODE:
575{ 638{
576 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);
577 dREQ; 641 dREQ;
578 642
579 if (close_pipe < 0) 643 if (close_pipe < 0)
580 { 644 {
581 int pipefd [2]; 645 int pipefd [2];
… …
589 } 653 }
590 654
591 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
592 req->int1 = close_pipe; 656 req->int1 = close_pipe;
593 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
594 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
595 659
596 REQ_SEND (req); 660 REQ_SEND (req);
597} 661}
598 662
599void 663void
… …
605 PPCODE: 669 PPCODE:
606{ 670{
607 STRLEN svlen; 671 STRLEN svlen;
608 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
609 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));
610 678
611 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
612 SvPOK_on (data); 680 SvPOK_only (data);
613 681
614 if (dataoffset < 0) 682 if (dataoffset < 0)
615 dataoffset += svlen; 683 dataoffset += svlen;
616 684
617 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
630 } 698 }
631 699
632 if (len < 0) 700 if (len < 0)
633 croak ("length must not be negative"); 701 croak ("length must not be negative");
634 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
635 { 705 {
636 dREQ; 706 dREQ;
637 707
638 req->type = ix; 708 req->type = ix;
639 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
640 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
641 : IoOFP (sv_2io (fh)));
642 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
643 req->size = len; 712 req->size = len;
644 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
645 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
646 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
661 PPCODE: 730 PPCODE:
662{ 731{
663 SV *data; 732 SV *data;
664 dREQ; 733 dREQ;
665 734
666 data = newSV (NAME_MAX);
667 SvPOK_on (data);
668
669 req->type = EIO_READLINK; 735 req->type = EIO_READLINK;
670 req->sv1 = newSVsv (path); 736 req->sv1 = newSVsv (path);
671 req->ptr1 = SvPVbyte_nolen (req->sv1); 737 req->ptr1 = SvPVbyte_nolen (req->sv1);
672 req->sv2 = data;
673 req->ptr2 = SvPVbyte_nolen (data);
674 738
675 REQ_SEND; 739 REQ_SEND;
676} 740}
677 741
678void 742void
679aio_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)
680 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
681 PPCODE: 745 PPCODE:
682{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
683 dREQ; 749 dREQ;
684 750
685 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
686 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
687 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
688 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
689 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
690 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
691 req->size = length; 757 req->size = length;
692 758
693 REQ_SEND; 759 REQ_SEND;
694} 760}
… …
696void 762void
697aio_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)
698 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
699 PPCODE: 765 PPCODE:
700{ 766{
767 int fd = extract_fd (fh, 0);
701 dREQ; 768 dREQ;
702 769
703 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
704 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
705 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
706 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
707 req->size = length; 774 req->size = length;
708 775
709 REQ_SEND; 776 REQ_SEND;
710} 777}
… …
716 aio_lstat = EIO_LSTAT 783 aio_lstat = EIO_LSTAT
717 PPCODE: 784 PPCODE:
718{ 785{
719 dREQ; 786 dREQ;
720 787
721 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
722 if (!req->ptr2)
723 {
724 req_destroy (req);
725 croak ("out of memory during aio_stat statdata allocation");
726 }
727
728 req->flags |= EIO_FLAG_PTR2_FREE;
729 req->sv1 = newSVsv (fh_or_path); 788 req->sv1 = newSVsv (fh_or_path);
730 789
731 if (SvPOK (fh_or_path)) 790 if (SvPOK (req->sv1))
732 { 791 {
733 req->type = ix; 792 req->type = ix;
734 req->ptr1 = SvPVbyte_nolen (req->sv1); 793 req->ptr1 = SvPVbyte_nolen (req->sv1);
735 } 794 }
736 else 795 else
… …
750 809
751 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 810 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
752 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 811 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
753 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
754 813
755 if (SvPOK (fh_or_path)) 814 if (SvPOK (req->sv1))
756 { 815 {
757 req->type = EIO_UTIME; 816 req->type = EIO_UTIME;
758 req->ptr1 = SvPVbyte_nolen (req->sv1); 817 req->ptr1 = SvPVbyte_nolen (req->sv1);
759 } 818 }
760 else 819 else
… …
773 dREQ; 832 dREQ;
774 833
775 req->sv1 = newSVsv (fh_or_path); 834 req->sv1 = newSVsv (fh_or_path);
776 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 835 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
777 836
778 if (SvPOK (fh_or_path)) 837 if (SvPOK (req->sv1))
779 { 838 {
780 req->type = EIO_TRUNCATE; 839 req->type = EIO_TRUNCATE;
781 req->ptr1 = SvPVbyte_nolen (req->sv1); 840 req->ptr1 = SvPVbyte_nolen (req->sv1);
782 } 841 }
783 else 842 else
… …
791 850
792void 851void
793aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 852aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
794 ALIAS: 853 ALIAS:
795 aio_chmod = EIO_CHMOD 854 aio_chmod = EIO_CHMOD
796 aio_fchmod = EIO_FCHMOD
797 aio_mkdir = EIO_MKDIR 855 aio_mkdir = EIO_MKDIR
798 PPCODE: 856 PPCODE:
799{ 857{
800 dREQ; 858 dREQ;
801 859
802 req->type = ix;
803 req->int2 = mode; 860 req->int2 = mode;
804 req->sv1 = newSVsv (fh_or_path); 861 req->sv1 = newSVsv (fh_or_path);
805 862
806 if (ix == EIO_FCHMOD) 863 if (SvPOK (req->sv1))
807 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 864 {
865 req->type = ix;
866 req->ptr1 = SvPVbyte_nolen (req->sv1);
867 }
808 else 868 else
809 req->ptr1 = SvPVbyte_nolen (req->sv1); 869 {
870 req->type = EIO_FCHMOD;
871 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
872 }
810 873
811 REQ_SEND; 874 REQ_SEND;
812} 875}
813 876
814void 877void
… …
819 882
820 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 883 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
821 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 884 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
822 req->sv1 = newSVsv (fh_or_path); 885 req->sv1 = newSVsv (fh_or_path);
823 886
824 if (SvPOK (fh_or_path)) 887 if (SvPOK (req->sv1))
825 { 888 {
826 req->type = EIO_CHOWN; 889 req->type = EIO_CHOWN;
827 req->ptr1 = SvPVbyte_nolen (req->sv1); 890 req->ptr1 = SvPVbyte_nolen (req->sv1);
828 } 891 }
829 else 892 else
… …
905{ 968{
906 dREQ; 969 dREQ;
907 970
908 req->type = EIO_GROUP; 971 req->type = EIO_GROUP;
909 972
910 eio_submit (req); 973 req_submit (req);
911 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 974 XPUSHs (req_sv (req, AIO_GRP_KLASS));
912} 975}
913 976
914void 977void
915aio_nop (SV *callback=&PL_sv_undef) 978aio_nop (SV *callback=&PL_sv_undef)
… …
927 990
928int 991int
929aioreq_pri (int pri = 0) 992aioreq_pri (int pri = 0)
930 PROTOTYPE: ;$ 993 PROTOTYPE: ;$
931 CODE: 994 CODE:
932 RETVAL = next_pri - EIO_PRI_BIAS; 995 RETVAL = next_pri;
933 if (items > 0) 996 if (items > 0)
934 { 997 {
935 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 998 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
936 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 999 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
937 next_pri = pri + EIO_PRI_BIAS; 1000 next_pri = pri;
938 } 1001 }
939 OUTPUT: 1002 OUTPUT:
940 RETVAL 1003 RETVAL
941 1004
942void 1005void
943aioreq_nice (int nice = 0) 1006aioreq_nice (int nice = 0)
944 CODE: 1007 CODE:
945 nice = next_pri - nice; 1008 nice = next_pri - nice;
946 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1009 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
947 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1010 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
948 next_pri = nice + EIO_PRI_BIAS; 1011 next_pri = nice;
949 1012
950void 1013void
951flush () 1014flush ()
952 PROTOTYPE: 1015 PROTOTYPE:
953 CODE: 1016 CODE:
… …
1014 1077
1015int 1078int
1016nthreads() 1079nthreads()
1017 PROTOTYPE: 1080 PROTOTYPE:
1018 CODE: 1081 CODE:
1019 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1082 RETVAL = eio_nthreads ();
1020 RETVAL = started;
1021 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1022 OUTPUT: 1083 OUTPUT:
1023 RETVAL 1084 RETVAL
1024 1085
1025void _on_next_submit (SV *cb) 1086void _on_next_submit (SV *cb)
1026 CODE: 1087 CODE:
… …
1036 CODE: 1097 CODE:
1037 eio_cancel (req); 1098 eio_cancel (req);
1038 1099
1039void 1100void
1040cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1041 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
1042 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1043 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1044 1115
1045MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1046 1117
1047void 1118void
1048add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1103void 1174void
1104feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1105 CODE: 1176 CODE:
1106{ 1177{
1107 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1108 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1109 1181
1110 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1111 grp->int2 = 2; 1183 grp->int2 = 2;
1112 1184
1113 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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