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.118 by root, Sun May 11 00:01:03 2008 UTC vs.
Revision 1.138 by root, Tue Apr 21 20:06:05 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);
… …
280 case EIO_BUSY: 299 case EIO_BUSY:
281 break; 300 break;
282 301
283 case EIO_READLINK: 302 case EIO_READLINK:
284 if (req->result > 0) 303 if (req->result > 0)
285 { 304 PUSHs (sv_2mortal (newSVpvn (req->ptr2, req->result)));
286 SvCUR_set (req->sv2, req->result);
287 *SvEND (req->sv2) = 0;
288 PUSHs (req->sv2);
289 }
290 break; 305 break;
291 306
292 case EIO_STAT: 307 case EIO_STAT:
293 case EIO_LSTAT: 308 case EIO_LSTAT:
294 case EIO_FSTAT: 309 case EIO_FSTAT:
… …
297 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2); 312 PL_statcache = *(EIO_STRUCT_STAT *)(req->ptr2);
298 PUSHs (sv_2mortal (newSViv (req->result))); 313 PUSHs (sv_2mortal (newSViv (req->result)));
299 break; 314 break;
300 315
301 case EIO_READ: 316 case EIO_READ:
317 {
302 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); 318 SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0));
303 *SvEND (req->sv2) = 0; 319 *SvEND (req->sv2) = 0;
320 SvPOK_only (req->sv2);
321 SvSETMAGIC (req->sv2);
304 PUSHs (sv_2mortal (newSViv (req->result))); 322 PUSHs (sv_2mortal (newSViv (req->result)));
323 }
305 break; 324 break;
306 325
307 case EIO_DUP2: 326 case EIO_DUP2:
308 if (req->result > 0) 327 if (req->result > 0)
309 req->result = 0; 328 req->result = 0;
… …
414 X_UNLOCK (reslock); 433 X_UNLOCK (reslock);
415 434
416 if (size) 435 if (size)
417 return; 436 return;
418 437
419 maybe_start_thread (); 438 etp_maybe_start_thread ();
420 439
421 FD_ZERO (&rfd); 440 FD_ZERO (&rfd);
422 FD_SET (respipe [0], &rfd); 441 FD_SET (respipe [0], &rfd);
423 442
424 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0); 443 PerlSock_select (respipe [0] + 1, &rfd, 0, 0, 0);
425 } 444 }
426} 445}
427 446
428static int poll_cb (void) 447static int poll_cb (void)
429{ 448{
430 int res; 449 for (;;)
431
432 do
433 { 450 {
434 res = eio_poll (); 451 int res = eio_poll ();
435 452
436 if (res > 0) 453 if (res > 0)
437 croak (0); 454 croak (0);
455
456 if (!max_outstanding || max_outstanding > eio_nreqs ())
457 return res;
458
459 poll_wait ();
438 } 460 }
439 while (max_outstanding && max_outstanding <= eio_nreqs ());
440
441 return res;
442} 461}
443 462
444static void atfork_child (void) 463static void atfork_child (void)
445{ 464{
446 create_respipe (); 465 create_respipe ();
447} 466}
448 467
468static SV *
469get_cb (SV *cb_sv)
470{
471 HV *st;
472 GV *gvp;
473 CV *cv;
474
475 if (!SvOK (cb_sv))
476 return 0;
477
478 cv = sv_2cv (cb_sv, &st, &gvp, 0);
479
480 if (!cv)
481 croak ("IO::AIO callback must be undef or a CODE reference");
482
483 return (SV *)cv;
484}
485
449#define dREQ \ 486#define dREQ \
487 SV *cb_cv; \
450 aio_req req; \ 488 aio_req req; \
451 int req_pri = next_pri; \ 489 int req_pri = next_pri; \
452 next_pri = EIO_DEFAULT_PRI + EIO_PRI_BIAS; \ 490 next_pri = EIO_PRI_DEFAULT; \
453 \ 491 \
454 if (SvOK (callback) && !SvROK (callback)) \ 492 cb_cv = get_cb (callback); \
455 croak ("callback must be undef or of reference type"); \
456 \ 493 \
457 Newz (0, req, 1, eio_req); \ 494 Newz (0, req, 1, eio_req); \
458 if (!req) \ 495 if (!req) \
459 croak ("out of memory during eio_req allocation"); \ 496 croak ("out of memory during eio_req allocation"); \
460 \ 497 \
461 req->callback = newSVsv (callback); \ 498 req->callback = SvREFCNT_inc (cb_cv); \
462 req->pri = req_pri 499 req->pri = req_pri
463 500
464#define REQ_SEND \ 501#define REQ_SEND \
502 PUTBACK; \
465 req_submit (req); \ 503 req_submit (req); \
504 SPAGAIN; \
466 \ 505 \
467 if (GIMME_V != G_VOID) \ 506 if (GIMME_V != G_VOID) \
468 XPUSHs (req_sv (req, AIO_REQ_KLASS)); 507 XPUSHs (req_sv (req, AIO_REQ_KLASS));
469 508
509static int
510extract_fd (SV *fh, int wr)
511{
512 int fd = PerlIO_fileno (wr ? IoOFP (sv_2io (fh)) : IoIFP (sv_2io (fh)));
513
514 if (fd < 0)
515 croak ("illegal fh argument, either not an OS file or read/write mode mismatch");
516
517 return fd;
518}
519
470MODULE = IO::AIO PACKAGE = IO::AIO 520MODULE = IO::AIO PACKAGE = IO::AIO
471 521
472PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
473 523
474BOOT: 524BOOT:
… …
478 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV)); 528 newCONSTSUB (stash, "EXDEV", newSViv (EXDEV));
479 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY)); 529 newCONSTSUB (stash, "O_RDONLY", newSViv (O_RDONLY));
480 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY)); 530 newCONSTSUB (stash, "O_WRONLY", newSViv (O_WRONLY));
481 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT)); 531 newCONSTSUB (stash, "O_CREAT", newSViv (O_CREAT));
482 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC)); 532 newCONSTSUB (stash, "O_TRUNC", newSViv (O_TRUNC));
483#ifdef _WIN32 533#ifndef _WIN32
484 X_MUTEX_CHECK (wrklock);
485 X_MUTEX_CHECK (reslock);
486 X_MUTEX_CHECK (reqlock);
487 X_MUTEX_CHECK (reqwait);
488 X_MUTEX_CHECK (preadwritelock);
489 X_MUTEX_CHECK (readdirlock);
490
491 X_COND_CHECK (reqwait);
492#else
493 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO)); 534 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
494#endif 535#endif
536 newCONSTSUB (stash, "S_IFIFO", newSViv (S_IFIFO));
537 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_BEFORE", newSViv (EIO_SYNC_FILE_RANGE_WAIT_BEFORE));
538 newCONSTSUB (stash, "SYNC_FILE_RANGE_WRITE" , newSViv (EIO_SYNC_FILE_RANGE_WRITE));
539 newCONSTSUB (stash, "SYNC_FILE_RANGE_WAIT_AFTER" , newSViv (EIO_SYNC_FILE_RANGE_WAIT_AFTER));
495 540
496 create_respipe (); 541 create_respipe ();
497 542
498 if (eio_init (want_poll, done_poll) < 0) 543 if (eio_init (want_poll, done_poll) < 0)
499 croak ("IO::AIO: unable to initialise eio library"); 544 croak ("IO::AIO: unable to initialise eio library");
… …
560 ALIAS: 605 ALIAS:
561 aio_fsync = EIO_FSYNC 606 aio_fsync = EIO_FSYNC
562 aio_fdatasync = EIO_FDATASYNC 607 aio_fdatasync = EIO_FDATASYNC
563 PPCODE: 608 PPCODE:
564{ 609{
610 int fd = extract_fd (fh, 0);
565 dREQ; 611 dREQ;
566 612
567 req->type = ix; 613 req->type = ix;
568 req->sv1 = newSVsv (fh); 614 req->sv1 = newSVsv (fh);
569 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 615 req->int1 = fd;
616
617 REQ_SEND (req);
618}
619
620void
621aio_sync_file_range (SV *fh, SV *offset, SV *nbytes, IV flags, SV *callback=&PL_sv_undef)
622 PROTOTYPE: $$$$;$
623 PPCODE:
624{
625 int fd = extract_fd (fh, 0);
626 dREQ;
627
628 req->type = EIO_SYNC_FILE_RANGE;
629 req->sv1 = newSVsv (fh);
630 req->int1 = fd;
631 req->offs = SvVAL64 (offset);
632 req->size = SvVAL64 (nbytes);
633 req->int2 = flags;
570 634
571 REQ_SEND (req); 635 REQ_SEND (req);
572} 636}
573 637
574void 638void
575aio_close (SV *fh, SV *callback=&PL_sv_undef) 639aio_close (SV *fh, SV *callback=&PL_sv_undef)
576 PROTOTYPE: $;$ 640 PROTOTYPE: $;$
577 PPCODE: 641 PPCODE:
578{ 642{
579 static int close_pipe = -1; /* dummy fd to close fds via dup2 */ 643 static int close_pipe = -1; /* dummy fd to close fds via dup2 */
644 int fd = extract_fd (fh, 0);
580 dREQ; 645 dREQ;
581 646
582 if (close_pipe < 0) 647 if (close_pipe < 0)
583 { 648 {
584 int pipefd [2]; 649 int pipefd [2];
… …
592 } 657 }
593 658
594 req->type = EIO_DUP2; 659 req->type = EIO_DUP2;
595 req->int1 = close_pipe; 660 req->int1 = close_pipe;
596 req->sv2 = newSVsv (fh); 661 req->sv2 = newSVsv (fh);
597 req->int2 = PerlIO_fileno (IoIFP (sv_2io (fh))); 662 req->int2 = fd;
598 663
599 REQ_SEND (req); 664 REQ_SEND (req);
600} 665}
601 666
602void 667void
… …
606 aio_write = EIO_WRITE 671 aio_write = EIO_WRITE
607 PROTOTYPE: $$$$$;$ 672 PROTOTYPE: $$$$$;$
608 PPCODE: 673 PPCODE:
609{ 674{
610 STRLEN svlen; 675 STRLEN svlen;
676 int fd = extract_fd (fh, ix == EIO_WRITE);
611 char *svptr = SvPVbyte (data, svlen); 677 char *svptr = SvPVbyte (data, svlen);
612 UV len = SvUV (length); 678 UV len = SvUV (length);
613
614 SvUPGRADE (data, SVt_PV);
615 SvPOK_on (data);
616 679
617 if (dataoffset < 0) 680 if (dataoffset < 0)
618 dataoffset += svlen; 681 dataoffset += svlen;
619 682
620 if (dataoffset < 0 || dataoffset > svlen) 683 if (dataoffset < 0 || dataoffset > svlen)
… …
626 if (!SvOK (length) || len + dataoffset > svlen) 689 if (!SvOK (length) || len + dataoffset > svlen)
627 len = svlen - dataoffset; 690 len = svlen - dataoffset;
628 } 691 }
629 else 692 else
630 { 693 {
631 /* read: grow scalar as necessary */ 694 /* read: check type and grow scalar as necessary */
695 SvUPGRADE (data, SVt_PV);
632 svptr = SvGROW (data, len + dataoffset + 1); 696 svptr = SvGROW (data, len + dataoffset + 1);
633 } 697 }
634 698
635 if (len < 0) 699 if (len < 0)
636 croak ("length must not be negative"); 700 croak ("length must not be negative");
… …
638 { 702 {
639 dREQ; 703 dREQ;
640 704
641 req->type = ix; 705 req->type = ix;
642 req->sv1 = newSVsv (fh); 706 req->sv1 = newSVsv (fh);
643 req->int1 = PerlIO_fileno (ix == EIO_READ ? IoIFP (sv_2io (fh)) 707 req->int1 = fd;
644 : IoOFP (sv_2io (fh)));
645 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 708 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
646 req->size = len; 709 req->size = len;
647 req->sv2 = SvREFCNT_inc (data); 710 req->sv2 = SvREFCNT_inc (data);
648 req->ptr2 = (char *)svptr + dataoffset; 711 req->ptr2 = (char *)svptr + dataoffset;
649 req->stroffset = dataoffset; 712 req->stroffset = dataoffset;
… …
664 PPCODE: 727 PPCODE:
665{ 728{
666 SV *data; 729 SV *data;
667 dREQ; 730 dREQ;
668 731
669 data = newSV (NAME_MAX);
670 SvPOK_on (data);
671
672 req->type = EIO_READLINK; 732 req->type = EIO_READLINK;
673 req->sv1 = newSVsv (path); 733 req->sv1 = newSVsv (path);
674 req->ptr1 = SvPVbyte_nolen (req->sv1); 734 req->ptr1 = SvPVbyte_nolen (req->sv1);
675 req->sv2 = data;
676 req->ptr2 = SvPVbyte_nolen (data);
677 735
678 REQ_SEND; 736 REQ_SEND;
679} 737}
680 738
681void 739void
682aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef) 740aio_sendfile (SV *out_fh, SV *in_fh, SV *in_offset, UV length, SV *callback=&PL_sv_undef)
683 PROTOTYPE: $$$$;$ 741 PROTOTYPE: $$$$;$
684 PPCODE: 742 PPCODE:
685{ 743{
744 int ifd = extract_fd (in_fh , 0);
745 int ofd = extract_fd (out_fh, 0);
686 dREQ; 746 dREQ;
687 747
688 req->type = EIO_SENDFILE; 748 req->type = EIO_SENDFILE;
689 req->sv1 = newSVsv (out_fh); 749 req->sv1 = newSVsv (out_fh);
690 req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); 750 req->int1 = ofd;
691 req->sv2 = newSVsv (in_fh); 751 req->sv2 = newSVsv (in_fh);
692 req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); 752 req->int2 = ifd;
693 req->offs = SvVAL64 (in_offset); 753 req->offs = SvVAL64 (in_offset);
694 req->size = length; 754 req->size = length;
695 755
696 REQ_SEND; 756 REQ_SEND;
697} 757}
… …
699void 759void
700aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef) 760aio_readahead (SV *fh, SV *offset, IV length, SV *callback=&PL_sv_undef)
701 PROTOTYPE: $$$;$ 761 PROTOTYPE: $$$;$
702 PPCODE: 762 PPCODE:
703{ 763{
764 int fd = extract_fd (fh, 0);
704 dREQ; 765 dREQ;
705 766
706 req->type = EIO_READAHEAD; 767 req->type = EIO_READAHEAD;
707 req->sv1 = newSVsv (fh); 768 req->sv1 = newSVsv (fh);
708 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); 769 req->int1 = fd;
709 req->offs = SvVAL64 (offset); 770 req->offs = SvVAL64 (offset);
710 req->size = length; 771 req->size = length;
711 772
712 REQ_SEND; 773 REQ_SEND;
713} 774}
… …
719 aio_lstat = EIO_LSTAT 780 aio_lstat = EIO_LSTAT
720 PPCODE: 781 PPCODE:
721{ 782{
722 dREQ; 783 dREQ;
723 784
724 req->ptr2 = malloc (sizeof (EIO_STRUCT_STAT));
725 if (!req->ptr2)
726 {
727 req_destroy (req);
728 croak ("out of memory during aio_stat statdata allocation");
729 }
730
731 req->flags |= EIO_FLAG_PTR2_FREE;
732 req->sv1 = newSVsv (fh_or_path); 785 req->sv1 = newSVsv (fh_or_path);
733 786
734 if (SvPOK (fh_or_path)) 787 if (SvPOK (req->sv1))
735 { 788 {
736 req->type = ix; 789 req->type = ix;
737 req->ptr1 = SvPVbyte_nolen (req->sv1); 790 req->ptr1 = SvPVbyte_nolen (req->sv1);
738 } 791 }
739 else 792 else
… …
753 806
754 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; 807 req->nv1 = SvOK (atime) ? SvNV (atime) : -1.;
755 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; 808 req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.;
756 req->sv1 = newSVsv (fh_or_path); 809 req->sv1 = newSVsv (fh_or_path);
757 810
758 if (SvPOK (fh_or_path)) 811 if (SvPOK (req->sv1))
759 { 812 {
760 req->type = EIO_UTIME; 813 req->type = EIO_UTIME;
761 req->ptr1 = SvPVbyte_nolen (req->sv1); 814 req->ptr1 = SvPVbyte_nolen (req->sv1);
762 } 815 }
763 else 816 else
… …
776 dREQ; 829 dREQ;
777 830
778 req->sv1 = newSVsv (fh_or_path); 831 req->sv1 = newSVsv (fh_or_path);
779 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1; 832 req->offs = SvOK (offset) ? SvVAL64 (offset) : -1;
780 833
781 if (SvPOK (fh_or_path)) 834 if (SvPOK (req->sv1))
782 { 835 {
783 req->type = EIO_TRUNCATE; 836 req->type = EIO_TRUNCATE;
784 req->ptr1 = SvPVbyte_nolen (req->sv1); 837 req->ptr1 = SvPVbyte_nolen (req->sv1);
785 } 838 }
786 else 839 else
… …
794 847
795void 848void
796aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) 849aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef)
797 ALIAS: 850 ALIAS:
798 aio_chmod = EIO_CHMOD 851 aio_chmod = EIO_CHMOD
799 aio_fchmod = EIO_FCHMOD
800 aio_mkdir = EIO_MKDIR 852 aio_mkdir = EIO_MKDIR
801 PPCODE: 853 PPCODE:
802{ 854{
803 dREQ; 855 dREQ;
804 856
805 req->type = ix;
806 req->int2 = mode; 857 req->int2 = mode;
807 req->sv1 = newSVsv (fh_or_path); 858 req->sv1 = newSVsv (fh_or_path);
808 859
809 if (ix == EIO_FCHMOD) 860 if (SvPOK (req->sv1))
810 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); 861 {
862 req->type = ix;
863 req->ptr1 = SvPVbyte_nolen (req->sv1);
864 }
811 else 865 else
812 req->ptr1 = SvPVbyte_nolen (req->sv1); 866 {
867 req->type = EIO_FCHMOD;
868 req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path)));
869 }
813 870
814 REQ_SEND; 871 REQ_SEND;
815} 872}
816 873
817void 874void
… …
822 879
823 req->int2 = SvOK (uid) ? SvIV (uid) : -1; 880 req->int2 = SvOK (uid) ? SvIV (uid) : -1;
824 req->int3 = SvOK (gid) ? SvIV (gid) : -1; 881 req->int3 = SvOK (gid) ? SvIV (gid) : -1;
825 req->sv1 = newSVsv (fh_or_path); 882 req->sv1 = newSVsv (fh_or_path);
826 883
827 if (SvPOK (fh_or_path)) 884 if (SvPOK (req->sv1))
828 { 885 {
829 req->type = EIO_CHOWN; 886 req->type = EIO_CHOWN;
830 req->ptr1 = SvPVbyte_nolen (req->sv1); 887 req->ptr1 = SvPVbyte_nolen (req->sv1);
831 } 888 }
832 else 889 else
… …
908{ 965{
909 dREQ; 966 dREQ;
910 967
911 req->type = EIO_GROUP; 968 req->type = EIO_GROUP;
912 969
913 eio_submit (req); 970 req_submit (req);
914 XPUSHs (req_sv (req, AIO_GRP_KLASS)); 971 XPUSHs (req_sv (req, AIO_GRP_KLASS));
915} 972}
916 973
917void 974void
918aio_nop (SV *callback=&PL_sv_undef) 975aio_nop (SV *callback=&PL_sv_undef)
… …
930 987
931int 988int
932aioreq_pri (int pri = 0) 989aioreq_pri (int pri = 0)
933 PROTOTYPE: ;$ 990 PROTOTYPE: ;$
934 CODE: 991 CODE:
935 RETVAL = next_pri - EIO_PRI_BIAS; 992 RETVAL = next_pri;
936 if (items > 0) 993 if (items > 0)
937 { 994 {
938 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN; 995 if (pri < EIO_PRI_MIN) pri = EIO_PRI_MIN;
939 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX; 996 if (pri > EIO_PRI_MAX) pri = EIO_PRI_MAX;
940 next_pri = pri + EIO_PRI_BIAS; 997 next_pri = pri;
941 } 998 }
942 OUTPUT: 999 OUTPUT:
943 RETVAL 1000 RETVAL
944 1001
945void 1002void
946aioreq_nice (int nice = 0) 1003aioreq_nice (int nice = 0)
947 CODE: 1004 CODE:
948 nice = next_pri - nice; 1005 nice = next_pri - nice;
949 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN; 1006 if (nice < EIO_PRI_MIN) nice = EIO_PRI_MIN;
950 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX; 1007 if (nice > EIO_PRI_MAX) nice = EIO_PRI_MAX;
951 next_pri = nice + EIO_PRI_BIAS; 1008 next_pri = nice;
952 1009
953void 1010void
954flush () 1011flush ()
955 PROTOTYPE: 1012 PROTOTYPE:
956 CODE: 1013 CODE:
… …
1017 1074
1018int 1075int
1019nthreads() 1076nthreads()
1020 PROTOTYPE: 1077 PROTOTYPE:
1021 CODE: 1078 CODE:
1022 if (WORDACCESS_UNSAFE) X_LOCK (wrklock); 1079 RETVAL = eio_nthreads ();
1023 RETVAL = started;
1024 if (WORDACCESS_UNSAFE) X_UNLOCK (wrklock);
1025 OUTPUT: 1080 OUTPUT:
1026 RETVAL 1081 RETVAL
1027 1082
1028void _on_next_submit (SV *cb) 1083void _on_next_submit (SV *cb)
1029 CODE: 1084 CODE:
… …
1039 CODE: 1094 CODE:
1040 eio_cancel (req); 1095 eio_cancel (req);
1041 1096
1042void 1097void
1043cb (aio_req_ornot req, SV *callback=&PL_sv_undef) 1098cb (aio_req_ornot req, SV *callback=&PL_sv_undef)
1044 CODE: 1099 PPCODE:
1100{
1101 if (GIMME_V != G_VOID)
1102 XPUSHs (req->callback ? sv_2mortal (newRV_inc (req->callback)) : &PL_sv_undef);
1103
1104 if (items > 1)
1105 {
1106 SV *cb_cv = get_cb (callback);
1107
1045 SvREFCNT_dec (req->callback); 1108 SvREFCNT_dec (req->callback);
1046 req->callback = newSVsv (callback); 1109 req->callback = SvREFCNT_inc (cb_cv);
1110 }
1111}
1047 1112
1048MODULE = IO::AIO PACKAGE = IO::AIO::GRP 1113MODULE = IO::AIO PACKAGE = IO::AIO::GRP
1049 1114
1050void 1115void
1051add (aio_req grp, ...) 1116add (aio_req grp, ...)
… …
1106void 1171void
1107feed (aio_req grp, SV *callback=&PL_sv_undef) 1172feed (aio_req grp, SV *callback=&PL_sv_undef)
1108 CODE: 1173 CODE:
1109{ 1174{
1110 SvREFCNT_dec (grp->sv2); 1175 SvREFCNT_dec (grp->sv2);
1111 grp->sv2 = newSVsv (callback); 1176 grp->sv2 = newSVsv (callback);
1177 grp->feed = aio_grp_feed;
1112 1178
1113 if (grp->int2 <= 0) 1179 if (grp->int2 <= 0)
1114 grp->int2 = 2; 1180 grp->int2 = 2;
1115 1181
1116 eio_grp_limit (grp, grp->int2); 1182 eio_grp_limit (grp, grp->int2);

Diff Legend

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