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.116 by root, Sat May 10 19:25:33 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 */
… …
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
128static SV *on_next_submit;
129static int next_pri = EIO_PRI_DEFAULT;
106static int max_outstanding = 0; 130static int max_outstanding;
107
108static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS;
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{
410 int res; 445 for (;;)
411
412 do
413 { 446 {
414 res = eio_poll (); 447 int res = eio_poll ();
415 448
416 if (res > 0) 449 if (res > 0)
417 croak (0); 450 croak (0);
451
452 if (!max_outstanding || max_outstanding > eio_nreqs ())
453 return res;
454
455 poll_wait ();
418 } 456 }
419 while (max_outstanding && max_outstanding <= eio_nreqs ());
420
421 return res;
422} 457}
423 458
424static void atfork_child (void) 459static void atfork_child (void)
425{ 460{
426 create_respipe (); 461 create_respipe ();
427} 462}
428 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
429#define dREQ \ 482#define dREQ \
483 SV *cb_cv; \
430 aio_req req; \ 484 aio_req req; \
431 int req_pri = next_pri; \ 485 int req_pri = next_pri; \
432 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 486 next_pri = EIO_PRI_DEFAULT; \
433 \ 487 \
434 if (SvOK (callback) && !SvROK (callback)) \ 488 cb_cv = get_cb (callback); \
435 croak ("callback must be undef or of reference type"); \
436 \ 489 \
437 Newz (0, req, 1, eio_req); \ 490 Newz (0, req, 1, eio_req); \
438 if (!req) \ 491 if (!req) \
439 croak ("out of memory during eio_req allocation"); \ 492 croak ("out of memory during eio_req allocation"); \
440 \ 493 \
441 req->callback = newSVsv (callback); \ 494 req->callback = SvREFCNT_inc (cb_cv); \
442 req->pri = req_pri 495 req->pri = req_pri
443 496
444#define REQ_SEND \ 497#define REQ_SEND \
498 PUTBACK; \
445 eio_submit (req); \ 499 req_submit (req); \
500 SPAGAIN; \
446 \ 501 \
447 if (GIMME_V != G_VOID) \ 502 if (GIMME_V != G_VOID) \
448 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 503 XPUSHs (req_sv (req, AIO_REQ_KLASS));
449 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
450MODULE = IO::AIO PACKAGE = IO::AIO 516MODULE = IO::AIO PACKAGE = IO::AIO
451 517
452PROTOTYPES: ENABLE 518PROTOTYPES: ENABLE
453 519
454BOOT: 520BOOT:
… …
458 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 524 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
459 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 525 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
460 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 526 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
461 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 527 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
462 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 528 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
463#ifdef _WIN32 529#ifndef _WIN32
464 X_MUTEX_CHECK (wrklock);
465 X_MUTEX_CHECK (reslock);
466 X_MUTEX_CHECK (reqlock);
467 X_MUTEX_CHECK (reqwait);
468 X_MUTEX_CHECK (preadwritelock);
469 X_MUTEX_CHECK (readdirlock);
470
471 X_COND_CHECK (reqwait);
472#else
473 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 530 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
474#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));
475 536
476 create_respipe (); 537 create_respipe ();
477 538
478 if (eio_init (want_poll, done_poll) < 0) 539 if (eio_init (want_poll, done_poll) < 0)
479 croak ("IO::AIO: unable to initialise eio library"); 540 croak ("IO::AIO: unable to initialise eio library");
… …
540 ALIAS: 601 ALIAS:
541 aio_fsync = EIO_FSYNC 602 aio_fsync = EIO_FSYNC
542 aio_fdatasync = EIO_FDATASYNC 603 aio_fdatasync = EIO_FDATASYNC
543 PPCODE: 604 PPCODE:
544{ 605{
606 int fd = extract_fd (fh, 0);
545 dREQ; 607 dREQ;
546 608
547 req->type = ix; 609 req->type = ix;
548 req->sv1 = newSVsv (fh); 610 req->sv1 = newSVsv (fh);
549 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;
550 630
551 REQ_SEND (req); 631 REQ_SEND (req);
552} 632}
553 633
554void 634void
555aio_close (SV *fh, SV *callback=&PL_sv_undef) 635aio_close (SV *fh, SV *callback=&PL_sv_undef)
556 PROTOTYPE: $;$ 636 PROTOTYPE: $;$
557 PPCODE: 637 PPCODE:
558{ 638{
559 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);
560 dREQ; 641 dREQ;
561 642
562 if (close_pipe < 0) 643 if (close_pipe < 0)
563 { 644 {
564 int pipefd [2]; 645 int pipefd [2];
… …
572 } 653 }
573 654
574 req->type = EIO_DUP2; 655 req->type = EIO_DUP2;
575 req->int1 = close_pipe; 656 req->int1 = close_pipe;
576 req->sv2 = newSVsv (fh); 657 req->sv2 = newSVsv (fh);
577 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 658 req->int2 = fd;
578 659
579 REQ_SEND (req); 660 REQ_SEND (req);
580} 661}
581 662
582void 663void
… …
588 PPCODE: 669 PPCODE:
589{ 670{
590 STRLEN svlen; 671 STRLEN svlen;
591 char *svptr = SvPVbyte (data, svlen); 672 char *svptr = SvPVbyte (data, svlen);
592 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));
593 678
594 SvUPGRADE (data, SVt_PV); 679 SvUPGRADE (data, SVt_PV);
595 SvPOK_on (data); 680 SvPOK_only (data);
596 681
597 if (dataoffset < 0) 682 if (dataoffset < 0)
598 dataoffset += svlen; 683 dataoffset += svlen;
599 684
600 if (dataoffset < 0 || dataoffset > svlen) 685 if (dataoffset < 0 || dataoffset > svlen)
… …
613 } 698 }
614 699
615 if (len < 0) 700 if (len < 0)
616 croak ("length must not be negative"); 701 croak ("length must not be negative");
617 702
703 fd = extract_fd (fh, ix == EIO_WRITE);
704
618 { 705 {
619 dREQ; 706 dREQ;
620 707
621 req->type = ix; 708 req->type = ix;
622 req->sv1 = newSVsv (fh); 709 req->sv1 = newSVsv (fh);
623 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 710 req->int1 = fd;
624 : IoOFP (sv_2io (fh)));
625 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 711 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
626 req->size = len; 712 req->size = len;
627 req->sv2 = SvREFCNT_inc (data); 713 req->sv2 = SvREFCNT_inc (data);
628 req->ptr2 = (char *)svptr + dataoffset; 714 req->ptr2 = (char *)svptr + dataoffset;
629 req->stroffset = dataoffset; 715 req->stroffset = dataoffset;
… …
644 PPCODE: 730 PPCODE:
645{ 731{
646 SV *data; 732 SV *data;
647 dREQ; 733 dREQ;
648 734
649 data = newSV (NAME_MAX);
650 SvPOK_on (data);
651
652 req->type = EIO_READLINK; 735 req->type = EIO_READLINK;
653 req->sv1 = newSVsv (path); 736 req->sv1 = newSVsv (path);
654 req->ptr1 = SvPVbyte_nolen (req->sv1); 737 req->ptr1 = SvPVbyte_nolen (req->sv1);
655 req->sv2 = data;
656 req->ptr2 = SvPVbyte_nolen (data);
657 738
658 REQ_SEND; 739 REQ_SEND;
659} 740}
660 741
661void 742void
662aio_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)
663 PROTOTYPE: $$$$;$ 744 PROTOTYPE: $$$$;$
664 PPCODE: 745 PPCODE:
665{ 746{
747 int ifd = extract_fd (in_fh , 0);
748 int ofd = extract_fd (out_fh, 0);
666 dREQ; 749 dREQ;
667 750
668 req->type = EIO_SENDFILE; 751 req->type = EIO_SENDFILE;
669 req->sv1 = newSVsv (out_fh); 752 req->sv1 = newSVsv (out_fh);
670 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 753 req->int1 = ofd;
671 req->sv2 = newSVsv (in_fh); 754 req->sv2 = newSVsv (in_fh);
672 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 755 req->int2 = ifd;
673 req->offs = SvVAL64 (in_offset); 756 req->offs = SvVAL64 (in_offset);
674 req->size = length; 757 req->size = length;
675 758
676 REQ_SEND; 759 REQ_SEND;
677} 760}
… …
679void 762void
680aio_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)
681 PROTOTYPE: $$$;$ 764 PROTOTYPE: $$$;$
682 PPCODE: 765 PPCODE:
683{ 766{
767 int fd = extract_fd (fh, 0);
684 dREQ; 768 dREQ;
685 769
686 req->type = EIO_READAHEAD; 770 req->type = EIO_READAHEAD;
687 req->sv1 = newSVsv (fh); 771 req->sv1 = newSVsv (fh);
688 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 772 req->int1 = fd;
689 req->offs = SvVAL64 (offset); 773 req->offs = SvVAL64 (offset);
690 req->size = length; 774 req->size = length;
691 775
692 REQ_SEND; 776 REQ_SEND;
693} 777}
… …
699 aio_lstat = EIO_LSTAT 783 aio_lstat = EIO_LSTAT
700 PPCODE: 784 PPCODE:
701{ 785{
702 dREQ; 786 dREQ;
703 787
704 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
705 if (!req->ptr2)
706 {
707 req_destroy (req);
708 croak ("out of memory during aio_stat statdata allocation");
709 }
710
711 req->flags |= EIO_FLAG_PTR2_FREE;
712 req->sv1 = newSVsv (fh_or_path); 788 req->sv1 = newSVsv (fh_or_path);
713 789
714 if (SvPOK (fh_or_path)) 790 if (SvPOK (req->sv1))
715 { 791 {
716 req->type = ix; 792 req->type = ix;
717 req->ptr1 = SvPVbyte_nolen (req->sv1); 793 req->ptr1 = SvPVbyte_nolen (req->sv1);
718 } 794 }
719 else 795 else
… …
733 809
734 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 810 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
735 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 811 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
736 req->sv1 = newSVsv (fh_or_path); 812 req->sv1 = newSVsv (fh_or_path);
737 813
738 if (SvPOK (fh_or_path)) 814 if (SvPOK (req->sv1))
739 { 815 {
740 req->type = EIO_UTIME; 816 req->type = EIO_UTIME;
741 req->ptr1 = SvPVbyte_nolen (req->sv1); 817 req->ptr1 = SvPVbyte_nolen (req->sv1);
742 } 818 }
743 else 819 else
… …
756 dREQ; 832 dREQ;
757 833
758 req->sv1 = newSVsv (fh_or_path); 834 req->sv1 = newSVsv (fh_or_path);
759 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 835 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
760 836
761 if (SvPOK (fh_or_path)) 837 if (SvPOK (req->sv1))
762 { 838 {
763 req->type = EIO_TRUNCATE; 839 req->type = EIO_TRUNCATE;
764 req->ptr1 = SvPVbyte_nolen (req->sv1); 840 req->ptr1 = SvPVbyte_nolen (req->sv1);
765 } 841 }
766 else 842 else
… …
774 850
775void 851void
776aio_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)
777 ALIAS: 853 ALIAS:
778 aio_chmod = EIO_CHMOD 854 aio_chmod = EIO_CHMOD
779 aio_fchmod = EIO_FCHMOD
780 aio_mkdir = EIO_MKDIR 855 aio_mkdir = EIO_MKDIR
781 PPCODE: 856 PPCODE:
782{ 857{
783 dREQ; 858 dREQ;
784 859
785 req->type = ix;
786 req->int2 = mode; 860 req->int2 = mode;
787 req->sv1 = newSVsv (fh_or_path); 861 req->sv1 = newSVsv (fh_or_path);
788 862
789 if (ix == EIO_FCHMOD) 863 if (SvPOK (req->sv1))
790 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 864 {
865 req->type = ix;
866 req->ptr1 = SvPVbyte_nolen (req->sv1);
867 }
791 else 868 else
792 req->ptr1 = SvPVbyte_nolen (req->sv1); 869 {
870 req->type = EIO_FCHMOD;
871 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
872 }
793 873
794 REQ_SEND; 874 REQ_SEND;
795} 875}
796 876
797void 877void
… …
802 882
803 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 883 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
804 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 884 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
805 req->sv1 = newSVsv (fh_or_path); 885 req->sv1 = newSVsv (fh_or_path);
806 886
807 if (SvPOK (fh_or_path)) 887 if (SvPOK (req->sv1))
808 { 888 {
809 req->type = EIO_CHOWN; 889 req->type = EIO_CHOWN;
810 req->ptr1 = SvPVbyte_nolen (req->sv1); 890 req->ptr1 = SvPVbyte_nolen (req->sv1);
811 } 891 }
812 else 892 else
… …
888{ 968{
889 dREQ; 969 dREQ;
890 970
891 req->type = EIO_GROUP; 971 req->type = EIO_GROUP;
892 972
893 eio_submit (req); 973 req_submit (req);
894 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 974 XPUSHs (req_sv (req, AIO_GRP_KLASS));
895} 975}
896 976
897void 977void
898aio_nop (SV *callback=&PL_sv_undef) 978aio_nop (SV *callback=&PL_sv_undef)
… …
910 990
911int 991int
912aioreq_pri (int pri = 0) 992aioreq_pri (int pri = 0)
913 PROTOTYPE: ;$ 993 PROTOTYPE: ;$
914 CODE: 994 CODE:
915 RETVAL = next_pri - EIO_PRI_BIAS; 995 RETVAL = next_pri;
916 if (items > 0) 996 if (items > 0)
917 { 997 {
918 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 998 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
919 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 999 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
920 next_pri = pri + EIO_PRI_BIAS; 1000 next_pri = pri;
921 } 1001 }
922 OUTPUT: 1002 OUTPUT:
923 RETVAL 1003 RETVAL
924 1004
925void 1005void
926aioreq_nice (int nice = 0) 1006aioreq_nice (int nice = 0)
927 CODE: 1007 CODE:
928 nice = next_pri - nice; 1008 nice = next_pri - nice;
929 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1009 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
930 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1010 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
931 next_pri = nice + EIO_PRI_BIAS; 1011 next_pri = nice;
932 1012
933void 1013void
934flush () 1014flush ()
935 PROTOTYPE: 1015 PROTOTYPE:
936 CODE: 1016 CODE:
… …
997 1077
998int 1078int
999nthreads() 1079nthreads()
1000 PROTOTYPE: 1080 PROTOTYPE:
1001 CODE: 1081 CODE:
1002 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1082 RETVAL = eio_nthreads ();
1003 RETVAL = started;
1004 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1005 OUTPUT: 1083 OUTPUT:
1006 RETVAL 1084 RETVAL
1007 1085
1086void _on_next_submit (SV *cb)
1087 CODE:
1088 SvREFCNT_dec (on_next_submit);
1089 on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
1090
1008PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1009 1092
1010MODULE = IO::AIO PACKAGE = IO::AIO::REQ 1093MODULE = IO::AIO PACKAGE = IO::AIO::REQ
1011 1094
1012void 1095void
… …
1014 CODE: 1097 CODE:
1015 eio_cancel (req); 1098 eio_cancel (req);
1016 1099
1017void 1100void
1018cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1101cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1019 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
1020 SvREFCNT_dec (req->callback); 1111 SvREFCNT_dec (req->callback);
1021 req->callback = newSVsv (callback); 1112 req->callback = SvREFCNT_inc (cb_cv);
1113 }
1114}
1022 1115
1023MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1116MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1024 1117
1025void 1118void
1026add (aio_req grp, ...) 1119add (aio_req grp, ...)
… …
1081void 1174void
1082feed (aio_req grp, SV *callback=&PL_sv_undef) 1175feed (aio_req grp, SV *callback=&PL_sv_undef)
1083 CODE: 1176 CODE:
1084{ 1177{
1085 SvREFCNT_dec (grp->sv2); 1178 SvREFCNT_dec (grp->sv2);
1086 grp->sv2 = newSVsv (callback); 1179 grp->sv2 = newSVsv (callback);
1180 grp->feed = aio_grp_feed;
1087 1181
1088 if (grp->int2 <= 0) 1182 if (grp->int2 <= 0)
1089 grp->int2 = 2; 1183 grp->int2 = 2;
1090 1184
1091 eio_grp_limit (grp, grp->int2); 1185 eio_grp_limit (grp, grp->int2);

Diff Legend

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