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.115 by root, Sat May 10 18:06:41 2008 UTC vs.
Revision 1.137 by root, Sun Apr 19 13:19:57 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 */
… …
101#include "libeio/eio.c" 123#include "libeio/eio.c"
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 unsigned int max_outstanding = 0x7fffffff; 128static SV *on_next_submit;
107 129static int next_pri = EIO_PRI_DEFAULT;
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 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);
113static void req_cancel (aio_req req); 135static void req_cancel (aio_req req);
… …
166 FREETMPS; 188 FREETMPS;
167 LEAVE; 189 LEAVE;
168 } 190 }
169} 191}
170 192
193static void req_submit (eio_req *req)
194{
195 eio_submit (req);
196
197 if (expect_false (on_next_submit))
198 {
199 dSP;
200 SV *cb = sv_2mortal (on_next_submit);
201
202 on_next_submit = 0;
203
204 PUSHMARK (SP);
205 PUTBACK;
206 call_sv (cb, G_DISCARD | G_EVAL);
207 }
208}
209
171static int req_invoke (eio_req *req) 210static int req_invoke (eio_req *req)
172{ 211{
173 dSP; 212 dSP;
174 213
175 if (req->flags & FLAG_SV2_RO_OFF) 214 if (req->flags & FLAG_SV2_RO_OFF)
176 SvREADONLY_off (req->sv2); 215 SvREADONLY_off (req->sv2);
177 216
178 if (!EIO_CANCELLED (req) && SvOK (req->callback)) 217 if (!EIO_CANCELLED (req) && req->callback)
179 { 218 {
180 ENTER; 219 ENTER;
181 SAVETMPS; 220 SAVETMPS;
182 PUSHMARK (SP); 221 PUSHMARK (SP);
183 EXTEND (SP, 1); 222 EXTEND (SP, 1);
… …
260 case EIO_BUSY: 299 case EIO_BUSY:
261 break; 300 break;
262 301
263 case EIO_READLINK: 302 case EIO_READLINK:
264 if (req->result > 0) 303 if (req->result > 0)
265 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
266 SvCUR_set (req->sv2, req->result);
267 *SvEND (req->sv2) = 0;
268 PUSHs (req->sv2);
269 }
270 break; 305 break;
271 306
272 case EIO_STAT: 307 case EIO_STAT:
273 case EIO_LSTAT: 308 case EIO_LSTAT:
274 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
394 X_UNLOCK (reslock); 429 X_UNLOCK (reslock);
395 430
396 if (size) 431 if (size)
397 return; 432 return;
398 433
399 maybe_start_thread (); 434 etp_maybe_start_thread ();
400 435
401 FD_ZERO (&rfd); 436 FD_ZERO (&rfd);
402 FD_SET (respipe [0], &rfd); 437 FD_SET (respipe [0], &rfd);
403 438
404 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 439 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
405 } 440 }
406} 441}
407 442
408static int poll_cb (void) 443static int poll_cb (void)
409{ 444{
445 for (;;)
446 {
410 int res = eio_poll (); 447 int res = eio_poll ();
411 448
412 if (res > 0) 449 if (res > 0)
413 croak (0); 450 croak (0);
414 451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
415 return res; 453 return res;
454
455 poll_wait ();
456 }
457}
458
459static void atfork_child (void)
460{
461 create_respipe ();
462}
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;
416} 480}
417 481
418#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
419 aio_req req; \ 484 aio_req req; \
420 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
421 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
422 \ 487 \
423 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
424 croak ("callback must be undef or of reference type"); \
425 \ 489 \
426 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
427 if (!req) \ 491 if (!req) \
428 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
429 \ 493 \
430 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
431 req->pri = req_pri 495 req->pri = req_pri
432 496
433#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
434 eio_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
435 \ 501 \
436 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
437 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
438 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
439MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
440 517
441PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
442 519
443BOOT: 520BOOT:
… …
447 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
448 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
449 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
450 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
451 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
452#ifdef _WIN32 529#ifndef _WIN32
453 X_MUTEX_CHECK (wrklock);
454 X_MUTEX_CHECK (reslock);
455 X_MUTEX_CHECK (reqlock);
456 X_MUTEX_CHECK (reqwait);
457 X_MUTEX_CHECK (preadwritelock);
458 X_MUTEX_CHECK (readdirlock);
459
460 X_COND_CHECK (reqwait);
461#else
462 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
463#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));
464 536
465 create_respipe (); 537 create_respipe ();
466 538
467 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
468 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
541
542 /* atfork child called in fifo order, so before eio's handler */
543 X_THREAD_ATFORK (0, 0, atfork_child);
469} 544}
470 545
471void 546void
472max_poll_reqs (int nreqs) 547max_poll_reqs (int nreqs)
473 PROTOTYPE: $ 548 PROTOTYPE: $
… …
526 ALIAS: 601 ALIAS:
527 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
528 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
529 PPCODE: 604 PPCODE:
530{ 605{
606 int fd = extract_fd (fh, 0);
531 dREQ; 607 dREQ;
532 608
533 req->type = ix; 609 req->type = ix;
534 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
535 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;
536 630
537 REQ_SEND (req); 631 REQ_SEND (req);
538} 632}
539 633
540void 634void
541aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
542 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
543 PPCODE: 637 PPCODE:
544{ 638{
545 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);
546 dREQ; 641 dREQ;
547 642
548 if (close_pipe < 0) 643 if (close_pipe < 0)
549 { 644 {
550 int pipefd [2]; 645 int pipefd [2];
… …
558 } 653 }
559 654
560 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
561 req->int1 = close_pipe; 656 req->int1 = close_pipe;
562 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
563 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
564 659
565 REQ_SEND (req); 660 REQ_SEND (req);
566} 661}
567 662
568void 663void
… …
572 aio_write = EIO_WRITE 667 aio_write = EIO_WRITE
573 PROTOTYPE: $$$$$;$ 668 PROTOTYPE: $$$$$;$
574 PPCODE: 669 PPCODE:
575{ 670{
576 STRLEN svlen; 671 STRLEN svlen;
672 int fd = extract_fd (fh, ix == EIO_WRITE);
577 char *svptr = SvPVbyte (data, svlen); 673 char *svptr = SvPVbyte (data, svlen);
578 UV len = SvUV (length); 674 UV len = SvUV (length);
579 675
676 if (SvTYPE (data) > SVt_PVMG || SvROK (data))
677 croak ("illegal data argument '%s', must be plain scalar string", SvPV_nolen (data));
678
580 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
581 SvPOK_on (data); 680 SvPOK_only (data);
582 681
583 if (dataoffset < 0) 682 if (dataoffset < 0)
584 dataoffset += svlen; 683 dataoffset += svlen;
585 684
586 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
604 { 703 {
605 dREQ; 704 dREQ;
606 705
607 req->type = ix; 706 req->type = ix;
608 req->sv1 = newSVsv (fh); 707 req->sv1 = newSVsv (fh);
609 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 708 req->int1 = fd;
610 : IoOFP (sv_2io (fh)));
611 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 709 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
612 req->size = len; 710 req->size = len;
613 req->sv2 = SvREFCNT_inc (data); 711 req->sv2 = SvREFCNT_inc (data);
614 req->ptr2 = (char *)svptr + dataoffset; 712 req->ptr2 = (char *)svptr + dataoffset;
615 req->stroffset = dataoffset; 713 req->stroffset = dataoffset;
… …
630 PPCODE: 728 PPCODE:
631{ 729{
632 SV *data; 730 SV *data;
633 dREQ; 731 dREQ;
634 732
635 data = newSV (NAME_MAX);
636 SvPOK_on (data);
637
638 req->type = EIO_READLINK; 733 req->type = EIO_READLINK;
639 req->sv1 = newSVsv (path); 734 req->sv1 = newSVsv (path);
640 req->ptr1 = SvPVbyte_nolen (req->sv1); 735 req->ptr1 = SvPVbyte_nolen (req->sv1);
641 req->sv2 = data;
642 req->ptr2 = SvPVbyte_nolen (data);
643 736
644 REQ_SEND; 737 REQ_SEND;
645} 738}
646 739
647void 740void
648aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 741aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
649 PROTOTYPE: $$$$;$ 742 PROTOTYPE: $$$$;$
650 PPCODE: 743 PPCODE:
651{ 744{
745 int ifd = extract_fd (in_fh , 0);
746 int ofd = extract_fd (out_fh, 0);
652 dREQ; 747 dREQ;
653 748
654 req->type = EIO_SENDFILE; 749 req->type = EIO_SENDFILE;
655 req->sv1 = newSVsv (out_fh); 750 req->sv1 = newSVsv (out_fh);
656 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 751 req->int1 = ofd;
657 req->sv2 = newSVsv (in_fh); 752 req->sv2 = newSVsv (in_fh);
658 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 753 req->int2 = ifd;
659 req->offs = SvVAL64 (in_offset); 754 req->offs = SvVAL64 (in_offset);
660 req->size = length; 755 req->size = length;
661 756
662 REQ_SEND; 757 REQ_SEND;
663} 758}
… …
665void 760void
666aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 761aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
667 PROTOTYPE: $$$;$ 762 PROTOTYPE: $$$;$
668 PPCODE: 763 PPCODE:
669{ 764{
765 int fd = extract_fd (fh, 0);
670 dREQ; 766 dREQ;
671 767
672 req->type = EIO_READAHEAD; 768 req->type = EIO_READAHEAD;
673 req->sv1 = newSVsv (fh); 769 req->sv1 = newSVsv (fh);
674 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 770 req->int1 = fd;
675 req->offs = SvVAL64 (offset); 771 req->offs = SvVAL64 (offset);
676 req->size = length; 772 req->size = length;
677 773
678 REQ_SEND; 774 REQ_SEND;
679} 775}
… …
685 aio_lstat = EIO_LSTAT 781 aio_lstat = EIO_LSTAT
686 PPCODE: 782 PPCODE:
687{ 783{
688 dREQ; 784 dREQ;
689 785
690 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
691 if (!req->ptr2)
692 {
693 req_destroy (req);
694 croak ("out of memory during aio_stat statdata allocation");
695 }
696
697 req->flags |= EIO_FLAG_PTR2_FREE;
698 req->sv1 = newSVsv (fh_or_path); 786 req->sv1 = newSVsv (fh_or_path);
699 787
700 if (SvPOK (fh_or_path)) 788 if (SvPOK (req->sv1))
701 { 789 {
702 req->type = ix; 790 req->type = ix;
703 req->ptr1 = SvPVbyte_nolen (req->sv1); 791 req->ptr1 = SvPVbyte_nolen (req->sv1);
704 } 792 }
705 else 793 else
… …
719 807
720 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 808 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
721 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 809 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
722 req->sv1 = newSVsv (fh_or_path); 810 req->sv1 = newSVsv (fh_or_path);
723 811
724 if (SvPOK (fh_or_path)) 812 if (SvPOK (req->sv1))
725 { 813 {
726 req->type = EIO_UTIME; 814 req->type = EIO_UTIME;
727 req->ptr1 = SvPVbyte_nolen (req->sv1); 815 req->ptr1 = SvPVbyte_nolen (req->sv1);
728 } 816 }
729 else 817 else
… …
742 dREQ; 830 dREQ;
743 831
744 req->sv1 = newSVsv (fh_or_path); 832 req->sv1 = newSVsv (fh_or_path);
745 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 833 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
746 834
747 if (SvPOK (fh_or_path)) 835 if (SvPOK (req->sv1))
748 { 836 {
749 req->type = EIO_TRUNCATE; 837 req->type = EIO_TRUNCATE;
750 req->ptr1 = SvPVbyte_nolen (req->sv1); 838 req->ptr1 = SvPVbyte_nolen (req->sv1);
751 } 839 }
752 else 840 else
… …
760 848
761void 849void
762aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 850aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
763 ALIAS: 851 ALIAS:
764 aio_chmod = EIO_CHMOD 852 aio_chmod = EIO_CHMOD
765 aio_fchmod = EIO_FCHMOD
766 aio_mkdir = EIO_MKDIR 853 aio_mkdir = EIO_MKDIR
767 PPCODE: 854 PPCODE:
768{ 855{
769 dREQ; 856 dREQ;
770 857
771 req->type = ix;
772 req->int2 = mode; 858 req->int2 = mode;
773 req->sv1 = newSVsv (fh_or_path); 859 req->sv1 = newSVsv (fh_or_path);
774 860
775 if (ix == EIO_FCHMOD) 861 if (SvPOK (req->sv1))
776 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 862 {
863 req->type = ix;
864 req->ptr1 = SvPVbyte_nolen (req->sv1);
865 }
777 else 866 else
778 req->ptr1 = SvPVbyte_nolen (req->sv1); 867 {
868 req->type = EIO_FCHMOD;
869 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
870 }
779 871
780 REQ_SEND; 872 REQ_SEND;
781} 873}
782 874
783void 875void
… …
788 880
789 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 881 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
790 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 882 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
791 req->sv1 = newSVsv (fh_or_path); 883 req->sv1 = newSVsv (fh_or_path);
792 884
793 if (SvPOK (fh_or_path)) 885 if (SvPOK (req->sv1))
794 { 886 {
795 req->type = EIO_CHOWN; 887 req->type = EIO_CHOWN;
796 req->ptr1 = SvPVbyte_nolen (req->sv1); 888 req->ptr1 = SvPVbyte_nolen (req->sv1);
797 } 889 }
798 else 890 else
… …
874{ 966{
875 dREQ; 967 dREQ;
876 968
877 req->type = EIO_GROUP; 969 req->type = EIO_GROUP;
878 970
879 eio_submit (req); 971 req_submit (req);
880 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 972 XPUSHs (req_sv (req, AIO_GRP_KLASS));
881} 973}
882 974
883void 975void
884aio_nop (SV *callback=&PL_sv_undef) 976aio_nop (SV *callback=&PL_sv_undef)
… …
896 988
897int 989int
898aioreq_pri (int pri = 0) 990aioreq_pri (int pri = 0)
899 PROTOTYPE: ;$ 991 PROTOTYPE: ;$
900 CODE: 992 CODE:
901 RETVAL = next_pri - EIO_PRI_BIAS; 993 RETVAL = next_pri;
902 if (items > 0) 994 if (items > 0)
903 { 995 {
904 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 996 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
905 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 997 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
906 next_pri = pri + EIO_PRI_BIAS; 998 next_pri = pri;
907 } 999 }
908 OUTPUT: 1000 OUTPUT:
909 RETVAL 1001 RETVAL
910 1002
911void 1003void
912aioreq_nice (int nice = 0) 1004aioreq_nice (int nice = 0)
913 CODE: 1005 CODE:
914 nice = next_pri - nice; 1006 nice = next_pri - nice;
915 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1007 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
916 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1008 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
917 next_pri = nice + EIO_PRI_BIAS; 1009 next_pri = nice;
918 1010
919void 1011void
920flush () 1012flush ()
921 PROTOTYPE: 1013 PROTOTYPE:
922 CODE: 1014 CODE:
923 while (nreqs) 1015 while (eio_nreqs ())
924 { 1016 {
925 poll_wait (); 1017 poll_wait ();
926 poll_cb (); 1018 poll_cb ();
927 } 1019 }
928 1020
… …
983 1075
984int 1076int
985nthreads() 1077nthreads()
986 PROTOTYPE: 1078 PROTOTYPE:
987 CODE: 1079 CODE:
988 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1080 RETVAL = eio_nthreads ();
989 RETVAL = started;
990 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
991 OUTPUT: 1081 OUTPUT:
992 RETVAL 1082 RETVAL
993 1083
1084void _on_next_submit (SV *cb)
1085 CODE:
1086 SvREFCNT_dec (on_next_submit);
1087 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1088
994PROTOTYPES: DISABLE 1089PROTOTYPES: DISABLE
995 1090
996MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1091MODULE = IO::AIO PACKAGE = IO::AIO::REQ
997 1092
998void 1093void
… …
1000 CODE: 1095 CODE:
1001 eio_cancel (req); 1096 eio_cancel (req);
1002 1097
1003void 1098void
1004cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1099cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1005 CODE: 1100 PPCODE:
1101{
1102 if (GIMME_V != G_VOID)
1103 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1104
1105 if (items > 1)
1106 {
1107 SV *cb_cv = get_cb (callback);
1108
1006 SvREFCNT_dec (req->callback); 1109 SvREFCNT_dec (req->callback);
1007 req->callback = newSVsv (callback); 1110 req->callback = SvREFCNT_inc (cb_cv);
1111 }
1112}
1008 1113
1009MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1114MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1010 1115
1011void 1116void
1012add (aio_req grp, ...) 1117add (aio_req grp, ...)
… …
1067void 1172void
1068feed (aio_req grp, SV *callback=&PL_sv_undef) 1173feed (aio_req grp, SV *callback=&PL_sv_undef)
1069 CODE: 1174 CODE:
1070{ 1175{
1071 SvREFCNT_dec (grp->sv2); 1176 SvREFCNT_dec (grp->sv2);
1072 grp->sv2 = newSVsv (callback); 1177 grp->sv2 = newSVsv (callback);
1178 grp->feed = aio_grp_feed;
1073 1179
1074 if (grp->int2 <= 0) 1180 if (grp->int2 <= 0)
1075 grp->int2 = 2; 1181 grp->int2 = 2;
1076 1182
1077 eio_grp_limit (grp, grp->int2); 1183 eio_grp_limit (grp, grp->int2);

Diff Legend

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