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.120 by root, Sun May 11 19:17:09 2008 UTC vs.
Revision 1.143 by root, Sat Jun 6 19:44:17 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"
84 103
85#define EIO_COMMON \ 104#define EIO_REQ_MEMBERS \
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;
109
110#define EIO_NO_WRAPPERS 1
90 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 */
… …
105 124
106typedef eio_req *aio_req; 125typedef eio_req *aio_req;
107typedef eio_req *aio_req_ornot; 126typedef eio_req *aio_req_ornot;
108 127
109static SV *on_next_submit; 128static SV *on_next_submit;
110static int next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; 129static int next_pri = EIO_PRI_DEFAULT;
111static int max_outstanding; 130static int max_outstanding;
112 131
113static int respipe_osf [2], respipe [2] = { -1, -1 }; 132static int respipe_osf [2], respipe [2] = { -1, -1 };
114 133
115static void req_destroy (aio_req req); 134static void req_destroy (aio_req req);
… …
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);
… …
216 235
217 av_extend (av, req->result - 1); 236 av_extend (av, req->result - 1);
218 237
219 for (i = 0; i < req->result; ++i) 238 for (i = 0; i < req->result; ++i)
220 { 239 {
240 if (req->int1 & EIO_READDIR_DENTS)
241 {
242 eio_dirent *ent = (eio_dirent *)buf;
243 SV *namesv = newSVpvn (ent->name, ent->namelen);
244
245 if (req->int1 & EIO_READDIR_CUSTOM2)
246 {
247 static SV *sv_type [EIO_DT_MAX + 1]; /* type sv cache */
248 AV *avent = newAV ();
249
250 av_extend (avent, 2);
251
252 if (!sv_type [ent->type])
253 {
254 sv_type [ent->type] = newSViv (ent->type);
255 SvREADONLY_on (sv_type [ent->type]);
256 }
257
258 av_store (avent, 0, namesv);
259 av_store (avent, 1, SvREFCNT_inc (sv_type [ent->type]));
260 av_store (avent, 2, IVSIZE >= 8 ? newSVuv (ent->inode) : newSVnv (ent->inode));
261
262 av_store (av, i, newRV_noinc ((SV *)avent));
263 }
264 else
265 av_store (av, i, namesv);
266
267 buf += sizeof (eio_dirent);
268 }
269 else
270 {
221 SV *sv = newSVpv (buf, 0); 271 SV *name = newSVpv (buf, 0);
222
223 av_store (av, i, sv); 272 av_store (av, i, name);
224 buf += SvCUR (sv) + 1; 273 buf += SvCUR (name) + 1;
274 }
225 } 275 }
226 276
227 rv = sv_2mortal (newRV_noinc ((SV *)av)); 277 rv = sv_2mortal (newRV_noinc ((SV *)av));
228 } 278 }
229 279
230 PUSHs (rv); 280 PUSHs (rv);
281
282 if (req->int1 & EIO_READDIR_CUSTOM1)
283 XPUSHs (sv_2mortal (newSViv (req->int1 & ~(EIO_READDIR_CUSTOM1 | EIO_READDIR_CUSTOM2))));
231 } 284 }
232 break; 285 break;
233 286
234 case EIO_OPEN: 287 case EIO_OPEN:
235 { 288 {
… …
293 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 346 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
294 PUSHs (sv_2mortal (newSViv (req->result))); 347 PUSHs (sv_2mortal (newSViv (req->result)));
295 break; 348 break;
296 349
297 case EIO_READ: 350 case EIO_READ:
351 {
298 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 352 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
299 *SvEND (req->sv2) = 0; 353 *SvEND (req->sv2) = 0;
354 SvPOK_only (req->sv2);
355 SvSETMAGIC (req->sv2);
300 PUSHs (sv_2mortal (newSViv (req->result))); 356 PUSHs (sv_2mortal (newSViv (req->result)));
357 }
301 break; 358 break;
302 359
303 case EIO_DUP2: 360 case EIO_DUP2:
304 if (req->result > 0) 361 if (req->result > 0)
305 req->result = 0; 362 req->result = 0;
… …
410 X_UNLOCK (reslock); 467 X_UNLOCK (reslock);
411 468
412 if (size) 469 if (size)
413 return; 470 return;
414 471
415 maybe_start_thread (); 472 etp_maybe_start_thread ();
416 473
417 FD_ZERO (&rfd); 474 FD_ZERO (&rfd);
418 FD_SET (respipe [0], &rfd); 475 FD_SET (respipe [0], &rfd);
419 476
420 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 477 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
421 } 478 }
422} 479}
423 480
424static int poll_cb (void) 481static int poll_cb (void)
425{ 482{
426 int res; 483 for (;;)
427
428 do
429 { 484 {
430 res = eio_poll (); 485 int res = eio_poll ();
431 486
432 if (res > 0) 487 if (res > 0)
433 croak (0); 488 croak (0);
489
490 if (!max_outstanding || max_outstanding > eio_nreqs ())
491 return res;
492
493 poll_wait ();
434 } 494 }
435 while (max_outstanding && max_outstanding <= eio_nreqs ());
436
437 return res;
438} 495}
439 496
440static void atfork_child (void) 497static void atfork_child (void)
441{ 498{
442 create_respipe (); 499 create_respipe ();
443} 500}
444 501
502static SV *
503get_cb (SV *cb_sv)
504{
505 HV *st;
506 GV *gvp;
507 CV *cv;
508
509 if (!SvOK (cb_sv))
510 return 0;
511
512 cv = sv_2cv (cb_sv, &st, &gvp, 0);
513
514 if (!cv)
515 croak ("IO::AIO callback must be undef or a CODE reference");
516
517 return (SV *)cv;
518}
519
445#define dREQ \ 520#define dREQ \
521 SV *cb_cv; \
446 aio_req req; \ 522 aio_req req; \
447 int req_pri = next_pri; \ 523 int req_pri = next_pri; \
448 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 524 next_pri = EIO_PRI_DEFAULT; \
449 \ 525 \
450 if (SvOK (callback) && !SvROK (callback)) \ 526 cb_cv = get_cb (callback); \
451 croak ("callback must be undef or of reference type"); \
452 \ 527 \
453 Newz (0, req, 1, eio_req); \ 528 Newz (0, req, 1, eio_req); \
454 if (!req) \ 529 if (!req) \
455 croak ("out of memory during eio_req allocation"); \ 530 croak ("out of memory during eio_req allocation"); \
456 \ 531 \
457 req->callback = newSVsv (callback); \ 532 req->callback = SvREFCNT_inc (cb_cv); \
458 req->pri = req_pri 533 req->pri = req_pri
459 534
460#define REQ_SEND \ 535#define REQ_SEND \
536 PUTBACK; \
461 req_submit (req); \ 537 req_submit (req); \
538 SPAGAIN; \
462 \ 539 \
463 if (GIMME_V != G_VOID) \ 540 if (GIMME_V != G_VOID) \
464 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 541 XPUSHs (req_sv (req, AIO_REQ_KLASS));
465 542
543static int
544extract_fd (SV *fh, int wr)
545{
546 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
547
548 if (fd < 0)
549 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
550
551 return fd;
552}
553
466MODULE = IO::AIO PACKAGE = IO::AIO 554MODULE = IO::AIO PACKAGE = IO::AIO
467 555
468PROTOTYPES: ENABLE 556PROTOTYPES: ENABLE
469 557
470BOOT: 558BOOT:
471{ 559{
472 stash = gv_stashpv ("IO::AIO", 1); 560 stash = gv_stashpv ("IO::AIO", 1);
473 561
474 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 562 static const struct {
475 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 563 const char *name;
476 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 564 IV iv;
477 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 565 } *civ, const_iv[] = {
478 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 566# define const_iv(name, value) { # name, (IV) value },
567# define const_eio(name) { # name, (IV) EIO_ ## name },
568 const_iv (EXDEV , EXDEV)
569 const_iv (ENOSYS , ENOSYS)
570 const_iv (O_RDONLY, O_RDONLY)
571 const_iv (O_WRONLY, O_WRONLY)
572 const_iv (O_CREAT , O_CREAT)
573 const_iv (O_TRUNC , O_TRUNC)
479#ifdef _WIN32 574#ifndef _WIN32
480 X_MUTEX_CHECK (wrklock); 575 const_iv (S_IFIFO , S_IFIFO)
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));
490#endif 576#endif
577 const_eio (SYNC_FILE_RANGE_WAIT_BEFORE)
578 const_eio (SYNC_FILE_RANGE_WRITE)
579 const_eio (SYNC_FILE_RANGE_WAIT_AFTER)
491 580
581 const_eio (READDIR_DENTS)
582 const_eio (READDIR_DIRS_FIRST)
583 const_eio (READDIR_STAT_ORDER)
584 const_eio (READDIR_FOUND_UNKNOWN)
585
586 const_eio (DT_UNKNOWN)
587 const_eio (DT_FIFO)
588 const_eio (DT_CHR)
589 const_eio (DT_DIR)
590 const_eio (DT_BLK)
591 const_eio (DT_REG)
592 const_eio (DT_LNK)
593 const_eio (DT_SOCK)
594 const_eio (DT_WHT)
595 };
596
597 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
598 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
599
492 create_respipe (); 600 create_respipe ();
493 601
494 if (eio_init (want_poll, done_poll) < 0) 602 if (eio_init (want_poll, done_poll) < 0)
495 croak ("IO::AIO: unable to initialise eio library"); 603 croak ("IO::AIO: unable to initialise eio library");
496 604
497 /* atfork child called in fifo order, so before eio's handler */ 605 /* atfork child called in fifo order, so before eio's handler */
498 X_THREAD_ATFORK (0, 0, atfork_child); 606 X_THREAD_ATFORK (0, 0, atfork_child);
499} 607}
500 608
501void 609void
502max_poll_reqs (int nreqs) 610max_poll_reqs (int nreqs)
503 PROTOTYPE: $ 611 PROTOTYPE: $
… …
556 ALIAS: 664 ALIAS:
557 aio_fsync = EIO_FSYNC 665 aio_fsync = EIO_FSYNC
558 aio_fdatasync = EIO_FDATASYNC 666 aio_fdatasync = EIO_FDATASYNC
559 PPCODE: 667 PPCODE:
560{ 668{
669 int fd = extract_fd (fh, 0);
561 dREQ; 670 dREQ;
562 671
563 req->type = ix; 672 req->type = ix;
564 req->sv1 = newSVsv (fh); 673 req->sv1 = newSVsv (fh);
565 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 674 req->int1 = fd;
675
676 REQ_SEND (req);
677}
678
679void
680aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
681 PROTOTYPE: $$$$;$
682 PPCODE:
683{
684 int fd = extract_fd (fh, 0);
685 dREQ;
686
687 req->type = EIO_SYNC_FILE_RANGE;
688 req->sv1 = newSVsv (fh);
689 req->int1 = fd;
690 req->offs = SvVAL64 (offset);
691 req->size = SvVAL64 (nbytes);
692 req->int2 = flags;
566 693
567 REQ_SEND (req); 694 REQ_SEND (req);
568} 695}
569 696
570void 697void
571aio_close (SV *fh, SV *callback=&PL_sv_undef) 698aio_close (SV *fh, SV *callback=&PL_sv_undef)
572 PROTOTYPE: $;$ 699 PROTOTYPE: $;$
573 PPCODE: 700 PPCODE:
574{ 701{
575 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 702 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
703 int fd = extract_fd (fh, 0);
576 dREQ; 704 dREQ;
577 705
578 if (close_pipe < 0) 706 if (close_pipe < 0)
579 { 707 {
580 int pipefd [2]; 708 int pipefd [2];
… …
588 } 716 }
589 717
590 req->type = EIO_DUP2; 718 req->type = EIO_DUP2;
591 req->int1 = close_pipe; 719 req->int1 = close_pipe;
592 req->sv2 = newSVsv (fh); 720 req->sv2 = newSVsv (fh);
593 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 721 req->int2 = fd;
594 722
595 REQ_SEND (req); 723 REQ_SEND (req);
596} 724}
597 725
598void 726void
… …
602 aio_write = EIO_WRITE 730 aio_write = EIO_WRITE
603 PROTOTYPE: $$$$$;$ 731 PROTOTYPE: $$$$$;$
604 PPCODE: 732 PPCODE:
605{ 733{
606 STRLEN svlen; 734 STRLEN svlen;
735 int fd = extract_fd (fh, ix == EIO_WRITE);
607 char *svptr = SvPVbyte (data, svlen); 736 char *svptr = SvPVbyte (data, svlen);
608 UV len = SvUV (length); 737 UV len = SvUV (length);
609
610 SvUPGRADE (data, SVt_PV);
611 SvPOK_on (data);
612 738
613 if (dataoffset < 0) 739 if (dataoffset < 0)
614 dataoffset += svlen; 740 dataoffset += svlen;
615 741
616 if (dataoffset < 0 || dataoffset > svlen) 742 if (dataoffset < 0 || dataoffset > svlen)
… …
622 if (!SvOK (length) || len + dataoffset > svlen) 748 if (!SvOK (length) || len + dataoffset > svlen)
623 len = svlen - dataoffset; 749 len = svlen - dataoffset;
624 } 750 }
625 else 751 else
626 { 752 {
627 /* read: grow scalar as necessary */ 753 /* read: check type and grow scalar as necessary */
754 SvUPGRADE (data, SVt_PV);
628 svptr = SvGROW (data, len + dataoffset + 1); 755 svptr = SvGROW (data, len + dataoffset + 1);
629 } 756 }
630
631 if (len < 0)
632 croak ("length must not be negative");
633 757
634 { 758 {
635 dREQ; 759 dREQ;
636 760
637 req->type = ix; 761 req->type = ix;
638 req->sv1 = newSVsv (fh); 762 req->sv1 = newSVsv (fh);
639 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 763 req->int1 = fd;
640 : IoOFP (sv_2io (fh)));
641 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 764 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
642 req->size = len; 765 req->size = len;
643 req->sv2 = SvREFCNT_inc (data); 766 req->sv2 = SvREFCNT_inc (data);
644 req->ptr2 = (char *)svptr + dataoffset; 767 req->ptr2 = (char *)svptr + dataoffset;
645 req->stroffset = dataoffset; 768 req->stroffset = dataoffset;
… …
672void 795void
673aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 796aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
674 PROTOTYPE: $$$$;$ 797 PROTOTYPE: $$$$;$
675 PPCODE: 798 PPCODE:
676{ 799{
800 int ifd = extract_fd (in_fh , 0);
801 int ofd = extract_fd (out_fh, 0);
677 dREQ; 802 dREQ;
678 803
679 req->type = EIO_SENDFILE; 804 req->type = EIO_SENDFILE;
680 req->sv1 = newSVsv (out_fh); 805 req->sv1 = newSVsv (out_fh);
681 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 806 req->int1 = ofd;
682 req->sv2 = newSVsv (in_fh); 807 req->sv2 = newSVsv (in_fh);
683 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 808 req->int2 = ifd;
684 req->offs = SvVAL64 (in_offset); 809 req->offs = SvVAL64 (in_offset);
685 req->size = length; 810 req->size = length;
686 811
687 REQ_SEND; 812 REQ_SEND;
688} 813}
… …
690void 815void
691aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 816aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
692 PROTOTYPE: $$$;$ 817 PROTOTYPE: $$$;$
693 PPCODE: 818 PPCODE:
694{ 819{
820 int fd = extract_fd (fh, 0);
695 dREQ; 821 dREQ;
696 822
697 req->type = EIO_READAHEAD; 823 req->type = EIO_READAHEAD;
698 req->sv1 = newSVsv (fh); 824 req->sv1 = newSVsv (fh);
699 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 825 req->int1 = fd;
700 req->offs = SvVAL64 (offset); 826 req->offs = SvVAL64 (offset);
701 req->size = length; 827 req->size = length;
702 828
703 REQ_SEND; 829 REQ_SEND;
704} 830}
… …
821 req->type = EIO_FCHOWN; 947 req->type = EIO_FCHOWN;
822 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 948 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
823 } 949 }
824 950
825 REQ_SEND; 951 REQ_SEND;
952}
953
954void
955aio_readdirx (SV8 *pathname, IV flags, SV *callback=&PL_sv_undef)
956 PPCODE:
957{
958 dREQ;
959
960 req->type = EIO_READDIR;
961 req->sv1 = newSVsv (pathname);
962 req->ptr1 = SvPVbyte_nolen (req->sv1);
963 req->int1 = flags | EIO_READDIR_DENTS | EIO_READDIR_CUSTOM1;
964
965 if (flags & EIO_READDIR_DENTS)
966 req->int1 |= EIO_READDIR_CUSTOM2;
967
968 REQ_SEND;
826} 969}
827 970
828void 971void
829aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) 972aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef)
830 ALIAS: 973 ALIAS:
… …
895{ 1038{
896 dREQ; 1039 dREQ;
897 1040
898 req->type = EIO_GROUP; 1041 req->type = EIO_GROUP;
899 1042
900 eio_submit (req); 1043 req_submit (req);
901 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 1044 XPUSHs (req_sv (req, AIO_GRP_KLASS));
902} 1045}
903 1046
904void 1047void
905aio_nop (SV *callback=&PL_sv_undef) 1048aio_nop (SV *callback=&PL_sv_undef)
… …
917 1060
918int 1061int
919aioreq_pri (int pri = 0) 1062aioreq_pri (int pri = 0)
920 PROTOTYPE: ;$ 1063 PROTOTYPE: ;$
921 CODE: 1064 CODE:
922 RETVAL = next_pri - EIO_PRI_BIAS; 1065 RETVAL = next_pri;
923 if (items > 0) 1066 if (items > 0)
924 { 1067 {
925 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 1068 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
926 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 1069 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
927 next_pri = pri + EIO_PRI_BIAS; 1070 next_pri = pri;
928 } 1071 }
929 OUTPUT: 1072 OUTPUT:
930 RETVAL 1073 RETVAL
931 1074
932void 1075void
933aioreq_nice (int nice = 0) 1076aioreq_nice (int nice = 0)
934 CODE: 1077 CODE:
935 nice = next_pri - nice; 1078 nice = next_pri - nice;
936 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1079 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
937 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1080 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
938 next_pri = nice + EIO_PRI_BIAS; 1081 next_pri = nice;
939 1082
940void 1083void
941flush () 1084flush ()
942 PROTOTYPE: 1085 PROTOTYPE:
943 CODE: 1086 CODE:
… …
1004 1147
1005int 1148int
1006nthreads() 1149nthreads()
1007 PROTOTYPE: 1150 PROTOTYPE:
1008 CODE: 1151 CODE:
1009 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1152 RETVAL = eio_nthreads ();
1010 RETVAL = started;
1011 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1012 OUTPUT: 1153 OUTPUT:
1013 RETVAL 1154 RETVAL
1014 1155
1015void _on_next_submit (SV *cb) 1156void _on_next_submit (SV *cb)
1016 CODE: 1157 CODE:
… …
1026 CODE: 1167 CODE:
1027 eio_cancel (req); 1168 eio_cancel (req);
1028 1169
1029void 1170void
1030cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1171cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1031 CODE: 1172 PPCODE:
1173{
1174 if (GIMME_V != G_VOID)
1175 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1176
1177 if (items > 1)
1178 {
1179 SV *cb_cv = get_cb (callback);
1180
1032 SvREFCNT_dec (req->callback); 1181 SvREFCNT_dec (req->callback);
1033 req->callback = newSVsv (callback); 1182 req->callback = SvREFCNT_inc (cb_cv);
1183 }
1184}
1034 1185
1035MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1186MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1036 1187
1037void 1188void
1038add (aio_req grp, ...) 1189add (aio_req grp, ...)
… …
1070 AV *av; 1221 AV *av;
1071 1222
1072 grp->errorno = errno; 1223 grp->errorno = errno;
1073 1224
1074 av = newAV (); 1225 av = newAV ();
1226 av_extend (av, items - 1);
1075 1227
1076 for (i = 1; i < items; ++i ) 1228 for (i = 1; i < items; ++i )
1077 av_push (av, newSVsv (ST (i))); 1229 av_push (av, newSVsv (ST (i)));
1078 1230
1079 SvREFCNT_dec (grp->sv1); 1231 SvREFCNT_dec (grp->sv1);
… …
1093void 1245void
1094feed (aio_req grp, SV *callback=&PL_sv_undef) 1246feed (aio_req grp, SV *callback=&PL_sv_undef)
1095 CODE: 1247 CODE:
1096{ 1248{
1097 SvREFCNT_dec (grp->sv2); 1249 SvREFCNT_dec (grp->sv2);
1098 grp->sv2 = newSVsv (callback); 1250 grp->sv2 = newSVsv (callback);
1251 grp->feed = aio_grp_feed;
1099 1252
1100 if (grp->int2 <= 0) 1253 if (grp->int2 <= 0)
1101 grp->int2 = 2; 1254 grp->int2 = 2;
1102 1255
1103 eio_grp_limit (grp, grp->int2); 1256 eio_grp_limit (grp, grp->int2);

Diff Legend

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